mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-10-12 20:49:53 +08:00
## Problem
Two audits of the repository (a workflow of finder, dedup and per-file verifier agents, run on 2026-10-11 against 1f4141e and again against 07f3e3c after a first round of refactoring) found dead code and features that were more machinery than the app needs: an Electron configuration-preset system with its own settings window, three copies of the about page, a hand-written `.env` parser, an "extended" system prompt nobody selected, two data migrations for formats from 2025-12 and 2026-01, a server-side example cache, type-to-confirm provider deletion, 81 unused dictionary keys, wrapper components around single call sites, and a long tail of unused exports, props, options and tests.
## Change
Every item below was either approved one by one or covered by "fix all of the others".
- **Electron:** the configuration-preset system is gone (settings window, preload, IPC, menu entry, dev watcher); `config-manager.ts` keeps only `userLocale`; `.env` files are parsed with `dotenv`. Entitlements file and a duplicate CI workflow removed; `test.yml` gets a type check and concurrency.
- **Server:** no extended prompt, no example cache, no `ENABLE_HISTORY_XML_REPLACE`, no message metadata or `hasConfig`; the connection test is one shared helper; EdgeOne loses its mock branch and model aliases; `DEBUG_LLM_PAYLOAD` logs message structure instead of payloads; Langfuse scoring helper; `apiKeyEnv` arrays kept and documented in `env.example` and the provider docs.
- **Pages:** one about page per language from a single component (old `/cn` and `/ja` URLs redirect with 308); layout uses `hasLocale`; the GitHub icon is a local component instead of `react-icons`; Cloudflare deploys without an R2 cache by default.
- **Chat and canvas:** the legacy `diagramHistory` conversion, the localStorage chat migration and the templates storage are gone; `chat-engine` reads the diagram through the context's refs; the diagram context has one tagged export path (`requestTaggedExport` / `fetchDiagramXml`); the screenshot check uses fetch + JSON and `generateText` with `Output.object`; `load-diagram` accepts `<svg:svg>` and strips the XML prolog.
- **Settings UI:** `model-selector` inlines its Dialog, Command and Tooltip; `ai-elements/model-selector`, `button-with-tooltip`, `error-toast` removed; no type-to-confirm, no footer, no `bedrockApiKey`; `use-model-config` loses the old-format migration; one reasoning component; the shimmer is CSS (no `motion`, no `@radix-ui/react-use-controllable-state`); 81 dictionary keys removed in all four languages.
- **MCP server:** `registerTool` / `ok` / `fail` replace per-tool try/catch; `syncFromBrowser`, `commitDocument`, `describePages`; the hand-written XML syntax check, unused result fields, `pickPageSelector`, `expandStyles` and the `host` attribute handling are gone; tests get a shared `setup.ts` and drive the server through the SDK client.
- **Prompt:** the web app's style rules come from the MCP drawing guide (`styleRules`), byte-identical to before.
- **Tests:** shared e2e helpers (`openApp`, `sse`, `toolCallEvents`, `chunkedReplies`); placeholder specs dropped; `settings-review-fixes` split by topic; unit tests use `vi.stubEnv`.
- **Dependencies removed:** `@xmldom/xmldom`, `remark-gfm`, `@anthropic-ai/tokenizer`, `@testing-library/user-event`, `concurrently`, `wait-on`, `eslint`, `eslint-config-next`, `@vitest/coverage-v8`, `shx`, `motion`, `@radix-ui/react-use-controllable-state`, `react-icons`.
Source lines: 74,983 before, 67,418 after (excluding lockfiles).
The last commit merges #984 (the canvas shell). Where the shell, the classic page or their tests depend on a wire format or signature this branch had changed, main's version wins (export fields of the poll response, `addHistory` signature); where main only extended code this branch restructured, main's change is carried into the new structure (`start_session`, `get_selection`, `prepareNewDiagram`, the diagram context's `requestExport`).
## Testing
- `tsc --noEmit` for the web app, `packages/mcp-server`, its shell and `electron`: clean
- `biome ci`: 0 errors (37 pre-existing warnings)
- Root `vitest run`: 719 passed; `packages/mcp-server` `vitest run`: 372 passed
- `next build`: clean
- Playwright, whole web suite on the dev server (4 workers): 280 tests, 279 passed; `language.spec.ts` "a stale offer to switch without saving does nothing once a message is being sent" failed under parallel load and passed alone, as it does on main
243 lines
8.8 KiB
TypeScript
243 lines
8.8 KiB
TypeScript
import {
|
|
ConditionalCheckFailedException,
|
|
DynamoDBClient,
|
|
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) },
|
|
},
|
|
// On a failed condition the exception carries the item as it
|
|
// was, so no second read is needed to tell which limit was hit
|
|
ReturnValuesOnConditionCheckFailure: "ALL_OLD",
|
|
}),
|
|
)
|
|
|
|
return { allowed: true }
|
|
} catch (e: any) {
|
|
// Condition failed - the exception's Item holds the current counts
|
|
if (e instanceof ConditionalCheckFailedException) {
|
|
const item = e.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 }
|
|
}
|
|
|
|
// 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}`,
|
|
)
|
|
}
|
|
}
|
|
}
|