mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-10-13 04:59:51 +08:00
Dayuan Jiang
60105ddb51
## 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
342 lines
11 KiB
TypeScript
342 lines
11 KiB
TypeScript
// Bedrock in the settings: an API key or AWS access keys, one at a time
|
|
import {
|
|
changeInAnotherTab,
|
|
expect,
|
|
openApp,
|
|
openSettings,
|
|
savedModelConfigs,
|
|
settingsDialog,
|
|
test,
|
|
} from "./lib/fixtures"
|
|
|
|
test("Bedrock shows one way of signing in and empties the other", async ({
|
|
page,
|
|
}) => {
|
|
await openApp(page, {
|
|
config: {
|
|
version: 1,
|
|
providers: [
|
|
{
|
|
id: "b1",
|
|
provider: "bedrock",
|
|
apiKey: "bedrock-key",
|
|
awsRegion: "us-east-1",
|
|
// Left by an older version: belongs to the access keys
|
|
awsSessionToken: "session-token",
|
|
models: [
|
|
{
|
|
id: "m1",
|
|
modelId: "amazon.nova-lite-v1:0",
|
|
validated: true,
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
})
|
|
await openSettings(page)
|
|
const dialog = settingsDialog(page)
|
|
await dialog.getByTestId("provider-row-b1").click()
|
|
await expect(dialog.getByLabel("Bedrock API key")).toHaveValue(
|
|
"bedrock-key",
|
|
)
|
|
await expect(dialog.locator("#aws-access-key-id")).toHaveCount(0)
|
|
|
|
await dialog
|
|
.getByRole("button", { name: "Access keys", exact: true })
|
|
.click()
|
|
await expect(dialog.locator("#bedrock-api-key")).toHaveCount(0)
|
|
// The key that was tested is gone, and so is its test result
|
|
await expect
|
|
.poll(
|
|
async () =>
|
|
(await savedModelConfigs(page)).providers[0].models[0]
|
|
.validated,
|
|
)
|
|
.toBeUndefined()
|
|
await dialog.locator("#aws-access-key-id").fill("AKIATEST")
|
|
await dialog.locator("#aws-secret-access-key").fill("secret")
|
|
await expect
|
|
.poll(async () => (await savedModelConfigs(page)).providers[0])
|
|
.toMatchObject({
|
|
apiKey: "",
|
|
awsAccessKeyId: "AKIATEST",
|
|
awsSecretAccessKey: "secret",
|
|
})
|
|
// Reopened, it shows the way that is filled in
|
|
await page.keyboard.press("Escape")
|
|
await openSettings(page)
|
|
await dialog.getByTestId("provider-row-b1").click()
|
|
await expect(
|
|
dialog.getByRole("button", { name: "Access keys", exact: true }),
|
|
).toHaveAttribute("aria-pressed", "true")
|
|
|
|
await dialog
|
|
.getByRole("button", { name: "Bedrock API key", exact: true })
|
|
.click()
|
|
await expect
|
|
.poll(async () => (await savedModelConfigs(page)).providers[0])
|
|
.toMatchObject({
|
|
awsAccessKeyId: "",
|
|
awsSecretAccessKey: "",
|
|
awsSessionToken: "",
|
|
})
|
|
})
|
|
|
|
test("switching Bedrock's sign-in with nothing filled in keeps the test results", async ({
|
|
page,
|
|
}) => {
|
|
// Older configs may hold a result without the key that earned it
|
|
await openApp(page, {
|
|
config: {
|
|
version: 1,
|
|
providers: [
|
|
{
|
|
id: "b1",
|
|
provider: "bedrock",
|
|
apiKey: "",
|
|
awsRegion: "us-east-1",
|
|
models: [
|
|
{
|
|
id: "m1",
|
|
modelId: "amazon.nova-lite-v1:0",
|
|
validated: true,
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
})
|
|
await openSettings(page)
|
|
const dialog = settingsDialog(page)
|
|
await dialog.getByTestId("provider-row-b1").click()
|
|
await dialog
|
|
.getByRole("button", { name: "Access keys", exact: true })
|
|
.click()
|
|
await expect(dialog.locator("#aws-access-key-id")).toBeVisible()
|
|
await page.waitForTimeout(300)
|
|
expect(
|
|
(await savedModelConfigs(page)).providers[0].models[0].validated,
|
|
).toBe(true)
|
|
})
|
|
|
|
test("Bedrock shows the sign-in that is saved, also after another tab", async ({
|
|
page,
|
|
}) => {
|
|
await openApp(page, {
|
|
config: {
|
|
version: 1,
|
|
providers: [
|
|
{
|
|
id: "b1",
|
|
provider: "bedrock",
|
|
apiKey: "",
|
|
awsAccessKeyId: "AKIAOLD",
|
|
awsSecretAccessKey: "old-secret",
|
|
awsRegion: "us-east-1",
|
|
models: [{ id: "m1", modelId: "amazon.nova-lite-v1:0" }],
|
|
},
|
|
],
|
|
},
|
|
})
|
|
await openSettings(page)
|
|
const dialog = settingsDialog(page)
|
|
await dialog.getByTestId("provider-row-b1").click()
|
|
await expect(dialog.locator("#aws-access-key-id")).toHaveValue("AKIAOLD")
|
|
// Another tab signs the provider in with an API key instead
|
|
await changeInAnotherTab(page, (config) => {
|
|
config.providers[0].apiKey = "bedrock-key"
|
|
config.providers[0].awsAccessKeyId = ""
|
|
config.providers[0].awsSecretAccessKey = ""
|
|
})
|
|
await expect(dialog.locator("#bedrock-api-key")).toHaveValue("bedrock-key")
|
|
await expect(dialog.locator("#aws-access-key-id")).toHaveCount(0)
|
|
})
|
|
|
|
test("emptying Bedrock's access keys to type new ones keeps their fields", async ({
|
|
page,
|
|
}) => {
|
|
await openApp(page, {
|
|
config: {
|
|
version: 1,
|
|
providers: [
|
|
{
|
|
id: "b1",
|
|
provider: "bedrock",
|
|
apiKey: "",
|
|
awsAccessKeyId: "AKIAOLD",
|
|
awsSecretAccessKey: "old-secret",
|
|
awsRegion: "us-east-1",
|
|
models: [{ id: "m1", modelId: "amazon.nova-lite-v1:0" }],
|
|
},
|
|
],
|
|
},
|
|
})
|
|
await openSettings(page)
|
|
const dialog = settingsDialog(page)
|
|
await dialog.getByTestId("provider-row-b1").click()
|
|
await dialog.locator("#aws-secret-access-key").fill("")
|
|
await dialog.locator("#aws-access-key-id").fill("")
|
|
await expect(dialog.locator("#bedrock-api-key")).toHaveCount(0)
|
|
await dialog.locator("#aws-access-key-id").fill("AKIANEW")
|
|
await expect
|
|
.poll(async () => (await savedModelConfigs(page)).providers[0])
|
|
.toMatchObject({ apiKey: "", awsAccessKeyId: "AKIANEW" })
|
|
})
|
|
|
|
test("refused access keys are named as such", async ({ page }) => {
|
|
await page.route("**/api/validate-model", (route) =>
|
|
route.fulfill({
|
|
json: { valid: false, code: "invalid_api_key", error: "Bad keys" },
|
|
}),
|
|
)
|
|
await openApp(page, {
|
|
config: {
|
|
version: 1,
|
|
providers: [
|
|
{
|
|
id: "b1",
|
|
provider: "bedrock",
|
|
apiKey: "",
|
|
awsAccessKeyId: "AKIA1",
|
|
awsSecretAccessKey: "s",
|
|
awsRegion: "us-east-1",
|
|
models: [{ id: "m1", modelId: "amazon.nova-lite-v1:0" }],
|
|
},
|
|
],
|
|
},
|
|
})
|
|
await openSettings(page)
|
|
const dialog = settingsDialog(page)
|
|
await dialog.getByTestId("provider-row-b1").click()
|
|
await dialog.getByTestId("test-models").click()
|
|
await expect(
|
|
dialog.getByText(
|
|
"AWS rejected these access keys. Check that both were copied in full. Bad keys",
|
|
),
|
|
).toBeVisible()
|
|
for (const id of ["#aws-access-key-id", "#aws-secret-access-key"]) {
|
|
await expect(dialog.locator(id)).toHaveAttribute("aria-invalid", "true")
|
|
}
|
|
})
|
|
|
|
test("temporary Bedrock access keys can carry their session token", async ({
|
|
page,
|
|
}) => {
|
|
const bodies: any[] = []
|
|
await page.route("**/api/validate-model", async (route) => {
|
|
bodies.push(route.request().postDataJSON())
|
|
await route.fulfill({ json: { valid: true, responseTime: 900 } })
|
|
})
|
|
await openApp(page, {
|
|
config: {
|
|
version: 1,
|
|
providers: [
|
|
{
|
|
id: "b1",
|
|
provider: "bedrock",
|
|
apiKey: "",
|
|
awsAccessKeyId: "ASIATEMP",
|
|
awsSecretAccessKey: "secret",
|
|
awsRegion: "us-east-1",
|
|
models: [{ id: "m1", modelId: "amazon.nova-lite-v1:0" }],
|
|
},
|
|
],
|
|
},
|
|
})
|
|
await openSettings(page)
|
|
const dialog = settingsDialog(page)
|
|
await dialog.getByTestId("provider-row-b1").click()
|
|
await dialog.getByLabel("AWS session token (optional)").fill("session-1")
|
|
await dialog.getByTestId("test-models").click()
|
|
await expect.poll(() => bodies.length).toBe(1)
|
|
expect(bodies[0]).toMatchObject({
|
|
awsAccessKeyId: "ASIATEMP",
|
|
awsSessionToken: "session-1",
|
|
})
|
|
expect((await savedModelConfigs(page)).providers[0].awsSessionToken).toBe(
|
|
"session-1",
|
|
)
|
|
})
|
|
|
|
test("Bedrock with both kinds of credentials offers to remove the access keys", async ({
|
|
page,
|
|
}) => {
|
|
await openApp(page, {
|
|
config: {
|
|
version: 1,
|
|
providers: [
|
|
{
|
|
id: "b1",
|
|
provider: "bedrock",
|
|
apiKey: "bedrock-key",
|
|
awsAccessKeyId: "AKIAOLD",
|
|
awsSecretAccessKey: "old-secret",
|
|
awsSessionToken: "old-token",
|
|
awsRegion: "us-east-1",
|
|
models: [{ id: "m1", modelId: "amazon.nova-lite-v1:0" }],
|
|
},
|
|
],
|
|
},
|
|
})
|
|
await openSettings(page)
|
|
const dialog = settingsDialog(page)
|
|
await dialog.getByTestId("provider-row-b1").click()
|
|
const notice = dialog.getByText(/also keeps an access key pair/)
|
|
await expect(notice).toBeVisible()
|
|
await dialog.getByRole("button", { name: "Remove the access keys" }).click()
|
|
await expect(notice).toHaveCount(0)
|
|
await expect
|
|
.poll(async () => (await savedModelConfigs(page)).providers[0])
|
|
.toMatchObject({
|
|
apiKey: "bedrock-key",
|
|
awsAccessKeyId: "",
|
|
awsSecretAccessKey: "",
|
|
awsSessionToken: "",
|
|
})
|
|
await expect(dialog.locator("#bedrock-api-key")).toHaveValue("bedrock-key")
|
|
})
|
|
|
|
test("removing access keys kept behind an API key keeps the test results", async ({
|
|
page,
|
|
}) => {
|
|
await openApp(page, {
|
|
config: {
|
|
version: 1,
|
|
providers: [
|
|
{
|
|
id: "b1",
|
|
provider: "bedrock",
|
|
apiKey: "bedrock-key",
|
|
awsAccessKeyId: "AKIAOLD",
|
|
awsSecretAccessKey: "old-secret",
|
|
awsRegion: "us-east-1",
|
|
models: [
|
|
{
|
|
id: "m1",
|
|
modelId: "amazon.nova-lite-v1:0",
|
|
validated: true,
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
})
|
|
await openSettings(page)
|
|
const dialog = settingsDialog(page)
|
|
await dialog.getByTestId("provider-row-b1").click()
|
|
await dialog.getByRole("button", { name: "Remove the access keys" }).focus()
|
|
await page.keyboard.press("Enter")
|
|
await expect
|
|
.poll(
|
|
async () =>
|
|
(await savedModelConfigs(page)).providers[0].awsAccessKeyId,
|
|
)
|
|
.toBe("")
|
|
// The API key was the one in use: its result still holds
|
|
expect(
|
|
(await savedModelConfigs(page)).providers[0].models[0].validated,
|
|
).toBe(true)
|
|
await expect(dialog.locator("#bedrock-api-key")).toBeFocused()
|
|
})
|