mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-10-09 19:19:50 +08:00
Chats: - New Chat right after an answer saves that chat once. Saves run one at a time and read the chat on screen when their turn comes; a save scheduled for a chat that is no longer on screen is dropped. A chat whose id was still on its way to the URL no longer comes back after New Chat (the next answer went into it). - Crossing the 768 px breakpoint keeps the chat panel: a streaming answer, unsaved messages and attachments stay. The panel gets the sizes of each side, and a panel collapsed on desktop opens on mobile. - The chat's export waits for its own reply: an edit's history export still on its way no longer answers it with the older diagram, and two file saves at once no longer swap results. - A second edit in one answer is previewed on the first edit's result. - Stop also ends a running screenshot check; a chat that cannot be saved (storage full) can be left with "Continue without saving". - Small diagrams with shapes count as diagrams; the tool card no longer crashes on malformed operations. Quota and providers: - Requests that reach the server's own endpoints count toward the quota: EdgeOne (always its own endpoint now), a private base URL whatever key header is sent, keyless Ollama without a URL. With the quota on, a redirect is followed only to a public address. The output cap applies to these requests too. - Stop records the tokens of the steps that finished; the screenshot check counts its tokens without counting a request. - EdgeOne configured only by AI_PROVIDER works, also in the admin Test, which forwards the access code. Azure set up only in the admin panel works in chat. The Test sends a Bedrock session token. - The admin panel's Test of an entry without a URL uses the server's URL as the server does (no private address check for it); the admin panel no longer writes an Ollama URL. MCP server: - Write tools and start_session run one at a time, so two at once never drop each other's change; a cancelled call waiting its turn is skipped. get_diagram and export_diagram keep the session they started with. - Export to .drawio first gets the user's latest edits from the browser. - History thumbnails: one that arrives after the next AI write is dropped; a sync reply keeps the image; a version that changed only page settings is its own entry. - A diagram over the 10 MB limit is saved without its image, or the user is told to download it (the server now answers 413 instead of cutting the connection). - Labels holding text like id='1' or parent='1' are no longer read as attributes (a layer or a parent was deleted). A broken bare <mxGraphModel> file is refused. - After a sync reply the tab no longer sends its autosave copy again. Desktop and files: - A newer switch of the same preset is not rolled back by an older one that failed. .env values with escaped quotes are read whole. - MCP saved files: a file that could not be read stays protected while a folder without permission hides it, and is saved again once deleted. - The desktop app reports "no chats" only when the count was read and no model settings are stored.
259 lines
9.5 KiB
TypeScript
259 lines
9.5 KiB
TypeScript
import {
|
|
ConditionalCheckFailedException,
|
|
DynamoDBClient,
|
|
GetItemCommand,
|
|
UpdateItemCommand,
|
|
} from "@aws-sdk/client-dynamodb"
|
|
|
|
// Quota tracking is OPT-IN: only enabled if DYNAMODB_QUOTA_TABLE is explicitly set
|
|
// OSS users who don't need quota tracking can simply not set this env var
|
|
const TABLE = process.env.DYNAMODB_QUOTA_TABLE
|
|
const DYNAMODB_REGION = process.env.DYNAMODB_REGION || "ap-northeast-1"
|
|
// Timezone for daily quota reset (e.g., "Asia/Tokyo" for JST midnight reset)
|
|
// Defaults to UTC if not set
|
|
let QUOTA_TIMEZONE = process.env.QUOTA_TIMEZONE || "UTC"
|
|
|
|
// Validate timezone at module load
|
|
try {
|
|
new Intl.DateTimeFormat("en-CA", { timeZone: QUOTA_TIMEZONE }).format(
|
|
new Date(),
|
|
)
|
|
} catch {
|
|
console.warn(
|
|
`[quota] Invalid QUOTA_TIMEZONE "${QUOTA_TIMEZONE}", using UTC`,
|
|
)
|
|
QUOTA_TIMEZONE = "UTC"
|
|
}
|
|
|
|
/**
|
|
* Get today's date string in the configured timezone (YYYY-MM-DD format)
|
|
* This is used as the Sort Key (SK) for per-day tracking
|
|
*/
|
|
function getTodayInTimezone(): string {
|
|
return new Intl.DateTimeFormat("en-CA", {
|
|
timeZone: QUOTA_TIMEZONE,
|
|
}).format(new Date())
|
|
}
|
|
|
|
// Only create client if quota is enabled
|
|
const client = TABLE ? new DynamoDBClient({ region: DYNAMODB_REGION }) : null
|
|
|
|
/**
|
|
* Check if server-side quota tracking is enabled.
|
|
* Quota is opt-in: only enabled when DYNAMODB_QUOTA_TABLE env var is set.
|
|
*/
|
|
export function isQuotaEnabled(): boolean {
|
|
return !!TABLE
|
|
}
|
|
|
|
interface QuotaLimits {
|
|
requests: number // Daily request limit
|
|
tokens: number // Daily token limit
|
|
tpm: number // Tokens per minute
|
|
}
|
|
|
|
interface QuotaCheckResult {
|
|
allowed: boolean
|
|
error?: string
|
|
type?: "request" | "token" | "tpm"
|
|
used?: number
|
|
limit?: number
|
|
}
|
|
|
|
/**
|
|
* Check all quotas and increment request count atomically.
|
|
* Uses composite key (PK=user, SK=date) for per-day tracking.
|
|
* Each day automatically gets a new item - no explicit reset needed.
|
|
* A request limit of 0 means none; increment 0 checks the limits without
|
|
* counting a request (the screenshot check).
|
|
*/
|
|
export async function checkAndIncrementRequest(
|
|
ip: string,
|
|
limits: QuotaLimits,
|
|
increment = 1,
|
|
): Promise<QuotaCheckResult> {
|
|
// Skip if quota tracking not enabled
|
|
if (!client || !TABLE) {
|
|
return { allowed: true }
|
|
}
|
|
|
|
const pk = ip // User identifier (base64 IP)
|
|
const sk = getTodayInTimezone() // Date as sort key (YYYY-MM-DD)
|
|
const currentMinute = Math.floor(Date.now() / 60000).toString()
|
|
|
|
try {
|
|
// Single atomic update - handles creation AND increment
|
|
// New day automatically creates new item (different SK)
|
|
// Note: lastMinute/tpmCount are managed by recordTokenUsage only
|
|
await client.send(
|
|
new UpdateItemCommand({
|
|
TableName: TABLE,
|
|
Key: {
|
|
PK: { S: pk },
|
|
SK: { S: sk },
|
|
},
|
|
UpdateExpression: "ADD reqCount :one",
|
|
// Check all limits before allowing increment
|
|
// TPM check: allow if new minute OR under limit
|
|
ConditionExpression: `
|
|
(attribute_not_exists(reqCount) OR reqCount < :reqLimit) AND
|
|
(attribute_not_exists(tokenCount) OR tokenCount < :tokenLimit) AND
|
|
(attribute_not_exists(lastMinute) OR lastMinute <> :minute OR
|
|
attribute_not_exists(tpmCount) OR tpmCount < :tpmLimit)
|
|
`,
|
|
ExpressionAttributeValues: {
|
|
":one": { N: String(increment) },
|
|
":minute": { S: currentMinute },
|
|
":reqLimit": { N: String(limits.requests || 999999) },
|
|
":tokenLimit": { N: String(limits.tokens || 999999) },
|
|
":tpmLimit": { N: String(limits.tpm || 999999) },
|
|
},
|
|
}),
|
|
)
|
|
|
|
return { allowed: true }
|
|
} catch (e: any) {
|
|
// Condition failed - need to determine which limit was exceeded
|
|
if (e instanceof ConditionalCheckFailedException) {
|
|
// Get current counts to determine which limit was hit
|
|
try {
|
|
const getResult = await client.send(
|
|
new GetItemCommand({
|
|
TableName: TABLE,
|
|
Key: {
|
|
PK: { S: pk },
|
|
SK: { S: sk },
|
|
},
|
|
}),
|
|
)
|
|
|
|
const item = getResult.Item
|
|
const storedMinute = item?.lastMinute?.S
|
|
|
|
const reqCount = Number(item?.reqCount?.N || 0)
|
|
const tokenCount = Number(item?.tokenCount?.N || 0)
|
|
const tpmCount =
|
|
storedMinute !== currentMinute
|
|
? 0
|
|
: Number(item?.tpmCount?.N || 0)
|
|
|
|
// Determine which limit was exceeded
|
|
if (limits.requests > 0 && reqCount >= limits.requests) {
|
|
return {
|
|
allowed: false,
|
|
type: "request",
|
|
error: "Daily request limit exceeded",
|
|
used: reqCount,
|
|
limit: limits.requests,
|
|
}
|
|
}
|
|
if (limits.tokens > 0 && tokenCount >= limits.tokens) {
|
|
return {
|
|
allowed: false,
|
|
type: "token",
|
|
error: "Daily token limit exceeded",
|
|
used: tokenCount,
|
|
limit: limits.tokens,
|
|
}
|
|
}
|
|
if (limits.tpm > 0 && tpmCount >= limits.tpm) {
|
|
return {
|
|
allowed: false,
|
|
type: "tpm",
|
|
error: "Rate limit exceeded (tokens per minute)",
|
|
used: tpmCount,
|
|
limit: limits.tpm,
|
|
}
|
|
}
|
|
|
|
// Condition failed but no limit clearly exceeded - race condition edge case
|
|
// Fail safe by allowing (could be a TPM reset race)
|
|
console.warn(
|
|
`[quota] Condition failed but no limit exceeded for IP prefix: ${ip.slice(0, 8)}...`,
|
|
)
|
|
return { allowed: true }
|
|
} catch (getError: any) {
|
|
console.error(
|
|
`[quota] Failed to get quota details after condition failure, IP prefix: ${ip.slice(0, 8)}..., error: ${getError.message}`,
|
|
)
|
|
return { allowed: true } // Fail open
|
|
}
|
|
}
|
|
|
|
// Other DynamoDB errors - fail open
|
|
console.error(
|
|
`[quota] DynamoDB error (fail-open), IP prefix: ${ip.slice(0, 8)}..., error: ${e.message}`,
|
|
)
|
|
return { allowed: true }
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Record token usage after response completes.
|
|
* Uses composite key (PK=user, SK=date) for per-day tracking.
|
|
* Handles minute boundaries atomically to prevent race conditions.
|
|
*/
|
|
export async function recordTokenUsage(
|
|
ip: string,
|
|
tokens: number,
|
|
): Promise<void> {
|
|
// Skip if quota tracking not enabled
|
|
if (!client || !TABLE) return
|
|
if (!Number.isFinite(tokens) || tokens <= 0) return
|
|
|
|
const pk = ip // User identifier (base64 IP)
|
|
const sk = getTodayInTimezone() // Date as sort key (YYYY-MM-DD)
|
|
const currentMinute = Math.floor(Date.now() / 60000).toString()
|
|
|
|
try {
|
|
// Try to update for same minute OR new item (most common cases)
|
|
// Handles: 1) new item (no lastMinute), 2) same minute (lastMinute matches)
|
|
await client.send(
|
|
new UpdateItemCommand({
|
|
TableName: TABLE,
|
|
Key: {
|
|
PK: { S: pk },
|
|
SK: { S: sk },
|
|
},
|
|
UpdateExpression:
|
|
"SET lastMinute = if_not_exists(lastMinute, :minute) ADD tokenCount :tokens, tpmCount :tokens",
|
|
ConditionExpression:
|
|
"attribute_not_exists(lastMinute) OR lastMinute = :minute",
|
|
ExpressionAttributeValues: {
|
|
":minute": { S: currentMinute },
|
|
":tokens": { N: String(tokens) },
|
|
},
|
|
}),
|
|
)
|
|
} catch (e: any) {
|
|
if (e instanceof ConditionalCheckFailedException) {
|
|
// Different minute - reset TPM count and set new minute
|
|
try {
|
|
await client.send(
|
|
new UpdateItemCommand({
|
|
TableName: TABLE,
|
|
Key: {
|
|
PK: { S: pk },
|
|
SK: { S: sk },
|
|
},
|
|
UpdateExpression:
|
|
"SET lastMinute = :minute, tpmCount = :tokens ADD tokenCount :tokens",
|
|
ExpressionAttributeValues: {
|
|
":minute": { S: currentMinute },
|
|
":tokens": { N: String(tokens) },
|
|
},
|
|
}),
|
|
)
|
|
} catch (retryError: any) {
|
|
console.error(
|
|
`[quota] Failed to record tokens (retry), IP prefix: ${ip.slice(0, 8)}..., tokens: ${tokens}, error: ${retryError.message}`,
|
|
)
|
|
}
|
|
} else {
|
|
console.error(
|
|
`[quota] Failed to record tokens, IP prefix: ${ip.slice(0, 8)}..., tokens: ${tokens}, error: ${e.message}`,
|
|
)
|
|
}
|
|
}
|
|
}
|