From 319857b0b405916c80029de7d84226d36478dd0d Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Thu, 23 Apr 2026 15:58:19 +0300 Subject: [PATCH 01/55] update node requirement --- CONTRIBUTING.md | 2 +- README.md | 2 +- cli/services/runtime/node-version-guard.test.ts | 11 ++++++----- cli/services/runtime/node-version-guard.ts | 2 +- docs/aso-runtime-flows.md | 2 +- package-lock.json | 2 +- package.json | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a9e74fb..fe2deaf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ npm run build ``` Runtime requirement: -- Runtime: Node.js `>=20.18.1` +- Runtime: Node.js `>=18.14.1` - Local development/build: Node.js `>=20.19.0` (enforced by script checks) ## Development workflow diff --git a/README.md b/README.md index 2aca51f..e9c5e00 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ The dashboard keywords shown above were discovered and added automatically by an npm install -g aso-cli ``` -Note: requires Node.js `>=20.18.1`. +Note: requires Node.js `>=18.14.1`. ## Apple Search Ads Setup diff --git a/cli/services/runtime/node-version-guard.test.ts b/cli/services/runtime/node-version-guard.test.ts index bcc6027..4f7244f 100644 --- a/cli/services/runtime/node-version-guard.test.ts +++ b/cli/services/runtime/node-version-guard.test.ts @@ -2,17 +2,18 @@ import { assertSupportedNodeVersion } from "./node-version-guard"; describe("assertSupportedNodeVersion", () => { it("does not throw for supported versions", () => { - expect(() => assertSupportedNodeVersion("v20.18.1")).not.toThrow(); + expect(() => assertSupportedNodeVersion("v18.14.1")).not.toThrow(); + expect(() => assertSupportedNodeVersion("v18.17.0")).not.toThrow(); expect(() => assertSupportedNodeVersion("v20.19.5")).not.toThrow(); expect(() => assertSupportedNodeVersion("v22.12.0")).not.toThrow(); }); it("throws for versions below the minimum", () => { - expect(() => assertSupportedNodeVersion("v18.17.0")).toThrow( - /requires Node\.js >= 20\.18\.1/i + expect(() => assertSupportedNodeVersion("v18.14.0")).toThrow( + /requires Node\.js >= 18\.14\.1/i ); - expect(() => assertSupportedNodeVersion("v20.18.0")).toThrow( - /requires Node\.js >= 20\.18\.1/i + expect(() => assertSupportedNodeVersion("v18.13.9")).toThrow( + /requires Node\.js >= 18\.14\.1/i ); }); }); diff --git a/cli/services/runtime/node-version-guard.ts b/cli/services/runtime/node-version-guard.ts index 7b6dc18..31816a8 100644 --- a/cli/services/runtime/node-version-guard.ts +++ b/cli/services/runtime/node-version-guard.ts @@ -1,4 +1,4 @@ -const MIN_NODE_VERSION: [number, number, number] = [20, 18, 1]; +const MIN_NODE_VERSION: [number, number, number] = [18, 14, 1]; function parseNodeVersion(version: string): [number, number, number] { const [major = "0", minor = "0", patch = "0"] = version diff --git a/docs/aso-runtime-flows.md b/docs/aso-runtime-flows.md index fcf0217..a32d8f8 100644 --- a/docs/aso-runtime-flows.md +++ b/docs/aso-runtime-flows.md @@ -4,7 +4,7 @@ Runtime flow contracts across CLI commands, local dashboard API, and ASO services. ## Runtime Requirement -- Runtime: Node.js `>=20.18.1`. +- Runtime: Node.js `>=18.14.1`. - Local development/build: Node.js `>=20.19.0`. ## Operational Prerequisite diff --git a/package-lock.json b/package-lock.json index 8ab85d6..5706a72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -54,7 +54,7 @@ "yaml": "^2.8.2" }, "engines": { - "node": ">=20.18.1", + "node": ">=18.14.1", "npm": ">=8.0.0" } }, diff --git a/package.json b/package.json index bd421ab..d7f0949 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ ], "license": "MIT", "engines": { - "node": ">=20.18.1", + "node": ">=18.14.1", "npm": ">=8.0.0" }, "homepage": "https://github.com/semihcihan/App-Store-Optimization-CLI", From 5960b9b668185742a242ed8f6b4ef831cd24c7d2 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Thu, 23 Apr 2026 15:58:31 +0300 Subject: [PATCH 02/55] fix bugsnag report --- scripts/bugsnag-export-events.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bugsnag-export-events.sh b/scripts/bugsnag-export-events.sh index 9c5897c..e5ada6a 100755 --- a/scripts/bugsnag-export-events.sh +++ b/scripts/bugsnag-export-events.sh @@ -93,7 +93,7 @@ list_orgs() { local body headers status body="$(mktemp)" headers="$(mktemp)" - trap 'rm -f "$body" "$headers"' RETURN + trap 'rm -f "${body:-}" "${headers:-}"' RETURN api_get "${BUGSNAG_BASE_URL}/user/organizations" "$body" "$headers" status="$(http_status_from_headers "$headers")" @@ -110,7 +110,7 @@ list_projects() { local body headers status body="$(mktemp)" headers="$(mktemp)" - trap 'rm -f "$body" "$headers"' RETURN + trap 'rm -f "${body:-}" "${headers:-}"' RETURN api_get "${BUGSNAG_BASE_URL}/organizations/${org_id}/projects?per_page=100" "$body" "$headers" status="$(http_status_from_headers "$headers")" @@ -182,7 +182,7 @@ export_events() { while [[ -n "$page_url" ]]; do body="$(mktemp)" headers="$(mktemp)" - trap 'rm -f "$body" "$headers"' RETURN + trap 'rm -f "${body:-}" "${headers:-}"' RETURN api_get "$page_url" "$body" "$headers" status="$(http_status_from_headers "$headers")" From ac8e4107732a6e6b28dda93ead413984efae8913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20G=C3=BCldal=C4=B1?= Date: Fri, 24 Apr 2026 15:13:33 +0300 Subject: [PATCH 03/55] =?UTF-8?q?feat(backend):=20projects=20workspaces=20?= =?UTF-8?q?=E2=80=94=20schema=20+=20API=20+=20scoping?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduce project workspaces so users can partition their owned apps and research keyword pools across unrelated categories (e.g. gold tracker vs halal food scanner). Data model: - New `projects (id, name, color, created_at, updated_at)` table. `id` is a human-readable slug derived from the project name (Turkish diacritic normalization + collision suffix). - `owned_apps.project_id` column (idempotent migration, default `'default'`). FK is enforced at the application layer because SQLite disallows ADD COLUMN with REFERENCES + NOT NULL default. - Partial unique index enforces one research app per project. - Global keyword caches (`aso_keywords`, `aso_apps`, `aso_keyword_failures`) stay global — shared across projects. - Idempotent migration of legacy bare `research` app id to `research:default` (with escape-hatch env var). DB helpers (`cli/db/projects.ts`): - `createProject` seeds a per-project research app. - `deleteProject` guards against removing the last project and cascades its owned apps + keywords + position history. - `updateProject` preserves the id across renames (stable for CLI scripts and bookmarks). - `listProjectSummaries` returns appCount + keywordCount for UI. HTTP: - GET/POST `/api/projects`, PATCH/DELETE `/api/projects/:id`. - GET/PUT `/api/projects/current` mirrored into `metadata` so CLI commands and dashboard share a default project. - `/api/apps` GET + POST scoped by `?projectId=`. Falls back to the default project when omitted (backward compatible). - New `PATCH /api/apps/:id {projectId}` to move an app between projects (keywords follow the app). - `resolveProjectId` helper validates the query param against the projects table; unknown id returns 404 PROJECT_NOT_FOUND. Tests: - 19 new shared helpers tests (slug + research id helpers). - 15 new `projects` DB helper tests covering CRUD, cascade, last project guard, research uniqueness. - 4 new migration tests covering legacy rename, idempotency, escape-hatch, fresh install. - Existing server route tests updated for the new per-project research id and `projectId` pass-through. Full suite: 431 tests passing, typecheck clean. --- cli/dashboard-server/apps-handler.ts | 96 ++++++- cli/dashboard-server/project-scope.ts | 71 +++++ .../routes/project-handlers.ts | 205 ++++++++++++++ cli/dashboard-server/server.routes.test.ts | 19 +- cli/dashboard-server/server.ts | 77 +++++- cli/db/owned-apps.ts | 102 +++++-- cli/db/projects.test.ts | 208 ++++++++++++++ cli/db/projects.ts | 256 ++++++++++++++++++ cli/db/store.migrations.test.ts | 208 ++++++++++++++ cli/db/store.ts | 122 +++++++++ cli/db/types.ts | 1 + cli/shared/aso-research.test.ts | 44 +++ cli/shared/aso-research.ts | 17 ++ cli/shared/project-types.test.ts | 115 ++++++++ cli/shared/project-types.ts | 113 ++++++++ 15 files changed, 1620 insertions(+), 34 deletions(-) create mode 100644 cli/dashboard-server/project-scope.ts create mode 100644 cli/dashboard-server/routes/project-handlers.ts create mode 100644 cli/db/projects.test.ts create mode 100644 cli/db/projects.ts create mode 100644 cli/db/store.migrations.test.ts create mode 100644 cli/shared/aso-research.test.ts create mode 100644 cli/shared/project-types.test.ts create mode 100644 cli/shared/project-types.ts diff --git a/cli/dashboard-server/apps-handler.ts b/cli/dashboard-server/apps-handler.ts index dde87bc..fcd347a 100644 --- a/cli/dashboard-server/apps-handler.ts +++ b/cli/dashboard-server/apps-handler.ts @@ -2,14 +2,18 @@ import * as http from "http"; import { deleteOwnedAppById, getOwnedAppById, + moveAppToProject, upsertOwnedApps, upsertOwnedAppSnapshots, } from "../db/owned-apps"; +import { getProjectById } from "../db/projects"; import { deleteAppKeywordsByAppId } from "../db/app-keywords"; import { DEFAULT_RESEARCH_APP_ID, DEFAULT_RESEARCH_APP_NAME, + researchAppIdForProject, } from "../shared/aso-research"; +import { DEFAULT_PROJECT_ID } from "../shared/project-types"; import type { OwnedAppSnapshot } from "./owned-app-details"; type ManualAppAddRequest = @@ -82,15 +86,29 @@ function nextResearchAppId(slug: string): string { } } -export function ensureDefaultResearchAppExists(): void { - if (getOwnedAppById(DEFAULT_RESEARCH_APP_ID)) { +export function ensureDefaultResearchAppExists( + projectId: string = DEFAULT_PROJECT_ID +): void { + const researchId = + projectId === DEFAULT_PROJECT_ID + ? researchAppIdForProject(DEFAULT_PROJECT_ID) + : researchAppIdForProject(projectId); + if (getOwnedAppById(researchId)) { + return; + } + // Backfill: if legacy bare "research" row exists (pre-migration), skip seed. + if ( + projectId === DEFAULT_PROJECT_ID && + getOwnedAppById(DEFAULT_RESEARCH_APP_ID) + ) { return; } upsertOwnedApps([ { - id: DEFAULT_RESEARCH_APP_ID, + id: researchId, kind: "research", name: DEFAULT_RESEARCH_APP_NAME, + projectId, }, ]); } @@ -98,7 +116,8 @@ export function ensureDefaultResearchAppExists(): void { export function createAppsHandlers(deps: CreateAppsHandlersDeps) { async function handleApiAppsPost( req: http.IncomingMessage, - res: http.ServerResponse + res: http.ServerResponse, + projectId: string = DEFAULT_PROJECT_ID ): Promise { const body = await deps.parseJsonBody(req, res); if (!body) { @@ -123,12 +142,15 @@ export function createAppsHandlers(deps: CreateAppsHandlersDeps) { } const country = deps.hydrationCountry; - upsertOwnedApps([{ id: appId, kind: "owned", name: appId }]); + upsertOwnedApps([{ id: appId, kind: "owned", name: appId, projectId }]); let hydratedName = appId; try { const snapshots = await deps.fetchOwnedAppSnapshotsFromApi(country, [appId]); if (snapshots.length > 0) { - upsertOwnedAppSnapshots(country, snapshots); + upsertOwnedAppSnapshots( + country, + snapshots.map((snapshot) => ({ ...snapshot, projectId })) + ); const first = snapshots[0]; if (first?.name?.trim()) { hydratedName = first.name.trim(); @@ -141,6 +163,7 @@ export function createAppsHandlers(deps: CreateAppsHandlersDeps) { phase: "manual-app-hydration", appId, country, + projectId, }); } @@ -161,9 +184,9 @@ export function createAppsHandlers(deps: CreateAppsHandlersDeps) { } const slug = slugifyResearchName(name); - ensureDefaultResearchAppExists(); + ensureDefaultResearchAppExists(projectId); const id = nextResearchAppId(slug); - upsertOwnedApps([{ id, kind: "research", name }]); + upsertOwnedApps([{ id, kind: "research", name, projectId }]); deps.sendJson(res, 201, { success: true, data: { @@ -220,8 +243,65 @@ export function createAppsHandlers(deps: CreateAppsHandlersDeps) { }); } + async function handleApiAppPatch( + req: http.IncomingMessage, + res: http.ServerResponse, + appId: string + ): Promise { + const body = await deps.parseJsonBody<{ projectId?: string }>(req, res); + if (!body) return; + const normalized = normalizeAppId(appId); + if (!normalized) { + deps.sendApiError(res, 400, "INVALID_REQUEST", "App ID is required."); + return; + } + const targetProjectId = + typeof body.projectId === "string" ? body.projectId.trim() : ""; + if (!targetProjectId) { + deps.sendApiError( + res, + 400, + "INVALID_REQUEST", + "projectId is required in the request body." + ); + return; + } + const project = getProjectById(targetProjectId); + if (!project) { + deps.sendApiError(res, 404, "PROJECT_NOT_FOUND", "Project not found."); + return; + } + const existing = getOwnedAppById(normalized, deps.hydrationCountry); + if (!existing) { + deps.sendApiError(res, 404, "NOT_FOUND", "App not found."); + return; + } + if (existing.kind === "research") { + deps.sendApiError( + res, + 400, + "INVALID_REQUEST", + "Research apps cannot be moved between projects." + ); + return; + } + const moved = moveAppToProject(normalized, project.id); + if (!moved) { + deps.sendApiError(res, 404, "NOT_FOUND", "App not found."); + return; + } + deps.sendJson(res, 200, { + success: true, + data: { + id: normalized, + projectId: project.id, + }, + }); + } + return { handleApiAppsPost, handleApiAppsDelete, + handleApiAppPatch, }; } diff --git a/cli/dashboard-server/project-scope.ts b/cli/dashboard-server/project-scope.ts new file mode 100644 index 0000000..5c1791b --- /dev/null +++ b/cli/dashboard-server/project-scope.ts @@ -0,0 +1,71 @@ +import * as http from "http"; +import { getProjectById } from "../db/projects"; +import { setMetadataValue } from "../db/metadata"; +import { DEFAULT_PROJECT_ID } from "../shared/project-types"; + +export function resolveProjectId( + query: Record, + res: http.ServerResponse, + sendApiError: ( + res: http.ServerResponse, + status: number, + errorCode: string, + message: string + ) => void +): string | null { + const raw = typeof query.projectId === "string" ? query.projectId.trim() : ""; + const explicit = raw.length > 0; + const candidate = explicit ? raw : DEFAULT_PROJECT_ID; + let project: { id: string } | null = null; + try { + project = getProjectById(candidate); + } catch { + project = null; + } + if (!project) { + if (explicit) { + sendApiError( + res, + 404, + "PROJECT_NOT_FOUND", + `Project "${candidate}" does not exist.` + ); + return null; + } + // No explicit projectId and no default row available (e.g. mocked test DB). + return DEFAULT_PROJECT_ID; + } + try { + setMetadataValue("current_project_id", project.id); + } catch {} + return project.id; +} + +export function resolveProjectIdFromBody( + body: { projectId?: unknown } | null | undefined, + res: http.ServerResponse, + sendApiError: ( + res: http.ServerResponse, + status: number, + errorCode: string, + message: string + ) => void +): string | null { + const raw = + body && typeof body.projectId === "string" ? body.projectId.trim() : ""; + const candidate = raw.length > 0 ? raw : DEFAULT_PROJECT_ID; + const project = getProjectById(candidate); + if (!project) { + sendApiError( + res, + 404, + "PROJECT_NOT_FOUND", + `Project "${candidate}" does not exist.` + ); + return null; + } + try { + setMetadataValue("current_project_id", project.id); + } catch {} + return project.id; +} diff --git a/cli/dashboard-server/routes/project-handlers.ts b/cli/dashboard-server/routes/project-handlers.ts new file mode 100644 index 0000000..60587ae --- /dev/null +++ b/cli/dashboard-server/routes/project-handlers.ts @@ -0,0 +1,205 @@ +import * as http from "http"; +import { + ProjectError, + createProject, + deleteProject, + getProjectById, + listProjectSummaries, + updateProject, +} from "../../db/projects"; +import { getMetadataValue, setMetadataValue } from "../../db/metadata"; +import { + DEFAULT_PROJECT_ID, + isValidProjectColor, + type ProjectColor, +} from "../../shared/project-types"; + +type ProjectHandlersDeps = { + parseJsonBody: ( + req: http.IncomingMessage, + res: http.ServerResponse + ) => Promise; + sendJson: (res: http.ServerResponse, status: number, data: unknown) => void; + sendApiError: ( + res: http.ServerResponse, + status: number, + errorCode: string, + message: string + ) => void; + reportDashboardError: ( + error: unknown, + metadata: Record + ) => void; +}; + +function handleProjectError( + res: http.ServerResponse, + deps: ProjectHandlersDeps, + error: unknown +): void { + if (error instanceof ProjectError) { + const status = + error.code === "LAST_PROJECT" + ? 409 + : error.code === "DUPLICATE_NAME" + ? 409 + : 400; + deps.sendApiError(res, status, error.code, error.message); + return; + } + deps.reportDashboardError(error, { + source: "project-handlers", + }); + deps.sendApiError( + res, + 500, + "INTERNAL_ERROR", + "An unexpected error occurred while processing projects." + ); +} + +export function createProjectHandlers(deps: ProjectHandlersDeps) { + function handleProjectsGet(res: http.ServerResponse): void { + try { + const summaries = listProjectSummaries(); + deps.sendJson(res, 200, { + success: true, + data: summaries, + }); + } catch (error) { + handleProjectError(res, deps, error); + } + } + + async function handleProjectsPost( + req: http.IncomingMessage, + res: http.ServerResponse + ): Promise { + const body = await deps.parseJsonBody<{ + name?: string; + color?: string; + }>(req, res); + if (!body) return; + if (typeof body.name !== "string") { + deps.sendApiError( + res, + 400, + "INVALID_REQUEST", + "Project name is required." + ); + return; + } + const color: ProjectColor | undefined = isValidProjectColor(body.color) + ? body.color + : undefined; + try { + const project = createProject({ name: body.name, color }); + deps.sendJson(res, 201, { success: true, data: project }); + } catch (error) { + handleProjectError(res, deps, error); + } + } + + async function handleProjectPatch( + req: http.IncomingMessage, + res: http.ServerResponse, + id: string + ): Promise { + const body = await deps.parseJsonBody<{ + name?: string; + color?: string; + }>(req, res); + if (!body) return; + const color: ProjectColor | undefined = isValidProjectColor(body.color) + ? body.color + : undefined; + try { + const updated = updateProject(id, { + name: typeof body.name === "string" ? body.name : undefined, + color, + }); + if (!updated) { + deps.sendApiError(res, 404, "PROJECT_NOT_FOUND", "Project not found."); + return; + } + deps.sendJson(res, 200, { success: true, data: updated }); + } catch (error) { + handleProjectError(res, deps, error); + } + } + + function handleProjectDelete(res: http.ServerResponse, id: string): void { + try { + const result = deleteProject(id); + if (!result) { + deps.sendApiError(res, 404, "PROJECT_NOT_FOUND", "Project not found."); + return; + } + const current = getMetadataValue("current_project_id"); + if (current === id) { + setMetadataValue("current_project_id", DEFAULT_PROJECT_ID); + } + deps.sendJson(res, 200, { success: true, data: result }); + } catch (error) { + handleProjectError(res, deps, error); + } + } + + function handleCurrentProjectGet(res: http.ServerResponse): void { + const stored = getMetadataValue("current_project_id"); + const project = + (stored ? getProjectById(stored) : null) ?? + getProjectById(DEFAULT_PROJECT_ID); + if (!project) { + deps.sendApiError( + res, + 404, + "PROJECT_NOT_FOUND", + "No project is available." + ); + return; + } + deps.sendJson(res, 200, { + success: true, + data: { projectId: project.id }, + }); + } + + async function handleCurrentProjectPut( + req: http.IncomingMessage, + res: http.ServerResponse + ): Promise { + const body = await deps.parseJsonBody<{ projectId?: string }>(req, res); + if (!body) return; + const projectId = + typeof body.projectId === "string" ? body.projectId.trim() : ""; + if (!projectId) { + deps.sendApiError( + res, + 400, + "INVALID_REQUEST", + "projectId is required." + ); + return; + } + const project = getProjectById(projectId); + if (!project) { + deps.sendApiError(res, 404, "PROJECT_NOT_FOUND", "Project not found."); + return; + } + setMetadataValue("current_project_id", project.id); + deps.sendJson(res, 200, { + success: true, + data: { projectId: project.id }, + }); + } + + return { + handleProjectsGet, + handleProjectsPost, + handleProjectPatch, + handleProjectDelete, + handleCurrentProjectGet, + handleCurrentProjectPut, + }; +} diff --git a/cli/dashboard-server/server.routes.test.ts b/cli/dashboard-server/server.routes.test.ts index 91aa61d..348a4e9 100644 --- a/cli/dashboard-server/server.routes.test.ts +++ b/cli/dashboard-server/server.routes.test.ts @@ -357,7 +357,12 @@ describe("dashboard server routes", () => { expect(response.statusCode).toBe(200); expect(mockUpsertOwnedApps).toHaveBeenCalledWith([ - { id: DEFAULT_RESEARCH_APP_ID, kind: "research", name: "Research" }, + { + id: "research:default", + kind: "research", + name: "Research", + projectId: "default", + }, ]); expect(response.json?.data.map((item: any) => item.id)).toEqual(["2", "1"]); }); @@ -450,7 +455,7 @@ describe("dashboard server routes", () => { it("creates research app with slug collision suffix", async () => { mockGetOwnedAppById.mockImplementation((id: string) => { - if (id === DEFAULT_RESEARCH_APP_ID) return { id, name: "Research" } as any; + if (id === "research:default") return { id, name: "Research" } as any; if (id === "research:my-ideas") return { id, name: "My Ideas" } as any; return null; }); @@ -470,7 +475,12 @@ describe("dashboard server routes", () => { }, }); expect(mockUpsertOwnedApps).toHaveBeenCalledWith([ - { id: "research:my-ideas-2", kind: "research", name: "My Ideas" }, + { + id: "research:my-ideas-2", + kind: "research", + name: "My Ideas", + projectId: "default", + }, ]); }); @@ -500,7 +510,7 @@ describe("dashboard server routes", () => { }, }); expect(mockUpsertOwnedApps).toHaveBeenCalledWith([ - { id: "123", kind: "owned", name: "123" }, + { id: "123", kind: "owned", name: "123", projectId: "default" }, ]); expect(mockUpsertOwnedAppSnapshots).toHaveBeenCalledWith("US", [ { @@ -509,6 +519,7 @@ describe("dashboard server routes", () => { averageUserRating: 4.4, userRatingCount: 100, expiresAt: "2099-01-01T00:00:00.000Z", + projectId: "default", }, ]); }); diff --git a/cli/dashboard-server/server.ts b/cli/dashboard-server/server.ts index 79ff679..f404e40 100644 --- a/cli/dashboard-server/server.ts +++ b/cli/dashboard-server/server.ts @@ -33,6 +33,8 @@ import { import { createAsoRouteHandlers, } from "./routes/aso-routes"; +import { createProjectHandlers } from "./routes/project-handlers"; +import { resolveProjectId } from "./project-scope"; import { sendApiError, sendJson, parseJsonBody } from "./http-utils"; import { resolveStaticPath, @@ -238,6 +240,13 @@ const asoRouteHandlers = createAsoRouteHandlers({ isTruthyQueryParam, }); +const projectHandlers = createProjectHandlers({ + parseJsonBody, + sendJson, + sendApiError, + reportDashboardError, +}); + export function createServerRequestHandler(): http.RequestListener { return async (req, res) => { const url = req.url ?? "/"; @@ -255,6 +264,50 @@ export function createServerRequestHandler(): http.RequestListener { return; } + if (req.method === "GET" && pathname === "/api/projects") { + projectHandlers.handleProjectsGet(res); + return; + } + + if (req.method === "POST" && pathname === "/api/projects") { + await runAsForegroundMutation(() => + projectHandlers.handleProjectsPost(req, res) + ); + return; + } + + if (req.method === "GET" && pathname === "/api/projects/current") { + projectHandlers.handleCurrentProjectGet(res); + return; + } + + if (req.method === "PUT" && pathname === "/api/projects/current") { + await runAsForegroundMutation(() => + projectHandlers.handleCurrentProjectPut(req, res) + ); + return; + } + + if ( + pathname.startsWith("/api/projects/") && + pathname !== "/api/projects/current" + ) { + const projectId = pathname.slice("/api/projects/".length); + if (req.method === "PATCH") { + await runAsForegroundMutation(() => + projectHandlers.handleProjectPatch(req, res, projectId) + ); + return; + } + if (req.method === "DELETE") { + await runAsForegroundMutation(() => { + projectHandlers.handleProjectDelete(res, projectId); + return Promise.resolve(); + }); + return; + } + } + if (req.method === "GET" && pathname === DASHBOARD_RUNTIME_CONFIG_PATH) { sendDashboardRuntimeConfig( res, @@ -266,8 +319,10 @@ export function createServerRequestHandler(): http.RequestListener { } if (req.method === "GET" && pathname === "/api/apps") { - ensureDefaultResearchAppExists(); - let apps = listOwnedApps(DEFAULT_APP_DOCS_HYDRATION_COUNTRY); + const projectId = resolveProjectId(query, res, sendApiError); + if (!projectId) return; + ensureDefaultResearchAppExists(projectId); + let apps = listOwnedApps(DEFAULT_APP_DOCS_HYDRATION_COUNTRY, projectId); const nowMs = Date.now(); const refreshMaxAgeMs = ASO_ENV.ownedAppDocRefreshMaxAgeMs; const staleOwnedAppIds = apps @@ -290,7 +345,7 @@ export function createServerRequestHandler(): http.RequestListener { if (snapshots.length > 0) { upsertOwnedAppSnapshots(DEFAULT_APP_DOCS_HYDRATION_COUNTRY, snapshots); } - apps = listOwnedApps(DEFAULT_APP_DOCS_HYDRATION_COUNTRY); + apps = listOwnedApps(DEFAULT_APP_DOCS_HYDRATION_COUNTRY, projectId); } catch (error) { reportDashboardError(error, { method: "GET", @@ -328,8 +383,10 @@ export function createServerRequestHandler(): http.RequestListener { } if (req.method === "POST" && pathname === "/api/apps") { + const projectId = resolveProjectId(query, res, sendApiError); + if (!projectId) return; await runAsForegroundMutation(() => - appsHandlers.handleApiAppsPost(req, res) + appsHandlers.handleApiAppsPost(req, res, projectId) ); return; } @@ -341,6 +398,18 @@ export function createServerRequestHandler(): http.RequestListener { return; } + if ( + req.method === "PATCH" && + pathname.startsWith("/api/apps/") && + pathname !== "/api/apps/" + ) { + const appId = pathname.slice("/api/apps/".length); + await runAsForegroundMutation(() => + appsHandlers.handleApiAppPatch(req, res, appId) + ); + return; + } + if (req.method === "GET" && pathname === "/api/aso/auth/status") { handleApiAsoAuthStatusGet(res); return; diff --git a/cli/db/owned-apps.ts b/cli/db/owned-apps.ts index 12583dc..0ec2865 100644 --- a/cli/db/owned-apps.ts +++ b/cli/db/owned-apps.ts @@ -1,12 +1,14 @@ import { DEFAULT_ASO_COUNTRY, normalizeCountry } from "../domain/keywords/policy"; import type { OwnedAppKind, StoredOwnedApp } from "./types"; import { getDb } from "./store"; +import { DEFAULT_PROJECT_ID } from "../shared/project-types"; type OwnedAppRow = { id: string; kind: string; name: string; icon_json: string | null; + project_id: string; average_user_rating: number | null; user_rating_count: number | null; previous_average_user_rating: number | null; @@ -46,6 +48,7 @@ function toStoredOwnedApp(row: OwnedAppRow): StoredOwnedApp { id: row.id, kind: toOwnedAppKind(row.kind), name: row.name, + projectId: row.project_id ?? DEFAULT_PROJECT_ID, averageUserRating: row.average_user_rating, userRatingCount: row.user_rating_count, previousAverageUserRating: row.previous_average_user_rating, @@ -56,46 +59,71 @@ function toStoredOwnedApp(row: OwnedAppRow): StoredOwnedApp { }; } -export function listOwnedApps(country: string = DEFAULT_ASO_COUNTRY): StoredOwnedApp[] { +export function listOwnedApps( + country: string = DEFAULT_ASO_COUNTRY, + projectId?: string +): StoredOwnedApp[] { const db = getDb(); const normalizedCountry = normalizeCountry(country); + const params: unknown[] = [normalizedCountry]; + let whereClause = ""; + if (projectId) { + whereClause = " WHERE app.project_id = ?"; + params.push(projectId); + } const rows = db .prepare( - `SELECT app.id, app.kind, app.name, app.icon_json, + `SELECT app.id, app.kind, app.name, app.icon_json, app.project_id, ratings.average_user_rating, ratings.user_rating_count, ratings.previous_average_user_rating, ratings.previous_user_rating_count, ratings.expires_at, ratings.last_fetched_at FROM owned_apps app LEFT JOIN owned_app_country_ratings ratings ON ratings.app_id = app.id - AND ratings.country = ? + AND ratings.country = ?${whereClause} ORDER BY app.name COLLATE NOCASE ASC` ) - .all(normalizedCountry) as OwnedAppRow[]; + .all(...params) as OwnedAppRow[]; return rows.map(toStoredOwnedApp); } -export function listOwnedAppIdsByKind(kind: OwnedAppKind): string[] { +export function listOwnedAppIdsByKind( + kind: OwnedAppKind, + projectId?: string +): string[] { const db = getDb(); + const params: unknown[] = [kind]; + let whereClause = ""; + if (projectId) { + whereClause = " AND project_id = ?"; + params.push(projectId); + } const rows = db .prepare( `SELECT id FROM owned_apps - WHERE kind = ?` + WHERE kind = ?${whereClause}` ) - .all(kind) as Array<{ id: string }>; + .all(...params) as Array<{ id: string }>; return rows.map((row) => row.id); } export function getOwnedAppById( id: string, - country: string = DEFAULT_ASO_COUNTRY + country: string = DEFAULT_ASO_COUNTRY, + projectId?: string ): StoredOwnedApp | null { const db = getDb(); const normalizedCountry = normalizeCountry(country); + const params: unknown[] = [normalizedCountry, id]; + let whereClause = "WHERE app.id = ?"; + if (projectId) { + whereClause += " AND app.project_id = ?"; + params.push(projectId); + } const row = db .prepare( - `SELECT app.id, app.kind, app.name, app.icon_json, + `SELECT app.id, app.kind, app.name, app.icon_json, app.project_id, ratings.average_user_rating, ratings.user_rating_count, ratings.previous_average_user_rating, ratings.previous_user_rating_count, ratings.expires_at, ratings.last_fetched_at @@ -103,20 +131,44 @@ export function getOwnedAppById( LEFT JOIN owned_app_country_ratings ratings ON ratings.app_id = app.id AND ratings.country = ? - WHERE app.id = ?` + ${whereClause}` ) - .get(normalizedCountry, id) as OwnedAppRow | undefined; + .get(...params) as OwnedAppRow | undefined; return row ? toStoredOwnedApp(row) : null; } +export function getAppProjectId(id: string): string | null { + const db = getDb(); + const row = db + .prepare(`SELECT project_id FROM owned_apps WHERE id = ?`) + .get(id) as { project_id: string } | undefined; + return row?.project_id ?? null; +} + +export function moveAppToProject( + id: string, + projectId: string +): boolean { + const db = getDb(); + const result = db + .prepare(`UPDATE owned_apps SET project_id = ? WHERE id = ?`) + .run(projectId, id); + return result.changes > 0; +} + export function upsertOwnedApps( - apps: Array<{ id: string; kind: OwnedAppKind; name: string }> + apps: Array<{ + id: string; + kind: OwnedAppKind; + name: string; + projectId?: string; + }> ): void { if (apps.length === 0) return; const db = getDb(); const stmt = db.prepare( - `INSERT INTO owned_apps (id, kind, name) - VALUES (@id, @kind, @name) + `INSERT INTO owned_apps (id, kind, name, project_id) + VALUES (@id, @kind, @name, @projectId) ON CONFLICT(id) DO UPDATE SET kind = excluded.kind, name = excluded.name` @@ -128,6 +180,7 @@ export function upsertOwnedApps( id: app.id, kind: app.kind, name: app.name, + projectId: app.projectId ?? DEFAULT_PROJECT_ID, }); } }); @@ -139,6 +192,7 @@ export function upsertOwnedAppSnapshots( apps: Array<{ id: string; name?: string; + projectId?: string; averageUserRating?: number | null; userRatingCount?: number | null; icon?: Record; @@ -150,7 +204,7 @@ export function upsertOwnedAppSnapshots( const db = getDb(); const normalizedCountry = normalizeCountry(country); const selectOwnedStmt = db.prepare( - `SELECT id, kind, name, icon_json + `SELECT id, kind, name, icon_json, project_id FROM owned_apps WHERE id = ?` ); @@ -162,8 +216,8 @@ export function upsertOwnedAppSnapshots( WHERE app_id = ? AND country = ?` ); const upsertOwnedStmt = db.prepare( - `INSERT INTO owned_apps (id, kind, name, icon_json) - VALUES (@id, @kind, @name, @iconJson) + `INSERT INTO owned_apps (id, kind, name, icon_json, project_id) + VALUES (@id, @kind, @name, @iconJson, @projectId) ON CONFLICT(id) DO UPDATE SET kind = excluded.kind, name = excluded.name, @@ -194,7 +248,13 @@ export function upsertOwnedAppSnapshots( const tx = db.transaction(() => { for (const app of apps) { const existingOwned = selectOwnedStmt.get(app.id) as - | { id: string; kind: string; name: string; icon_json: string | null } + | { + id: string; + kind: string; + name: string; + icon_json: string | null; + project_id: string | null; + } | undefined; const existingRating = selectRatingStmt.get( app.id, @@ -227,11 +287,17 @@ export function upsertOwnedAppSnapshots( const icon = app.icon ?? parseJsonObject(existingOwned?.icon_json ?? null) ?? undefined; + const projectId = + app.projectId ?? + existingOwned?.project_id ?? + DEFAULT_PROJECT_ID; + upsertOwnedStmt.run({ id: app.id, kind, name: nextName, iconJson: icon ? JSON.stringify(icon) : null, + projectId, }); upsertRatingsStmt.run({ diff --git a/cli/db/projects.test.ts b/cli/db/projects.test.ts new file mode 100644 index 0000000..aa0b4b5 --- /dev/null +++ b/cli/db/projects.test.ts @@ -0,0 +1,208 @@ +import * as fs from "fs"; +import * as os from "os"; +import * as path from "path"; +import { closeDbForTests, getDb } from "./store"; +import { + ProjectError, + createProject, + deleteProject, + getProjectById, + getProjectByName, + getProjectCounts, + listProjects, + listProjectSummaries, + updateProject, +} from "./projects"; +import { DEFAULT_PROJECT_ID } from "../shared/project-types"; +import { researchAppIdForProject } from "../shared/aso-research"; + +const TEST_DB_PATH = path.join( + os.tmpdir(), + `aso-projects-${process.pid}-${Date.now()}.sqlite` +); + +function cleanDbFiles(): void { + for (const suffix of ["", "-wal", "-shm"]) { + try { + fs.unlinkSync(`${TEST_DB_PATH}${suffix}`); + } catch {} + } +} + +describe("projects", () => { + beforeAll(() => { + process.env.ASO_DB_PATH = TEST_DB_PATH; + }); + + beforeEach(() => { + closeDbForTests(); + cleanDbFiles(); + }); + + afterAll(() => { + closeDbForTests(); + cleanDbFiles(); + delete process.env.ASO_DB_PATH; + }); + + it("returns the default project on fresh init", () => { + const projects = listProjects(); + expect(projects).toHaveLength(1); + expect(projects[0].id).toBe(DEFAULT_PROJECT_ID); + expect(projects[0].name).toBe("Default"); + }); + + it("creates a project with slug id and seeds a research app", () => { + const created = createProject({ name: "Halal Food", color: "green" }); + expect(created.id).toBe("halal-food"); + expect(created.name).toBe("Halal Food"); + expect(created.color).toBe("green"); + + const db = getDb(); + const researchRow = db + .prepare( + `SELECT id, kind, project_id FROM owned_apps WHERE project_id = ? AND kind = 'research'` + ) + .get(created.id) as + | { id: string; kind: string; project_id: string } + | undefined; + expect(researchRow).toBeDefined(); + expect(researchRow?.id).toBe(researchAppIdForProject(created.id)); + }); + + it("normalizes Turkish characters in slug", () => { + const created = createProject({ name: "Altın Takibi" }); + expect(created.id).toBe("altin-takibi"); + }); + + it("appends suffix when two different names slugify to the same value", () => { + const first = createProject({ name: "Food Scanner" }); + // "food-scanner" as a display name slugifies to the same "food-scanner" id, + // but passes the case-insensitive name uniqueness check. + const second = createProject({ name: "food-scanner" }); + expect(first.id).toBe("food-scanner"); + expect(second.id).toBe("food-scanner-2"); + }); + + it("rejects duplicate names case-insensitively", () => { + createProject({ name: "Gold Tracker" }); + expect(() => createProject({ name: "gold tracker" })).toThrow(ProjectError); + expect(() => createProject({ name: "GOLD TRACKER" })).toThrow(ProjectError); + }); + + it("rejects invalid or empty names", () => { + expect(() => createProject({ name: "" })).toThrow(ProjectError); + expect(() => createProject({ name: " " })).toThrow(ProjectError); + expect(() => createProject({ name: "x".repeat(61) })).toThrow(ProjectError); + }); + + it("updates project name and color but preserves id", () => { + const created = createProject({ name: "Draft" }); + const updated = updateProject(created.id, { + name: "Published", + color: "blue", + }); + expect(updated?.id).toBe(created.id); + expect(updated?.name).toBe("Published"); + expect(updated?.color).toBe("blue"); + }); + + it("rejects renaming to an existing project name", () => { + const a = createProject({ name: "Alpha" }); + createProject({ name: "Beta" }); + expect(() => updateProject(a.id, { name: "Beta" })).toThrow(ProjectError); + }); + + it("allows renaming to the same name (case-insensitive no-op)", () => { + const created = createProject({ name: "Alpha" }); + const updated = updateProject(created.id, { name: "ALPHA" }); + expect(updated?.name).toBe("ALPHA"); + }); + + it("refuses to delete the only project", () => { + expect(() => deleteProject(DEFAULT_PROJECT_ID)).toThrow(ProjectError); + }); + + it("deletes a project and cascades its owned apps + keywords", () => { + const project = createProject({ name: "Temp" }); + const db = getDb(); + db.prepare( + `INSERT INTO owned_apps (id, kind, name, icon_json, project_id) + VALUES (?, 'owned', ?, NULL, ?)` + ).run("11111", "Temp App", project.id); + db.prepare( + `INSERT INTO app_keywords (app_id, keyword, country, is_favorite, previous_position, added_at) + VALUES (?, ?, 'US', 0, NULL, ?)` + ).run("11111", "temp kw", new Date().toISOString()); + db.prepare( + `INSERT INTO app_keyword_position_history (app_id, keyword, country, position, captured_at) + VALUES (?, ?, 'US', ?, ?)` + ).run("11111", "temp kw", 10, new Date().toISOString()); + + const counts = getProjectCounts(project.id); + expect(counts.appCount).toBe(1); + expect(counts.keywordCount).toBe(1); + + const result = deleteProject(project.id); + expect(result?.deletedAppCount).toBe(1); + expect(result?.deletedKeywordCount).toBe(1); + + expect(getProjectById(project.id)).toBeNull(); + const ownedAfter = db + .prepare(`SELECT id FROM owned_apps WHERE project_id = ?`) + .all(project.id); + expect(ownedAfter).toHaveLength(0); + const keywordsAfter = db + .prepare(`SELECT keyword FROM app_keywords WHERE app_id = ?`) + .all("11111"); + expect(keywordsAfter).toHaveLength(0); + const historyAfter = db + .prepare( + `SELECT keyword FROM app_keyword_position_history WHERE app_id = ?` + ) + .all("11111"); + expect(historyAfter).toHaveLength(0); + }); + + it("returns null from delete for unknown project id", () => { + expect(deleteProject("does-not-exist")).toBeNull(); + }); + + it("provides summaries with counts", () => { + const project = createProject({ name: "With Data" }); + const db = getDb(); + db.prepare( + `INSERT INTO owned_apps (id, kind, name, icon_json, project_id) + VALUES (?, 'owned', ?, NULL, ?)` + ).run("22222", "Data App", project.id); + db.prepare( + `INSERT INTO app_keywords (app_id, keyword, country, is_favorite, previous_position, added_at) + VALUES (?, ?, 'US', 0, NULL, ?)` + ).run("22222", "demo", new Date().toISOString()); + + const summaries = listProjectSummaries(); + const withData = summaries.find((summary) => summary.id === project.id); + expect(withData?.appCount).toBe(1); + expect(withData?.keywordCount).toBe(1); + }); + + it("looks up projects by name case-insensitively", () => { + const created = createProject({ name: "Mixed" }); + expect(getProjectByName("mixed")?.id).toBe(created.id); + expect(getProjectByName(" MIXED ")?.id).toBe(created.id); + expect(getProjectByName("absent")).toBeNull(); + }); + + it("enforces uniqueness of research app per project via index", () => { + const project = createProject({ name: "Unique Research" }); + const db = getDb(); + expect(() => + db + .prepare( + `INSERT INTO owned_apps (id, kind, name, icon_json, project_id) + VALUES (?, 'research', ?, NULL, ?)` + ) + .run(`research:${project.id}-extra`, "Extra", project.id) + ).toThrow(); + }); +}); diff --git a/cli/db/projects.ts b/cli/db/projects.ts new file mode 100644 index 0000000..ad1a1e0 --- /dev/null +++ b/cli/db/projects.ts @@ -0,0 +1,256 @@ +import { getDb } from "./store"; +import { + DEFAULT_PROJECT_COLOR, + DEFAULT_PROJECT_ID, + PROJECT_COLORS, + ensureUniqueSlug, + slugifyProjectName, + validateProjectName, + type Project, + type ProjectColor, + type ProjectSummary, +} from "../shared/project-types"; +import { + DEFAULT_RESEARCH_APP_NAME, + researchAppIdForProject, +} from "../shared/aso-research"; + +type ProjectRow = { + id: string; + name: string; + color: string; + created_at: string; + updated_at: string; +}; + +function toProject(row: ProjectRow): Project { + const color = (PROJECT_COLORS as readonly string[]).includes(row.color) + ? (row.color as ProjectColor) + : DEFAULT_PROJECT_COLOR; + return { + id: row.id, + name: row.name, + color, + createdAt: row.created_at, + updatedAt: row.updated_at, + }; +} + +export class ProjectError extends Error { + code: string; + constructor(code: string, message: string) { + super(message); + this.name = "ProjectError"; + this.code = code; + } +} + +export function listProjects(): Project[] { + const db = getDb(); + const rows = db + .prepare( + `SELECT id, name, color, created_at, updated_at + FROM projects + ORDER BY created_at ASC, id ASC` + ) + .all() as ProjectRow[]; + return rows.map(toProject); +} + +export function listProjectSummaries(): ProjectSummary[] { + const db = getDb(); + const rows = db + .prepare( + `SELECT + p.id, + p.name, + p.color, + p.created_at, + p.updated_at, + (SELECT COUNT(*) FROM owned_apps oa + WHERE oa.project_id = p.id AND oa.kind = 'owned') AS app_count, + (SELECT COUNT(*) FROM app_keywords ak + JOIN owned_apps oa2 ON oa2.id = ak.app_id + WHERE oa2.project_id = p.id) AS keyword_count + FROM projects p + ORDER BY p.created_at ASC, p.id ASC` + ) + .all() as Array; + return rows.map((row) => ({ + ...toProject(row), + appCount: Number(row.app_count ?? 0), + keywordCount: Number(row.keyword_count ?? 0), + })); +} + +export function getProjectById(id: string): Project | null { + const db = getDb(); + const row = db + .prepare( + `SELECT id, name, color, created_at, updated_at + FROM projects WHERE id = ?` + ) + .get(id) as ProjectRow | undefined; + return row ? toProject(row) : null; +} + +export function getProjectByName(name: string): Project | null { + const db = getDb(); + const row = db + .prepare( + `SELECT id, name, color, created_at, updated_at + FROM projects WHERE LOWER(name) = LOWER(?)` + ) + .get(name.trim()) as ProjectRow | undefined; + return row ? toProject(row) : null; +} + +export function getProjectCounts(id: string): { + appCount: number; + keywordCount: number; +} { + const db = getDb(); + const appRow = db + .prepare( + `SELECT COUNT(*) AS n FROM owned_apps WHERE project_id = ? AND kind = 'owned'` + ) + .get(id) as { n: number }; + const keywordRow = db + .prepare( + `SELECT COUNT(*) AS n + FROM app_keywords ak + JOIN owned_apps oa ON oa.id = ak.app_id + WHERE oa.project_id = ?` + ) + .get(id) as { n: number }; + return { + appCount: Number(appRow?.n ?? 0), + keywordCount: Number(keywordRow?.n ?? 0), + }; +} + +export function createProject(input: { + name: string; + color?: ProjectColor; +}): Project { + const validation = validateProjectName(input.name); + if (!validation.ok) { + throw new ProjectError( + validation.reason === "empty" ? "INVALID_NAME" : "NAME_TOO_LONG", + validation.reason === "empty" + ? "Project name cannot be empty." + : "Project name is too long." + ); + } + const name = validation.value; + const existingByName = getProjectByName(name); + if (existingByName) { + throw new ProjectError( + "DUPLICATE_NAME", + `A project named "${name}" already exists.` + ); + } + const color: ProjectColor = input.color ?? DEFAULT_PROJECT_COLOR; + const desiredSlug = slugifyProjectName(name); + const existing = listProjects().map((project) => project.id); + const id = ensureUniqueSlug(desiredSlug, existing); + const now = new Date().toISOString(); + const db = getDb(); + const tx = db.transaction(() => { + db.prepare( + `INSERT INTO projects (id, name, color, created_at, updated_at) + VALUES (?, ?, ?, ?, ?)` + ).run(id, name, color, now, now); + db.prepare( + `INSERT OR IGNORE INTO owned_apps (id, kind, name, icon_json, project_id) + VALUES (?, 'research', ?, NULL, ?)` + ).run(researchAppIdForProject(id), DEFAULT_RESEARCH_APP_NAME, id); + }); + tx(); + const created = getProjectById(id); + if (!created) { + throw new ProjectError( + "UNEXPECTED_ERROR", + "Project was not created successfully." + ); + } + return created; +} + +export function updateProject( + id: string, + patch: { name?: string; color?: ProjectColor } +): Project | null { + const existing = getProjectById(id); + if (!existing) return null; + const nextName = patch.name !== undefined ? patch.name : existing.name; + const validation = validateProjectName(nextName); + if (!validation.ok) { + throw new ProjectError( + validation.reason === "empty" ? "INVALID_NAME" : "NAME_TOO_LONG", + validation.reason === "empty" + ? "Project name cannot be empty." + : "Project name is too long." + ); + } + const resolvedName = validation.value; + if (resolvedName.toLowerCase() !== existing.name.toLowerCase()) { + const conflict = getProjectByName(resolvedName); + if (conflict && conflict.id !== id) { + throw new ProjectError( + "DUPLICATE_NAME", + `A project named "${resolvedName}" already exists.` + ); + } + } + const color = patch.color ?? existing.color; + const now = new Date().toISOString(); + const db = getDb(); + db.prepare( + `UPDATE projects + SET name = ?, color = ?, updated_at = ? + WHERE id = ?` + ).run(resolvedName, color, now, id); + return getProjectById(id); +} + +export function deleteProject(id: string): { + deletedProjectId: string; + deletedAppCount: number; + deletedKeywordCount: number; +} | null { + const existing = getProjectById(id); + if (!existing) return null; + const projects = listProjects(); + if (projects.length <= 1) { + throw new ProjectError( + "LAST_PROJECT", + "Cannot delete the only remaining project." + ); + } + const counts = getProjectCounts(id); + const db = getDb(); + const tx = db.transaction(() => { + const appIdRows = db + .prepare(`SELECT id FROM owned_apps WHERE project_id = ?`) + .all(id) as Array<{ id: string }>; + for (const row of appIdRows) { + db.prepare(`DELETE FROM app_keywords WHERE app_id = ?`).run(row.id); + db.prepare( + `DELETE FROM app_keyword_position_history WHERE app_id = ?` + ).run(row.id); + db.prepare(`DELETE FROM owned_apps WHERE id = ?`).run(row.id); + } + db.prepare(`DELETE FROM projects WHERE id = ?`).run(id); + }); + tx(); + return { + deletedProjectId: id, + deletedAppCount: counts.appCount, + deletedKeywordCount: counts.keywordCount, + }; +} + +export function isDefaultProject(id: string): boolean { + return id === DEFAULT_PROJECT_ID; +} diff --git a/cli/db/store.migrations.test.ts b/cli/db/store.migrations.test.ts new file mode 100644 index 0000000..6a0c4f3 --- /dev/null +++ b/cli/db/store.migrations.test.ts @@ -0,0 +1,208 @@ +import * as fs from "fs"; +import * as os from "os"; +import * as path from "path"; +import Database from "better-sqlite3"; +import { closeDbForTests, getDb } from "./store"; +import { DEFAULT_PROJECT_ID } from "../shared/project-types"; +import { researchAppIdForProject } from "../shared/aso-research"; + +function tempDbPath(suffix: string): string { + return path.join( + os.tmpdir(), + `aso-store-migrations-${suffix}-${process.pid}-${Date.now()}.sqlite` + ); +} + +function cleanDbFiles(dbPath: string): void { + for (const suffix of ["", "-wal", "-shm"]) { + try { + fs.unlinkSync(`${dbPath}${suffix}`); + } catch {} + } +} + +function runDdl(raw: Database.Database, sql: string): void { + raw.exec(sql); +} + +function seedLegacySchema(dbPath: string): void { + const raw = new Database(dbPath); + raw.pragma("journal_mode = WAL"); + raw.pragma("foreign_keys = ON"); + runDdl( + raw, + `CREATE TABLE IF NOT EXISTS owned_apps ( + id TEXT PRIMARY KEY, + kind TEXT NOT NULL CHECK (kind IN ('owned', 'research')), + name TEXT NOT NULL, + icon_json TEXT + ); + CREATE TABLE IF NOT EXISTS owned_app_country_ratings ( + app_id TEXT NOT NULL, + country TEXT NOT NULL, + average_user_rating REAL, + user_rating_count INTEGER, + previous_average_user_rating REAL, + previous_user_rating_count INTEGER, + expires_at TEXT, + last_fetched_at TEXT, + PRIMARY KEY (app_id, country), + FOREIGN KEY (app_id) REFERENCES owned_apps(id) ON DELETE CASCADE + ); + CREATE TABLE IF NOT EXISTS app_keywords ( + app_id TEXT NOT NULL, + keyword TEXT NOT NULL, + country TEXT NOT NULL, + is_favorite INTEGER NOT NULL DEFAULT 0, + previous_position INTEGER, + added_at TEXT, + PRIMARY KEY (app_id, keyword, country) + ); + CREATE TABLE IF NOT EXISTS app_keyword_position_history ( + app_id TEXT NOT NULL, + keyword TEXT NOT NULL, + country TEXT NOT NULL, + position INTEGER, + captured_at TEXT NOT NULL, + PRIMARY KEY (app_id, keyword, country, captured_at) + ); + CREATE TABLE IF NOT EXISTS metadata ( + key TEXT PRIMARY KEY, + value TEXT NOT NULL, + updated_at TEXT NOT NULL + );` + ); + raw.prepare( + `INSERT INTO owned_apps (id, kind, name) VALUES (?, 'research', 'Research')` + ).run("research"); + raw.prepare( + `INSERT INTO owned_apps (id, kind, name) VALUES (?, 'owned', 'App One')` + ).run("111"); + raw.prepare( + `INSERT INTO app_keywords (app_id, keyword, country, is_favorite, previous_position, added_at) + VALUES (?, ?, ?, 0, NULL, ?)` + ).run("research", "halal", "US", new Date().toISOString()); + raw.prepare( + `INSERT INTO app_keywords (app_id, keyword, country, is_favorite, previous_position, added_at) + VALUES (?, ?, ?, 0, NULL, ?)` + ).run("111", "scanner", "US", new Date().toISOString()); + raw.prepare( + `INSERT INTO app_keyword_position_history (app_id, keyword, country, position, captured_at) + VALUES (?, ?, ?, ?, ?)` + ).run("research", "halal", "US", 7, new Date().toISOString()); + raw.close(); +} + +describe("store migration", () => { + const dbPath = tempDbPath("legacy"); + + afterEach(() => { + closeDbForTests(); + cleanDbFiles(dbPath); + delete process.env.ASO_DB_PATH; + }); + + it("creates projects table + default project and renames legacy research app", () => { + seedLegacySchema(dbPath); + process.env.ASO_DB_PATH = dbPath; + + const db = getDb(); + const projects = db.prepare(`SELECT id, name FROM projects`).all() as Array<{ + id: string; + name: string; + }>; + expect(projects).toHaveLength(1); + expect(projects[0].id).toBe(DEFAULT_PROJECT_ID); + + const legacyRow = db + .prepare(`SELECT id FROM owned_apps WHERE id = 'research'`) + .get(); + expect(legacyRow).toBeUndefined(); + + const targetResearchId = researchAppIdForProject(DEFAULT_PROJECT_ID); + const renamed = db + .prepare(`SELECT id, project_id, kind FROM owned_apps WHERE id = ?`) + .get(targetResearchId) as + | { id: string; project_id: string; kind: string } + | undefined; + expect(renamed).toBeDefined(); + expect(renamed?.project_id).toBe(DEFAULT_PROJECT_ID); + expect(renamed?.kind).toBe("research"); + + const ownedAppRow = db + .prepare(`SELECT project_id FROM owned_apps WHERE id = '111'`) + .get() as { project_id: string } | undefined; + expect(ownedAppRow?.project_id).toBe(DEFAULT_PROJECT_ID); + + const keywordRow = db + .prepare( + `SELECT app_id FROM app_keywords WHERE keyword = 'halal' AND country = 'US'` + ) + .get() as { app_id: string } | undefined; + expect(keywordRow?.app_id).toBe(targetResearchId); + + const historyRow = db + .prepare( + `SELECT app_id FROM app_keyword_position_history WHERE keyword = 'halal'` + ) + .get() as { app_id: string } | undefined; + expect(historyRow?.app_id).toBe(targetResearchId); + }); + + it("is idempotent when run twice", () => { + seedLegacySchema(dbPath); + process.env.ASO_DB_PATH = dbPath; + + getDb(); + closeDbForTests(); + expect(() => getDb()).not.toThrow(); + + const db = getDb(); + const projectCount = db + .prepare(`SELECT COUNT(*) as n FROM projects`) + .get() as { n: number }; + expect(projectCount.n).toBe(1); + + const ownedCount = db + .prepare(`SELECT COUNT(*) as n FROM owned_apps`) + .get() as { n: number }; + expect(ownedCount.n).toBe(2); + }); + + it("skips rename when ASO_PROJECTS_SKIP_RESEARCH_RENAME=1", () => { + seedLegacySchema(dbPath); + process.env.ASO_DB_PATH = dbPath; + process.env.ASO_PROJECTS_SKIP_RESEARCH_RENAME = "1"; + + const db = getDb(); + const legacyRow = db + .prepare(`SELECT id FROM owned_apps WHERE id = 'research'`) + .get(); + expect(legacyRow).toBeDefined(); + + delete process.env.ASO_PROJECTS_SKIP_RESEARCH_RENAME; + }); + + it("initializes a fresh database cleanly", () => { + process.env.ASO_DB_PATH = dbPath; + cleanDbFiles(dbPath); + + const db = getDb(); + const projectRow = db + .prepare(`SELECT id, name, color FROM projects WHERE id = ?`) + .get(DEFAULT_PROJECT_ID) as + | { id: string; name: string; color: string } + | undefined; + expect(projectRow?.id).toBe(DEFAULT_PROJECT_ID); + expect(projectRow?.name).toBe("Default"); + expect(projectRow?.color).toBe("slate"); + + const columns = db + .prepare(`PRAGMA table_info(owned_apps)`) + .all() as Array<{ name: string }>; + const projectIdColumn = columns.find( + (column) => column.name === "project_id" + ); + expect(projectIdColumn).toBeDefined(); + }); +}); diff --git a/cli/db/store.ts b/cli/db/store.ts index d66c9be..6f90037 100644 --- a/cli/db/store.ts +++ b/cli/db/store.ts @@ -2,8 +2,20 @@ import * as fs from "fs"; import * as path from "path"; import Database from "better-sqlite3"; import { ASO_ENV } from "../shared/aso-env"; +import { + DEFAULT_PROJECT_COLOR, + DEFAULT_PROJECT_ID, + DEFAULT_PROJECT_NAME, +} from "../shared/project-types"; +import { + RESEARCH_APP_ID, + researchAppIdForProject, +} from "../shared/aso-research"; + let db: Database.Database | null = null; +const SKIP_RESEARCH_RENAME_ENV = "ASO_PROJECTS_SKIP_RESEARCH_RENAME"; + function ensureAppKeywordFavoriteColumn(database: Database.Database): void { const columns = database .prepare(`PRAGMA table_info(app_keywords)`) @@ -17,6 +29,111 @@ function ensureAppKeywordFavoriteColumn(database: Database.Database): void { } } +function ensureProjectsTable(database: Database.Database): void { + database.exec(` + CREATE TABLE IF NOT EXISTS projects ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL UNIQUE COLLATE NOCASE, + color TEXT NOT NULL DEFAULT '${DEFAULT_PROJECT_COLOR}', + created_at TEXT NOT NULL, + updated_at TEXT NOT NULL + ); + `); +} + +function ensureDefaultProjectRow(database: Database.Database): void { + const now = new Date().toISOString(); + database + .prepare( + `INSERT OR IGNORE INTO projects (id, name, color, created_at, updated_at) + VALUES (?, ?, ?, ?, ?)` + ) + .run( + DEFAULT_PROJECT_ID, + DEFAULT_PROJECT_NAME, + DEFAULT_PROJECT_COLOR, + now, + now + ); +} + +function ensureProjectIdColumnOnOwnedApps(database: Database.Database): void { + const columns = database + .prepare(`PRAGMA table_info(owned_apps)`) + .all() as Array<{ name?: string }>; + const hasProjectIdColumn = columns.some( + (column) => column.name === "project_id" + ); + if (!hasProjectIdColumn) { + // SQLite does not allow ADD COLUMN with REFERENCES+NOT NULL default. + // Referential integrity is enforced at the application layer in projects.ts + // (deleteProject cascades owned_apps rows manually). + database.exec( + `ALTER TABLE owned_apps + ADD COLUMN project_id TEXT NOT NULL DEFAULT '${DEFAULT_PROJECT_ID}'` + ); + } +} + +function ensureOwnedAppsProjectIndexes(database: Database.Database): void { + database.exec(` + CREATE INDEX IF NOT EXISTS idx_owned_apps_project + ON owned_apps(project_id, kind); + CREATE UNIQUE INDEX IF NOT EXISTS idx_owned_apps_research_per_project + ON owned_apps(project_id) WHERE kind = 'research'; + `); +} + +function migrateLegacyResearchAppId(database: Database.Database): void { + if (process.env[SKIP_RESEARCH_RENAME_ENV] === "1") return; + const legacy = database + .prepare(`SELECT id FROM owned_apps WHERE id = ?`) + .get(RESEARCH_APP_ID) as { id: string } | undefined; + if (!legacy) return; + + const targetId = researchAppIdForProject(DEFAULT_PROJECT_ID); + const conflict = database + .prepare(`SELECT id FROM owned_apps WHERE id = ?`) + .get(targetId) as { id: string } | undefined; + if (conflict) return; + + const fkPragma = database.pragma("foreign_keys", { simple: true }); + const wasFkOn = + fkPragma === 1 || fkPragma === "1" || fkPragma === true; + if (wasFkOn) { + database.pragma("foreign_keys = OFF"); + } + try { + const tx = database.transaction(() => { + database + .prepare(`UPDATE app_keywords SET app_id = ? WHERE app_id = ?`) + .run(targetId, RESEARCH_APP_ID); + database + .prepare( + `UPDATE owned_app_country_ratings SET app_id = ? WHERE app_id = ?` + ) + .run(targetId, RESEARCH_APP_ID); + database + .prepare( + `UPDATE app_keyword_position_history SET app_id = ? WHERE app_id = ?` + ) + .run(targetId, RESEARCH_APP_ID); + database + .prepare( + `UPDATE owned_apps + SET id = ?, project_id = ? + WHERE id = ?` + ) + .run(targetId, DEFAULT_PROJECT_ID, RESEARCH_APP_ID); + }); + tx(); + } finally { + if (wasFkOn) { + database.pragma("foreign_keys = ON"); + } + } +} + function initializeDatabase(database: Database.Database): void { database.pragma("journal_mode = WAL"); database.pragma("foreign_keys = ON"); @@ -139,6 +256,11 @@ function initializeDatabase(database: Database.Database): void { CREATE INDEX IF NOT EXISTS idx_aso_keyword_failures_country_stage ON aso_keyword_failures(country, stage); `); + ensureProjectsTable(database); + ensureDefaultProjectRow(database); + ensureProjectIdColumnOnOwnedApps(database); + ensureOwnedAppsProjectIndexes(database); + migrateLegacyResearchAppId(database); ensureAppKeywordFavoriteColumn(database); database.exec(` CREATE INDEX IF NOT EXISTS idx_app_keywords_country_app_favorite diff --git a/cli/db/types.ts b/cli/db/types.ts index 43b98ce..06364d3 100644 --- a/cli/db/types.ts +++ b/cli/db/types.ts @@ -11,6 +11,7 @@ export interface StoredOwnedApp { id: string; kind: OwnedAppKind; name: string; + projectId: string; averageUserRating: number | null; userRatingCount: number | null; previousAverageUserRating: number | null; diff --git a/cli/shared/aso-research.test.ts b/cli/shared/aso-research.test.ts new file mode 100644 index 0000000..5ff87e1 --- /dev/null +++ b/cli/shared/aso-research.test.ts @@ -0,0 +1,44 @@ +import { + DEFAULT_RESEARCH_APP_ID, + RESEARCH_APP_ID, + RESEARCH_APP_ID_PREFIX, + isResearchAppId, + projectIdFromResearchAppId, + researchAppIdForProject, +} from "./aso-research"; + +describe("aso-research helpers", () => { + it("recognizes bare and suffixed research ids", () => { + expect(isResearchAppId(RESEARCH_APP_ID)).toBe(true); + expect(isResearchAppId(DEFAULT_RESEARCH_APP_ID)).toBe(true); + expect(isResearchAppId(`${RESEARCH_APP_ID_PREFIX}halal-food`)).toBe(true); + expect(isResearchAppId("6755012360")).toBe(false); + expect(isResearchAppId("")).toBe(false); + expect(isResearchAppId(" ")).toBe(false); + }); + + it("builds research app id for a project", () => { + expect(researchAppIdForProject("default")).toBe("research:default"); + expect(researchAppIdForProject("halal-food")).toBe("research:halal-food"); + expect(researchAppIdForProject(" spaced ")).toBe("research:spaced"); + }); + + it("throws when building research app id without a project", () => { + expect(() => researchAppIdForProject("")).toThrow(); + expect(() => researchAppIdForProject(" ")).toThrow(); + }); + + it("extracts projectId from suffixed research id", () => { + expect(projectIdFromResearchAppId("research:default")).toBe("default"); + expect(projectIdFromResearchAppId("research:halal-food")).toBe( + "halal-food" + ); + }); + + it("returns null for non-prefixed or bare research ids", () => { + expect(projectIdFromResearchAppId("research")).toBeNull(); + expect(projectIdFromResearchAppId("6755012360")).toBeNull(); + expect(projectIdFromResearchAppId("")).toBeNull(); + expect(projectIdFromResearchAppId("research:")).toBeNull(); + }); +}); diff --git a/cli/shared/aso-research.ts b/cli/shared/aso-research.ts index 056dc8d..07b5187 100644 --- a/cli/shared/aso-research.ts +++ b/cli/shared/aso-research.ts @@ -11,3 +11,20 @@ export function isResearchAppId(appId: string): boolean { normalized.startsWith(RESEARCH_APP_ID_PREFIX) ); } + +export function researchAppIdForProject(projectId: string): string { + const trimmed = projectId.trim(); + if (!trimmed) { + throw new Error("projectId is required to build a research app id"); + } + return `${RESEARCH_APP_ID_PREFIX}${trimmed}`; +} + +export function projectIdFromResearchAppId(appId: string): string | null { + const trimmed = appId.trim(); + if (!trimmed) return null; + if (trimmed === RESEARCH_APP_ID) return null; + if (!trimmed.startsWith(RESEARCH_APP_ID_PREFIX)) return null; + const projectId = trimmed.slice(RESEARCH_APP_ID_PREFIX.length); + return projectId.length > 0 ? projectId : null; +} diff --git a/cli/shared/project-types.test.ts b/cli/shared/project-types.test.ts new file mode 100644 index 0000000..c7e689a --- /dev/null +++ b/cli/shared/project-types.test.ts @@ -0,0 +1,115 @@ +import { + DEFAULT_PROJECT_COLOR, + DEFAULT_PROJECT_ID, + DEFAULT_PROJECT_NAME, + PROJECT_COLORS, + PROJECT_NAME_MAX_LENGTH, + ensureUniqueSlug, + isValidProjectColor, + slugifyProjectName, + validateProjectName, +} from "./project-types"; + +describe("project-types helpers", () => { + it("exposes the expected default project sentinel", () => { + expect(DEFAULT_PROJECT_ID).toBe("default"); + expect(DEFAULT_PROJECT_NAME).toBe("Default"); + expect((PROJECT_COLORS as readonly string[]).includes(DEFAULT_PROJECT_COLOR)).toBe(true); + }); + + describe("isValidProjectColor", () => { + it("accepts preset colors", () => { + for (const color of PROJECT_COLORS) { + expect(isValidProjectColor(color)).toBe(true); + } + }); + it("rejects other values", () => { + expect(isValidProjectColor("maroon")).toBe(false); + expect(isValidProjectColor("")).toBe(false); + expect(isValidProjectColor(123)).toBe(false); + expect(isValidProjectColor(null)).toBe(false); + }); + }); + + describe("validateProjectName", () => { + it("accepts and trims valid names", () => { + expect(validateProjectName("Halal Food")).toEqual({ + ok: true, + value: "Halal Food", + }); + expect(validateProjectName(" spaced ")).toEqual({ + ok: true, + value: "spaced", + }); + }); + + it("rejects empty / whitespace-only", () => { + expect(validateProjectName("")).toEqual({ ok: false, reason: "empty" }); + expect(validateProjectName(" ")).toEqual({ ok: false, reason: "empty" }); + expect(validateProjectName(123)).toEqual({ ok: false, reason: "empty" }); + }); + + it("rejects names above max length", () => { + const tooLong = "x".repeat(PROJECT_NAME_MAX_LENGTH + 1); + expect(validateProjectName(tooLong)).toEqual({ + ok: false, + reason: "too_long", + }); + }); + }); + + describe("slugifyProjectName", () => { + it("lowercases and replaces non-alphanumeric with dashes", () => { + expect(slugifyProjectName("Halal Food")).toBe("halal-food"); + expect(slugifyProjectName("My App 2024!")).toBe("my-app-2024"); + }); + + it("normalizes Turkish diacritics", () => { + expect(slugifyProjectName("Altın Takibi")).toBe("altin-takibi"); + expect(slugifyProjectName("Şeker Ürünü")).toBe("seker-urunu"); + expect(slugifyProjectName("Çiğdem Öznur Güneş")).toBe( + "cigdem-oznur-gunes" + ); + }); + + it("collapses repeated dashes and trims edges", () => { + expect(slugifyProjectName("---weird----name---")).toBe("weird-name"); + expect(slugifyProjectName("___underscores___")).toBe("underscores"); + }); + + it("falls back to 'project' when name yields empty slug", () => { + expect(slugifyProjectName("!!!")).toBe("project"); + expect(slugifyProjectName("🎉🎉")).toBe("project"); + expect(slugifyProjectName(" ")).toBe("project"); + }); + + it("truncates to max slug length", () => { + const long = "a".repeat(120); + const slug = slugifyProjectName(long); + expect(slug.length).toBeLessThanOrEqual(48); + expect(slug.startsWith("a")).toBe(true); + expect(slug.endsWith("-")).toBe(false); + }); + }); + + describe("ensureUniqueSlug", () => { + it("returns original slug when unique", () => { + expect(ensureUniqueSlug("halal-food", [])).toBe("halal-food"); + expect(ensureUniqueSlug("halal-food", ["default"])).toBe("halal-food"); + }); + + it("appends -2, -3, ... on collisions", () => { + expect(ensureUniqueSlug("halal-food", ["halal-food"])).toBe( + "halal-food-2" + ); + expect( + ensureUniqueSlug("halal-food", ["halal-food", "halal-food-2"]) + ).toBe("halal-food-3"); + }); + + it("accepts Set inputs", () => { + const existing = new Set(["halal-food", "halal-food-2"]); + expect(ensureUniqueSlug("halal-food", existing)).toBe("halal-food-3"); + }); + }); +}); diff --git a/cli/shared/project-types.ts b/cli/shared/project-types.ts new file mode 100644 index 0000000..1c236bd --- /dev/null +++ b/cli/shared/project-types.ts @@ -0,0 +1,113 @@ +export const DEFAULT_PROJECT_ID = "default"; +export const DEFAULT_PROJECT_NAME = "Default"; + +export const PROJECT_COLORS = [ + "slate", + "blue", + "green", + "amber", + "red", + "purple", + "pink", + "teal", +] as const; + +export type ProjectColor = (typeof PROJECT_COLORS)[number]; + +export const DEFAULT_PROJECT_COLOR: ProjectColor = "slate"; + +export type Project = { + id: string; + name: string; + color: ProjectColor; + createdAt: string; + updatedAt: string; +}; + +export type ProjectSummary = Project & { + appCount: number; + keywordCount: number; +}; + +export type ProjectCreateRequest = { + name: string; + color?: ProjectColor; +}; + +export type ProjectUpdateRequest = { + name?: string; + color?: ProjectColor; +}; + +export const PROJECT_NAME_MIN_LENGTH = 1; +export const PROJECT_NAME_MAX_LENGTH = 60; +export const PROJECT_SLUG_MAX_LENGTH = 48; + +export function isValidProjectColor(value: unknown): value is ProjectColor { + return ( + typeof value === "string" && + (PROJECT_COLORS as readonly string[]).includes(value) + ); +} + +export type ProjectNameValidation = + | { ok: true; value: string } + | { ok: false; reason: "empty" | "too_long" }; + +export function validateProjectName(name: unknown): ProjectNameValidation { + if (typeof name !== "string") return { ok: false, reason: "empty" }; + const trimmed = name.trim(); + if (trimmed.length < PROJECT_NAME_MIN_LENGTH) { + return { ok: false, reason: "empty" }; + } + if (trimmed.length > PROJECT_NAME_MAX_LENGTH) { + return { ok: false, reason: "too_long" }; + } + return { ok: true, value: trimmed }; +} + +const TURKISH_DIACRITIC_MAP: Record = { + ı: "i", + İ: "i", + ş: "s", + Ş: "s", + ğ: "g", + Ğ: "g", + ü: "u", + Ü: "u", + ö: "o", + Ö: "o", + ç: "c", + Ç: "c", +}; + +function normalizeDiacritics(input: string): string { + let out = ""; + for (const ch of input) { + out += TURKISH_DIACRITIC_MAP[ch] ?? ch; + } + return out.normalize("NFKD").replace(/[̀-ͯ]/g, ""); +} + +export function slugifyProjectName(name: string): string { + const lowered = normalizeDiacritics(name).toLowerCase(); + const replaced = lowered.replace(/[^a-z0-9]+/g, "-"); + const trimmed = replaced.replace(/^-+|-+$/g, ""); + const truncated = trimmed.slice(0, PROJECT_SLUG_MAX_LENGTH).replace(/-+$/g, ""); + if (truncated.length === 0) return "project"; + return truncated; +} + +export function ensureUniqueSlug( + slug: string, + existingIds: Iterable +): string { + const existing = new Set(); + for (const id of existingIds) existing.add(id); + if (!existing.has(slug)) return slug; + let counter = 2; + while (existing.has(`${slug}-${counter}`)) { + counter += 1; + } + return `${slug}-${counter}`; +} From 90a446b415eda6af15326b60b3431e3096f7b943 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Sat, 25 Apr 2026 19:57:56 +0300 Subject: [PATCH 04/55] Reduce Bugsnag trace payloads and fix Apple auth drift classification --- cli/services/auth/aso-auth-service.test.ts | 81 ++++++++++++ cli/services/auth/aso-auth-service.ts | 54 +++++++- .../keywords/apple-http-trace.test.ts | 46 ++++++- cli/services/keywords/apple-http-trace.ts | 123 +++++++++++++----- .../telemetry/bugsnag-classifier.test.ts | 14 ++ cli/shared/telemetry/bugsnag-classifier.ts | 1 + docs/aso-error-handling.md | 5 +- 7 files changed, 284 insertions(+), 40 deletions(-) diff --git a/cli/services/auth/aso-auth-service.test.ts b/cli/services/auth/aso-auth-service.test.ts index 799450c..193de34 100644 --- a/cli/services/auth/aso-auth-service.test.ts +++ b/cli/services/auth/aso-auth-service.test.ts @@ -11,6 +11,7 @@ import inquirer from "inquirer"; import path from "path"; import { asoCookieStoreService } from "./aso-cookie-store-service"; import { asoKeychainService } from "./aso-keychain-service"; +import * as appleHttpTrace from "../keywords/apple-http-trace"; function loadFixture(name: string): unknown { return JSON.parse( @@ -215,6 +216,32 @@ describe("aso-auth-service legacy parity edge handling", () => { }); }); + it("maps 401 -20101 responses to invalid credentials without contract drift", async () => { + const engine = createEngine(); + const reportContractSpy = jest + .spyOn(appleHttpTrace, "reportAppleContractChange") + .mockImplementation(() => {}); + + await expect( + (engine as any).handlePostLoginResponse({ + status: 401, + data: { + serviceErrors: [ + { + code: "-20101", + message: "Check the account information you entered and try again.", + }, + ], + }, + headers: {}, + }) + ).rejects.toMatchObject({ + name: "AppleAuthResponseError", + reason: "invalid_credentials", + }); + expect(reportContractSpy).not.toHaveBeenCalled(); + }); + it("maps itctx cookie responses to explicit account-access error", async () => { const engine = createEngine(); @@ -773,6 +800,60 @@ describe("aso-auth-service 2FA method handling", () => { ).rejects.toThrow("No supported 2FA verification methods were returned."); }); + it("treats Apple -28248 as verification delivery failure instead of contract drift", async () => { + const request = jest + .fn() + .mockResolvedValueOnce({ + status: 500, + data: { + noTrustedDevices: true, + trustedPhoneNumbers: [], + trustedDevices: [], + serviceErrors: [ + { + code: "-28248", + title: "Verification Failed", + message: + "Verification codes cannot be sent to this phone number at this time. Please try again later.", + }, + ], + }, + headers: {}, + }) + .mockResolvedValueOnce({ + status: 500, + data: { + noTrustedDevices: true, + trustedPhoneNumbers: [], + trustedDevices: [], + serviceErrors: [ + { + code: "-28248", + title: "Verification Failed", + message: + "Verification codes cannot be sent to this phone number at this time. Please try again later.", + }, + ], + }, + headers: {}, + }); + const reportContractSpy = jest + .spyOn(appleHttpTrace, "reportAppleContractChange") + .mockImplementation(() => {}); + const engine = new AsoAuthEngine({ request } as any, "auto") as any; + + await expect( + engine.handleTwoFactor({ + scnt: "scnt", + xAppleIdSessionId: "session-id", + }) + ).rejects.toMatchObject({ + name: "AppleAuthResponseError", + reason: "verification_delivery_failed", + }); + expect(reportContractSpy).not.toHaveBeenCalled(); + }); + it("fails fast when 2FA is attempted without interactive TTY", async () => { Object.defineProperty(process.stdin, "isTTY", { configurable: true, diff --git a/cli/services/auth/aso-auth-service.ts b/cli/services/auth/aso-auth-service.ts index 2b53bfa..111e96b 100644 --- a/cli/services/auth/aso-auth-service.ts +++ b/cli/services/auth/aso-auth-service.ts @@ -40,6 +40,7 @@ type AppleAuthFailureReason = | "invalid_credentials" | "two_factor_required" | "upgrade_required" + | "verification_delivery_failed" | "unknown"; export class AppleAuthResponseError extends Error { @@ -123,6 +124,8 @@ interface AppleAuthErrorPayload { } const SUPPORTED_AUTH_TYPES = new Set(["sa", "hsa", "non-sa", "hsa2"]); +const APPLE_INVALID_CREDENTIAL_CODES = new Set(["-20101"]); +const APPLE_TWO_FACTOR_DELIVERY_FAILURE_CODES = new Set(["-28248"]); interface RubySirpResult { ok: boolean; @@ -493,8 +496,10 @@ puts({ function collectAppleServiceErrors( payload: unknown ): Array<{ code?: string; title?: string; message?: string }> { - if (!payload || typeof payload !== "object") return []; - const typed = payload as AppleAuthErrorPayload; + const parsed = + typeof payload === "string" ? tryParseJsonString(payload) : payload; + if (!parsed || typeof parsed !== "object") return []; + const typed = parsed as AppleAuthErrorPayload; const buckets = [ typed.serviceErrors, typed.service_errors, @@ -503,6 +508,16 @@ function collectAppleServiceErrors( return buckets.flatMap((bucket) => (Array.isArray(bucket) ? bucket : [])); } +function payloadHasAppleServiceErrorCode( + payload: unknown, + codes: Set +): boolean { + return collectAppleServiceErrors(payload).some((error) => { + if (typeof error.code !== "string") return false; + return codes.has(error.code.trim()); + }); +} + export function summarizeAppleErrorPayload(payload: unknown): string { if (!payload || typeof payload !== "object") { return String(payload); @@ -595,6 +610,9 @@ function quoteDesCookieValue(cookieHeader: string): string { } function payloadIndicatesInvalidCredentials(payload: unknown): boolean { + if (payloadHasAppleServiceErrorCode(payload, APPLE_INVALID_CREDENTIAL_CODES)) { + return true; + } const errors = collectAppleServiceErrors(payload); if (errors.length === 0) return false; const combinedText = errors @@ -608,7 +626,8 @@ function payloadIndicatesInvalidCredentials(payload: unknown): boolean { combinedText.includes("apple id") || combinedText.includes("account"))) || combinedText.includes("incorrect password") || - combinedText.includes("account name or password") + combinedText.includes("account name or password") || + combinedText.includes("check the account information you entered") ); } @@ -619,6 +638,12 @@ function inferAppleAuthFailureReason( if (status === 403) return "invalid_credentials"; if (status === 409) return "two_factor_required"; if (status === 412) return "upgrade_required"; + if ( + status === 401 && + payloadHasAppleServiceErrorCode(payload, APPLE_INVALID_CREDENTIAL_CODES) + ) { + return "invalid_credentials"; + } if (payloadIndicatesInvalidCredentials(payload)) return "invalid_credentials"; return "unknown"; } @@ -1545,6 +1570,29 @@ export class AsoAuthEngine { }); } if (methodChoices.length === 0) { + if ( + payloadHasAppleServiceErrorCode( + body, + APPLE_TWO_FACTOR_DELIVERY_FAILURE_CODES + ) + ) { + throw this.withAppleAuthTrace( + new AppleAuthResponseError({ + message: getTwoFactorVerificationErrorMessage(body), + status: challengeResponse.status, + payload: body, + reason: "verification_delivery_failed", + }), + "2fa-method-selection", + { + status: challengeResponse.status, + noTrustedDevices, + trustedPhoneCount: phoneNumbers.length, + hasTrustedDevices, + failureCode: "-28248", + } + ); + } reportAppleContractChange({ provider: "apple-auth", operation: "2fa-method-selection", diff --git a/cli/services/keywords/apple-http-trace.test.ts b/cli/services/keywords/apple-http-trace.test.ts index b88a5c4..f649f3e 100644 --- a/cli/services/keywords/apple-http-trace.test.ts +++ b/cli/services/keywords/apple-http-trace.test.ts @@ -108,7 +108,7 @@ describe("apple-http-trace", () => { expect(trace.request.url).toContain("plain=ok"); }); - it("attaches last 10 calls plus recent failed calls that fell out of the window", async () => { + it("attaches last 3 calls plus recent failed calls that fell out of the window", async () => { const client = axios.create(); attachAppleHttpTracing(client, "apple-search-ads"); const mock = new AxiosMockAdapter(client); @@ -155,10 +155,52 @@ describe("apple-http-trace", () => { ) ); - expect(traceSeq).toEqual([3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 1, 2]); + expect(traceSeq).toEqual([10, 11, 12, 1, 2, 5]); expect(failedSeq).toEqual([1, 2, 5]); }); + it("truncates oversized trace payloads to keep metadata bounded", async () => { + const client = axios.create(); + attachAppleHttpTracing(client, "apple-appstore"); + const mock = new AxiosMockAdapter(client); + mock.onGet("/huge").reply(500, { + hugeText: "x".repeat(10000), + list: Array.from({ length: 60 }, (_, index) => ({ index })), + nested: { + level1: { + level2: { + level3: { + level4: { + level5: { + level6: { + level7: "too-deep", + }, + }, + }, + }, + }, + }, + }, + }); + + await expect(client.get("/huge")).rejects.toThrow(); + + const wrapped = withAppleHttpTraceContext(new Error("bounded"), { + provider: "apple-appstore", + operation: "appstore.app-lookup", + }); + const metadata = getErrorBugsnagMetadata(wrapped); + const traces = (metadata?.appleApi as any)?.recentHttpTraces || []; + const trace = traces[traces.length - 1]; + + expect(String(trace.response.body.hugeText)).toContain("[TRUNCATED:"); + expect(trace.response.body.list).toHaveLength(21); + expect(trace.response.body.list[20]).toContain("[TRUNCATED:"); + expect(JSON.stringify(trace.response.body.nested)).toContain( + "[TRUNCATED:DEPTH]" + ); + }); + it("does not redact unrelated keys that merely contain letter a or c", async () => { const client = axios.create(); attachAppleHttpTracing(client, "apple-auth"); diff --git a/cli/services/keywords/apple-http-trace.ts b/cli/services/keywords/apple-http-trace.ts index 49fb80f..38ca0f7 100644 --- a/cli/services/keywords/apple-http-trace.ts +++ b/cli/services/keywords/apple-http-trace.ts @@ -40,9 +40,13 @@ type AppleHttpTraceStoreEntry = AppleHttpTrace & { nonSuccess: boolean; }; -const RECENT_TRACE_LIMIT = 10; +const RECENT_TRACE_LIMIT = 3; const RECENT_FAILED_TRACE_LIMIT = 3; const APPLE_CONTRACT_CHANGE_DEDUPE_WINDOW_MS = 15 * 60 * 1000; +const TRACE_STRING_MAX_LENGTH = 2000; +const TRACE_ARRAY_MAX_ITEMS = 20; +const TRACE_OBJECT_MAX_KEYS = 40; +const TRACE_MAX_DEPTH = 6; const recentTraceStore: AppleHttpTraceStoreEntry[] = []; const recentFailedTraceStore: AppleHttpTraceStoreEntry[] = []; const appleContractChangeLastSeenAt = new Map(); @@ -79,26 +83,67 @@ function toRequestSnapshot(config?: AxiosRequestConfig): AppleHttpTrace["request isSensitiveKey, baseUrl: "https://apple.local", }), - params: sanitizeTelemetryValue(config?.params, { - isSensitiveKey, - parseJsonStrings: true, - }), - headers: sanitizeTelemetryValue(config?.headers, { - isSensitiveKey, - parseJsonStrings: true, - }), - body: sanitizeTelemetryValue(config?.data, { - isSensitiveKey, - parseJsonStrings: true, - }), + params: truncateTraceValue( + sanitizeTelemetryValue(config?.params, { + isSensitiveKey, + parseJsonStrings: true, + }) + ), + headers: truncateTraceValue( + sanitizeTelemetryValue(config?.headers, { + isSensitiveKey, + parseJsonStrings: true, + }) + ), + body: truncateTraceValue( + sanitizeTelemetryValue(config?.data, { + isSensitiveKey, + parseJsonStrings: true, + }) + ), }; } +function truncateTraceValue(value: unknown, depth = 0): unknown { + if (value == null) return value; + if (depth >= TRACE_MAX_DEPTH) return "[TRUNCATED:DEPTH]"; + + if (typeof value === "string") { + if (value.length <= TRACE_STRING_MAX_LENGTH) return value; + const truncatedChars = value.length - TRACE_STRING_MAX_LENGTH; + return `${value.slice(0, TRACE_STRING_MAX_LENGTH)}...[TRUNCATED:${truncatedChars} chars]`; + } + + if (Array.isArray(value)) { + const limited = value + .slice(0, TRACE_ARRAY_MAX_ITEMS) + .map((entry) => truncateTraceValue(entry, depth + 1)); + if (value.length > TRACE_ARRAY_MAX_ITEMS) { + limited.push(`[TRUNCATED:${value.length - TRACE_ARRAY_MAX_ITEMS} items]`); + } + return limited; + } + + if (typeof value === "object") { + const entries = Object.entries(value as Record); + const limitedEntries = entries + .slice(0, TRACE_OBJECT_MAX_KEYS) + .map(([key, entry]) => [key, truncateTraceValue(entry, depth + 1)]); + const output = Object.fromEntries(limitedEntries) as Record; + if (entries.length > TRACE_OBJECT_MAX_KEYS) { + output._truncatedKeys = entries.length - TRACE_OBJECT_MAX_KEYS; + } + return output; + } + + return value; +} + function toMetadataTrace( entry: AppleHttpTraceStoreEntry ): AppleHttpTrace { const { traceId: _traceId, nonSuccess: _nonSuccess, ...trace } = entry; - return trace; + return truncateTraceValue(trace) as AppleHttpTrace; } function isNonSuccessTrace(trace: AppleHttpTrace): boolean { @@ -206,14 +251,18 @@ export function attachAppleHttpTracing( request: toRequestSnapshot(response.config), response: { status: response.status, - headers: sanitizeTelemetryValue(response.headers, { - isSensitiveKey, - parseJsonStrings: true, - }), - body: sanitizeTelemetryValue(response.data, { - isSensitiveKey, - parseJsonStrings: true, - }), + headers: truncateTraceValue( + sanitizeTelemetryValue(response.headers, { + isSensitiveKey, + parseJsonStrings: true, + }) + ), + body: truncateTraceValue( + sanitizeTelemetryValue(response.data, { + isSensitiveKey, + parseJsonStrings: true, + }) + ), durationMs: startedAt > 0 ? Date.now() - startedAt : undefined, }, }); @@ -228,14 +277,18 @@ export function attachAppleHttpTracing( request: toRequestSnapshot(error.config), response: { status: error.response?.status, - headers: sanitizeTelemetryValue(error.response?.headers, { - isSensitiveKey, - parseJsonStrings: true, - }), - body: sanitizeTelemetryValue(error.response?.data, { - isSensitiveKey, - parseJsonStrings: true, - }), + headers: truncateTraceValue( + sanitizeTelemetryValue(error.response?.headers, { + isSensitiveKey, + parseJsonStrings: true, + }) + ), + body: truncateTraceValue( + sanitizeTelemetryValue(error.response?.data, { + isSensitiveKey, + parseJsonStrings: true, + }) + ), durationMs: startedAt > 0 ? Date.now() - startedAt : undefined, }, error: { @@ -287,10 +340,12 @@ export function withAppleHttpTraceContext( appleApi: { provider: params.provider, operation: params.operation, - context: sanitizeTelemetryValue(params.context || {}, { - isSensitiveKey, - parseJsonStrings: true, - }), + context: truncateTraceValue( + sanitizeTelemetryValue(params.context || {}, { + isSensitiveKey, + parseJsonStrings: true, + }) + ), recentHttpTraces: [...recentHttpTraces, ...extraRecentFailedHttpTraces], recentFailedHttpTraces, }, diff --git a/cli/shared/telemetry/bugsnag-classifier.test.ts b/cli/shared/telemetry/bugsnag-classifier.test.ts index 5d7e533..dd82062 100644 --- a/cli/shared/telemetry/bugsnag-classifier.test.ts +++ b/cli/shared/telemetry/bugsnag-classifier.test.ts @@ -109,6 +109,20 @@ describe("bugsnag-classifier", () => { expect(decision.classification).toBe("user_fault"); }); + it("classifies Apple 2FA verification delivery failures as user_fault", () => { + const error = Object.assign(new Error("Verification codes cannot be sent"), { + name: "AppleAuthResponseError", + reason: "verification_delivery_failed", + }); + + const decision = classifyTelemetryError(error, {}); + expect(decision).toEqual({ + report: true, + classification: "user_fault", + reason: "apple_auth_verification_delivery_failed", + }); + }); + it("classifies mcp parse-json payload drift as user-fault noise", () => { const decision = classifyTelemetryError( new Error("MCP expected JSON output from aso keywords"), diff --git a/cli/shared/telemetry/bugsnag-classifier.ts b/cli/shared/telemetry/bugsnag-classifier.ts index 24d12e4..880af41 100644 --- a/cli/shared/telemetry/bugsnag-classifier.ts +++ b/cli/shared/telemetry/bugsnag-classifier.ts @@ -68,6 +68,7 @@ const APPLE_AUTH_USER_FAULT_REASONS = new Set([ "invalid_credentials", "two_factor_required", "upgrade_required", + "verification_delivery_failed", ]); function getTelemetryHint(metadata: AnyRecord): TelemetryHint | undefined { diff --git a/docs/aso-error-handling.md b/docs/aso-error-handling.md index 0b0c11a..52c666e 100644 --- a/docs/aso-error-handling.md +++ b/docs/aso-error-handling.md @@ -59,7 +59,7 @@ Define failure boundaries, retry rules, and recovery behavior across CLI, dashbo ## Observability - Apple HTTP calls carry trace context. -- Bugsnag Apple metadata includes the latest `10` redacted Apple HTTP calls plus up to `3` latest non-success calls when they have already rotated out of that `10`-call window. +- Bugsnag Apple metadata includes the latest `3` redacted Apple HTTP calls plus up to `3` latest non-success calls when they have already rotated out of that `3`-call window. - Apple contract-drift reporting is centralized: when expected Apple response shapes/flow contracts drift, the runtime emits Bugsnag events classified as `apple_contract_change` with endpoint + expected-vs-actual metadata. - Contract-drift reporting covers all Apple API surfaces used by ASO runtime: - Apple auth/session bootstrap and 2FA flow @@ -80,6 +80,9 @@ Define failure boundaries, retry rules, and recovery behavior across CLI, dashbo - reports internal bugs, Apple contract-change signals, and terminal upstream failures - suppresses expected flow/validation noise (`4xx`, validation issues) - reports selected user-fault noise as low-severity (`info`, handled) for visibility without paging +- Apple auth `401` responses carrying Apple service code `-20101` are classified as `invalid_credentials` (`user_fault`) instead of contract drift. +- Apple 2FA challenge payloads with service code `-28248` (verification code delivery unavailable) are classified as verification-delivery `user_fault` instead of contract drift. +- Apple HTTP trace metadata attached to Bugsnag is size-bounded (string/array/object/depth truncation) so contract-drift events retain actionable metadata instead of being dropped for oversized payloads. - Dashboard UI reports only actionable API failures (for example: `5xx`, network/runtime exceptions, malformed success payloads); expected `4xx` flows are suppressed. - Dashboard UI transport/setup noise (`/api/aso/auth/status` network fetch failures and repeated local search failures) is reclassified as `user_fault` and deduped in-process per signature for `60` seconds. - MCP parse-json shape drift (`MCP expected JSON output from aso keywords`) is reclassified as `user_fault` and deduped in the shared reporter path for `60` seconds. From 9c3c8087b7501ba548fb71ae98f0221cb699554f Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Sun, 26 Apr 2026 11:49:45 +0300 Subject: [PATCH 05/55] add usage analytics --- .env.example | 4 + cli/cli.ts | 14 +- .../runtime/aso-config-service.test.ts | 81 ++++ cli/services/runtime/aso-config-service.ts | 60 +++ cli/services/telemetry/instrument.test.ts | 46 +++ cli/services/telemetry/instrument.ts | 11 + cli/services/telemetry/posthog-shared.test.ts | 86 ++++ .../telemetry/posthog-usage-tracking.test.ts | 129 ++++++ .../telemetry/posthog-usage-tracking.ts | 93 +++++ cli/shared/telemetry/posthog-shared.ts | 32 ++ docs/aso-error-handling.md | 3 + docs/aso-runtime-flows.md | 1 + package-lock.json | 375 ++++++------------ package.json | 3 +- 14 files changed, 678 insertions(+), 260 deletions(-) create mode 100644 cli/services/runtime/aso-config-service.test.ts create mode 100644 cli/services/runtime/aso-config-service.ts create mode 100644 cli/services/telemetry/posthog-shared.test.ts create mode 100644 cli/services/telemetry/posthog-usage-tracking.test.ts create mode 100644 cli/services/telemetry/posthog-usage-tracking.ts create mode 100644 cli/shared/telemetry/posthog-shared.ts diff --git a/.env.example b/.env.example index 36546eb..2a91924 100644 --- a/.env.example +++ b/.env.example @@ -17,3 +17,7 @@ # ASO_POPULARITY_CACHE_TTL_HOURS=720 # ASO_APP_CACHE_TTL_HOURS=168 # ASO_OWNED_APP_DOC_REFRESH_MAX_AGE_HOURS=24 + +# Optional PostHog runtime telemetry +# ASO_POSTHOG_API_KEY=phc_xxx +# ASO_POSTHOG_HOST=https://us.i.posthog.com diff --git a/cli/cli.ts b/cli/cli.ts index ff048df..e0f06ce 100644 --- a/cli/cli.ts +++ b/cli/cli.ts @@ -16,10 +16,18 @@ import { isStdoutKeywordsRun, toMachineReadableErrorMessage, } from "./services/runtime/stdout-contract"; +import { + shutdownPostHog, + trackCliStarted, +} from "./services/telemetry/posthog-usage-tracking"; assertSupportedNodeVersion(); const processArgs = process.argv?.slice(2) || []; const stdoutKeywordsRun = isStdoutKeywordsRun(processArgs); +const commandName = + typeof processArgs[0] === "string" && processArgs[0].trim() + ? processArgs[0].trim() + : "dashboard"; const isDebugEnabled = process.env.NODE_ENV == "development"; @@ -34,6 +42,7 @@ if (isDebugEnabled) { } async function main() { + trackCliStarted({ command: commandName }); checkVersionUpdateSync({ allowStdoutMessage: !stdoutKeywordsRun }); const parser = yargs(hideBin(process.argv)) @@ -51,14 +60,16 @@ async function main() { "Use 'aso --help' to see available commands and options." ); } + await shutdownPostHog(); process.exit(1); }) .help(); await parser.parseAsync(); + await shutdownPostHog(); } -main().catch((err) => { +main().catch(async (err) => { let command = "unknown"; try { @@ -81,5 +92,6 @@ main().catch((err) => { command, context: processedError, }); + await shutdownPostHog(); process.exitCode = 1; }); diff --git a/cli/services/runtime/aso-config-service.test.ts b/cli/services/runtime/aso-config-service.test.ts new file mode 100644 index 0000000..ecad38d --- /dev/null +++ b/cli/services/runtime/aso-config-service.test.ts @@ -0,0 +1,81 @@ +import fs from "fs"; +import os from "os"; +import path from "path"; +import { readAsoConfig, writeAsoConfig } from "./aso-config-service"; + +describe("aso config service", () => { + const tempDirs: string[] = []; + + afterEach(() => { + jest.restoreAllMocks(); + for (const dirPath of tempDirs) { + fs.rmSync(dirPath, { recursive: true, force: true }); + } + tempDirs.length = 0; + }); + + function createTempConfigPath(): string { + const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "aso-config-test-")); + tempDirs.push(tempDir); + return path.join(tempDir, ".aso", "config.json"); + } + + it("returns empty config when file does not exist", () => { + const configPath = createTempConfigPath(); + + expect(readAsoConfig(configPath)).toEqual({}); + }); + + it("writes and reads config values", () => { + const configPath = createTempConfigPath(); + + writeAsoConfig( + { + userId: "user-1", + featureFlag: true, + }, + configPath + ); + + expect(readAsoConfig(configPath)).toEqual({ + userId: "user-1", + featureFlag: true, + }); + }); + + it("returns empty config for invalid json", () => { + const configPath = createTempConfigPath(); + fs.mkdirSync(path.dirname(configPath), { recursive: true }); + fs.writeFileSync(configPath, "{ invalid", "utf8"); + + expect(readAsoConfig(configPath)).toEqual({}); + }); + + it("serves repeated reads from in-memory cache", () => { + const configPath = createTempConfigPath(); + fs.mkdirSync(path.dirname(configPath), { recursive: true }); + fs.writeFileSync(configPath, JSON.stringify({ userId: "first-user" }), "utf8"); + const readSpy = jest.spyOn(fs, "readFileSync"); + + const firstRead = readAsoConfig(configPath); + fs.writeFileSync(configPath, JSON.stringify({ userId: "second-user" }), "utf8"); + const secondRead = readAsoConfig(configPath); + + expect(firstRead).toEqual({ userId: "first-user" }); + expect(secondRead).toEqual({ userId: "first-user" }); + expect(readSpy).toHaveBeenCalledTimes(1); + }); + + it("updates cache on write and protects cached state from caller mutation", () => { + const configPath = createTempConfigPath(); + const readSpy = jest.spyOn(fs, "readFileSync"); + + writeAsoConfig({ userId: "cached-user" }, configPath); + const firstRead = readAsoConfig(configPath); + firstRead.userId = "mutated-by-caller"; + const secondRead = readAsoConfig(configPath); + + expect(readSpy).not.toHaveBeenCalled(); + expect(secondRead).toEqual({ userId: "cached-user" }); + }); +}); diff --git a/cli/services/runtime/aso-config-service.ts b/cli/services/runtime/aso-config-service.ts new file mode 100644 index 0000000..ae58d2b --- /dev/null +++ b/cli/services/runtime/aso-config-service.ts @@ -0,0 +1,60 @@ +import fs from "fs"; +import os from "os"; +import path from "path"; + +const ASO_CONFIG_PATH = path.join(os.homedir(), ".aso", "config.json"); +const configCache = new Map(); + +export type AsoConfig = Record; + +function normalizeConfigPath(configPath: string): string { + return path.resolve(configPath); +} + +function cloneConfig(config: AsoConfig): AsoConfig { + return { ...config }; +} + +export function readAsoConfig(configPath = ASO_CONFIG_PATH): AsoConfig { + const resolvedPath = normalizeConfigPath(configPath); + const cached = configCache.get(resolvedPath); + if (cached) { + return cloneConfig(cached); + } + + let loadedConfig: AsoConfig = {}; + + try { + if (fs.existsSync(resolvedPath)) { + const raw = fs.readFileSync(resolvedPath, "utf8"); + const parsed = JSON.parse(raw) as unknown; + if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) { + loadedConfig = parsed as AsoConfig; + } + } + } catch { + loadedConfig = {}; + } + + configCache.set(resolvedPath, cloneConfig(loadedConfig)); + return cloneConfig(loadedConfig); +} + +export function writeAsoConfig( + config: AsoConfig, + configPath = ASO_CONFIG_PATH +): void { + const resolvedPath = normalizeConfigPath(configPath); + const dirPath = path.dirname(resolvedPath); + if (!fs.existsSync(dirPath)) { + fs.mkdirSync(dirPath, { recursive: true, mode: 0o700 }); + } + + const tempPath = `${resolvedPath}.tmp`; + fs.writeFileSync(tempPath, JSON.stringify(config, null, 2), { + encoding: "utf8", + mode: 0o600, + }); + fs.renameSync(tempPath, resolvedPath); + configCache.set(resolvedPath, cloneConfig(config)); +} diff --git a/cli/services/telemetry/instrument.test.ts b/cli/services/telemetry/instrument.test.ts index 7445cce..37d4fb9 100644 --- a/cli/services/telemetry/instrument.test.ts +++ b/cli/services/telemetry/instrument.test.ts @@ -1,9 +1,14 @@ describe("telemetry instrument", () => { + const defaultPosthogApiKey = "phc_CjK5coJt6fxtXseg8XgkU8dMfXPur3JgabQh5454opmQ"; const originalNodeEnv = process.env.NODE_ENV; const originalBugsnagApiKey = process.env.BUGSNAG_API_KEY; + const originalPosthogApiKey = process.env.ASO_POSTHOG_API_KEY; + const originalPosthogHost = process.env.ASO_POSTHOG_HOST; beforeEach(() => { delete process.env.BUGSNAG_API_KEY; + delete process.env.ASO_POSTHOG_API_KEY; + delete process.env.ASO_POSTHOG_HOST; }); afterEach(() => { @@ -13,6 +18,16 @@ describe("telemetry instrument", () => { } else { process.env.BUGSNAG_API_KEY = originalBugsnagApiKey; } + if (originalPosthogApiKey === undefined) { + delete process.env.ASO_POSTHOG_API_KEY; + } else { + process.env.ASO_POSTHOG_API_KEY = originalPosthogApiKey; + } + if (originalPosthogHost === undefined) { + delete process.env.ASO_POSTHOG_HOST; + } else { + process.env.ASO_POSTHOG_HOST = originalPosthogHost; + } jest.resetModules(); jest.clearAllMocks(); }); @@ -20,7 +35,9 @@ describe("telemetry instrument", () => { it("initializes bugsnag in development mode", async () => { process.env.NODE_ENV = "development"; const initializeBugsnag = jest.fn(); + const initializePostHog = jest.fn(); jest.doMock("../../shared/telemetry/bugsnag-shared", () => ({ initializeBugsnag })); + jest.doMock("../../shared/telemetry/posthog-shared", () => ({ initializePostHog })); await import("./instrument"); @@ -29,12 +46,18 @@ describe("telemetry instrument", () => { isDevelopment: true, appVersion: version, }); + expect(initializePostHog).toHaveBeenCalledWith({ + isDevelopment: true, + apiKey: defaultPosthogApiKey, + }); }); it("initializes bugsnag in production mode", async () => { process.env.NODE_ENV = "production"; const initializeBugsnag = jest.fn(); + const initializePostHog = jest.fn(); jest.doMock("../../shared/telemetry/bugsnag-shared", () => ({ initializeBugsnag })); + jest.doMock("../../shared/telemetry/posthog-shared", () => ({ initializePostHog })); await import("./instrument"); @@ -43,5 +66,28 @@ describe("telemetry instrument", () => { isDevelopment: false, appVersion: version, }); + expect(initializePostHog).toHaveBeenCalledWith({ + isDevelopment: false, + apiKey: defaultPosthogApiKey, + }); + }); + + it("passes posthog env overrides into telemetry startup", async () => { + process.env.NODE_ENV = "production"; + process.env.ASO_POSTHOG_API_KEY = "phc_test_key"; + process.env.ASO_POSTHOG_HOST = "https://eu.i.posthog.com"; + + const initializeBugsnag = jest.fn(); + const initializePostHog = jest.fn(); + jest.doMock("../../shared/telemetry/bugsnag-shared", () => ({ initializeBugsnag })); + jest.doMock("../../shared/telemetry/posthog-shared", () => ({ initializePostHog })); + + await import("./instrument"); + + expect(initializePostHog).toHaveBeenCalledWith({ + isDevelopment: false, + apiKey: "phc_test_key", + host: "https://eu.i.posthog.com", + }); }); }); diff --git a/cli/services/telemetry/instrument.ts b/cli/services/telemetry/instrument.ts index d003714..4ae78e4 100644 --- a/cli/services/telemetry/instrument.ts +++ b/cli/services/telemetry/instrument.ts @@ -1,5 +1,8 @@ import { version } from "../../../package.json"; import { initializeBugsnag } from "../../shared/telemetry/bugsnag-shared"; +import { initializePostHog } from "../../shared/telemetry/posthog-shared"; + +const DEFAULT_POSTHOG_API_KEY = "phc_CjK5coJt6fxtXseg8XgkU8dMfXPur3JgabQh5454opmQ"; const isDevelopment = process.env.NODE_ENV == "development"; const bugsnagApiKey = process.env.BUGSNAG_API_KEY?.trim(); @@ -8,3 +11,11 @@ initializeBugsnag({ ...(bugsnagApiKey ? { apiKey: bugsnagApiKey } : {}), appVersion: version, }); + +const posthogApiKey = process.env.ASO_POSTHOG_API_KEY?.trim() || DEFAULT_POSTHOG_API_KEY; +const posthogHost = process.env.ASO_POSTHOG_HOST?.trim(); +initializePostHog({ + isDevelopment, + apiKey: posthogApiKey, + ...(posthogHost ? { host: posthogHost } : {}), +}); diff --git a/cli/services/telemetry/posthog-shared.test.ts b/cli/services/telemetry/posthog-shared.test.ts new file mode 100644 index 0000000..190a701 --- /dev/null +++ b/cli/services/telemetry/posthog-shared.test.ts @@ -0,0 +1,86 @@ +jest.mock("posthog-node", () => ({ + PostHog: jest.fn(() => ({ + identify: jest.fn(), + capture: jest.fn(), + shutdown: jest.fn(), + })), +})); + +describe("posthog-shared", () => { + function getPostHogCtor(): jest.Mock { + return (jest.requireMock("posthog-node") as { PostHog: jest.Mock }).PostHog; + } + + beforeEach(() => { + jest.resetModules(); + jest.clearAllMocks(); + }); + + it("does not start in development mode", async () => { + const { initializePostHog, getPostHogClient } = await import( + "../../shared/telemetry/posthog-shared" + ); + const PostHog = getPostHogCtor(); + + initializePostHog({ + isDevelopment: true, + apiKey: "phc_test", + }); + + expect(PostHog).not.toHaveBeenCalled(); + expect(getPostHogClient()).toBeNull(); + }); + + it("does not start when api key is blank", async () => { + const { initializePostHog, getPostHogClient } = await import( + "../../shared/telemetry/posthog-shared" + ); + const PostHog = getPostHogCtor(); + + initializePostHog({ + isDevelopment: false, + apiKey: " ", + }); + + expect(PostHog).not.toHaveBeenCalled(); + expect(getPostHogClient()).toBeNull(); + }); + + it("starts once without host override when host is not provided", async () => { + const { initializePostHog, getPostHogClient } = await import( + "../../shared/telemetry/posthog-shared" + ); + const PostHog = getPostHogCtor(); + + initializePostHog({ + isDevelopment: false, + apiKey: "phc_test", + }); + initializePostHog({ + isDevelopment: false, + apiKey: "phc_test_again", + host: "https://eu.i.posthog.com", + }); + + expect(PostHog).toHaveBeenCalledTimes(1); + expect(PostHog).toHaveBeenCalledWith("phc_test"); + expect(getPostHogClient()).toBe(PostHog.mock.results[0]?.value); + }); + + it("passes host override only when provided", async () => { + const { initializePostHog } = await import( + "../../shared/telemetry/posthog-shared" + ); + const PostHog = getPostHogCtor(); + + initializePostHog({ + isDevelopment: false, + apiKey: "phc_test", + host: "https://eu.i.posthog.com", + }); + + expect(PostHog).toHaveBeenCalledWith("phc_test", { + host: "https://eu.i.posthog.com", + }); + }); +}); diff --git a/cli/services/telemetry/posthog-usage-tracking.test.ts b/cli/services/telemetry/posthog-usage-tracking.test.ts new file mode 100644 index 0000000..ed10054 --- /dev/null +++ b/cli/services/telemetry/posthog-usage-tracking.test.ts @@ -0,0 +1,129 @@ +import fs from "fs"; +import os from "os"; +import path from "path"; +import { version } from "../../../package.json"; + +jest.mock("../../shared/telemetry/posthog-shared", () => ({ + getPostHogClient: jest.fn(), +})); + +import { getPostHogClient } from "../../shared/telemetry/posthog-shared"; +import { + getOrCreatePostHogUserId, + shutdownPostHog, + trackCliStarted, +} from "./posthog-usage-tracking"; + +describe("posthog usage tracking", () => { + const mockedGetPostHogClient = jest.mocked(getPostHogClient); + const tempDirs: string[] = []; + + afterEach(() => { + mockedGetPostHogClient.mockReset(); + for (const dirPath of tempDirs) { + fs.rmSync(dirPath, { recursive: true, force: true }); + } + tempDirs.length = 0; + }); + + function createTempConfigPath(): string { + const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "aso-posthog-test-")); + tempDirs.push(tempDir); + return path.join(tempDir, ".aso", "config.json"); + } + + it("creates and persists a stable user id when config is missing", () => { + const configPath = createTempConfigPath(); + + const userId = getOrCreatePostHogUserId(configPath); + + expect(userId).toMatch(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i); + const payload = JSON.parse(fs.readFileSync(configPath, "utf8")) as { + userId: string; + }; + expect(payload.userId).toBe(userId); + }); + + it("reuses the persisted user id from config", () => { + const configPath = createTempConfigPath(); + fs.mkdirSync(path.dirname(configPath), { recursive: true }); + fs.writeFileSync( + configPath, + JSON.stringify({ userId: "existing-user-id", other: "value" }), + "utf8" + ); + + const userId = getOrCreatePostHogUserId(configPath); + + expect(userId).toBe("existing-user-id"); + const payload = JSON.parse(fs.readFileSync(configPath, "utf8")) as { + userId: string; + other: string; + }; + expect(payload).toEqual({ + userId: "existing-user-id", + other: "value", + }); + }); + + it("tracks cli_started with identify and first/last seen properties", () => { + const identify = jest.fn(); + const capture = jest.fn(); + mockedGetPostHogClient.mockReturnValue({ + identify, + capture, + } as any); + + trackCliStarted({ + distinctId: "test-user-id", + command: "keywords", + now: new Date("2026-04-26T08:00:00.000Z"), + }); + + expect(identify).toHaveBeenCalledWith({ + distinctId: "test-user-id", + properties: { + cli_version: version, + node_version: process.version, + command: "keywords", + }, + }); + expect(capture).toHaveBeenCalledWith({ + distinctId: "test-user-id", + event: "cli_started", + properties: { + $set_once: { + first_seen_at: "2026-04-26T08:00:00.000Z", + }, + $set: { + last_seen_at: "2026-04-26T08:00:00.000Z", + cli_version: version, + node_version: process.version, + command: "keywords", + }, + }, + }); + }); + + it("shuts down posthog before process exit", async () => { + const shutdown = jest.fn().mockResolvedValue(undefined); + mockedGetPostHogClient.mockReturnValue({ + shutdown, + } as any); + + await shutdownPostHog(1234); + + expect(shutdown).toHaveBeenCalledWith(1234); + }); + + it("ignores posthog shutdown errors", async () => { + const shutdown = jest.fn(() => { + throw new Error("shutdown failed"); + }); + mockedGetPostHogClient.mockReturnValue({ + shutdown, + } as any); + + await expect(shutdownPostHog()).resolves.toBeUndefined(); + }); +}); diff --git a/cli/services/telemetry/posthog-usage-tracking.ts b/cli/services/telemetry/posthog-usage-tracking.ts new file mode 100644 index 0000000..e1e0582 --- /dev/null +++ b/cli/services/telemetry/posthog-usage-tracking.ts @@ -0,0 +1,93 @@ +import { randomUUID } from "crypto"; +import { version } from "../../../package.json"; +import { getPostHogClient } from "../../shared/telemetry/posthog-shared"; +import { + readAsoConfig, + writeAsoConfig, +} from "../runtime/aso-config-service"; + +type PostHogWithPromiseShutdown = { + shutdown: (shutdownTimeoutMs?: number) => Promise | void; +}; + +export function getOrCreatePostHogUserId(configPath?: string): string { + const config = readAsoConfig(configPath); + const persistedUserId = + typeof config.userId === "string" ? config.userId.trim() : ""; + + if (persistedUserId) { + return persistedUserId; + } + + const generatedUserId = randomUUID(); + + try { + writeAsoConfig( + { + ...config, + userId: generatedUserId, + }, + configPath + ); + } catch { + return generatedUserId; + } + + return generatedUserId; +} + +export function trackCliStarted(options?: { + command?: string; + now?: Date; + distinctId?: string; +}): void { + const client = getPostHogClient(); + if (!client) return; + + const distinctId = options?.distinctId || getOrCreatePostHogUserId(); + const timestamp = (options?.now || new Date()).toISOString(); + const command = options?.command?.trim(); + + const userProperties = { + cli_version: version, + node_version: process.version, + ...(command ? { command } : {}), + }; + + client.identify({ + distinctId, + properties: userProperties, + }); + + client.capture({ + distinctId, + event: "cli_started", + properties: { + $set_once: { + first_seen_at: timestamp, + }, + $set: { + last_seen_at: timestamp, + ...userProperties, + }, + }, + }); +} + +export async function shutdownPostHog(shutdownTimeoutMs = 5000): Promise { + const client = getPostHogClient() as PostHogWithPromiseShutdown | null; + if (!client) return; + + try { + const result = client.shutdown(shutdownTimeoutMs); + if ( + result && + typeof result === "object" && + typeof (result as Promise).then === "function" + ) { + await result; + } + } catch { + return; + } +} diff --git a/cli/shared/telemetry/posthog-shared.ts b/cli/shared/telemetry/posthog-shared.ts new file mode 100644 index 0000000..c2ddaef --- /dev/null +++ b/cli/shared/telemetry/posthog-shared.ts @@ -0,0 +1,32 @@ +import { PostHog } from "posthog-node"; + +let started = false; +let posthogClient: PostHog | null = null; + +function normalizeOptional(value: string | undefined): string | undefined { + if (typeof value !== "string") return undefined; + const trimmed = value.trim(); + return trimmed === "" ? undefined : trimmed; +} + +export function initializePostHog(options: { + isDevelopment: boolean; + apiKey: string; + host?: string; +}): void { + if (started) return; + started = true; + + if (options.isDevelopment) return; + + const apiKey = normalizeOptional(options.apiKey); + if (!apiKey) return; + + const host = normalizeOptional(options.host); + + posthogClient = host ? new PostHog(apiKey, { host }) : new PostHog(apiKey); +} + +export function getPostHogClient(): PostHog | null { + return posthogClient; +} diff --git a/docs/aso-error-handling.md b/docs/aso-error-handling.md index 52c666e..38e99dc 100644 --- a/docs/aso-error-handling.md +++ b/docs/aso-error-handling.md @@ -71,6 +71,9 @@ Define failure boundaries, retry rules, and recovery behavior across CLI, dashbo - Contract-drift events are deduped for `15` minutes per unique signature (`provider + operation + endpoint + drift kind + status bucket`) to reduce alert spam during repeated failures. - Bugsnag redaction is centralized at SDK startup via global `redactedKeys` and `onError` sanitization before event delivery (including nested metadata and keychain command-arg payloads such as `spawnargs` values after `-w`). - Runtime telemetry startup resolves Bugsnag API key in this order: explicit runtime option, runtime `BUGSNAG_API_KEY`, then packaged fallback key injected in release CI from GitHub Secret `BUGSNAG_API_KEY`; startup is skipped with a warning only when all are missing. +- Runtime telemetry startup resolves PostHog settings before shared init: API key from `ASO_POSTHOG_API_KEY` (or packaged fallback when unset) plus optional `ASO_POSTHOG_HOST` override; `posthog-shared` passes host only when explicitly provided and otherwise relies on the PostHog SDK default host, and initialization is skipped in development mode. +- CLI usage tracking persists a stable PostHog `distinctId` in `~/.aso/config.json` (`userId`) and emits `cli_started` with `$set_once.first_seen_at` plus `$set.last_seen_at/cli_version/node_version` on each process start. +- CLI process exit paths explicitly call PostHog shutdown before exiting so short-lived command runs flush queued analytics events. - Release pipeline enforces packaged-key integrity by requiring the secret, replacing exactly one source placeholder, and failing if placeholder text remains in built artifacts. - Dashboard Bugsnag startup enables browser session tracking and includes `request`/`navigation` breadcrumbs; CLI/MCP keep stricter defaults. - Dashboard server reports failures with structured metadata (path, phase, counts). diff --git a/docs/aso-runtime-flows.md b/docs/aso-runtime-flows.md index a32d8f8..3ad8dc2 100644 --- a/docs/aso-runtime-flows.md +++ b/docs/aso-runtime-flows.md @@ -20,6 +20,7 @@ Runtime flow contracts across CLI commands, local dashboard API, and ASO service - `aso keywords "..." --stdout`: machine-friendly mode; emits JSON-only stdout, attempts silent reauth, and fails when interactive user input is required. - `aso auth`: run only Apple Search Ads reauthentication. - `aso reset-credentials`: clear saved ASO keychain credentials and local cookies. +- Any `aso` process start emits PostHog `cli_started` telemetry using a persisted user id at `~/.aso/config.json` (`userId`), then flushes telemetry on normal/error exits. - MCP `aso_evaluate_keywords`: accept explicit keywords (max 100), run `aso keywords "" --stdout`, return evaluated keyword results. - Dashboard API mutations: app add (single-item POST; UI may batch multiple selections), app delete, keyword add/delete, keyword favorite toggle, auth start. diff --git a/package-lock.json b/package-lock.json index 5706a72..2ce56cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "aso-cli", - "version": "0.5.0", + "version": "0.8.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "aso-cli", - "version": "0.5.0", + "version": "0.8.0", "license": "MIT", "dependencies": { "@bugsnag/js": "^8.6.0", @@ -17,6 +17,7 @@ "dotenv": "^16.6.1", "inquirer": "^8.2.5", "ora": "^8.2.0", + "posthog-node": "^5.30.4", "winston": "^3.17.0", "yargs": "^17.7.2", "zod": "4.1.9", @@ -117,6 +118,7 @@ "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", @@ -728,34 +730,6 @@ "node": ">=0.1.90" } }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, "node_modules/@csstools/color-helpers": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz", @@ -844,6 +818,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" }, @@ -867,6 +842,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" } @@ -1359,9 +1335,9 @@ } }, "node_modules/@hono/node-server": { - "version": "1.19.11", - "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.11.tgz", - "integrity": "sha512-dr8/3zEaB+p0D2n/IUrlPF1HZm586qgJNXK1a9fhg/PzdtkK7Ksd5l312tJX2yBuALqDYBlG20QEbayqPyxn+g==", + "version": "1.19.14", + "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz", + "integrity": "sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==", "license": "MIT", "engines": { "node": ">=18.14.1" @@ -1988,9 +1964,9 @@ } }, "node_modules/@jest/reporters/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", + "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", "dev": true, "license": "MIT", "dependencies": { @@ -2571,6 +2547,21 @@ "url": "https://opencollective.com/pkgr" } }, + "node_modules/@posthog/core": { + "version": "1.27.5", + "resolved": "https://registry.npmjs.org/@posthog/core/-/core-1.27.5.tgz", + "integrity": "sha512-sYCcUDuYKumYTjwGqGCPT8aUy086v9PKw5wD+UXCRSfCsxWy5R/ic6W13kGTn4O5B2cD1V19wJv19oIH5kHUiQ==", + "license": "MIT", + "dependencies": { + "@posthog/types": "1.372.1" + } + }, + "node_modules/@posthog/types": { + "version": "1.372.1", + "resolved": "https://registry.npmjs.org/@posthog/types/-/types-1.372.1.tgz", + "integrity": "sha512-yl2x2HgtdhFk8bvf6HuRSDzXnKmKGrzNxUahKvA/0mcwheweINvmWy5MsN55NevrcCrNXA6m8GPHS9o/y1mn4A==", + "license": "MIT" + }, "node_modules/@rolldown/pluginutils": { "version": "1.0.0-rc.3", "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.3.tgz", @@ -3041,42 +3032,6 @@ } } }, - "node_modules/@tsconfig/node10": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.12.tgz", - "integrity": "sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", - "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, "node_modules/@tybys/wasm-util": { "version": "0.10.1", "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", @@ -3093,8 +3048,7 @@ "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/@types/babel__core": { "version": "7.20.5", @@ -3260,6 +3214,7 @@ "integrity": "sha512-GYDxsZi3ChgmckRT9HPU0WEhKLP08ev/Yfcq2AstjrDASOYCSXeyjDsHg4v5t4jOj7cyDX3vmprafKlWIG9MXQ==", "devOptional": true, "license": "MIT", + "peer": true, "dependencies": { "undici-types": "~7.16.0" } @@ -3277,6 +3232,7 @@ "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "csstype": "^3.2.2" } @@ -3287,6 +3243,7 @@ "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", "dev": true, "license": "MIT", + "peer": true, "peerDependencies": { "@types/react": "^19.2.0" } @@ -3648,36 +3605,6 @@ "node": ">= 0.6" } }, - "node_modules/acorn": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", - "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-walk": { - "version": "8.3.5", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz", - "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "acorn": "^8.11.0" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/agent-base": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", @@ -3773,9 +3700,9 @@ } }, "node_modules/anymatch/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, "license": "MIT", "engines": { @@ -3785,15 +3712,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -3837,14 +3755,15 @@ "license": "MIT" }, "node_modules/axios": { - "version": "1.13.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.6.tgz", - "integrity": "sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.2.tgz", + "integrity": "sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==", "license": "MIT", + "peer": true, "dependencies": { "follow-redirects": "^1.15.11", "form-data": "^4.0.5", - "proxy-from-env": "^1.1.0" + "proxy-from-env": "^2.1.0" } }, "node_modules/axios-mock-adapter": { @@ -4197,9 +4116,9 @@ } }, "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", + "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", "dev": true, "license": "MIT", "dependencies": { @@ -4227,6 +4146,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -4914,15 +4834,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -5111,25 +5022,12 @@ "node": ">=8" } }, - "node_modules/diff": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz", - "integrity": "sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==", - "dev": true, - "license": "BSD-3-Clause", - "optional": true, - "peer": true, - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/dom-accessibility-api": { "version": "0.5.16", "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/dotenv": { "version": "16.6.1", @@ -5460,6 +5358,7 @@ "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==", "license": "MIT", + "peer": true, "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.1", @@ -5655,9 +5554,9 @@ "license": "MIT" }, "node_modules/follow-redirects": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", - "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz", + "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==", "funding": [ { "type": "individual", @@ -5938,9 +5837,9 @@ "license": "ISC" }, "node_modules/handlebars": { - "version": "4.7.8", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", - "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "version": "4.7.9", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz", + "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6009,10 +5908,11 @@ } }, "node_modules/hono": { - "version": "4.12.7", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.7.tgz", - "integrity": "sha512-jq9l1DM0zVIvsm3lv9Nw9nlJnMNPOcAtsbsgiUhWcFzPE99Gvo6yRTlszSLLYacMeQ6quHD6hMfId8crVHvexw==", + "version": "4.12.15", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.15.tgz", + "integrity": "sha512-qM0jDhFEaCBb4TxoW7f53Qrpv9RBiayUHo0S52JudprkhvpjIrGoU1mnnr29Fvd1U335ZFPZQY1wlkqgfGXyLg==", "license": "MIT", + "peer": true, "engines": { "node": ">=16.9.0" } @@ -6641,6 +6541,7 @@ "integrity": "sha512-AkXIIFcaazymvey2i/+F94XRnM6TsVLZDhBMLsd1Sf/W0wzsvvpjeyUrCZD6HGG4SDYPgDJDBKeiJTBb10WzMg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@jest/core": "30.3.0", "@jest/types": "30.3.0", @@ -6997,9 +6898,9 @@ } }, "node_modules/jest-config/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", + "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", "dev": true, "license": "MIT", "dependencies": { @@ -8096,9 +7997,9 @@ } }, "node_modules/jest-runtime/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", + "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", "dev": true, "license": "MIT", "dependencies": { @@ -8771,6 +8672,7 @@ "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "cssstyle": "^4.2.1", "data-urls": "^5.0.0", @@ -8887,9 +8789,9 @@ } }, "node_modules/lodash": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", - "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", "license": "MIT" }, "node_modules/lodash.camelcase": { @@ -8979,7 +8881,6 @@ "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", "dev": true, "license": "MIT", - "peer": true, "bin": { "lz-string": "bin/bin.js" } @@ -9726,9 +9627,9 @@ "license": "ISC" }, "node_modules/path-to-regexp": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", - "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==", "license": "MIT", "funding": { "type": "opencollective", @@ -9743,9 +9644,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", "engines": { @@ -9835,9 +9736,9 @@ } }, "node_modules/postcss": { - "version": "8.5.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz", - "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==", + "version": "8.5.10", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.10.tgz", + "integrity": "sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==", "dev": true, "funding": [ { @@ -9863,6 +9764,26 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/posthog-node": { + "version": "5.30.4", + "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-5.30.4.tgz", + "integrity": "sha512-NjEgLdQwff9aPssHgmDYYDe5EbMsR33k327g/hC7RM3qbaqWio559TqAaVjP+Ks8c61liP0Vhr90lr4dpO48OQ==", + "license": "MIT", + "dependencies": { + "@posthog/core": "1.27.5" + }, + "engines": { + "node": "^20.20.0 || >=22.22.0" + }, + "peerDependencies": { + "rxjs": "^7.0.0" + }, + "peerDependenciesMeta": { + "rxjs": { + "optional": true + } + } + }, "node_modules/prebuild-install": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", @@ -9912,7 +9833,6 @@ "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", @@ -9928,7 +9848,6 @@ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=10" }, @@ -9950,10 +9869,13 @@ } }, "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "license": "MIT" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz", + "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==", + "license": "MIT", + "engines": { + "node": ">=10" + } }, "node_modules/pump": { "version": "3.0.4", @@ -10077,6 +9999,7 @@ "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -10087,6 +10010,7 @@ "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -10099,8 +10023,7 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/react-refresh": { "version": "0.18.0", @@ -11232,52 +11155,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/ts-node": { - "version": "10.9.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", - "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -11345,6 +11222,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -11378,9 +11256,9 @@ } }, "node_modules/undici": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.23.0.tgz", - "integrity": "sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g==", + "version": "6.25.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.25.0.tgz", + "integrity": "sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg==", "dev": true, "license": "MIT", "engines": { @@ -11475,15 +11353,6 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "license": "MIT" }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, "node_modules/v8-to-istanbul": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", @@ -11520,11 +11389,12 @@ } }, "node_modules/vite": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz", - "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.2.tgz", + "integrity": "sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", @@ -11947,9 +11817,9 @@ "license": "ISC" }, "node_modules/yaml": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz", - "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz", + "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==", "dev": true, "license": "ISC", "bin": { @@ -11989,18 +11859,6 @@ "node": ">=12" } }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">=6" - } - }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", @@ -12019,6 +11877,7 @@ "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.9.tgz", "integrity": "sha512-HI32jTq0AUAC125z30E8bQNz0RQ+9Uc+4J7V97gLYjZVKRjeydPgGt6dvQzFrav7MYOUGFqqOGiHpA/fdbd0cQ==", "license": "MIT", + "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } diff --git a/package.json b/package.json index d7f0949..584f9e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aso-cli", - "version": "0.8.0", + "version": "0.9.0", "description": "Local App Store Optimization CLI", "main": "cli/dist/cli.js", "bin": { @@ -75,6 +75,7 @@ "dotenv": "^16.6.1", "inquirer": "^8.2.5", "ora": "^8.2.0", + "posthog-node": "^5.30.4", "winston": "^3.17.0", "yargs": "^17.7.2", "zod": "4.1.9", From b8fea4cb829a7471ef87b52878761ac831ec221b Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Wed, 29 Apr 2026 12:05:07 +0300 Subject: [PATCH 06/55] match auth handling on dashboard startup with add new keyword flow --- cli/dashboard-server/server.routes.test.ts | 15 ++ cli/dashboard-server/server.ts | 17 ++ .../startup-refresh-manager.test.ts | 57 +++++ .../startup-refresh-manager.ts | 36 ++- cli/dashboard-ui/App.tsx | 152 ++++++++++-- cli/dashboard-ui/app.auth.test.tsx | 218 ++++++++++++++++++ cli/dashboard-ui/hooks/use-auth-flow.ts | 46 +++- cli/dashboard-ui/styles.css | 30 ++- docs/aso-error-handling.md | 3 + docs/aso-runtime-flows.md | 16 +- 10 files changed, 544 insertions(+), 46 deletions(-) diff --git a/cli/dashboard-server/server.routes.test.ts b/cli/dashboard-server/server.routes.test.ts index 91aa61d..fd807ab 100644 --- a/cli/dashboard-server/server.routes.test.ts +++ b/cli/dashboard-server/server.routes.test.ts @@ -341,6 +341,21 @@ describe("dashboard server routes", () => { ); }); + it("starts startup refresh on demand", async () => { + const response = await request({ + method: "POST", + path: "/api/aso/refresh/start", + }); + + expect(response.statusCode).toBe(202); + expect(response.json?.success).toBe(true); + expect(response.json?.data).toEqual( + expect.objectContaining({ + status: expect.any(String), + }) + ); + }); + it("returns apps sorted and ensures default research app", async () => { mockListOwnedApps.mockReturnValue([ { id: "2", kind: "owned", name: "Beta", lastFetchedAt: null } as any, diff --git a/cli/dashboard-server/server.ts b/cli/dashboard-server/server.ts index 1cc968b..8dbd437 100644 --- a/cli/dashboard-server/server.ts +++ b/cli/dashboard-server/server.ts @@ -141,12 +141,17 @@ const startupRefreshManager = createStartupRefreshManager({ context: "startup-refresh", }); }, + isAuthReauthRequiredError: isAsoAuthReauthRequiredError, }); function getStartupRefreshState(): StartupRefreshState { return startupRefreshManager.getState(); } +function startStartupRefresh(): void { + startupRefreshManager.start(); +} + const dashboardAuthStateManager = createDashboardAuthStateManager({ reAuthenticate: (options) => asoAuthService.reAuthenticate(options), onError: (error) => { @@ -203,6 +208,11 @@ function handleApiAsoRefreshStatusGet(res: http.ServerResponse): void { sendJson(res, 200, { success: true, data: getStartupRefreshState() }); } +function handleApiAsoRefreshStartPost(res: http.ServerResponse): void { + startStartupRefresh(); + sendJson(res, 202, { success: true, data: getStartupRefreshState() }); +} + function handleApiAsoAuthStartPost(res: http.ServerResponse): void { if (!hasInteractiveTerminal()) { sendApiError( @@ -351,6 +361,13 @@ export function createServerRequestHandler(): http.RequestListener { return; } + if (req.method === "POST" && pathname === "/api/aso/refresh/start") { + runAsForegroundMutationSync(() => { + handleApiAsoRefreshStartPost(res); + }); + return; + } + if (req.method === "POST" && pathname === "/api/aso/auth/start") { runAsForegroundMutationSync(() => { handleApiAsoAuthStartPost(res); diff --git a/cli/dashboard-server/startup-refresh-manager.test.ts b/cli/dashboard-server/startup-refresh-manager.test.ts index 5c45da9..0fb0f40 100644 --- a/cli/dashboard-server/startup-refresh-manager.test.ts +++ b/cli/dashboard-server/startup-refresh-manager.test.ts @@ -190,6 +190,7 @@ describe("startup-refresh-manager", () => { expect(state.counters.eligibleKeywordCount).toBe(3); expect(state.counters.refreshedKeywordCount).toBe(3); expect(state.counters.failedKeywordCount).toBe(0); + expect(state.requiresReauthentication).toBe(false); expect(enrichCalls).toHaveLength(3); expect(errors).toHaveLength(0); }); @@ -228,6 +229,62 @@ describe("startup-refresh-manager", () => { expect(state.status).toBe("failed"); expect(state.counters.refreshedKeywordCount).toBe(0); expect(state.counters.failedKeywordCount).toBe(1); + expect(state.requiresReauthentication).toBe(false); expect(errors).toHaveLength(1); }); + + it("marks auth-required failures and allows restart after failure", async () => { + let attempt = 0; + + const manager = createStartupRefreshManager({ + country: "US", + listKeywords: () => [ + buildKeyword({ + keyword: "k1", + normalizedKeyword: "k1", + orderExpiresAt: "2026-03-06T00:00:00.000Z", + }), + ], + listAppKeywords: () => [buildAssociation({ keyword: "k1", appId: "app-1" })], + listAssociatedAppIds: () => new Set(["app-1"]), + listOrderRelevantAppIds: () => new Set(["app-1"]), + enrichKeywords: async () => { + attempt += 1; + if (attempt === 1) { + throw new Error( + "Apple Search Ads session expired. Reauthentication is required." + ); + } + }, + isForegroundBusy: () => false, + isAuthReauthRequiredError: (error) => + error instanceof Error && + error.message.includes("Reauthentication is required"), + nowMs: () => Date.parse("2026-03-07T00:00:00.000Z"), + sleep: async () => {}, + keywordBatchSize: 25, + }); + + manager.start(); + await waitForManagerToFinish(manager); + + expect(manager.getState()).toEqual( + expect.objectContaining({ + status: "failed", + requiresReauthentication: true, + }) + ); + + await Promise.resolve(); + manager.start(); + await waitForManagerToFinish(manager); + + expect(manager.getState()).toEqual( + expect.objectContaining({ + status: "completed", + requiresReauthentication: false, + }) + ); + expect(attempt).toBe(2); + }); }); diff --git a/cli/dashboard-server/startup-refresh-manager.ts b/cli/dashboard-server/startup-refresh-manager.ts index c819cad..b97d03b 100644 --- a/cli/dashboard-server/startup-refresh-manager.ts +++ b/cli/dashboard-server/startup-refresh-manager.ts @@ -19,6 +19,7 @@ export type StartupRefreshState = { startedAt: string | null; finishedAt: string | null; lastError: string | null; + requiresReauthentication: boolean; counters: StartupRefreshCounters; }; @@ -43,6 +44,7 @@ type StartupRefreshDeps = { ) => Promise; isForegroundBusy: () => boolean; reportError?: (error: unknown, metadata: Record) => void; + isAuthReauthRequiredError?: (error: unknown) => boolean; nowMs?: () => number; sleep?: (ms: number) => Promise; keywordBatchSize?: number; @@ -124,6 +126,7 @@ function initialState(): StartupRefreshState { startedAt: null, finishedAt: null, lastError: null, + requiresReauthentication: false, counters: initialCounters(), }; } @@ -138,11 +141,15 @@ function errorToMessage(error: unknown): string { async function withOneRetry( operation: () => Promise, - sleep: (ms: number) => Promise + sleep: (ms: number) => Promise, + shouldRetry?: (error: unknown) => boolean ): Promise { try { await operation(); - } catch { + } catch (error) { + if (shouldRetry?.(error) === false) { + throw error; + } await sleep(RETRY_DELAY_MS); await operation(); } @@ -166,6 +173,8 @@ export function createStartupRefreshManager( const setFailure = (error: unknown, metadata: Record) => { if (!state.lastError) { state.lastError = errorToMessage(error); + state.requiresReauthentication = + deps.isAuthReauthRequiredError?.(error) === true; } deps.reportError?.(error, metadata); }; @@ -189,7 +198,7 @@ export function createStartupRefreshManager( try { await withOneRetry(async () => { await deps.enrichKeywords(deps.country, batch); - }, sleep); + }, sleep, (error) => deps.isAuthReauthRequiredError?.(error) !== true); state.counters.refreshedKeywordCount += batch.length; } catch (error) { state.counters.failedKeywordCount += batch.length; @@ -208,6 +217,7 @@ export function createStartupRefreshManager( startedAt: new Date(nowMs()).toISOString(), finishedAt: null, lastError: null, + requiresReauthentication: false, counters: initialCounters(), }; @@ -223,14 +233,18 @@ export function createStartupRefreshManager( return { start: () => { if (runPromise) return; - runPromise = run().catch((error) => { - setFailure(error, { phase: "startup-refresh-unhandled" }); - state = { - ...state, - status: "failed", - finishedAt: new Date(nowMs()).toISOString(), - }; - }); + runPromise = run() + .catch((error) => { + setFailure(error, { phase: "startup-refresh-unhandled" }); + state = { + ...state, + status: "failed", + finishedAt: new Date(nowMs()).toISOString(), + }; + }) + .finally(() => { + runPromise = null; + }); }, getState: () => ({ ...state, diff --git a/cli/dashboard-ui/App.tsx b/cli/dashboard-ui/App.tsx index c1fe5ab..1977361 100644 --- a/cli/dashboard-ui/App.tsx +++ b/cli/dashboard-ui/App.tsx @@ -191,6 +191,7 @@ type StartupRefreshStatusPayload = { startedAt: string | null; finishedAt: string | null; lastError: string | null; + requiresReauthentication: boolean; counters: { eligibleKeywordCount: number; refreshedKeywordCount: number; @@ -315,6 +316,8 @@ export function App() { const [hasCachedData, setHasCachedData] = useState(false); const [isAddingKeywords, setIsAddingKeywords] = useState(false); const [isRetryingFailedKeywords, setIsRetryingFailedKeywords] = useState(false); + const [isRestartingStartupRefresh, setIsRestartingStartupRefresh] = + useState(false); const [loadingText, setLoadingText] = useState(""); const [errorText, setErrorText] = useState(""); const [successText, setSuccessText] = useState(""); @@ -343,6 +346,8 @@ export function App() { const selectedAppIdRef = useRef(selectedAppId); const autoRetryInFlightRef = useRef(false); const startupAppSyncAtRef = useRef(null); + const resumeStartupRefreshAfterAuthRef = useRef(false); + const startupRefreshAuthAttemptKeyRef = useRef(null); const appById = useMemo( () => new Map(apps.map((app) => [app.id, app])), @@ -396,9 +401,11 @@ export function App() { pendingAddContext, setPendingAddContext, openAuthModalForPendingAdd, + requestStartupRefreshReauthentication, startReauthentication, authCheckLoadingText, authStatusLabel, + activeAuthContext, canStartReauth, showReauthButton, } = useAuthFlow({ @@ -446,6 +453,24 @@ export function App() { return list; }, []); + const restartStartupRefresh = useCallback(async (): Promise => { + try { + setIsRestartingStartupRefresh(true); + const data = await apiWrite( + "POST", + "/api/aso/refresh/start", + {} + ); + setStartupRefreshState(data); + } catch (error) { + setErrorText( + toActionableErrorMessage(error, "Failed to restart background refresh") + ); + } finally { + setIsRestartingStartupRefresh(false); + } + }, []); + const buildKeywordQueryKey = useCallback((appId: string) => { const normalizedKeywordFilter = keywordFilter.trim().toLowerCase(); const normalizedMinRank = showRankingColumns ? minRank : DEFAULT_MIN_RANK; @@ -755,12 +780,20 @@ export function App() { }, [positionHistoryKeyword]); useEffect(() => { + const shouldPoll = + !startupRefreshState || + startupRefreshState.status === "idle" || + startupRefreshState.status === "running"; + if (!shouldPoll) return; + let isActive = true; let intervalId: number | null = null; const pollStatus = async (): Promise => { try { - const data = await apiGet("/api/aso/refresh-status"); + const data = await apiGet( + "/api/aso/refresh-status" + ); if (!isActive) return; setStartupRefreshState(data); if ( @@ -777,12 +810,9 @@ export function App() { }; void pollStatus(); - intervalId = window.setInterval( - () => { - void pollStatus(); - }, - STARTUP_REFRESH_STATUS_POLL_INTERVAL_SECONDS * 1000 - ); + intervalId = window.setInterval(() => { + void pollStatus(); + }, STARTUP_REFRESH_STATUS_POLL_INTERVAL_SECONDS * 1000); return () => { isActive = false; @@ -790,7 +820,7 @@ export function App() { window.clearInterval(intervalId); } }; - }, []); + }, [startupRefreshState?.status]); const hasPendingDifficulty = pendingKeywordCount > 0; @@ -1223,6 +1253,30 @@ export function App() { }); }, [authStatus, pendingAddContext, submitKeywords]); + useEffect(() => { + if (authStatus !== "succeeded") return; + if (!resumeStartupRefreshAfterAuthRef.current) return; + resumeStartupRefreshAfterAuthRef.current = false; + void restartStartupRefresh(); + }, [authStatus, restartStartupRefresh]); + + useEffect(() => { + if (!startupRefreshState) return; + if (startupRefreshState.status !== "failed") return; + if (!startupRefreshState.requiresReauthentication) return; + + const attemptKey = + startupRefreshState.finishedAt ?? + startupRefreshState.startedAt ?? + startupRefreshState.lastError ?? + "startup-refresh-auth-required"; + if (startupRefreshAuthAttemptKeyRef.current === attemptKey) return; + + startupRefreshAuthAttemptKeyRef.current = attemptKey; + resumeStartupRefreshAfterAuthRef.current = true; + requestStartupRefreshReauthentication(); + }, [requestStartupRefreshReauthentication, startupRefreshState]); + const onAddApp = async (event: React.FormEvent) => { event.preventDefault(); if (selectedAddCandidateList.length === 0) { @@ -1660,18 +1714,54 @@ export function App() { const showError = !showLoading && errorText !== ""; const showSuccess = !showLoading && !showError && successText !== ""; const addButtonLabel = isCompactLayout ? "Add" : "Add Keywords"; - const startupRefreshMessage = useMemo(() => { + const startupRefreshBanner = useMemo(() => { if (!startupRefreshState) return null; + const { eligibleKeywordCount, refreshedKeywordCount } = + startupRefreshState.counters; + const progressLabel = + eligibleKeywordCount > 0 + ? `${refreshedKeywordCount}/${eligibleKeywordCount} keywords` + : null; if (startupRefreshState.status === "running") { - const { eligibleKeywordCount, refreshedKeywordCount } = - startupRefreshState.counters; - if (eligibleKeywordCount > 0) { - return `Refreshing local data in background (${refreshedKeywordCount}/${eligibleKeywordCount} keywords)...`; + return { + tone: "muted" as const, + action: null, + text: progressLabel + ? `Refreshing local data in background (${progressLabel})...` + : "Refreshing local data in background...", + }; + } + if (startupRefreshState.status !== "failed") return null; + const progressSuffix = progressLabel ? ` after ${progressLabel}` : ""; + if (startupRefreshState.requiresReauthentication) { + if ( + activeAuthContext === "startup-refresh" && + (isStartingAuth || + authStatus === "idle" || + authStatus === "in_progress" || + authStatus === "succeeded") + ) { + return { + tone: "muted" as const, + action: null, + text: `Checking Apple session for background refresh${progressSuffix}...`, + }; } - return "Refreshing local data in background..."; + return { + tone: "error" as const, + action: null, + text: `Background refresh paused${progressSuffix}. Apple Search Ads session expired.`, + }; } - return null; - }, [startupRefreshState]); + const detail = startupRefreshState.lastError?.trim(); + return { + tone: "error" as const, + action: "retry" as const, + text: detail + ? `Background refresh failed${progressSuffix}. ${detail}` + : `Background refresh failed${progressSuffix}.`, + }; + }, [activeAuthContext, authStatus, isStartingAuth, startupRefreshState]); const hasRankFiltersApplied = showRankingColumns && (minRank !== DEFAULT_MIN_RANK || maxRank !== DEFAULT_MAX_RANK); @@ -1997,11 +2087,33 @@ export function App() { -

- {startupRefreshMessage} -

+

+ {startupRefreshBanner?.text} +

+ {startupRefreshBanner?.action === "retry" ? ( + + ) : null} + + + + ) : null} + + {!props.prompt && props.actionButton ? ( +
+ +
+ ) : null} + + + + ); +} diff --git a/cli/dashboard-ui/hooks/use-auth-flow.ts b/cli/dashboard-ui/hooks/use-auth-flow.ts index a659af6..28f8439 100644 --- a/cli/dashboard-ui/hooks/use-auth-flow.ts +++ b/cli/dashboard-ui/hooks/use-auth-flow.ts @@ -1,4 +1,8 @@ import { useCallback, useEffect, useMemo, useState } from "react"; +import type { + AsoInteractivePrompt, + AsoInteractivePromptResponse, +} from "../../shared/aso-interactive-prompts"; import { apiGet, apiWrite, @@ -16,6 +20,7 @@ type DashboardAuthStatusPayload = { lastError: string | null; requiresTerminalAction: boolean; canPrompt: boolean; + pendingPrompt: AsoInteractivePrompt | null; }; export type PendingAddContext = { @@ -31,47 +36,137 @@ type UseAuthFlowParams = { isAddingKeywords: boolean; }; +function promptIdentity(prompt: AsoInteractivePrompt | null): string { + if (!prompt) return "none"; + switch (prompt.kind) { + case "primary_app_id": + return `${prompt.kind}:${prompt.defaultValue ?? ""}:${prompt.placeholder ?? ""}:${ + prompt.errorMessage ?? "" + }`; + case "apple_credentials": + return `${prompt.kind}:${prompt.defaultAppleId ?? ""}:${prompt.errorMessage ?? ""}`; + case "remember_credentials": + return `${prompt.kind}:${prompt.defaultValue ? "1" : "0"}`; + case "two_factor_method": + case "trusted_phone": + return `${prompt.kind}:${prompt.choices + .map((choice) => `${choice.value}:${choice.label}`) + .join("|")}`; + case "verification_code": + return `${prompt.kind}:${prompt.digits}:${prompt.message}:${prompt.errorMessage ?? ""}`; + } +} + export function useAuthFlow(params: UseAuthFlowParams) { const [authModalOpen, setAuthModalOpen] = useState(false); const [authStatus, setAuthStatus] = useState("idle"); const [authCanPrompt, setAuthCanPrompt] = useState(true); - const [authNeedsTerminalAction, setAuthNeedsTerminalAction] = useState(false); const [authStatusError, setAuthStatusError] = useState(""); const [isStartingAuth, setIsStartingAuth] = useState(false); + const [isSubmittingAuthPromptRequest, setIsSubmittingAuthPromptRequest] = useState(false); + const [isAwaitingAuthPromptAdvance, setIsAwaitingAuthPromptAdvance] = useState(false); + const [submittedAuthPromptIdentity, setSubmittedAuthPromptIdentity] = + useState(null); const [authFlowContext, setAuthFlowContext] = useState(null); + const [authPendingPrompt, setAuthPendingPrompt] = + useState(null); + const isSubmittingAuthPrompt = + isSubmittingAuthPromptRequest || isAwaitingAuthPromptAdvance; + + const applyAuthState = useCallback((data: DashboardAuthStatusPayload) => { + setAuthStatus(data.status); + setAuthCanPrompt(data.canPrompt); + setAuthPendingPrompt((current) => + data.pendingPrompt ?? (data.status === "in_progress" ? current : null) + ); + if (data.status !== "in_progress") { + setIsAwaitingAuthPromptAdvance(false); + setSubmittedAuthPromptIdentity(null); + } else if (data.pendingPrompt) { + setIsAwaitingAuthPromptAdvance(false); + setSubmittedAuthPromptIdentity(null); + } + if (data.status === "failed") { + setAuthStatusError(data.lastError?.trim() || "Reauthentication failed."); + return; + } + setAuthStatusError(""); + }, []); const startReauthentication = useCallback(async () => { try { setIsStartingAuth(true); setAuthStatus("in_progress"); - setAuthNeedsTerminalAction(false); setAuthStatusError(""); - const data = await apiWrite("POST", "/api/aso/auth/start", {}); - setAuthStatus(data.status); - setAuthCanPrompt(data.canPrompt); - setAuthNeedsTerminalAction(Boolean(data.requiresTerminalAction)); + const data = await apiWrite( + "POST", + "/api/aso/auth/start", + {} + ); + applyAuthState(data); } catch (error) { const errorCode = getDashboardApiErrorCode(error); if (isAuthFlowErrorCode(errorCode)) { setAuthStatusError(authFlowErrorMessage(errorCode)); if (errorCode === "AUTH_IN_PROGRESS") { setAuthStatus("in_progress"); - setAuthCanPrompt(true); - setAuthNeedsTerminalAction(false); - } else if (errorCode === "TTY_REQUIRED") { - setAuthStatus("failed"); - setAuthCanPrompt(false); - setAuthNeedsTerminalAction(true); + return; } return; } setAuthStatus("failed"); - setAuthNeedsTerminalAction(false); - setAuthStatusError(toActionableErrorMessage(error, "Failed to start reauthentication.")); + setAuthStatusError( + toActionableErrorMessage(error, "Failed to start reauthentication.") + ); } finally { setIsStartingAuth(false); } - }, []); + }, [applyAuthState]); + + const submitAuthPromptResponse = useCallback( + async (response: AsoInteractivePromptResponse) => { + const currentPromptIdentity = promptIdentity(authPendingPrompt); + try { + setIsSubmittingAuthPromptRequest(true); + setIsAwaitingAuthPromptAdvance(false); + setSubmittedAuthPromptIdentity(currentPromptIdentity); + setAuthStatusError(""); + const data = await apiWrite( + "POST", + "/api/aso/auth/respond", + response + ); + applyAuthState(data); + if (data.status === "in_progress" && data.pendingPrompt == null) { + setIsAwaitingAuthPromptAdvance(true); + } else { + setIsAwaitingAuthPromptAdvance(false); + setSubmittedAuthPromptIdentity(null); + } + } catch (error) { + setIsAwaitingAuthPromptAdvance(false); + setSubmittedAuthPromptIdentity(null); + setAuthStatusError( + toActionableErrorMessage(error, "Failed to submit authentication step.") + ); + } finally { + setIsSubmittingAuthPromptRequest(false); + } + }, + [applyAuthState, authPendingPrompt] + ); + + useEffect(() => { + if (!isAwaitingAuthPromptAdvance) return; + const currentPromptIdentity = promptIdentity(authPendingPrompt); + if (currentPromptIdentity === submittedAuthPromptIdentity) return; + setIsAwaitingAuthPromptAdvance(false); + setSubmittedAuthPromptIdentity(null); + }, [ + authPendingPrompt, + isAwaitingAuthPromptAdvance, + submittedAuthPromptIdentity, + ]); const pendingAddContext = useMemo(() => { if (authFlowContext?.kind !== "add-keywords") return null; @@ -94,18 +189,9 @@ export function useAuthFlow(params: UseAuthFlowParams) { setAuthFlowContext({ kind: "add-keywords", keywords }); if (errorCode === "AUTH_IN_PROGRESS") { setAuthStatus("in_progress"); - setAuthCanPrompt(true); - setAuthNeedsTerminalAction(false); setAuthStatusError(""); - } else if (errorCode === "TTY_REQUIRED") { - setAuthStatus("failed"); - setAuthCanPrompt(false); - setAuthNeedsTerminalAction(true); - setAuthStatusError(authFlowErrorMessage(errorCode)); } else { setAuthStatus("idle"); - setAuthCanPrompt(true); - setAuthNeedsTerminalAction(false); setAuthStatusError(""); } return true; @@ -115,29 +201,27 @@ export function useAuthFlow(params: UseAuthFlowParams) { const requestStartupRefreshReauthentication = useCallback(() => { setAuthFlowContext((current) => current ?? { kind: "startup-refresh" }); - if (!authCanPrompt || isStartingAuth) return; + if (!authCanPrompt || isStartingAuth || isSubmittingAuthPrompt) return; if (authStatus !== "idle" && authStatus !== "failed") return; void startReauthentication(); - }, [authCanPrompt, authStatus, isStartingAuth, startReauthentication]); + }, [ + authCanPrompt, + authStatus, + isStartingAuth, + isSubmittingAuthPrompt, + startReauthentication, + ]); useEffect(() => { if (!isStartingAuth && authStatus !== "in_progress") return; let isActive = true; const pollStatus = async () => { try { - const data = await apiGet("/api/aso/auth/status"); + const data = await apiGet( + "/api/aso/auth/status" + ); if (!isActive) return; - setAuthStatus(data.status); - setAuthCanPrompt(data.canPrompt); - setAuthNeedsTerminalAction(Boolean(data.requiresTerminalAction)); - if (data.status === "failed") { - setAuthStatusError(data.lastError?.trim() || "Reauthentication failed."); - return; - } - if (data.status === "succeeded") { - setAuthStatusError(""); - return; - } + applyAuthState(data); } catch { if (!isActive) return; } @@ -146,25 +230,26 @@ export function useAuthFlow(params: UseAuthFlowParams) { void pollStatus(); const timerId = window.setInterval(() => { void pollStatus(); - }, 1500); + }, 500); return () => { isActive = false; window.clearInterval(timerId); }; - }, [authStatus, isStartingAuth]); + }, [applyAuthState, authStatus, isStartingAuth]); useEffect(() => { if (!pendingAddContext) return; if (authStatus !== "idle") return; if (!authCanPrompt) return; - if (isStartingAuth) return; + if (isStartingAuth || isSubmittingAuthPrompt) return; void startReauthentication(); }, [ pendingAddContext, authStatus, authCanPrompt, isStartingAuth, + isSubmittingAuthPrompt, startReauthentication, ]); @@ -173,20 +258,8 @@ export function useAuthFlow(params: UseAuthFlowParams) { setAuthModalOpen(false); return; } - if (!authCanPrompt) { - setAuthModalOpen(true); - return; - } - if (authStatus === "failed") { - setAuthModalOpen(true); - return; - } - if (authNeedsTerminalAction) { - setAuthModalOpen(true); - return; - } - setAuthModalOpen(false); - }, [authFlowContext, authCanPrompt, authStatus, authNeedsTerminalAction]); + setAuthModalOpen(Boolean(authPendingPrompt) || authStatus === "failed"); + }, [authFlowContext, authPendingPrompt, authStatus]); useEffect(() => { if (authStatus !== "succeeded") return; @@ -201,6 +274,7 @@ export function useAuthFlow(params: UseAuthFlowParams) { !authModalOpen && !params.isAddingKeywords && (isStartingAuth || + isSubmittingAuthPrompt || authStatus === "idle" || authStatus === "in_progress" || authStatus === "succeeded") @@ -208,35 +282,34 @@ export function useAuthFlow(params: UseAuthFlowParams) { : ""; const authStatusLabel = useMemo(() => { - if (!authCanPrompt) { - return "Open dashboard from terminal to authenticate."; - } - if (authNeedsTerminalAction) { - return "Complete reauthentication in the terminal that launched the dashboard."; - } if (authStatus === "failed") { return "Reauthentication failed. Try again."; } return ""; - }, [authCanPrompt, authNeedsTerminalAction, authStatus]); + }, [authStatus]); return { authModalOpen, authStatus, authCanPrompt, - authNeedsTerminalAction, authStatusError, isStartingAuth, + isSubmittingAuthPrompt, + authPendingPrompt, pendingAddContext, setPendingAddContext, openAuthModalForPendingAdd, requestStartupRefreshReauthentication, startReauthentication, + submitAuthPromptResponse, authCheckLoadingText, authStatusLabel, activeAuthContext: authFlowContext?.kind ?? null, canStartReauth: - authCanPrompt && !isStartingAuth && authStatus !== "in_progress", + authCanPrompt && + !isStartingAuth && + !isSubmittingAuthPrompt && + authStatus !== "in_progress", showReauthButton: authStatus === "failed" && authCanPrompt, }; } diff --git a/cli/dashboard-ui/hooks/use-primary-app-setup-flow.ts b/cli/dashboard-ui/hooks/use-primary-app-setup-flow.ts new file mode 100644 index 0000000..91b2b9d --- /dev/null +++ b/cli/dashboard-ui/hooks/use-primary-app-setup-flow.ts @@ -0,0 +1,241 @@ +import { useCallback, useEffect, useMemo, useState } from "react"; +import type { + AsoInteractivePrompt, + AsoInteractivePromptResponse, +} from "../../shared/aso-interactive-prompts"; +import { + apiGet, + apiWrite, + getDashboardApiErrorCode, + isPrimaryAppIdReconfigureErrorCode, + toActionableErrorMessage, +} from "../app-helpers"; + +type DashboardSetupStatus = "idle" | "in_progress" | "failed" | "succeeded"; + +type DashboardSetupStatusPayload = { + status: DashboardSetupStatus; + updatedAt: string | null; + lastError: string | null; + canPrompt: boolean; + isRequired: boolean; + pendingPrompt: AsoInteractivePrompt | null; +}; + +type StartSetupOptions = { + forcePrompt?: boolean; + initialError?: string; +}; + +function promptIdentity(prompt: AsoInteractivePrompt | null): string { + if (!prompt) return "none"; + switch (prompt.kind) { + case "primary_app_id": + return `${prompt.kind}:${prompt.defaultValue ?? ""}:${prompt.placeholder ?? ""}:${ + prompt.errorMessage ?? "" + }`; + default: + return prompt.kind; + } +} + +export function usePrimaryAppSetupFlow() { + const [setupStatus, setSetupStatus] = useState("idle"); + const [setupStatusError, setSetupStatusError] = useState(""); + const [setupPendingPrompt, setSetupPendingPrompt] = + useState(null); + const [isSetupRequired, setIsSetupRequired] = useState(false); + const [isStartingSetup, setIsStartingSetup] = useState(false); + const [isSubmittingSetupPromptRequest, setIsSubmittingSetupPromptRequest] = + useState(false); + const [isAwaitingSetupPromptAdvance, setIsAwaitingSetupPromptAdvance] = + useState(false); + const [submittedSetupPromptIdentity, setSubmittedSetupPromptIdentity] = + useState(null); + const isSubmittingSetupPrompt = + isSubmittingSetupPromptRequest || isAwaitingSetupPromptAdvance; + + const applySetupState = useCallback((data: DashboardSetupStatusPayload) => { + setSetupStatus(data.status); + setSetupPendingPrompt((current) => + data.pendingPrompt ?? (data.status === "in_progress" ? current : null) + ); + setIsSetupRequired(Boolean(data.isRequired)); + if (data.status !== "in_progress") { + setIsAwaitingSetupPromptAdvance(false); + setSubmittedSetupPromptIdentity(null); + } else if (data.pendingPrompt) { + setIsAwaitingSetupPromptAdvance(false); + setSubmittedSetupPromptIdentity(null); + } + if (data.status === "failed") { + setSetupStatusError(data.lastError?.trim() || "Primary App ID setup failed."); + return; + } + setSetupStatusError(""); + }, []); + + const startSetup = useCallback(async (options?: StartSetupOptions) => { + const forcePrompt = options?.forcePrompt === true; + const initialError = options?.initialError?.trim() ?? ""; + if (initialError) { + setSetupStatusError(initialError); + } + try { + setIsStartingSetup(true); + const data = await apiWrite( + "POST", + forcePrompt ? "/api/aso/setup/start?force=1" : "/api/aso/setup/start", + {} + ); + applySetupState(data); + if (initialError) { + setSetupStatusError(initialError); + } + } catch (error) { + setSetupStatusError( + toActionableErrorMessage(error, "Failed to start Primary App ID setup.") + ); + } finally { + setIsStartingSetup(false); + } + }, [applySetupState]); + + const submitSetupPromptResponse = useCallback( + async (response: AsoInteractivePromptResponse) => { + const currentPromptIdentity = promptIdentity(setupPendingPrompt); + try { + setIsSubmittingSetupPromptRequest(true); + setIsAwaitingSetupPromptAdvance(false); + setSubmittedSetupPromptIdentity(currentPromptIdentity); + setSetupStatusError(""); + const data = await apiWrite( + "POST", + "/api/aso/setup/respond", + response + ); + applySetupState(data); + if (data.status === "in_progress" && data.pendingPrompt == null) { + setIsAwaitingSetupPromptAdvance(true); + } else { + setIsAwaitingSetupPromptAdvance(false); + setSubmittedSetupPromptIdentity(null); + } + } catch (error) { + setIsAwaitingSetupPromptAdvance(false); + setSubmittedSetupPromptIdentity(null); + setSetupStatusError( + toActionableErrorMessage(error, "Failed to submit Primary App ID.") + ); + } finally { + setIsSubmittingSetupPromptRequest(false); + } + }, + [applySetupState, setupPendingPrompt] + ); + + useEffect(() => { + if (!isAwaitingSetupPromptAdvance) return; + const currentPromptIdentity = promptIdentity(setupPendingPrompt); + if (currentPromptIdentity === submittedSetupPromptIdentity) return; + setIsAwaitingSetupPromptAdvance(false); + setSubmittedSetupPromptIdentity(null); + }, [ + isAwaitingSetupPromptAdvance, + setupPendingPrompt, + submittedSetupPromptIdentity, + ]); + + const openSetupModalForPrimaryAppAccessError = useCallback( + (error: unknown): boolean => { + const errorCode = getDashboardApiErrorCode(error); + if (!isPrimaryAppIdReconfigureErrorCode(errorCode)) return false; + void startSetup({ + forcePrompt: true, + initialError: toActionableErrorMessage( + error, + "Current Primary App ID is not accessible for this Apple Ads account." + ), + }); + return true; + }, + [startSetup] + ); + + useEffect(() => { + let isActive = true; + const loadStatus = async () => { + try { + const data = await apiGet( + "/api/aso/setup/status" + ); + if (!isActive) return; + applySetupState(data); + } catch { + if (!isActive) return; + } + }; + + void loadStatus(); + return () => { + isActive = false; + }; + }, [applySetupState]); + + useEffect(() => { + if (!isSetupRequired) return; + if (setupStatus !== "idle") return; + if (isStartingSetup || isSubmittingSetupPrompt) return; + void startSetup(); + }, [ + isSetupRequired, + setupStatus, + isStartingSetup, + isSubmittingSetupPrompt, + startSetup, + ]); + + useEffect(() => { + if (setupStatus !== "in_progress") return; + let isActive = true; + const pollStatus = async () => { + try { + const data = await apiGet( + "/api/aso/setup/status" + ); + if (!isActive) return; + applySetupState(data); + } catch { + if (!isActive) return; + } + }; + + void pollStatus(); + const timerId = window.setInterval(() => { + void pollStatus(); + }, 500); + + return () => { + isActive = false; + window.clearInterval(timerId); + }; + }, [applySetupState, setupStatus]); + + const setupModalOpen = useMemo( + () => isSetupRequired && (Boolean(setupPendingPrompt) || setupStatus === "failed"), + [isSetupRequired, setupPendingPrompt, setupStatus] + ); + + return { + setupStatus, + setupStatusError, + setupPendingPrompt, + isSetupRequired, + isStartingSetup, + isSubmittingSetupPrompt, + setupModalOpen, + startSetup, + submitSetupPromptResponse, + openSetupModalForPrimaryAppAccessError, + }; +} diff --git a/cli/dashboard-ui/styles.css b/cli/dashboard-ui/styles.css index 5a9d813..1f9afdc 100644 --- a/cli/dashboard-ui/styles.css +++ b/cli/dashboard-ui/styles.css @@ -1178,12 +1178,109 @@ tbody tr.selected:hover td { margin-top: 22px; } +.aso-prompt-form { + display: grid; + gap: 14px; +} + +.aso-prompt-fieldset { + display: grid; + gap: 14px; + margin: 0; + padding: 0; + border: 0; + min-inline-size: 0; +} + +.aso-prompt-field { + display: grid; + gap: 6px; +} + +.aso-prompt-field > span, +.aso-prompt-checkbox > span { + color: var(--foreground); + font-size: 0.94rem; + font-weight: 600; +} + +.aso-prompt-checkbox { + display: flex; + align-items: center; + gap: 10px; +} + +.aso-prompt-checkbox input, +.aso-prompt-choice input { + accent-color: var(--accent); +} + +.aso-prompt-choice-list { + display: grid; + gap: 10px; +} + +.aso-prompt-choice { + display: flex; + align-items: center; + gap: 10px; + border: 1px solid color-mix(in oklab, var(--border) 86%, transparent); + border-radius: 12px; + padding: 10px 12px; + background: color-mix(in oklab, var(--card) 90%, transparent); +} + .auth-action-button { + position: relative; + display: inline-flex; + align-items: center; + justify-content: center; font-size: 1.02rem; font-weight: 600; min-height: 40px; } +.auth-action-button-label { + display: inline-block; +} + +.auth-action-button-label.is-hidden { + visibility: hidden; +} + +.auth-action-button-spinner { + position: absolute; + left: 50%; + top: 50%; + display: block; + width: 14px; + height: 14px; + margin: 0; + line-height: 0; + box-sizing: border-box; + transform: translate(-50%, -50%); + border-radius: 999px; + border: 2px solid + color-mix(in oklab, var(--primary-foreground) 34%, transparent); + border-top-color: var(--primary-foreground); + opacity: 0; + pointer-events: none; +} + +.auth-action-button-spinner.visible { + opacity: 1; + animation: auth-action-button-spin 700ms linear infinite; +} + +@keyframes auth-action-button-spin { + from { + transform: translate(-50%, -50%) rotate(0deg); + } + to { + transform: translate(-50%, -50%) rotate(360deg); + } +} + .top-apps-list { display: grid; gap: 10px; @@ -2331,6 +2428,13 @@ td.updated-value { letter-spacing: 0.08em; } +.auth-action-button-spinner { + width: 12px; + height: 12px; + border: 2px solid rgba(255, 255, 255, 0.25); + border-top-color: #ffffff; +} + .top-apps-list { gap: 8px; } diff --git a/cli/domain/errors/dashboard-errors.ts b/cli/domain/errors/dashboard-errors.ts index 5f5c557..3d04814 100644 --- a/cli/domain/errors/dashboard-errors.ts +++ b/cli/domain/errors/dashboard-errors.ts @@ -5,6 +5,7 @@ export type DashboardErrorCode = | "AUTH_REQUIRED" | "AUTH_IN_PROGRESS" | "TTY_REQUIRED" + | "PRIMARY_APP_ID_RECONFIGURE_REQUIRED" | "AUTHORIZATION_FAILED" | "RATE_LIMITED" | "REQUEST_TIMEOUT" @@ -50,9 +51,9 @@ export function mapToDashboardUserSafeError( lower.includes("no user owned apps found") ) { return { - errorCode: "AUTHORIZATION_FAILED", + errorCode: "PRIMARY_APP_ID_RECONFIGURE_REQUIRED", message: - "Primary App ID is not accessible for this Apple Ads account. Run 'aso --primary-app-id ' with an accessible app ID and retry.", + "Current Primary App ID is not accessible for this Apple Ads account. Choose a different Primary App ID and retry.", }; } @@ -102,6 +103,7 @@ export function statusForDashboardErrorCode(errorCode: DashboardErrorCode): numb if (errorCode === "INVALID_REQUEST") return 400; if (errorCode === "PAYLOAD_TOO_LARGE") return 413; if (errorCode === "AUTH_REQUIRED") return 401; + if (errorCode === "PRIMARY_APP_ID_RECONFIGURE_REQUIRED") return 403; if (errorCode === "AUTHORIZATION_FAILED") return 403; if (errorCode === "NOT_FOUND") return 404; if (errorCode === "AUTH_IN_PROGRESS") return 409; @@ -117,6 +119,10 @@ export function isAuthFlowErrorCode(code: string | null): boolean { ); } +export function isPrimaryAppIdReconfigureErrorCode(code: string | null): boolean { + return code === "PRIMARY_APP_ID_RECONFIGURE_REQUIRED"; +} + export function authFlowErrorMessage(code: string | null): string { if (code === "AUTH_IN_PROGRESS") { return "Reauthentication is already in progress. If prompted, complete it in terminal."; @@ -159,6 +165,12 @@ export function toDashboardActionableErrorMessage( if (errorCode === "TTY_REQUIRED") { return "Reauthentication requires an interactive terminal. Start dashboard from terminal and retry."; } + if (errorCode === "PRIMARY_APP_ID_RECONFIGURE_REQUIRED") { + return ( + message || + "Current Primary App ID is not accessible for this Apple Ads account. Choose a different Primary App ID and retry." + ); + } if (isPrimaryAppIdAccessError) { return message || "Primary App ID is not accessible for this Apple Ads account."; } diff --git a/cli/services/auth/aso-auth-service.ts b/cli/services/auth/aso-auth-service.ts index 111e96b..0a1d01e 100644 --- a/cli/services/auth/aso-auth-service.ts +++ b/cli/services/auth/aso-auth-service.ts @@ -1,5 +1,4 @@ import axios, { type AxiosRequestConfig, type AxiosResponse } from "axios"; -import inquirer from "inquirer"; import ora from "ora"; import type { Ora } from "ora"; import { logger } from "../../utils/logger"; @@ -19,6 +18,14 @@ import { withAppleHttpTraceContext, } from "../keywords/apple-http-trace"; import { ASO_ENV } from "../../shared/aso-env"; +import type { + AsoInteractivePrompt, + AsoInteractivePromptResponse, +} from "../../shared/aso-interactive-prompts"; +import { + promptWithCliAsoPrompt, + type AsoPromptHandler, +} from "../prompts/aso-prompt-handler"; const APPLE_APP_ADS_URL = "https://app-ads.apple.com/cm/app"; const APPLE_SEARCH_ADS_URL = "https://app.searchads.apple.com/cm/app"; @@ -70,6 +77,7 @@ type ReAuthenticateOptions = { onUserActionRequired?: (reason: ReauthUserActionReason) => void; forcePromptCredentials?: boolean; resetStoredCredentials?: boolean; + promptHandler?: AsoPromptHandler; }; interface AppleAuthSessionHeaders { @@ -704,90 +712,10 @@ function logWithSpinnerPause( if (wasSpinning) spinner.start(); } -async function askForCredentials(): Promise { - const answers = await inquirer.prompt([ - { - type: "input", - name: "appleId", - message: "Apple ID (email):", - validate: (value: string) => - value.trim() ? true : "Apple ID is required", - }, - { - type: "password", - name: "password", - message: "Password:", - mask: "*", - validate: (value: string) => - value.trim() ? true : "Password is required", - }, - ]); - - return { appleId: answers.appleId.trim(), password: answers.password }; -} - -async function askWhetherToRememberCredentials(): Promise { - const { remember } = await inquirer.prompt([ - { - type: "confirm", - name: "remember", - default: false, - message: "Remember Apple credentials in macOS Keychain?", - }, - ]); - return remember; -} - -async function askForSixDigitCode(message: string): Promise { - const { code } = await inquirer.prompt([ - { - type: "input", - name: "code", - message, - validate: (value: string) => - /^\d{6}$/.test(value.trim()) ? true : "Please enter exactly 6 digits", - }, - ]); - return code.trim(); -} - -async function askForVerificationCode( - message: string, - digits: number -): Promise { - const normalizedDigits = Number.isFinite(digits) ? Math.max(1, digits) : 6; - const regex = new RegExp(`^\\d{${normalizedDigits}}$`); - const { code } = await inquirer.prompt([ - { - type: "input", - name: "code", - message, - validate: (value: string) => - regex.test(value.trim()) - ? true - : `Please enter exactly ${normalizedDigits} digits`, - }, - ]); - return code.trim(); -} - function hasInteractiveTerminal(): boolean { return process.stdin.isTTY === true && process.stdout.isTTY === true; } -async function promptWithSpinnerPause( - spinner: Ora | undefined, - runPrompt: () => Promise -): Promise { - const wasSpinning = spinner?.isSpinning === true; - if (wasSpinning) spinner.stop(); - try { - return await runPrompt(); - } finally { - if (wasSpinning) spinner.start(); - } -} - class CookieJar { private readonly byKey = new Map(); @@ -889,13 +817,25 @@ export class AsoAuthEngine { private readonly spinner?: Ora, private readonly onUserActionRequired?: ( reason: ReauthUserActionReason - ) => void + ) => void, + private readonly promptUser?: ( + prompt: AsoInteractivePrompt + ) => Promise ) {} private markUserActionRequired(reason: ReauthUserActionReason): void { this.onUserActionRequired?.(reason); } + private async requestPrompt( + prompt: AsoInteractivePrompt + ): Promise { + if (this.promptUser) { + return this.promptUser(prompt); + } + return promptWithCliAsoPrompt(prompt, { spinner: this.spinner }); + } + private withAppleAuthTrace( error: unknown, operation: string, @@ -1492,7 +1432,7 @@ export class AsoAuthEngine { sessionHeaders: AppleAuthSessionHeaders ): Promise { this.markUserActionRequired("two_factor"); - if (!hasInteractiveTerminal()) { + if (!this.promptUser && !hasInteractiveTerminal()) { throw new Error( "Interactive terminal is required to complete Apple two-factor authentication. Run 'aso auth' in a terminal and retry." ); @@ -1617,17 +1557,20 @@ export class AsoAuthEngine { if (methodChoices.length === 1) { method = methodChoices[0].value; } else { - const promptResult = await promptWithSpinnerPause(this.spinner, () => - inquirer.prompt([ - { - type: "list", - name: "method", - message: "Choose 2FA verification method:", - choices: methodChoices, - }, - ]) - ); - method = promptResult.method as "trusteddevice" | "phone"; + const promptResult = await this.requestPrompt({ + kind: "two_factor_method", + title: "Choose Verification Method", + message: "Choose 2FA verification method:", + choices: methodChoices.map((choice) => ({ + label: choice.name, + value: choice.value, + })), + }); + if (promptResult.kind !== "two_factor_method") { + throw new Error("Unexpected 2FA method prompt response."); + } + method = + promptResult.value === "phone" ? "phone" : "trusteddevice"; } } @@ -1635,23 +1578,23 @@ export class AsoAuthEngine { let codePromptMessage = `Enter ${codeLength}-digit trusted-device code:`; if (method === "phone") { if (!selectedPhone) { - const phonePromptResult = await promptWithSpinnerPause(this.spinner, () => - inquirer.prompt([ - { - type: "list", - name: "selectedPhone", - message: "Send verification code to:", - choices: phoneNumbers.map((phone) => ({ - name: phone.numberWithDialCode, - value: phone, - })), - }, - ]) - ); - selectedPhone = phonePromptResult.selectedPhone as Pick< - AppleTrustedPhoneNumber, - "id" | "numberWithDialCode" - >; + const phonePromptResult = await this.requestPrompt({ + kind: "trusted_phone", + title: "Choose Verification Number", + message: "Send verification code to:", + choices: phoneNumbers.map((phone) => ({ + label: phone.numberWithDialCode, + value: String(phone.id), + })), + }); + if (phonePromptResult.kind !== "trusted_phone") { + throw new Error("Unexpected trusted phone prompt response."); + } + const selectedPhoneId = Number(phonePromptResult.value); + selectedPhone = phoneNumbers.find((phone) => phone.id === selectedPhoneId); + if (!selectedPhone) { + throw new Error("Selected verification phone is no longer available."); + } } const phoneId = selectedPhone.id as number; @@ -1693,10 +1636,19 @@ export class AsoAuthEngine { codePromptMessage = `Enter ${codeLength}-digit code sent to ${selectedPhone.numberWithDialCode}:`; } let verifyResponse: AxiosResponse | undefined; + let codePromptError: string | undefined; while (true) { - const code = await promptWithSpinnerPause(this.spinner, () => - askForVerificationCode(codePromptMessage, codeLength) - ); + const codeResponse = await this.requestPrompt({ + kind: "verification_code", + title: "Enter Verification Code", + message: codePromptMessage, + digits: codeLength, + errorMessage: codePromptError, + }); + if (codeResponse.kind !== "verification_code") { + throw new Error("Unexpected verification code prompt response."); + } + const code = codeResponse.code.trim(); const verifyBody = method === "phone" ? { @@ -1735,6 +1687,7 @@ export class AsoAuthEngine { verifyResponse.data )}` ); + codePromptError = verifyErrorMessage; logWithSpinnerPause( this.spinner, "warn", @@ -1743,6 +1696,8 @@ export class AsoAuthEngine { continue; } + codePromptError = undefined; + logger.debug( `[aso-auth] 2FA verify error payload: ${summarizeAppleErrorPayload( verifyResponse.data @@ -1990,6 +1945,14 @@ export class AsoAuthService { const spinner = ora("Authenticating with Apple Search Ads...").start(); try { const authMode = ASO_ENV.authMode; + const promptUser = async ( + prompt: AsoInteractivePrompt + ): Promise => { + if (options?.promptHandler) { + return options.promptHandler.prompt(prompt); + } + return promptWithCliAsoPrompt(prompt, { spinner }); + }; const authenticateWith = async ( credentials: AppleLoginCredentials ): Promise => { @@ -2000,7 +1963,8 @@ export class AsoAuthService { client, mode, spinner, - options?.onUserActionRequired + options?.onUserActionRequired, + promptUser ); await engine.ensureAuthenticated(credentials); @@ -2049,20 +2013,36 @@ export class AsoAuthService { shouldRememberCredentials: boolean; }> => { options?.onUserActionRequired?.("credentials"); - if (!hasInteractiveTerminal()) { + if (!options?.promptHandler && !hasInteractiveTerminal()) { throw new Error( "Interactive terminal is required to enter Apple credentials. Run 'aso auth' in a terminal and retry." ); } - const promptedCredentials = await promptWithSpinnerPause(spinner, () => - askForCredentials() - ); + const promptedCredentials = await promptUser({ + kind: "apple_credentials", + title: "Apple Sign In", + message: "Enter your Apple ID and password to continue.", + }); + if (promptedCredentials.kind !== "apple_credentials") { + throw new Error("Unexpected Apple credentials prompt response."); + } options?.onUserActionRequired?.("remember_credentials"); - const shouldRememberCredentials = await promptWithSpinnerPause( - spinner, - () => askWhetherToRememberCredentials() - ); - return { credentials: promptedCredentials, shouldRememberCredentials }; + const rememberCredentialsResponse = await promptUser({ + kind: "remember_credentials", + title: "Save Credentials", + message: "Remember Apple credentials in macOS Keychain?", + defaultValue: false, + }); + if (rememberCredentialsResponse.kind !== "remember_credentials") { + throw new Error("Unexpected remember credentials prompt response."); + } + return { + credentials: { + appleId: promptedCredentials.appleId.trim(), + password: promptedCredentials.password, + }, + shouldRememberCredentials: rememberCredentialsResponse.remember, + }; }; if (options?.resetStoredCredentials) { diff --git a/cli/services/keywords/aso-adam-id-service.test.ts b/cli/services/keywords/aso-adam-id-service.test.ts index 596f45c..e9aa2ad 100644 --- a/cli/services/keywords/aso-adam-id-service.test.ts +++ b/cli/services/keywords/aso-adam-id-service.test.ts @@ -2,6 +2,8 @@ import { beforeEach, describe, expect, it, jest } from "@jest/globals"; import inquirer from "inquirer"; import { getSavedAsoAdamId, + getConfiguredAsoAdamId, + resetAsoAdamIdRuntimeOverrideForTests, resolveAsoAdamId, saveAsoAdamId, } from "./aso-adam-id-service"; @@ -20,6 +22,7 @@ describe("aso-adam-id-service", () => { beforeEach(() => { jest.clearAllMocks(); + resetAsoAdamIdRuntimeOverrideForTests(); process.env = { ...originalEnv }; delete process.env.ASO_PRIMARY_APP_ID; jest.mocked(getMetadataValue).mockReturnValue(null); @@ -81,6 +84,14 @@ describe("aso-adam-id-service", () => { expect(mockInquirer.prompt).not.toHaveBeenCalled(); }); + it("activates saved adam id immediately in the current process", () => { + process.env.ASO_PRIMARY_APP_ID = "121212121"; + + saveAsoAdamId("900100200"); + + expect(getConfiguredAsoAdamId()).toBe("900100200"); + }); + it("ignores invalid env adam id and uses saved adam id", async () => { process.env.ASO_PRIMARY_APP_ID = "not-numeric"; jest.mocked(getMetadataValue).mockReturnValue("101010101"); @@ -119,4 +130,20 @@ describe("aso-adam-id-service", () => { ); expect(mockInquirer.prompt).not.toHaveBeenCalled(); }); + + it("forces re-entry when an id is already configured", async () => { + jest.mocked(getMetadataValue).mockReturnValue("101010101"); + + const result = await resolveAsoAdamId({ forcePrompt: true }); + + expect(result).toBe("1234567890"); + expect(mockInquirer.prompt).toHaveBeenCalledWith( + expect.arrayContaining([ + expect.objectContaining({ + name: "adamId", + default: "101010101", + }), + ]) + ); + }); }); diff --git a/cli/services/keywords/aso-adam-id-service.ts b/cli/services/keywords/aso-adam-id-service.ts index c1deb8d..b8f94f2 100644 --- a/cli/services/keywords/aso-adam-id-service.ts +++ b/cli/services/keywords/aso-adam-id-service.ts @@ -1,8 +1,10 @@ -import inquirer from "inquirer"; import { getMetadataValue, setMetadataValue } from "../../db/metadata"; import { ASO_ENV } from "../../shared/aso-env"; +import { promptWithCliAsoPrompt, type AsoPromptHandler } from "../prompts/aso-prompt-handler"; +import type { AsoInteractivePromptResponse } from "../../shared/aso-interactive-prompts"; const ASO_POPULARITY_ADAM_ID_METADATA_KEY = "aso-popularity-adam-id"; +let runtimeAdamIdOverride: string | null = null; function normalizeAdamId(raw: string): string | null { const candidate = raw.trim(); @@ -18,6 +20,13 @@ export function getSavedAsoAdamId(): string | null { return normalizeAdamId(saved); } +export function getConfiguredAsoAdamId(): string | null { + if (runtimeAdamIdOverride) return runtimeAdamIdOverride; + const envAdamId = normalizeAdamId(ASO_ENV.primaryAppId || ""); + if (envAdamId) return envAdamId; + return getSavedAsoAdamId(); +} + export function saveAsoAdamId(adamId: string): string { const normalized = normalizeAdamId(adamId); if (!normalized) { @@ -26,41 +35,56 @@ export function saveAsoAdamId(adamId: string): string { ); } setMetadataValue(ASO_POPULARITY_ADAM_ID_METADATA_KEY, normalized); + runtimeAdamIdOverride = normalized; return normalized; } export async function resolveAsoAdamId(options?: { adamId?: string; allowPrompt?: boolean; + forcePrompt?: boolean; + promptHandler?: AsoPromptHandler; }): Promise { if (options?.adamId != null) { return saveAsoAdamId(options.adamId); } - const envAdamId = normalizeAdamId(ASO_ENV.primaryAppId || ""); - if (envAdamId) return envAdamId; - - const saved = getSavedAsoAdamId(); - if (saved) return saved; + const configuredAdamId = getConfiguredAsoAdamId(); + if (configuredAdamId && !options?.forcePrompt) return configuredAdamId; if (options?.allowPrompt === false) { throw new Error( - "Primary App ID is missing. Run 'aso --primary-app-id ' or run 'aso' in a terminal to set it, then retry this command with --stdout." + configuredAdamId + ? "Primary App ID must be updated interactively. Run 'aso' in a terminal or use 'aso --primary-app-id ', then retry this command with --stdout." + : "Primary App ID is missing. Run 'aso --primary-app-id ' or run 'aso' in a terminal to set it, then retry this command with --stdout." ); } - const { adamId } = await inquirer.prompt([ - { - type: "input", - name: "adamId", - message: - "Enter Primary App ID (Any App ID that your Apple Ads account has access to):", - validate: (input: string) => - normalizeAdamId(input) - ? true - : "Please enter a numeric Primary App ID, e.g. 1234567890.", - }, - ]); + const promptResponse: AsoInteractivePromptResponse = options?.promptHandler + ? await options.promptHandler.prompt({ + kind: "primary_app_id", + title: "Primary App ID Required", + message: + "Enter a Primary App ID that your Apple Search Ads account can access.", + defaultValue: configuredAdamId ?? undefined, + placeholder: "1234567890", + }) + : await promptWithCliAsoPrompt({ + kind: "primary_app_id", + title: "Primary App ID Required", + message: + "Enter Primary App ID (Any App ID that your Apple Ads account has access to):", + defaultValue: configuredAdamId ?? undefined, + placeholder: "1234567890", + }); + + if (promptResponse.kind !== "primary_app_id") { + throw new Error("Primary App ID prompt returned an unexpected response."); + } + + return saveAsoAdamId(promptResponse.adamId); +} - return saveAsoAdamId(String(adamId)); +export function resetAsoAdamIdRuntimeOverrideForTests(): void { + runtimeAdamIdOverride = null; } diff --git a/cli/services/keywords/aso-popularity-service.ts b/cli/services/keywords/aso-popularity-service.ts index 986900a..b999c7d 100644 --- a/cli/services/keywords/aso-popularity-service.ts +++ b/cli/services/keywords/aso-popularity-service.ts @@ -1,7 +1,7 @@ import { ContextualError } from "../../utils/error-handling-helpers"; import { logger } from "../../utils/logger"; import { asoAuthService } from "../auth/aso-auth-service"; -import { getSavedAsoAdamId } from "./aso-adam-id-service"; +import { getConfiguredAsoAdamId } from "./aso-adam-id-service"; import { requestPopularitiesWithKwsRetry, type PopularityResponse, @@ -59,7 +59,7 @@ function sanitizeKeyword(keyword: string): string { } function requireAdamId(): string { - const adamId = getSavedAsoAdamId(); + const adamId = getConfiguredAsoAdamId(); if (!adamId) { throw new ContextualError( "Primary App ID is missing. Run 'aso --primary-app-id ' or run 'aso' to set it." diff --git a/cli/services/prompts/aso-prompt-handler.ts b/cli/services/prompts/aso-prompt-handler.ts new file mode 100644 index 0000000..cc56591 --- /dev/null +++ b/cli/services/prompts/aso-prompt-handler.ts @@ -0,0 +1,127 @@ +import inquirer from "inquirer"; +import type { Ora } from "ora"; +import type { + AsoInteractivePrompt, + AsoInteractivePromptResponse, +} from "../../shared/aso-interactive-prompts"; + +export type AsoPromptHandler = { + prompt: ( + prompt: AsoInteractivePrompt + ) => Promise; +}; + +function withSpinnerPause( + spinner: Ora | undefined, + operation: () => Promise +): Promise { + const wasSpinning = spinner?.isSpinning === true; + if (wasSpinning) spinner.stop(); + return operation().finally(() => { + if (wasSpinning) spinner?.start(); + }); +} + +export async function promptWithCliAsoPrompt( + prompt: AsoInteractivePrompt, + options?: { spinner?: Ora } +): Promise { + return withSpinnerPause(options?.spinner, async () => { + switch (prompt.kind) { + case "primary_app_id": { + const { adamId } = await inquirer.prompt([ + { + type: "input", + name: "adamId", + message: prompt.message, + default: prompt.defaultValue ?? "", + validate: (input: string) => + /^\d+$/.test(input.trim()) + ? true + : "Please enter a numeric Primary App ID, e.g. 1234567890.", + }, + ]); + return { + kind: "primary_app_id", + adamId: String(adamId ?? "").trim(), + }; + } + case "apple_credentials": { + const answers = await inquirer.prompt([ + { + type: "input", + name: "appleId", + message: "Apple ID (email):", + default: prompt.defaultAppleId ?? "", + validate: (value: string) => + value.trim() ? true : "Apple ID is required", + }, + { + type: "password", + name: "password", + message: "Password:", + mask: "*", + validate: (value: string) => + value.trim() ? true : "Password is required", + }, + ]); + + return { + kind: "apple_credentials", + appleId: String(answers.appleId ?? "").trim(), + password: String(answers.password ?? ""), + }; + } + case "remember_credentials": { + const { remember } = await inquirer.prompt([ + { + type: "confirm", + name: "remember", + default: prompt.defaultValue, + message: prompt.message, + }, + ]); + return { + kind: "remember_credentials", + remember: Boolean(remember), + }; + } + case "two_factor_method": + case "trusted_phone": { + const { value } = await inquirer.prompt([ + { + type: "list", + name: "value", + message: prompt.message, + choices: prompt.choices.map((choice) => ({ + name: choice.label, + value: choice.value, + })), + }, + ]); + return { + kind: prompt.kind, + value: String(value), + }; + } + case "verification_code": { + const regex = new RegExp(`^\\d{${prompt.digits}}$`); + const { code } = await inquirer.prompt([ + { + type: "input", + name: "code", + message: prompt.message, + validate: (value: string) => + regex.test(value.trim()) + ? true + : `Please enter exactly ${prompt.digits} digits`, + }, + ]); + return { + kind: "verification_code", + code: String(code ?? "").trim(), + }; + } + } + }); +} diff --git a/cli/shared/aso-interactive-prompts.ts b/cli/shared/aso-interactive-prompts.ts new file mode 100644 index 0000000..430336e --- /dev/null +++ b/cli/shared/aso-interactive-prompts.ts @@ -0,0 +1,73 @@ +export type AsoPromptChoice = { + value: string; + label: string; +}; + +export type AsoInteractivePrompt = + | { + kind: "primary_app_id"; + title: string; + message: string; + errorMessage?: string; + defaultValue?: string; + placeholder?: string; + } + | { + kind: "apple_credentials"; + title: string; + message: string; + errorMessage?: string; + defaultAppleId?: string; + } + | { + kind: "remember_credentials"; + title: string; + message: string; + defaultValue: boolean; + } + | { + kind: "two_factor_method"; + title: string; + message: string; + choices: AsoPromptChoice[]; + } + | { + kind: "trusted_phone"; + title: string; + message: string; + choices: AsoPromptChoice[]; + } + | { + kind: "verification_code"; + title: string; + message: string; + digits: number; + errorMessage?: string; + }; + +export type AsoInteractivePromptResponse = + | { + kind: "primary_app_id"; + adamId: string; + } + | { + kind: "apple_credentials"; + appleId: string; + password: string; + } + | { + kind: "remember_credentials"; + remember: boolean; + } + | { + kind: "two_factor_method"; + value: string; + } + | { + kind: "trusted_phone"; + value: string; + } + | { + kind: "verification_code"; + code: string; + }; diff --git a/cli/shared/telemetry/bugsnag-classifier.ts b/cli/shared/telemetry/bugsnag-classifier.ts index 880af41..78c30ed 100644 --- a/cli/shared/telemetry/bugsnag-classifier.ts +++ b/cli/shared/telemetry/bugsnag-classifier.ts @@ -60,6 +60,7 @@ const EXPECTED_DASHBOARD_FLOW_ERROR_CODES = new Set([ "AUTH_REQUIRED", "AUTH_IN_PROGRESS", "TTY_REQUIRED", + "PRIMARY_APP_ID_RECONFIGURE_REQUIRED", "AUTHORIZATION_FAILED", "NOT_FOUND", ]); diff --git a/docs/aso-error-handling.md b/docs/aso-error-handling.md index 97c3217..4942153 100644 --- a/docs/aso-error-handling.md +++ b/docs/aso-error-handling.md @@ -8,6 +8,7 @@ Define failure boundaries, retry rules, and recovery behavior across CLI, dashbo - Dashboard error mapping is centralized in `cli/domain/errors/dashboard-errors.ts` and consumed by both server (`cli/dashboard-server/server.ts`) and UI (`cli/dashboard-ui/app-helpers.ts`). - Enrichment services (`cli/services/cache-api/services/aso-enrichment-service.ts`, `cli/services/cache-api/services/aso-apple-client.ts`) handle App Store fetch failures and fallback behavior. - Dashboard keyword/app-doc route handlers are split under `cli/dashboard-server/routes/*`, while auth state and HTTP utilities are isolated in `cli/dashboard-server/auth-state.ts` and `cli/dashboard-server/http-utils.ts`. +- Shared setup/auth prompts are emitted by services and transported through either CLI prompts or dashboard prompt sessions; browser UX does not fork the auth logic. ## Dashboard Error Codes - `INVALID_REQUEST` @@ -15,6 +16,7 @@ Define failure boundaries, retry rules, and recovery behavior across CLI, dashbo - `AUTH_REQUIRED` - `AUTH_IN_PROGRESS` - `TTY_REQUIRED` +- `PRIMARY_APP_ID_RECONFIGURE_REQUIRED` - `AUTHORIZATION_FAILED` - `RATE_LIMITED` - `REQUEST_TIMEOUT` @@ -29,12 +31,13 @@ Define failure boundaries, retry rules, and recovery behavior across CLI, dashbo - Enrichment applies one bounded retry/backoff cycle for competitive keywords when top-5 difficulty docs are incomplete (`reasonCode=INSUFFICIENT_DOCS` when still unresolved). - Startup refresh manager retries each unit once and records failures without crashing runtime. - Startup refresh auth failures are exposed as structured refresh-status state so the dashboard can prompt for reauthentication instead of silently stopping. -- Startup refresh auth failures reuse the same dashboard reauthentication UX as add-keyword: one automatic auth-start attempt, then shared modal/button handling if terminal input or retry is needed. +- Startup refresh auth failures reuse the same dashboard reauthentication UX as add-keyword: one automatic auth-start attempt, then shared browser prompt / retry handling if user input is needed. - `keywordPipelineService` isolates terminal failures per keyword and stores normalized failure metadata in `aso_keyword_failures` via `keywordWriteRepository` (single write owner). ## Recovery Behavior - Dashboard add-keyword: - If auth is invalid in stage 1, return `AUTH_REQUIRED` (no interactive prompt in request path). + - If the configured Primary App ID is inaccessible for the current Apple Ads account, return `PRIMARY_APP_ID_RECONFIGURE_REQUIRED` so the dashboard can reopen the shared Primary App ID setup flow. - If stage-2 enrichment fails, stage-1 writes remain; caller can retry later. - Stage-2 enrichment writes are per-keyword progressive: successful keywords are visible in cache/UI polling as soon as that keyword finishes, while other keywords continue running. - For `appCount >= 5`, enrichment does not persist fallback `difficultyScore=1` when top-5 docs are incomplete; it records a retryable enrichment failure instead. @@ -58,6 +61,9 @@ Define failure boundaries, retry rules, and recovery behavior across CLI, dashbo - Attempts cached-session reuse before full credential login. - Reuses keychain credentials first when full login is required. - Clears invalid keychain credentials and reprompts when Apple rejects stored creds. +- Plain `aso`: + - Starts dashboard even when Primary App ID is missing. + - Recovers missing Primary App ID through dashboard setup state instead of requiring an immediate terminal prompt. ## Observability - Apple HTTP calls carry trace context. diff --git a/docs/aso-runtime-flows.md b/docs/aso-runtime-flows.md index 1791f43..469d46d 100644 --- a/docs/aso-runtime-flows.md +++ b/docs/aso-runtime-flows.md @@ -22,15 +22,17 @@ Runtime flow contracts across CLI commands, local dashboard API, and ASO service - `aso reset-credentials`: clear saved ASO keychain credentials and local cookies. - Any `aso` process start emits PostHog `cli_started` telemetry using a persisted user id at `~/.aso/config.json` (`userId`), then flushes telemetry on normal/error exits. - MCP `aso_evaluate_keywords`: accept explicit keywords (max 100), run `aso keywords "" --stdout`, return evaluated keyword results. -- Dashboard API mutations: app add (single-item POST; UI may batch multiple selections), app delete, keyword add/delete, keyword favorite toggle, auth start. +- Dashboard API mutations: app add (single-item POST; UI may batch multiple selections), app delete, keyword add/delete, keyword favorite toggle, auth start/respond, setup start/respond. ## Boundary Ownership - Domain policy (`cli/domain/keywords/*`, `cli/domain/errors/*`) is shared across CLI/server/UI for country guardrails, keyword normalization, limits, and dashboard-safe error/message mapping. - `keywordPipelineService` (`cli/services/keywords/keyword-pipeline-service.ts`) is the only keyword orchestration entrypoint. - `keywordWriteRepository` (`cli/services/keywords/keyword-write-repository.ts`) is the only write-side owner for keyword cache rows, failure rows, competitor app docs, and previous-position updates. +- Interactive setup/auth prompts are emitted from shared services and fulfilled by either CLI prompts or dashboard prompt sessions; the prompt transport is not duplicated per surface. - Dashboard HTTP wiring is split by concern: - bootstrap (`server.ts`) - auth state (`auth-state.ts`) + - setup state (`setup-state.ts`) - request/response helpers (`http-utils.ts`) - apps handlers (`apps-handler.ts`) - keyword/app-doc handlers (`routes/keyword-handlers.ts`, `routes/app-doc-handlers.ts`) @@ -106,25 +108,33 @@ Runtime flow contracts across CLI commands, local dashboard API, and ASO service 3. Server updates `app_keywords.is_favorite` for the exact `(appId, keyword, country)` association. 4. Favorite state is app-scoped: the same keyword associated to a different app keeps its own favorite state. +## Flow C0: Dashboard Primary App Setup +1. Plain `aso` starts the dashboard immediately; it does not block startup on a terminal-only Primary App ID prompt. +2. If Primary App ID is already configured (`--primary-app-id` save, env, or saved local value), dashboard setup is skipped unless a later API call proves that the configured ID is inaccessible for the current Apple Ads account. +3. If Primary App ID is missing, or if the dashboard receives `PRIMARY_APP_ID_RECONFIGURE_REQUIRED`, server starts a single-flight setup session and exposes its prompt state via `GET /api/aso/setup/status`. +4. Dashboard submits the chosen Primary App ID through `POST /api/aso/setup/respond`. +5. On success, the value is persisted through the same `resolveAsoAdamId` / `saveAsoAdamId` path used by CLI, becomes active for the current dashboard process immediately, and startup refresh begins. + ## Flow C: Dashboard Reauthentication 1. Add-keyword flow returns `AUTH_REQUIRED` or `AUTH_IN_PROGRESS` when auth state blocks stage 1. 2. Startup-refresh auth-required failures also enter this same flow automatically once, instead of waiting for a separate explicit auth action. 3. Client calls `POST /api/aso/auth/start`. -4. Server runs single-flight `asoAuthService.reAuthenticate()`. -5. Client polls `GET /api/aso/auth/status` until terminal state. -6. On success, client retries the pending add-keyword action and can resume a previously paused startup refresh. -7. If terminal input is required or auth fails, the same dashboard auth modal is used for both add-keyword and startup-refresh flows. -8. While reauth is auto-starting or in progress for a pending add-keyword action, the dashboard keeps the add action in a loading state (`Checking Apple session...`) so the button never appears idle. +4. Server runs single-flight `asoAuthService.reAuthenticate()` with a dashboard prompt handler instead of a terminal-only prompt path. +5. Client polls `GET /api/aso/auth/status` until terminal state and submits prompt answers through `POST /api/aso/auth/respond`. +6. Shared auth service can request browser-collected credentials, Keychain-save confirmation, 2FA method choice, trusted phone choice, and verification code without duplicating auth logic. +7. On success, client retries the pending add-keyword action and can resume a previously paused startup refresh. +8. On failure, the same dashboard auth modal remains the single recovery surface for both add-keyword and startup-refresh flows. +9. While reauth is auto-starting or in progress for a pending add-keyword action, the dashboard keeps the add action in a loading state (`Checking Apple session...`) so the button never appears idle. ## Flow D: Startup Background Refresh -1. Start once at dashboard boot. +1. Start once at dashboard boot after Primary App ID is already configured, or immediately after dashboard setup completes. 2. Select keywords associated with owned or research apps and finite popularity where at least one is true: - popularity TTL is stale - difficulty has never been computed - order TTL is stale (owned-associated keywords only; research-only keywords do not use order staleness as a refresh trigger) 3. Run the same keyword pipeline used by CLI fetch in non-interactive mode, in batches while pausing for foreground mutations. 4. Publish refresh status via `GET /api/aso/refresh-status`, including whether the failure requires Search Ads reauthentication. -5. If auth is required, the dashboard auto-starts the same reauthentication flow used by add-keyword once; silent session reuse stays invisible, while terminal-input/failure states surface through the shared auth modal. +5. If auth is required, the dashboard auto-starts the same reauthentication flow used by add-keyword once; silent session reuse stays invisible, while browser prompt steps/failure states surface through the shared auth modal. 6. Allow explicit restart via `POST /api/aso/refresh/start`; the UI uses this after reauthentication or manual retry. ## Flow E: App Doc Hydration @@ -202,6 +212,7 @@ Accepted row fields: - Prompt for credentials only when missing/invalid keychain credentials. 4. Complete Apple login + 2FA as needed, save refreshed cookie/auth state, then exit. 5. Exit without dashboard startup, keyword fetch, or Primary App ID resolution. +6. This uses the same auth service that powers dashboard browser prompts; only the prompt transport differs. 2FA fallback behavior: - If `noTrustedDevices=true` and exactly one trusted phone exists, treat code delivery as already triggered and prompt only for code. @@ -214,6 +225,8 @@ Accepted row fields: 3. Exit without dashboard startup, keyword fetch, or reauthentication. ## Prompt / TTY Contract -- Credential and 2FA prompts require an interactive terminal (`stdin` + `stdout` TTY). -- When prompt-required auth runs in non-interactive mode, auth fails with explicit actionable guidance. +- Shared services emit structured setup/auth prompts instead of hard-coding surface-specific UX. +- CLI fulfills those prompts through an interactive terminal (`stdin` + `stdout` TTY). +- Dashboard fulfills those prompts through local prompt-session APIs and browser modals. +- When prompt-required auth runs in a non-interactive surface with no prompt handler (for example `--stdout`), auth fails with explicit actionable guidance. - `aso keywords --stdout` keeps machine-friendly behavior: JSON-only stdout (success envelope or failure envelope), silent session reuse only, and no interactive auth prompts. From d8a9e74ebaf63d9ce885216d58da1168a0c8c265 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Wed, 29 Apr 2026 15:52:17 +0300 Subject: [PATCH 08/55] Stop auto-retrying keyword adds after reauth --- cli/dashboard-ui/App.tsx | 13 ----------- cli/dashboard-ui/app.auth.test.tsx | 17 ++++++++------ cli/dashboard-ui/hooks/use-auth-flow.ts | 30 +++++++++++-------------- docs/aso-runtime-flows.md | 4 ++-- 4 files changed, 25 insertions(+), 39 deletions(-) diff --git a/cli/dashboard-ui/App.tsx b/cli/dashboard-ui/App.tsx index de41169..d1c8347 100644 --- a/cli/dashboard-ui/App.tsx +++ b/cli/dashboard-ui/App.tsx @@ -345,7 +345,6 @@ export function App() { const keywordLoadRequestIdRef = useRef(0); const keywordQueryKeyRef = useRef(null); const selectedAppIdRef = useRef(selectedAppId); - const autoRetryInFlightRef = useRef(false); const startupAppSyncAtRef = useRef(null); const resumeStartupRefreshAfterAuthRef = useRef(false); const startupRefreshAuthAttemptKeyRef = useRef(null); @@ -401,7 +400,6 @@ export function App() { isStartingAuth, isSubmittingAuthPrompt, authPendingPrompt, - pendingAddContext, setPendingAddContext, openAuthModalForPendingAdd, requestStartupRefreshReauthentication, @@ -1265,17 +1263,6 @@ export function App() { selectedAppId, ]); - useEffect(() => { - if (authStatus !== "succeeded") return; - if (!pendingAddContext) return; - if (autoRetryInFlightRef.current) return; - - autoRetryInFlightRef.current = true; - void submitKeywords(pendingAddContext.keywords).finally(() => { - autoRetryInFlightRef.current = false; - }); - }, [authStatus, pendingAddContext, submitKeywords]); - useEffect(() => { if (authStatus !== "succeeded") return; if (!resumeStartupRefreshAfterAuthRef.current) return; diff --git a/cli/dashboard-ui/app.auth.test.tsx b/cli/dashboard-ui/app.auth.test.tsx index 77cb214..ecdf200 100644 --- a/cli/dashboard-ui/app.auth.test.tsx +++ b/cli/dashboard-ui/app.auth.test.tsx @@ -140,11 +140,6 @@ describe("dashboard auth modal UI flow", () => { fireEvent.change(input, { target: { value: "term" } }); fireEvent.click(screen.getByRole("button", { name: "Add Keywords" })); - expect( - await screen.findByText("Checking Apple session for 1 keyword...") - ).toBeInTheDocument(); - expect(screen.getByRole("button", { name: "Add Keywords" })).toBeDisabled(); - await waitFor(() => expect(fetchMock).toHaveBeenCalledWith( "/api/aso/auth/start", @@ -153,12 +148,18 @@ describe("dashboard auth modal UI flow", () => { }) ) ); + await waitFor(() => + expect(screen.getByRole("button", { name: "Add Keywords" })).not.toBeDisabled() + ); + expect( + screen.queryByText("Checking Apple session for 1 keyword...") + ).not.toBeInTheDocument(); expect( screen.queryByRole("heading", { name: "Apple Reauthentication Required" }) ).not.toBeInTheDocument(); }); - it("auto-retries pending keyword add after auth status becomes succeeded", async () => { + it("does not auto-retry the keyword add after auth succeeds", async () => { let keywordPostCount = 0; let authStatusCount = 0; const fetchMock = jest.fn(async (input: RequestInfo | URL, init?: RequestInit) => { @@ -275,7 +276,9 @@ describe("dashboard auth modal UI flow", () => { fireEvent.change(input, { target: { value: "term" } }); fireEvent.click(screen.getByRole("button", { name: "Add Keywords" })); - await waitFor(() => expect(keywordPostCount).toBe(2)); + await waitFor(() => expect(authStatusCount).toBeGreaterThan(0)); + expect(keywordPostCount).toBe(1); + expect(screen.getByRole("button", { name: "Add Keywords" })).not.toBeDisabled(); }); it("collects a missing Primary App ID through the dashboard setup flow", async () => { diff --git a/cli/dashboard-ui/hooks/use-auth-flow.ts b/cli/dashboard-ui/hooks/use-auth-flow.ts index 28f8439..6c9baa6 100644 --- a/cli/dashboard-ui/hooks/use-auth-flow.ts +++ b/cli/dashboard-ui/hooks/use-auth-flow.ts @@ -28,7 +28,7 @@ export type PendingAddContext = { }; type AuthFlowContext = - | { kind: "add-keywords"; keywords: string[] } + | { kind: "add-keywords" } | { kind: "startup-refresh" } | null; @@ -68,6 +68,8 @@ export function useAuthFlow(params: UseAuthFlowParams) { const [submittedAuthPromptIdentity, setSubmittedAuthPromptIdentity] = useState(null); const [authFlowContext, setAuthFlowContext] = useState(null); + const [pendingAddContext, setPendingAddContextState] = + useState(null); const [authPendingPrompt, setAuthPendingPrompt] = useState(null); const isSubmittingAuthPrompt = @@ -96,6 +98,9 @@ export function useAuthFlow(params: UseAuthFlowParams) { const startReauthentication = useCallback(async () => { try { setIsStartingAuth(true); + if (authFlowContext?.kind === "add-keywords") { + setPendingAddContextState(null); + } setAuthStatus("in_progress"); setAuthStatusError(""); const data = await apiWrite( @@ -121,7 +126,7 @@ export function useAuthFlow(params: UseAuthFlowParams) { } finally { setIsStartingAuth(false); } - }, [applyAuthState]); + }, [applyAuthState, authFlowContext]); const submitAuthPromptResponse = useCallback( async (response: AsoInteractivePromptResponse) => { @@ -168,29 +173,21 @@ export function useAuthFlow(params: UseAuthFlowParams) { submittedAuthPromptIdentity, ]); - const pendingAddContext = useMemo(() => { - if (authFlowContext?.kind !== "add-keywords") return null; - return { keywords: authFlowContext.keywords }; - }, [authFlowContext]); - const setPendingAddContext = useCallback((next: PendingAddContext | null) => { - setAuthFlowContext((current) => { - if (next) { - return { kind: "add-keywords", keywords: next.keywords }; - } - return current?.kind === "add-keywords" ? null : current; - }); + setPendingAddContextState(next); }, []); const openAuthModalForPendingAdd = useCallback( (error: unknown, keywords: string[]): boolean => { const errorCode = getDashboardApiErrorCode(error); if (!isAuthFlowErrorCode(errorCode)) return false; - setAuthFlowContext({ kind: "add-keywords", keywords }); + setAuthFlowContext({ kind: "add-keywords" }); if (errorCode === "AUTH_IN_PROGRESS") { + setPendingAddContextState(null); setAuthStatus("in_progress"); setAuthStatusError(""); } else { + setPendingAddContextState({ keywords }); setAuthStatus("idle"); setAuthStatusError(""); } @@ -263,9 +260,8 @@ export function useAuthFlow(params: UseAuthFlowParams) { useEffect(() => { if (authStatus !== "succeeded") return; - setAuthFlowContext((current) => - current?.kind === "startup-refresh" ? null : current - ); + setPendingAddContextState(null); + setAuthFlowContext(null); }, [authStatus]); const pendingAddKeywordCount = pendingAddContext?.keywords.length ?? 0; diff --git a/docs/aso-runtime-flows.md b/docs/aso-runtime-flows.md index 469d46d..e5fbedd 100644 --- a/docs/aso-runtime-flows.md +++ b/docs/aso-runtime-flows.md @@ -122,9 +122,9 @@ Runtime flow contracts across CLI commands, local dashboard API, and ASO service 4. Server runs single-flight `asoAuthService.reAuthenticate()` with a dashboard prompt handler instead of a terminal-only prompt path. 5. Client polls `GET /api/aso/auth/status` until terminal state and submits prompt answers through `POST /api/aso/auth/respond`. 6. Shared auth service can request browser-collected credentials, Keychain-save confirmation, 2FA method choice, trusted phone choice, and verification code without duplicating auth logic. -7. On success, client retries the pending add-keyword action and can resume a previously paused startup refresh. +7. On success, client can resume a previously paused startup refresh. Add-keyword auth handoff does not retry the original add automatically; the user retries that mutation explicitly. 8. On failure, the same dashboard auth modal remains the single recovery surface for both add-keyword and startup-refresh flows. -9. While reauth is auto-starting or in progress for a pending add-keyword action, the dashboard keeps the add action in a loading state (`Checking Apple session...`) so the button never appears idle. +9. While reauth is auto-starting for an add-keyword auth handoff, the dashboard may briefly show `Checking Apple session...`, then clears the add-keyword loading state once auth takes over so the user can retry manually after authentication. ## Flow D: Startup Background Refresh 1. Start once at dashboard boot after Primary App ID is already configured, or immediately after dashboard setup completes. From 62d514bab9ec5710909c51ed2eaf0abc0db7fe57 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Wed, 29 Apr 2026 16:28:02 +0300 Subject: [PATCH 09/55] Centralize stdout error formatting in CLI catch --- cli/cli.test.ts | 188 ++++++++++++++++++++++++ cli/cli.ts | 24 +-- cli/services/runtime/stdout-contract.ts | 17 +++ docs/aso-runtime-flows.md | 3 + 4 files changed, 221 insertions(+), 11 deletions(-) create mode 100644 cli/cli.test.ts diff --git a/cli/cli.test.ts b/cli/cli.test.ts new file mode 100644 index 0000000..d0a054e --- /dev/null +++ b/cli/cli.test.ts @@ -0,0 +1,188 @@ +describe("cli stdout failure handling", () => { + const originalArgv = process.argv.slice(); + const originalExitCode = process.exitCode; + + afterEach(() => { + jest.resetModules(); + jest.restoreAllMocks(); + process.argv = originalArgv.slice(); + process.exitCode = originalExitCode; + }); + + it("emits a single runtime envelope for stdout handler failures", async () => { + const writeSpy = jest + .spyOn(process.stdout, "write") + .mockImplementation(() => true as any); + + process.argv = [ + "node", + "cli.ts", + "keywords", + "term", + "--stdout", + ]; + + jest.doMock("./load-env", () => ({})); + jest.doMock("./services/telemetry/instrument", () => ({})); + jest.doMock("./commands/aso", () => ({ __esModule: true, default: {} })); + jest.doMock("./services/runtime/version-check-service", () => ({ + checkVersionUpdateSync: jest.fn(), + })); + jest.doMock("./services/telemetry/error-reporter", () => ({ + reportBugsnagError: jest.fn(), + })); + jest.doMock("./services/runtime/node-version-guard", () => ({ + assertSupportedNodeVersion: jest.fn(), + })); + jest.doMock("./services/telemetry/posthog-usage-tracking", () => ({ + shutdownPostHog: jest.fn().mockResolvedValue(undefined), + trackCliStarted: jest.fn(), + })); + jest.doMock("./utils/logger", () => ({ + logger: { + setOutputModes: jest.fn(), + setLevel: jest.fn(), + error: jest.fn(), + }, + processNestedErrors: jest.fn((error) => error), + })); + jest.doMock("yargs/helpers", () => ({ + hideBin: jest.fn(() => process.argv.slice(2)), + })); + jest.doMock("yargs", () => { + return { + __esModule: true, + default: jest.fn(() => { + let failHandler: + | ((msg?: string, err?: Error) => Promise) + | undefined; + + return { + command() { + return this; + }, + strict() { + return this; + }, + fail(handler: typeof failHandler) { + failHandler = handler; + return this; + }, + help() { + return this; + }, + async parseAsync() { + if (!failHandler) { + throw new Error("Missing fail handler"); + } + return failHandler( + "Primary App ID is missing.", + new Error("Primary App ID is missing.") + ); + }, + }; + }), + }; + }); + + await import("./cli"); + await new Promise((resolve) => setImmediate(resolve)); + + expect(writeSpy).toHaveBeenCalledTimes(1); + const payload = JSON.parse(String(writeSpy.mock.calls[0]?.[0] || "").trim()); + expect(payload).toEqual({ + error: { + code: "CLI_RUNTIME_ERROR", + message: "Primary App ID is missing.", + }, + }); + expect(process.exitCode).toBe(1); + }); + + it("emits a single validation envelope for stdout parser failures", async () => { + const writeSpy = jest + .spyOn(process.stdout, "write") + .mockImplementation(() => true as any); + + process.argv = [ + "node", + "cli.ts", + "keywords", + "--stdout", + ]; + + jest.doMock("./load-env", () => ({})); + jest.doMock("./services/telemetry/instrument", () => ({})); + jest.doMock("./commands/aso", () => ({ __esModule: true, default: {} })); + jest.doMock("./services/runtime/version-check-service", () => ({ + checkVersionUpdateSync: jest.fn(), + })); + jest.doMock("./services/telemetry/error-reporter", () => ({ + reportBugsnagError: jest.fn(), + })); + jest.doMock("./services/runtime/node-version-guard", () => ({ + assertSupportedNodeVersion: jest.fn(), + })); + jest.doMock("./services/telemetry/posthog-usage-tracking", () => ({ + shutdownPostHog: jest.fn().mockResolvedValue(undefined), + trackCliStarted: jest.fn(), + })); + jest.doMock("./utils/logger", () => ({ + logger: { + setOutputModes: jest.fn(), + setLevel: jest.fn(), + error: jest.fn(), + }, + processNestedErrors: jest.fn((error) => error), + })); + jest.doMock("yargs/helpers", () => ({ + hideBin: jest.fn(() => process.argv.slice(2)), + })); + jest.doMock("yargs", () => { + return { + __esModule: true, + default: jest.fn(() => { + let failHandler: + | ((msg?: string, err?: Error) => Promise) + | undefined; + + return { + command() { + return this; + }, + strict() { + return this; + }, + fail(handler: typeof failHandler) { + failHandler = handler; + return this; + }, + help() { + return this; + }, + async parseAsync() { + if (!failHandler) { + throw new Error("Missing fail handler"); + } + return failHandler("Missing required argument: terms"); + }, + }; + }), + }; + }); + + await import("./cli"); + await new Promise((resolve) => setImmediate(resolve)); + + expect(writeSpy).toHaveBeenCalledTimes(1); + const payload = JSON.parse(String(writeSpy.mock.calls[0]?.[0] || "").trim()); + expect(payload).toEqual({ + error: { + code: "CLI_VALIDATION_ERROR", + message: "Missing required argument: terms", + help: "Use `aso --help` to see available commands and options.", + }, + }); + expect(process.exitCode).toBe(1); + }); +}); diff --git a/cli/cli.ts b/cli/cli.ts index e0f06ce..20c89b0 100644 --- a/cli/cli.ts +++ b/cli/cli.ts @@ -11,8 +11,10 @@ import { checkVersionUpdateSync } from "./services/runtime/version-check-service import { reportBugsnagError } from "./services/telemetry/error-reporter"; import { assertSupportedNodeVersion } from "./services/runtime/node-version-guard"; import { + CliValidationError, emitStdoutRuntimeFailure, emitStdoutValidationFailure, + isCliValidationError, isStdoutKeywordsRun, toMachineReadableErrorMessage, } from "./services/runtime/stdout-contract"; @@ -48,20 +50,14 @@ async function main() { const parser = yargs(hideBin(process.argv)) .command(asoCmd) .strict() - .fail(async (msg, err) => { + .fail((msg, err) => { const failureMessage = (typeof msg === "string" && msg.trim()) || toMachineReadableErrorMessage(err); - if (stdoutKeywordsRun) { - emitStdoutValidationFailure(failureMessage); - } else { - logger.error( - failureMessage, - "Use 'aso --help' to see available commands and options." - ); + if (err) { + throw err; } - await shutdownPostHog(); - process.exit(1); + throw new CliValidationError(failureMessage); }) .help(); @@ -81,7 +77,13 @@ main().catch(async (err) => { const processedError = processNestedErrors(err, false); if (stdoutKeywordsRun) { - emitStdoutRuntimeFailure(toMachineReadableErrorMessage(processedError)); + if (isCliValidationError(err)) { + emitStdoutValidationFailure(err.message); + } else { + emitStdoutRuntimeFailure(toMachineReadableErrorMessage(processedError)); + } + } else if (isCliValidationError(err)) { + logger.error(err.message, err.help); } else { logger.error(`Command '${command}' failed`, processedError); } diff --git a/cli/services/runtime/stdout-contract.ts b/cli/services/runtime/stdout-contract.ts index 51bb852..a61d8b6 100644 --- a/cli/services/runtime/stdout-contract.ts +++ b/cli/services/runtime/stdout-contract.ts @@ -3,6 +3,17 @@ import { processNestedErrors } from "../../utils/logger"; export const CLI_VALIDATION_ERROR_CODE = "CLI_VALIDATION_ERROR"; export const CLI_RUNTIME_ERROR_CODE = "CLI_RUNTIME_ERROR"; +export class CliValidationError extends Error { + readonly code = CLI_VALIDATION_ERROR_CODE; + readonly help = "Use `aso --help` to see available commands and options."; + + constructor(message: string) { + super(message); + this.name = "CliValidationError"; + Object.setPrototypeOf(this, CliValidationError.prototype); + } +} + type StdoutErrorPayload = { error: { code: string; @@ -70,3 +81,9 @@ export function emitStdoutRuntimeFailure(message: string): void { }, }); } + +export function isCliValidationError( + error: unknown +): error is CliValidationError { + return error instanceof CliValidationError; +} diff --git a/docs/aso-runtime-flows.md b/docs/aso-runtime-flows.md index e5fbedd..535cf59 100644 --- a/docs/aso-runtime-flows.md +++ b/docs/aso-runtime-flows.md @@ -37,6 +37,7 @@ Runtime flow contracts across CLI commands, local dashboard API, and ASO service - apps handlers (`apps-handler.ts`) - keyword/app-doc handlers (`routes/keyword-handlers.ts`, `routes/app-doc-handlers.ts`) - static assets (`static-files.ts`) +- `cli/cli.ts` owns machine-readable stdout failure formatting for `aso keywords --stdout`; parser hooks may classify failures, but stdout JSON emission happens in one top-level path only. ## Flow A: CLI Keyword Fetch 1. Normalize and validate keywords. @@ -76,6 +77,8 @@ Runtime flow contracts across CLI commands, local dashboard API, and ASO service - `error.code` (`CLI_VALIDATION_ERROR` or `CLI_RUNTIME_ERROR`) - `error.message` - optional `error.help` + - exactly one failure envelope is emitted per failed run. + - parser/CLI-option failures emit `CLI_VALIDATION_ERROR`; command-execution failures (for example missing Primary App ID during handler execution) emit `CLI_RUNTIME_ERROR`. 11. Suppress CLI startup update notifications and keep logger failure text off stdout so output remains machine-parseable JSON. ## Flow B: Dashboard Add Keywords (`POST /api/aso/keywords`) From 5d7424c7ae0805ac6934734829ccec85f1e77e7f Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Wed, 29 Apr 2026 21:42:08 +0300 Subject: [PATCH 10/55] increment version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 584f9e2..91949ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aso-cli", - "version": "0.9.0", + "version": "0.10.0", "description": "Local App Store Optimization CLI", "main": "cli/dist/cli.js", "bin": { From 1e798bbd47498bb1126aa0cf8efe7bf281d9ade8 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Wed, 29 Apr 2026 22:02:29 +0300 Subject: [PATCH 11/55] Allow startup refresh reauth after successful auth --- cli/dashboard-ui/app.auth.test.tsx | 137 ++++++++++++++++++++++++ cli/dashboard-ui/hooks/use-auth-flow.ts | 2 +- 2 files changed, 138 insertions(+), 1 deletion(-) diff --git a/cli/dashboard-ui/app.auth.test.tsx b/cli/dashboard-ui/app.auth.test.tsx index ecdf200..f2a5656 100644 --- a/cli/dashboard-ui/app.auth.test.tsx +++ b/cli/dashboard-ui/app.auth.test.tsx @@ -1023,6 +1023,143 @@ describe("dashboard auth modal UI flow", () => { ).toBeInTheDocument(); }); + it("restarts startup refresh reauthentication after a later auth-required failure", async () => { + let refreshStatusCount = 0; + let refreshStartCount = 0; + let authStartCount = 0; + + const fetchMock = jest.fn(async (input: RequestInfo | URL, init?: RequestInit) => { + const url = String(input); + const method = (init?.method ?? "GET").toUpperCase(); + + if (method === "GET" && url === "/api/apps") { + return jsonResponse({ status: 200, body: { success: true, data: [] } }); + } + if (method === "GET" && url.startsWith("/api/aso/keywords?")) { + return jsonResponse({ + status: 200, + body: { success: true, data: emptyKeywordPagedPayload() }, + }); + } + if (method === "GET" && url === "/api/aso/refresh-status") { + refreshStatusCount += 1; + if (refreshStatusCount <= 2) { + return jsonResponse({ + status: 200, + body: { + success: true, + data: { + status: "failed", + startedAt: + refreshStatusCount === 1 + ? "2026-03-07T00:00:00.000Z" + : "2026-03-07T00:01:00.000Z", + finishedAt: + refreshStatusCount === 1 + ? "2026-03-07T00:00:10.000Z" + : "2026-03-07T00:01:10.000Z", + lastError: + "Apple Search Ads session expired. Reauthentication is required.", + requiresReauthentication: true, + counters: { + eligibleKeywordCount: 1086, + refreshedKeywordCount: 0, + failedKeywordCount: 1086, + }, + }, + }, + }); + } + return jsonResponse({ + status: 200, + body: { + success: true, + data: { + status: "running", + startedAt: "2026-03-07T00:01:20.000Z", + finishedAt: null, + lastError: null, + requiresReauthentication: false, + counters: { + eligibleKeywordCount: 1086, + refreshedKeywordCount: 0, + failedKeywordCount: 0, + }, + }, + }, + }); + } + if (method === "POST" && url === "/api/aso/auth/start") { + authStartCount += 1; + return jsonResponse({ + status: 202, + body: { + success: true, + data: { + status: "in_progress", + updatedAt: "2026-03-07T00:00:11.000Z", + lastError: null, + requiresTerminalAction: false, + canPrompt: true, + }, + }, + }); + } + if (method === "GET" && url === "/api/aso/auth/status") { + return jsonResponse({ + status: 200, + body: { + success: true, + data: { + status: "succeeded", + updatedAt: "2026-03-07T00:00:12.000Z", + lastError: null, + requiresTerminalAction: false, + canPrompt: true, + }, + }, + }); + } + if (method === "POST" && url === "/api/aso/refresh/start") { + refreshStartCount += 1; + return jsonResponse({ + status: 202, + body: { + success: true, + data: { + status: "running", + startedAt: + refreshStartCount === 1 + ? "2026-03-07T00:00:20.000Z" + : "2026-03-07T00:01:20.000Z", + finishedAt: null, + lastError: null, + requiresReauthentication: false, + counters: { + eligibleKeywordCount: 1086, + refreshedKeywordCount: 0, + failedKeywordCount: 0, + }, + }, + }, + }); + } + + throw new Error(`Unhandled fetch: ${method} ${url}`); + }); + global.fetch = fetchMock as typeof fetch; + + render(); + + await waitFor(() => expect(authStartCount).toBe(2)); + await waitFor(() => expect(refreshStartCount).toBe(2)); + expect( + await screen.findByText( + "Refreshing local data in background (0/1086 keywords)..." + ) + ).toBeInTheDocument(); + }); + it("auto-starts startup refresh reauthentication and shows browser auth prompts when input is required", async () => { let authStartCount = 0; diff --git a/cli/dashboard-ui/hooks/use-auth-flow.ts b/cli/dashboard-ui/hooks/use-auth-flow.ts index 6c9baa6..ccfc83c 100644 --- a/cli/dashboard-ui/hooks/use-auth-flow.ts +++ b/cli/dashboard-ui/hooks/use-auth-flow.ts @@ -199,7 +199,7 @@ export function useAuthFlow(params: UseAuthFlowParams) { const requestStartupRefreshReauthentication = useCallback(() => { setAuthFlowContext((current) => current ?? { kind: "startup-refresh" }); if (!authCanPrompt || isStartingAuth || isSubmittingAuthPrompt) return; - if (authStatus !== "idle" && authStatus !== "failed") return; + if (authStatus === "in_progress") return; void startReauthentication(); }, [ authCanPrompt, From f5689b6bab8f56e52ec4afae33919522c9bf1797 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Wed, 29 Apr 2026 22:21:24 +0300 Subject: [PATCH 12/55] Preserve forced setup retries after reconfigure failure --- cli/dashboard-server/setup-state.test.ts | 47 ++++++++++++++++++++++++ cli/dashboard-server/setup-state.ts | 9 +++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/cli/dashboard-server/setup-state.test.ts b/cli/dashboard-server/setup-state.test.ts index 5739e28..4860a84 100644 --- a/cli/dashboard-server/setup-state.test.ts +++ b/cli/dashboard-server/setup-state.test.ts @@ -33,4 +33,51 @@ describe("dashboard setup state manager", () => { }) ); }); + + it("retries failed forced setup without losing forced prompt mode", async () => { + const receivedForcePrompts: Array = []; + let attempts = 0; + + const manager = createDashboardSetupStateManager({ + isSetupRequired: () => false, + resolvePrimaryAppId: async (options) => { + receivedForcePrompts.push(options?.forcePrompt); + attempts += 1; + if (attempts === 1) { + throw new Error("Primary App ID is not accessible."); + } + return "1234567890"; + }, + onError: jest.fn(), + }); + + expect(manager.start({ forcePrompt: true })).toBe(true); + await new Promise((resolve) => setImmediate(resolve)); + + expect(manager.getState()).toEqual( + expect.objectContaining({ + status: "failed", + isRequired: true, + lastError: "Primary App ID is not accessible.", + }) + ); + + expect(manager.start()).toBe(true); + expect(manager.getState()).toEqual( + expect.objectContaining({ + status: "in_progress", + isRequired: true, + }) + ); + + await new Promise((resolve) => setImmediate(resolve)); + + expect(receivedForcePrompts).toEqual([true, true]); + expect(manager.getState()).toEqual( + expect.objectContaining({ + status: "succeeded", + isRequired: false, + }) + ); + }); }); diff --git a/cli/dashboard-server/setup-state.ts b/cli/dashboard-server/setup-state.ts index 3cf80d7..9cf1f97 100644 --- a/cli/dashboard-server/setup-state.ts +++ b/cli/dashboard-server/setup-state.ts @@ -85,17 +85,18 @@ export function createDashboardSetupStateManager( }, start(options?: { forcePrompt?: boolean }): boolean { - const forcePrompt = options?.forcePrompt === true; - if ((!params.isSetupRequired() && !forcePrompt) || inFlight) { + const requestedForcePrompt = options?.forcePrompt === true; + const effectiveForcePrompt = requestedForcePrompt || forcePromptActive; + if ((!params.isSetupRequired() && !effectiveForcePrompt) || inFlight) { return false; } - forcePromptActive = forcePrompt; + forcePromptActive = effectiveForcePrompt; setState("in_progress", null); promptSession.reset(); inFlight = params .resolvePrimaryAppId({ - forcePrompt, + forcePrompt: effectiveForcePrompt, promptHandler: promptSession.createPromptHandler(), }) .then((adamId) => { From 0212de817c292c5dbed91151951182e0336b45a1 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Wed, 29 Apr 2026 22:26:44 +0300 Subject: [PATCH 13/55] Fix popularity and auth test mocks for current prompt APIs --- cli/services/auth/aso-auth-service.test.ts | 2 +- cli/services/keywords/aso-popularity-service.test.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/services/auth/aso-auth-service.test.ts b/cli/services/auth/aso-auth-service.test.ts index 193de34..963f0d1 100644 --- a/cli/services/auth/aso-auth-service.test.ts +++ b/cli/services/auth/aso-auth-service.test.ts @@ -695,7 +695,7 @@ describe("aso-auth-service 2FA method handling", () => { const promptSpy = jest .spyOn(inquirer, "prompt") .mockResolvedValueOnce({ - selectedPhone: { id: 8, numberWithDialCode: "+1 ••• ••22" }, + value: "8", } as any) .mockResolvedValueOnce({ code: "12345678" } as any); diff --git a/cli/services/keywords/aso-popularity-service.test.ts b/cli/services/keywords/aso-popularity-service.test.ts index c3c8ccb..b3838c5 100644 --- a/cli/services/keywords/aso-popularity-service.test.ts +++ b/cli/services/keywords/aso-popularity-service.test.ts @@ -4,7 +4,7 @@ import { } from "./aso-popularity-service"; import { asoAuthService } from "../auth/aso-auth-service"; import { requestPopularitiesWithKwsRetry } from "./aso-apple-popularity-client"; -import { getSavedAsoAdamId } from "./aso-adam-id-service"; +import { getConfiguredAsoAdamId } from "./aso-adam-id-service"; jest.mock("../auth/aso-auth-service", () => ({ asoAuthService: { @@ -18,7 +18,7 @@ jest.mock("./aso-apple-popularity-client", () => ({ })); jest.mock("./aso-adam-id-service", () => ({ - getSavedAsoAdamId: jest.fn(), + getConfiguredAsoAdamId: jest.fn(), })); const mockRequestPopularitiesWithKwsRetry = jest.mocked( @@ -29,7 +29,7 @@ describe("AsoPopularityService", () => { beforeEach(() => { jest.clearAllMocks(); jest.mocked(asoAuthService.getCookieHeader).mockReturnValue("cookie=value"); - jest.mocked(getSavedAsoAdamId).mockReturnValue("1234567890"); + jest.mocked(getConfiguredAsoAdamId).mockReturnValue("1234567890"); }); describe("fetchKeywordPopularities", () => { @@ -122,7 +122,7 @@ describe("AsoPopularityService", () => { }); it("throws when adam id is missing", async () => { - jest.mocked(getSavedAsoAdamId).mockReturnValue(null); + jest.mocked(getConfiguredAsoAdamId).mockReturnValue(null); await expect( asoPopularityService.fetchKeywordPopularities(["test"]) From 9bb4ab7a0c9caecbde752517134b81a239c0db06 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Sat, 2 May 2026 12:09:52 +0300 Subject: [PATCH 14/55] add web app --- .github/workflows/ci.yml | 6 + .gitignore | 1 + README.md | 1 + docs/website-architecture.md | 53 + netlify.toml | 19 + package.json | 3 + website/README.md | 33 + website/astro.config.mjs | 18 + website/package-lock.json | 6150 ++++++++++++++++++++++++++++++ website/package.json | 17 + website/site-config.mjs | 33 + website/src/pages/index.astro | 356 ++ website/src/pages/llms.txt.ts | 47 + website/src/pages/robots.txt.ts | 17 + website/src/pages/sitemap.xml.ts | 23 + website/src/site-content.ts | 45 + website/src/styles/site.css | 498 +++ website/tsconfig.json | 3 + 18 files changed, 7323 insertions(+) create mode 100644 docs/website-architecture.md create mode 100644 netlify.toml create mode 100644 website/README.md create mode 100644 website/astro.config.mjs create mode 100644 website/package-lock.json create mode 100644 website/package.json create mode 100644 website/site-config.mjs create mode 100644 website/src/pages/index.astro create mode 100644 website/src/pages/llms.txt.ts create mode 100644 website/src/pages/robots.txt.ts create mode 100644 website/src/pages/sitemap.xml.ts create mode 100644 website/src/site-content.ts create mode 100644 website/src/styles/site.css create mode 100644 website/tsconfig.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0edc00b..0d9dd79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,9 @@ jobs: - name: Install dependencies run: npm ci + - name: Install website dependencies + run: npm ci --prefix website + - name: Typecheck run: npm run typecheck @@ -29,3 +32,6 @@ jobs: - name: Build run: npm run build + + - name: Build website + run: npm run --prefix website build diff --git a/.gitignore b/.gitignore index 7e3e6fd..5e84e65 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ node_modules/ # Build outputs dist/ cli/dist/ +.astro/ *.tsbuildinfo # Generated artifacts diff --git a/README.md b/README.md index e9c5e00..fb14e84 100644 --- a/README.md +++ b/README.md @@ -189,3 +189,4 @@ Example MCP config: ## Project Docs - Contribution guide: [CONTRIBUTING.md](CONTRIBUTING.md) +- Website architecture: [docs/website-architecture.md](docs/website-architecture.md) diff --git a/docs/website-architecture.md b/docs/website-architecture.md new file mode 100644 index 0000000..8c17531 --- /dev/null +++ b/docs/website-architecture.md @@ -0,0 +1,53 @@ +# Website Architecture + +## Scope +- Static marketing/discovery site for `aso-cli` with a single page. +- Purpose: SEO and discoverability, not product runtime. + +## Stack +- Astro static site under `website/`. +- Node.js `20.x` runtime for website build/development. + +## Content Contract +- Website messaging reflects existing CLI/runtime contracts: + - local-first CLI + local dashboard + - `aso keywords ...` command usage + - MCP surface (`aso-mcp`, `aso_evaluate_keywords`) +- Website links out to canonical repository docs for setup, troubleshooting, and releases. + +## SEO Contract +- Production URL is configured centrally in `website/site-config.mjs`. +- Default deployment target is Netlify on apex domain: + - origin: `https://asocli.com` + - base path: `/` +- Override with environment variables when deployment changes: + - `PUBLIC_SITE_ORIGIN` + - `PUBLIC_SITE_BASE_PATH` +- Generated SEO artifacts: + - canonical URL + Open Graph/Twitter tags in `src/pages/index.astro` + - `robots.txt` + - `sitemap.xml` + - `llms.txt` + - JSON-LD graph for website, software application, and FAQ + +## Deploy Contract +- Netlify is the deployment platform for `website/`. +- Root `netlify.toml` defines: + - build base: `website` + - build command: `npm run build` + - publish directory: `dist` + - Node runtime: `20` + - production + preview environment values for `PUBLIC_SITE_ORIGIN` and `PUBLIC_SITE_BASE_PATH` +- Continuous deployment behavior: + - production deploy on push to `main` + - deploy previews for pull requests + +## Shared Asset Policy +- Website imports images directly from existing repo sources: + - `assets/app-icon/aso-icon-readme.png` + - `cli/dashboard-ui/public/dashboard.jpg` + - `cli/dashboard-ui/public/mcp.jpg` +- No duplicate tracked copies under `website/`; README and website stay visually in sync. + +## Typography Policy +- Website uses the same typeface as dashboard UI: `JetBrains Mono`. diff --git a/netlify.toml b/netlify.toml new file mode 100644 index 0000000..1ae530b --- /dev/null +++ b/netlify.toml @@ -0,0 +1,19 @@ +[build] + base = "website" + command = "npm run build" + publish = "dist" + +[build.environment] + NODE_VERSION = "20" + +[context.production.environment] + PUBLIC_SITE_ORIGIN = "https://asocli.com" + PUBLIC_SITE_BASE_PATH = "/" + +[context.deploy-preview.environment] + PUBLIC_SITE_ORIGIN = "https://asocli.com" + PUBLIC_SITE_BASE_PATH = "/" + +[context.branch-deploy.environment] + PUBLIC_SITE_ORIGIN = "https://asocli.com" + PUBLIC_SITE_BASE_PATH = "/" diff --git a/package.json b/package.json index 584f9e2..32ac622 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,9 @@ "watch": "npm run build:watch", "dashboard:build": "vite build --config cli/dashboard-ui/vite.config.ts", "dashboard:watch": "vite build --watch --config cli/dashboard-ui/vite.config.ts", + "website:dev": "npm run --prefix website dev:watch", + "website:build": "npm run --prefix website build", + "website:preview": "npm run --prefix website preview -- --host localhost --port 4321", "dev": "concurrently -k -n watch,app \"npm:watch\" \"npm:start:dev\"", "clean": "rm -rf cli/dist", "nuke": "rm -rf node_modules cli/dist package-lock.json", diff --git a/website/README.md b/website/README.md new file mode 100644 index 0000000..d8f9d6a --- /dev/null +++ b/website/README.md @@ -0,0 +1,33 @@ +# ASO CLI Website + +Single-page static website for SEO/discoverability. + +## Requirements +- Node.js `20.x` + +## SEO Contract +- `PUBLIC_SITE_ORIGIN` sets the production origin for canonical and social URLs. +- `PUBLIC_SITE_BASE_PATH` sets the deployment base path. Default is `/` for apex domain hosting. +- SEO assets are generated from the same config: + - `/robots.txt` + - `/sitemap.xml` + - `/llms.txt` +- If the deployment URL changes, update the environment variables before building. + +## Netlify CD +- Deployment config is stored in root `netlify.toml`. +- Production deploys are automatic on pushes to the Netlify production branch (`main` by default). +- Pull requests get Netlify Deploy Previews automatically when the repository is connected. + +## Local Development +```bash +nvm use 20 +npm install --prefix website --cache /private/tmp/aso-npm-cache +npm run --prefix website dev +``` + +## Build +```bash +nvm use 20 +npm run --prefix website build +``` diff --git a/website/astro.config.mjs b/website/astro.config.mjs new file mode 100644 index 0000000..b8a9f06 --- /dev/null +++ b/website/astro.config.mjs @@ -0,0 +1,18 @@ +import { defineConfig } from "astro/config"; +import { fileURLToPath } from "node:url"; +import { siteBasePath, siteOrigin } from "./site-config.mjs"; + +const repoRoot = fileURLToPath(new URL("..", import.meta.url)); + +export default defineConfig({ + site: siteOrigin, + base: siteBasePath, + trailingSlash: "always", + vite: { + server: { + fs: { + allow: [repoRoot], + }, + }, + }, +}); diff --git a/website/package-lock.json b/website/package-lock.json new file mode 100644 index 0000000..cd428b7 --- /dev/null +++ b/website/package-lock.json @@ -0,0 +1,6150 @@ +{ + "name": "aso-cli-website", + "version": "0.1.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "aso-cli-website", + "version": "0.1.0", + "devDependencies": { + "astro": "^5.18.1", + "nodemon": "^3.1.10" + } + }, + "node_modules/@astrojs/compiler": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.13.1.tgz", + "integrity": "sha512-f3FN83d2G/v32ipNClRKgYv30onQlMZX1vCeZMjPsMMPl1mDpmbl0+N5BYo4S/ofzqJyS5hvwacEo0CCVDn/Qg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@astrojs/internal-helpers": { + "version": "0.7.6", + "resolved": "https://registry.npmjs.org/@astrojs/internal-helpers/-/internal-helpers-0.7.6.tgz", + "integrity": "sha512-GOle7smBWKfMSP8osUIGOlB5kaHdQLV3foCsf+5Q9Wsuu+C6Fs3Ez/ttXmhjZ1HkSgsogcM1RXSjjOVieHq16Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@astrojs/markdown-remark": { + "version": "6.3.11", + "resolved": "https://registry.npmjs.org/@astrojs/markdown-remark/-/markdown-remark-6.3.11.tgz", + "integrity": "sha512-hcaxX/5aC6lQgHeGh1i+aauvSwIT6cfyFjKWvExYSxUhZZBBdvCliOtu06gbQyhbe0pGJNoNmqNlQZ5zYUuIyQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@astrojs/internal-helpers": "0.7.6", + "@astrojs/prism": "3.3.0", + "github-slugger": "^2.0.0", + "hast-util-from-html": "^2.0.3", + "hast-util-to-text": "^4.0.2", + "import-meta-resolve": "^4.2.0", + "js-yaml": "^4.1.1", + "mdast-util-definitions": "^6.0.0", + "rehype-raw": "^7.0.0", + "rehype-stringify": "^10.0.1", + "remark-gfm": "^4.0.1", + "remark-parse": "^11.0.0", + "remark-rehype": "^11.1.2", + "remark-smartypants": "^3.0.2", + "shiki": "^3.21.0", + "smol-toml": "^1.6.0", + "unified": "^11.0.5", + "unist-util-remove-position": "^5.0.0", + "unist-util-visit": "^5.0.0", + "unist-util-visit-parents": "^6.0.2", + "vfile": "^6.0.3" + } + }, + "node_modules/@astrojs/prism": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@astrojs/prism/-/prism-3.3.0.tgz", + "integrity": "sha512-q8VwfU/fDZNoDOf+r7jUnMC2//H2l0TuQ6FkGJL8vD8nw/q5KiL3DS1KKBI3QhI9UQhpJ5dc7AtqfbXWuOgLCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prismjs": "^1.30.0" + }, + "engines": { + "node": "18.20.8 || ^20.3.0 || >=22.0.0" + } + }, + "node_modules/@astrojs/telemetry": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@astrojs/telemetry/-/telemetry-3.3.0.tgz", + "integrity": "sha512-UFBgfeldP06qu6khs/yY+q1cDAaArM2/7AEIqQ9Cuvf7B1hNLq0xDrZkct+QoIGyjq56y8IaE2I3CTvG99mlhQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ci-info": "^4.2.0", + "debug": "^4.4.0", + "dlv": "^1.1.3", + "dset": "^3.1.4", + "is-docker": "^3.0.0", + "is-wsl": "^3.1.0", + "which-pm-runs": "^1.1.0" + }, + "engines": { + "node": "18.20.8 || ^20.3.0 || >=22.0.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", + "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.29.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.3.tgz", + "integrity": "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.29.0" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/types": { + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@capsizecss/unpack": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@capsizecss/unpack/-/unpack-4.0.0.tgz", + "integrity": "sha512-VERIM64vtTP1C4mxQ5thVT9fK0apjPFobqybMtA1UdUujWka24ERHbRHFGmpbbhp73MhV+KSsHQH9C6uOTdEQA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fontkitten": "^1.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@emnapi/runtime": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz", + "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz", + "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz", + "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz", + "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz", + "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz", + "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz", + "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz", + "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz", + "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz", + "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz", + "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz", + "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz", + "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz", + "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz", + "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz", + "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz", + "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz", + "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz", + "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz", + "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz", + "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz", + "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz", + "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz", + "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz", + "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz", + "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz", + "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@img/colour": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz", + "integrity": "sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=18" + } + }, + "node_modules/@img/sharp-darwin-arm64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.5.tgz", + "integrity": "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-darwin-arm64": "1.2.4" + } + }, + "node_modules/@img/sharp-darwin-x64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.5.tgz", + "integrity": "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-darwin-x64": "1.2.4" + } + }, + "node_modules/@img/sharp-libvips-darwin-arm64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.4.tgz", + "integrity": "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "darwin" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-darwin-x64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.4.tgz", + "integrity": "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "darwin" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-arm": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.4.tgz", + "integrity": "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-arm64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.4.tgz", + "integrity": "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-ppc64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.4.tgz", + "integrity": "sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-riscv64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.2.4.tgz", + "integrity": "sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-s390x": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.4.tgz", + "integrity": "sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-x64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.4.tgz", + "integrity": "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linuxmusl-arm64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.4.tgz", + "integrity": "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linuxmusl-x64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.4.tgz", + "integrity": "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-linux-arm": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.5.tgz", + "integrity": "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm": "1.2.4" + } + }, + "node_modules/@img/sharp-linux-arm64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.5.tgz", + "integrity": "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm64": "1.2.4" + } + }, + "node_modules/@img/sharp-linux-ppc64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.5.tgz", + "integrity": "sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-ppc64": "1.2.4" + } + }, + "node_modules/@img/sharp-linux-riscv64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.34.5.tgz", + "integrity": "sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-riscv64": "1.2.4" + } + }, + "node_modules/@img/sharp-linux-s390x": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.5.tgz", + "integrity": "sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-s390x": "1.2.4" + } + }, + "node_modules/@img/sharp-linux-x64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.5.tgz", + "integrity": "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-x64": "1.2.4" + } + }, + "node_modules/@img/sharp-linuxmusl-arm64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.5.tgz", + "integrity": "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-arm64": "1.2.4" + } + }, + "node_modules/@img/sharp-linuxmusl-x64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.5.tgz", + "integrity": "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-x64": "1.2.4" + } + }, + "node_modules/@img/sharp-wasm32": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.5.tgz", + "integrity": "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==", + "cpu": [ + "wasm32" + ], + "dev": true, + "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", + "optional": true, + "dependencies": { + "@emnapi/runtime": "^1.7.0" + }, + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-arm64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz", + "integrity": "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-ia32": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.5.tgz", + "integrity": "sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-x64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz", + "integrity": "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "dev": true, + "license": "MIT" + }, + "node_modules/@oslojs/encoding": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@oslojs/encoding/-/encoding-1.1.0.tgz", + "integrity": "sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@rollup/pluginutils": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz", + "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.2.tgz", + "integrity": "sha512-dnlp69efPPg6Uaw2dVqzWRfAWRnYVb1XJ8CyyhIbZeaq4CA5/mLeZ1IEt9QqQxmbdvagjLIm2ZL8BxXv5lH4Yw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.2.tgz", + "integrity": "sha512-OqZTwDRDchGRHHm/hwLOL7uVPB9aUvI0am/eQuWMNyFHf5PSEQmyEeYYheA0EPPKUO/l0uigCp+iaTjoLjVoHg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.2.tgz", + "integrity": "sha512-UwRE7CGpvSVEQS8gUMBe1uADWjNnVgP3Iusyda1nSRwNDCsRjnGc7w6El6WLQsXmZTbLZx9cecegumcitNfpmA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.2.tgz", + "integrity": "sha512-gjEtURKLCC5VXm1I+2i1u9OhxFsKAQJKTVB8WvDAHF+oZlq0GTVFOlTlO1q3AlCTE/DF32c16ESvfgqR7343/g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.2.tgz", + "integrity": "sha512-Bcl6CYDeAgE70cqZaMojOi/eK63h5Me97ZqAQoh77VPjMysA/4ORQBRGo3rRy45x4MzVlU9uZxs8Uwy7ZaKnBw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.2.tgz", + "integrity": "sha512-LU+TPda3mAE2QB0/Hp5VyeKJivpC6+tlOXd1VMoXV/YFMvk/MNk5iXeBfB4MQGRWyOYVJ01625vjkr0Az98OJQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.2.tgz", + "integrity": "sha512-2QxQrM+KQ7DAW4o22j+XZ6RKdxjLD7BOWTP0Bv0tmjdyhXSsr2Ul1oJDQqh9Zf5qOwTuTc7Ek83mOFaKnodPjg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.2.tgz", + "integrity": "sha512-TbziEu2DVsTEOPif2mKWkMeDMLoYjx95oESa9fkQQK7r/Orta0gnkcDpzwufEcAO2BLBsD7mZkXGFqEdMRRwfw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.2.tgz", + "integrity": "sha512-bO/rVDiDUuM2YfuCUwZ1t1cP+/yqjqz+Xf2VtkdppefuOFS2OSeAfgafaHNkFn0t02hEyXngZkxtGqXcXwO8Rg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.2.tgz", + "integrity": "sha512-hr26p7e93Rl0Za+JwW7EAnwAvKkehh12BU1Llm9Ykiibg4uIr2rbpxG9WCf56GuvidlTG9KiiQT/TXT1yAWxTA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-gnu": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.2.tgz", + "integrity": "sha512-pOjB/uSIyDt+ow3k/RcLvUAOGpysT2phDn7TTUB3n75SlIgZzM6NKAqlErPhoFU+npgY3/n+2HYIQVbF70P9/A==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-musl": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.2.tgz", + "integrity": "sha512-2/w+q8jszv9Ww1c+6uJT3OwqhdmGP2/4T17cu8WuwyUuuaCDDJ2ojdyYwZzCxx0GcsZBhzi3HmH+J5pZNXnd+Q==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-gnu": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.2.tgz", + "integrity": "sha512-11+aL5vKheYgczxtPVVRhdptAM2H7fcDR5Gw4/bTcteuZBlH4oP9f5s9zYO9aGZvoGeBpqXI/9TZZihZ609wKw==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-musl": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.2.tgz", + "integrity": "sha512-i16fokAGK46IVZuV8LIIwMdtqhin9hfYkCh8pf8iC3QU3LpwL+1FSFGej+O7l3E/AoknL6Dclh2oTdnRMpTzFQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.2.tgz", + "integrity": "sha512-49FkKS6RGQoriDSK/6E2GkAsAuU5kETFCh7pG4yD/ylj9rKhTmO3elsnmBvRD4PgJPds5W2PkhC82aVwmUcJ7A==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-musl": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.2.tgz", + "integrity": "sha512-mjYNkHPfGpUR00DuM1ZZIgs64Hpf4bWcz9Z41+4Q+pgDx73UwWdAYyf6EG/lRFldmdHHzgrYyge5akFUW0D3mQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.2.tgz", + "integrity": "sha512-ALyvJz965BQk8E9Al/JDKKDLH2kfKFLTGMlgkAbbYtZuJt9LU8DW3ZoDMCtQpXAltZxwBHevXz5u+gf0yA0YoA==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.2.tgz", + "integrity": "sha512-UQjrkIdWrKI626Du8lCQ6MJp/6V1LAo2bOK9OTu4mSn8GGXIkPXk/Vsp4bLHCd9Z9Iz2OTEaokUE90VweJgIYQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.2.tgz", + "integrity": "sha512-bTsRGj6VlSdn/XD4CGyzMnzaBs9bsRxy79eTqTCBsA8TMIEky7qg48aPkvJvFe1HyzQ5oMZdg7AnVlWQSKLTnw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-openbsd-x64": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.2.tgz", + "integrity": "sha512-6d4Z3534xitaA1FcMWP7mQPq5zGwBmGbhphh2DwaA1aNIXUu3KTOfwrWpbwI4/Gr0uANo7NTtaykFyO2hPuFLg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ] + }, + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.2.tgz", + "integrity": "sha512-NetAg5iO2uN7eB8zE5qrZ3CSil+7IJt4WDFLcC75Ymywq1VZVD6qJ6EvNLjZ3rEm6gB7XW5JdT60c6MN35Z85Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.2.tgz", + "integrity": "sha512-NCYhOotpgWZ5kdxCZsv6Iudx0wX8980Q/oW4pNFNihpBKsDbEA1zpkfxJGC0yugsUuyDZ7gL37dbzwhR0VI7pQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.2.tgz", + "integrity": "sha512-RXsaOqXxfoUBQoOgvmmijVxJnW2IGB0eoMO7F8FAjaj0UTywUO/luSqimWBJn04WNgUkeNhh7fs7pESXajWmkg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.2.tgz", + "integrity": "sha512-qdAzEULD+/hzObedtmV6iBpdL5TIbKVztGiK7O3/KYSf+HIzU257+MX1EXJcyIiDbMAqmbwaufcYPvyRryeZtA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.2.tgz", + "integrity": "sha512-Nd/SgG27WoA9e+/TdK74KnHz852TLa94ovOYySo/yMPuTmpckK/jIF2jSwS3g7ELSKXK13/cVdmg1Z/DaCWKxA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@shikijs/core": { + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-3.23.0.tgz", + "integrity": "sha512-NSWQz0riNb67xthdm5br6lAkvpDJRTgB36fxlo37ZzM2yq0PQFFzbd8psqC2XMPgCzo1fW6cVi18+ArJ44wqgA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.23.0", + "@shikijs/vscode-textmate": "^10.0.2", + "@types/hast": "^3.0.4", + "hast-util-to-html": "^9.0.5" + } + }, + "node_modules/@shikijs/engine-javascript": { + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-3.23.0.tgz", + "integrity": "sha512-aHt9eiGFobmWR5uqJUViySI1bHMqrAgamWE1TYSUoftkAeCCAiGawPMwM+VCadylQtF4V3VNOZ5LmfItH5f3yA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.23.0", + "@shikijs/vscode-textmate": "^10.0.2", + "oniguruma-to-es": "^4.3.4" + } + }, + "node_modules/@shikijs/engine-oniguruma": { + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.23.0.tgz", + "integrity": "sha512-1nWINwKXxKKLqPibT5f4pAFLej9oZzQTsby8942OTlsJzOBZ0MWKiwzMsd+jhzu8YPCHAswGnnN1YtQfirL35g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.23.0", + "@shikijs/vscode-textmate": "^10.0.2" + } + }, + "node_modules/@shikijs/langs": { + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.23.0.tgz", + "integrity": "sha512-2Ep4W3Re5aB1/62RSYQInK9mM3HsLeB91cHqznAJMuylqjzNVAVCMnNWRHFtcNHXsoNRayP9z1qj4Sq3nMqYXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.23.0" + } + }, + "node_modules/@shikijs/themes": { + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.23.0.tgz", + "integrity": "sha512-5qySYa1ZgAT18HR/ypENL9cUSGOeI2x+4IvYJu4JgVJdizn6kG4ia5Q1jDEOi7gTbN4RbuYtmHh0W3eccOrjMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.23.0" + } + }, + "node_modules/@shikijs/types": { + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.23.0.tgz", + "integrity": "sha512-3JZ5HXOZfYjsYSk0yPwBrkupyYSLpAE26Qc0HLghhZNGTZg/SKxXIIgoxOpmmeQP0RRSDJTk1/vPfw9tbw+jSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/vscode-textmate": "^10.0.2", + "@types/hast": "^3.0.4" + } + }, + "node_modules/@shikijs/vscode-textmate": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz", + "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/debug": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz", + "integrity": "sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/ms": "*" + } + }, + "node_modules/@types/estree": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", + "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/hast": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz", + "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/@types/mdast": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz", + "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/@types/ms": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", + "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/nlcst": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/nlcst/-/nlcst-2.0.3.tgz", + "integrity": "sha512-vSYNSDe6Ix3q+6Z7ri9lyWqgGhJTmzRjZRqyq15N0Z/1/UnVsno9G/N40NBijoYx2seFDIl0+B2mgAb9mezUCA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/@types/node": { + "version": "24.12.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.2.tgz", + "integrity": "sha512-A1sre26ke7HDIuY/M23nd9gfB+nrmhtYyMINbjI1zHJxYteKR6qSMX56FsmjMcDb3SMcjJg5BiRRgOCC/yBD0g==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "undici-types": "~7.16.0" + } + }, + "node_modules/@types/unist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, + "license": "ISC" + }, + "node_modules/acorn": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", + "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/ansi-align": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", + "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.1.0" + } + }, + "node_modules/ansi-align/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-align/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/ansi-align/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-align/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/anymatch/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/aria-query": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz", + "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/array-iterate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-2.0.1.tgz", + "integrity": "sha512-I1jXZMjAgCMmxT4qxXfPXa6SthSoE8h6gkSI9BGGNv8mP8G/v0blc+qFnZu6K42vTOiuME596QaLO0TP3Lk0xg==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/astro": { + "version": "5.18.1", + "resolved": "https://registry.npmjs.org/astro/-/astro-5.18.1.tgz", + "integrity": "sha512-m4VWilWZ+Xt6NPoYzC4CgGZim/zQUO7WFL0RHCH0AiEavF1153iC3+me2atDvXpf/yX4PyGUeD8wZLq1cirT3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@astrojs/compiler": "^2.13.0", + "@astrojs/internal-helpers": "0.7.6", + "@astrojs/markdown-remark": "6.3.11", + "@astrojs/telemetry": "3.3.0", + "@capsizecss/unpack": "^4.0.0", + "@oslojs/encoding": "^1.1.0", + "@rollup/pluginutils": "^5.3.0", + "acorn": "^8.15.0", + "aria-query": "^5.3.2", + "axobject-query": "^4.1.0", + "boxen": "8.0.1", + "ci-info": "^4.3.1", + "clsx": "^2.1.1", + "common-ancestor-path": "^1.0.1", + "cookie": "^1.1.1", + "cssesc": "^3.0.0", + "debug": "^4.4.3", + "deterministic-object-hash": "^2.0.2", + "devalue": "^5.6.2", + "diff": "^8.0.3", + "dlv": "^1.1.3", + "dset": "^3.1.4", + "es-module-lexer": "^1.7.0", + "esbuild": "^0.27.3", + "estree-walker": "^3.0.3", + "flattie": "^1.1.1", + "fontace": "~0.4.0", + "github-slugger": "^2.0.0", + "html-escaper": "3.0.3", + "http-cache-semantics": "^4.2.0", + "import-meta-resolve": "^4.2.0", + "js-yaml": "^4.1.1", + "magic-string": "^0.30.21", + "magicast": "^0.5.1", + "mrmime": "^2.0.1", + "neotraverse": "^0.6.18", + "p-limit": "^6.2.0", + "p-queue": "^8.1.1", + "package-manager-detector": "^1.6.0", + "piccolore": "^0.1.3", + "picomatch": "^4.0.3", + "prompts": "^2.4.2", + "rehype": "^13.0.2", + "semver": "^7.7.3", + "shiki": "^3.21.0", + "smol-toml": "^1.6.0", + "svgo": "^4.0.0", + "tinyexec": "^1.0.2", + "tinyglobby": "^0.2.15", + "tsconfck": "^3.1.6", + "ultrahtml": "^1.6.0", + "unifont": "~0.7.3", + "unist-util-visit": "^5.0.0", + "unstorage": "^1.17.4", + "vfile": "^6.0.3", + "vite": "^6.4.1", + "vitefu": "^1.1.1", + "xxhash-wasm": "^1.1.0", + "yargs-parser": "^21.1.1", + "yocto-spinner": "^0.2.3", + "zod": "^3.25.76", + "zod-to-json-schema": "^3.25.1", + "zod-to-ts": "^1.2.0" + }, + "bin": { + "astro": "astro.js" + }, + "engines": { + "node": "18.20.8 || ^20.3.0 || >=22.0.0", + "npm": ">=9.6.5", + "pnpm": ">=7.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/astrodotbuild" + }, + "optionalDependencies": { + "sharp": "^0.34.0" + } + }, + "node_modules/astro/node_modules/@esbuild/aix-ppc64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz", + "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/android-arm": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz", + "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/android-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz", + "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/android-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz", + "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/darwin-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz", + "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/darwin-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz", + "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/freebsd-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz", + "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/freebsd-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz", + "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/linux-arm": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz", + "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/linux-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz", + "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/linux-ia32": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz", + "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/linux-loong64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz", + "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/linux-mips64el": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz", + "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/linux-ppc64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz", + "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/linux-riscv64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz", + "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/linux-s390x": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz", + "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/linux-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz", + "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/netbsd-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz", + "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/netbsd-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz", + "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/openbsd-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz", + "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/openbsd-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz", + "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/openharmony-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz", + "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/sunos-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz", + "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/win32-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz", + "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/win32-ia32": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz", + "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/@esbuild/win32-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz", + "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/astro/node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0" + } + }, + "node_modules/astro/node_modules/vite": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.2.tgz", + "integrity": "sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.25.0", + "fdir": "^6.4.4", + "picomatch": "^4.0.2", + "postcss": "^8.5.3", + "rollup": "^4.34.9", + "tinyglobby": "^0.2.13" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", + "jiti": ">=1.21.0", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "sass-embedded": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.16.0", + "tsx": "^4.8.1", + "yaml": "^2.4.2" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "jiti": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + }, + "tsx": { + "optional": true + }, + "yaml": { + "optional": true + } + } + }, + "node_modules/astro/node_modules/vite/node_modules/esbuild": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz", + "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.25.12", + "@esbuild/android-arm": "0.25.12", + "@esbuild/android-arm64": "0.25.12", + "@esbuild/android-x64": "0.25.12", + "@esbuild/darwin-arm64": "0.25.12", + "@esbuild/darwin-x64": "0.25.12", + "@esbuild/freebsd-arm64": "0.25.12", + "@esbuild/freebsd-x64": "0.25.12", + "@esbuild/linux-arm": "0.25.12", + "@esbuild/linux-arm64": "0.25.12", + "@esbuild/linux-ia32": "0.25.12", + "@esbuild/linux-loong64": "0.25.12", + "@esbuild/linux-mips64el": "0.25.12", + "@esbuild/linux-ppc64": "0.25.12", + "@esbuild/linux-riscv64": "0.25.12", + "@esbuild/linux-s390x": "0.25.12", + "@esbuild/linux-x64": "0.25.12", + "@esbuild/netbsd-arm64": "0.25.12", + "@esbuild/netbsd-x64": "0.25.12", + "@esbuild/openbsd-arm64": "0.25.12", + "@esbuild/openbsd-x64": "0.25.12", + "@esbuild/openharmony-arm64": "0.25.12", + "@esbuild/sunos-x64": "0.25.12", + "@esbuild/win32-arm64": "0.25.12", + "@esbuild/win32-ia32": "0.25.12", + "@esbuild/win32-x64": "0.25.12" + } + }, + "node_modules/axobject-query": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", + "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/bail": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz", + "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/base-64": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz", + "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==", + "dev": true, + "license": "MIT" + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "dev": true, + "license": "ISC" + }, + "node_modules/boxen": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-8.0.1.tgz", + "integrity": "sha512-F3PH5k5juxom4xktynS7MoFY+NUWH5LC4CnH11YB8NPew+HLpmBLCybSAEyb2F+4pRXhuhWqFesoQd6DAyc2hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-align": "^3.0.1", + "camelcase": "^8.0.0", + "chalk": "^5.3.0", + "cli-boxes": "^3.0.0", + "string-width": "^7.2.0", + "type-fest": "^4.21.0", + "widest-line": "^5.0.0", + "wrap-ansi": "^9.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/brace-expansion": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/camelcase": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz", + "integrity": "sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ccount": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz", + "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/chalk": { + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz", + "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/character-entities": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz", + "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-entities-html4": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz", + "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-entities-legacy": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz", + "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/ci-info": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz", + "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-boxes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz", + "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/comma-separated-tokens": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz", + "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/commander": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", + "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + } + }, + "node_modules/common-ancestor-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz", + "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==", + "dev": true, + "license": "ISC" + }, + "node_modules/cookie": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz", + "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/cookie-es": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/cookie-es/-/cookie-es-1.2.3.tgz", + "integrity": "sha512-lXVyvUvrNXblMqzIRrxHb57UUVmqsSWlxqt3XIjCkUP0wDAf6uicO6KMbEgYrMNtEvWgWHwe42CKxPu9MYAnWw==", + "dev": true, + "license": "MIT" + }, + "node_modules/crossws": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/crossws/-/crossws-0.3.5.tgz", + "integrity": "sha512-ojKiDvcmByhwa8YYqbQI/hg7MEU0NC03+pSdEq4ZUnZR9xXpwk7E43SMNGkn+JxJGPFtNvQ48+vV2p+P1ml5PA==", + "dev": true, + "license": "MIT", + "dependencies": { + "uncrypto": "^0.1.3" + } + }, + "node_modules/css-select": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz", + "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", + "nth-check": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-tree": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz", + "integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "mdn-data": "2.27.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" + } + }, + "node_modules/css-what": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz", + "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true, + "license": "MIT", + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/csso": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz", + "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "css-tree": "~2.2.0" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/csso/node_modules/css-tree": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz", + "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==", + "dev": true, + "license": "MIT", + "dependencies": { + "mdn-data": "2.0.28", + "source-map-js": "^1.0.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/csso/node_modules/mdn-data": { + "version": "2.0.28", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz", + "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decode-named-character-reference": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.3.0.tgz", + "integrity": "sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "character-entities": "^2.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/defu": { + "version": "6.1.7", + "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.7.tgz", + "integrity": "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/destr": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/destr/-/destr-2.0.5.tgz", + "integrity": "sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==", + "dev": true, + "license": "MIT" + }, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/deterministic-object-hash": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/deterministic-object-hash/-/deterministic-object-hash-2.0.2.tgz", + "integrity": "sha512-KxektNH63SrbfUyDiwXqRb1rLwKt33AmMv+5Nhsw1kqZ13SJBRTgZHtGbE+hH3a1mVW1cz+4pqSWVPAtLVXTzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "base-64": "^1.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/devalue": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/devalue/-/devalue-5.8.0.tgz", + "integrity": "sha512-2zA9pFEsnp7vWBZbXF5JAgAq0fsUIt/1XPbRiAmRV3lp/2C3upzH+sADiyy66aFCihoLEsrQHxNM5w1gIDfsBg==", + "dev": true, + "license": "MIT" + }, + "node_modules/devlop": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz", + "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "dequal": "^2.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/diff": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.4.tgz", + "integrity": "sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dlv": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "dev": true, + "license": "MIT" + }, + "node_modules/dom-serializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/dom-serializer/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "BSD-2-Clause" + }, + "node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.3.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/dset": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.4.tgz", + "integrity": "sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "dev": true, + "license": "MIT" + }, + "node_modules/entities": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", + "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/es-module-lexer": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz", + "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==", + "dev": true, + "license": "MIT" + }, + "node_modules/esbuild": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz", + "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.27.7", + "@esbuild/android-arm": "0.27.7", + "@esbuild/android-arm64": "0.27.7", + "@esbuild/android-x64": "0.27.7", + "@esbuild/darwin-arm64": "0.27.7", + "@esbuild/darwin-x64": "0.27.7", + "@esbuild/freebsd-arm64": "0.27.7", + "@esbuild/freebsd-x64": "0.27.7", + "@esbuild/linux-arm": "0.27.7", + "@esbuild/linux-arm64": "0.27.7", + "@esbuild/linux-ia32": "0.27.7", + "@esbuild/linux-loong64": "0.27.7", + "@esbuild/linux-mips64el": "0.27.7", + "@esbuild/linux-ppc64": "0.27.7", + "@esbuild/linux-riscv64": "0.27.7", + "@esbuild/linux-s390x": "0.27.7", + "@esbuild/linux-x64": "0.27.7", + "@esbuild/netbsd-arm64": "0.27.7", + "@esbuild/netbsd-x64": "0.27.7", + "@esbuild/openbsd-arm64": "0.27.7", + "@esbuild/openbsd-x64": "0.27.7", + "@esbuild/openharmony-arm64": "0.27.7", + "@esbuild/sunos-x64": "0.27.7", + "@esbuild/win32-arm64": "0.27.7", + "@esbuild/win32-ia32": "0.27.7", + "@esbuild/win32-x64": "0.27.7" + } + }, + "node_modules/escape-string-regexp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true, + "license": "MIT" + }, + "node_modules/eventemitter3": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz", + "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==", + "dev": true, + "license": "MIT" + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true, + "license": "MIT" + }, + "node_modules/fdir": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/flattie": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flattie/-/flattie-1.1.1.tgz", + "integrity": "sha512-9UbaD6XdAL97+k/n+N7JwX46K/M6Zc6KcFYskrYL8wbBV/Uyk0CTAMY0VT+qiK5PM7AIc9aTWYtq65U7T+aCNQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/fontace": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/fontace/-/fontace-0.4.1.tgz", + "integrity": "sha512-lDMvbAzSnHmbYMTEld5qdtvNH2/pWpICOqpean9IgC7vUbUJc3k+k5Dokp85CegamqQpFbXf0rAVkbzpyTA8aw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fontkitten": "^1.0.2" + } + }, + "node_modules/fontkitten": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/fontkitten/-/fontkitten-1.0.3.tgz", + "integrity": "sha512-Wp1zXWPVUPBmfoa3Cqc9ctaKuzKAV6uLstRqlR56kSjplf5uAce+qeyYym7F+PHbGTk+tCEdkCW6RD7DX/gBZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "tiny-inflate": "^1.0.3" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/get-east-asian-width": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.5.0.tgz", + "integrity": "sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/github-slugger": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz", + "integrity": "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==", + "dev": true, + "license": "ISC" + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/h3": { + "version": "1.15.11", + "resolved": "https://registry.npmjs.org/h3/-/h3-1.15.11.tgz", + "integrity": "sha512-L3THSe2MPeBwgIZVSH5zLdBBU90TOxarvhK9d04IDY2AmVS8j2Jz2LIWtwsGOU3lu2I5jCN7FNvVfY2+XyF+mg==", + "dev": true, + "license": "MIT", + "dependencies": { + "cookie-es": "^1.2.3", + "crossws": "^0.3.5", + "defu": "^6.1.6", + "destr": "^2.0.5", + "iron-webcrypto": "^1.2.1", + "node-mock-http": "^1.0.4", + "radix3": "^1.1.2", + "ufo": "^1.6.3", + "uncrypto": "^0.1.3" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/hast-util-from-html": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/hast-util-from-html/-/hast-util-from-html-2.0.3.tgz", + "integrity": "sha512-CUSRHXyKjzHov8yKsQjGOElXy/3EKpyX56ELnkHH34vDVw1N1XSQ1ZcAvTyAPtGqLTuKP/uxM+aLkSPqF/EtMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "devlop": "^1.1.0", + "hast-util-from-parse5": "^8.0.0", + "parse5": "^7.0.0", + "vfile": "^6.0.0", + "vfile-message": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-from-parse5": { + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-8.0.3.tgz", + "integrity": "sha512-3kxEVkEKt0zvcZ3hCRYI8rqrgwtlIOFMWkbclACvjlDw8Li9S2hk/d51OI0nr/gIpdMHNepwgOKqZ/sy0Clpyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "@types/unist": "^3.0.0", + "devlop": "^1.0.0", + "hastscript": "^9.0.0", + "property-information": "^7.0.0", + "vfile": "^6.0.0", + "vfile-location": "^5.0.0", + "web-namespaces": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-is-element": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz", + "integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-parse-selector": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-4.0.0.tgz", + "integrity": "sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-raw": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-9.1.0.tgz", + "integrity": "sha512-Y8/SBAHkZGoNkpzqqfCldijcuUKh7/su31kEBp67cFY09Wy0mTRgtsLYsiIxMJxlu0f6AA5SUTbDR8K0rxnbUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "@types/unist": "^3.0.0", + "@ungap/structured-clone": "^1.0.0", + "hast-util-from-parse5": "^8.0.0", + "hast-util-to-parse5": "^8.0.0", + "html-void-elements": "^3.0.0", + "mdast-util-to-hast": "^13.0.0", + "parse5": "^7.0.0", + "unist-util-position": "^5.0.0", + "unist-util-visit": "^5.0.0", + "vfile": "^6.0.0", + "web-namespaces": "^2.0.0", + "zwitch": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-to-html": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz", + "integrity": "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "@types/unist": "^3.0.0", + "ccount": "^2.0.0", + "comma-separated-tokens": "^2.0.0", + "hast-util-whitespace": "^3.0.0", + "html-void-elements": "^3.0.0", + "mdast-util-to-hast": "^13.0.0", + "property-information": "^7.0.0", + "space-separated-tokens": "^2.0.0", + "stringify-entities": "^4.0.0", + "zwitch": "^2.0.4" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-to-parse5": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-8.0.1.tgz", + "integrity": "sha512-MlWT6Pjt4CG9lFCjiz4BH7l9wmrMkfkJYCxFwKQic8+RTZgWPuWxwAfjJElsXkex7DJjfSJsQIt931ilUgmwdA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "comma-separated-tokens": "^2.0.0", + "devlop": "^1.0.0", + "property-information": "^7.0.0", + "space-separated-tokens": "^2.0.0", + "web-namespaces": "^2.0.0", + "zwitch": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-to-text": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-4.0.2.tgz", + "integrity": "sha512-KK6y/BN8lbaq654j7JgBydev7wuNMcID54lkRav1P0CaE1e47P72AWWPiGKXTJU271ooYzcvTAn/Zt0REnvc7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "@types/unist": "^3.0.0", + "hast-util-is-element": "^3.0.0", + "unist-util-find-after": "^5.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-whitespace": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz", + "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hastscript": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-9.0.1.tgz", + "integrity": "sha512-g7df9rMFX/SPi34tyGCyUBREQoKkapwdY/T04Qn9TDWfHhAYt4/I0gMVirzK5wEzeUqIjEB+LXC/ypb7Aqno5w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "comma-separated-tokens": "^2.0.0", + "hast-util-parse-selector": "^4.0.0", + "property-information": "^7.0.0", + "space-separated-tokens": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/html-escaper": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-3.0.3.tgz", + "integrity": "sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/html-void-elements": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz", + "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/http-cache-semantics": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", + "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true, + "license": "ISC" + }, + "node_modules/import-meta-resolve": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz", + "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/iron-webcrypto": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-1.2.1.tgz", + "integrity": "sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/brc-dd" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-docker": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", + "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", + "dev": true, + "license": "MIT", + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-inside-container": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", + "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-docker": "^3.0.0" + }, + "bin": { + "is-inside-container": "cli.js" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz", + "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-wsl": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.1.tgz", + "integrity": "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-inside-container": "^1.0.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/js-yaml": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/longest-streak": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz", + "integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/lru-cache": { + "version": "11.3.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.3.5.tgz", + "integrity": "sha512-NxVFwLAnrd9i7KUBxC4DrUhmgjzOs+1Qm50D3oF1/oL+r1NpZ4gA7xvG0/zJ8evR7zIKn4vLf7qTNduWFtCrRw==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/magic-string": { + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.5" + } + }, + "node_modules/magicast": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.2.tgz", + "integrity": "sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.29.0", + "@babel/types": "^7.29.0", + "source-map-js": "^1.2.1" + } + }, + "node_modules/markdown-table": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.4.tgz", + "integrity": "sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/mdast-util-definitions": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-6.0.0.tgz", + "integrity": "sha512-scTllyX6pnYNZH/AIp/0ePz6s4cZtARxImwoPJ7kS42n+MnVsI4XbnG6d4ibehRIldYMWM2LD7ImQblVhUejVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "@types/unist": "^3.0.0", + "unist-util-visit": "^5.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-find-and-replace": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.2.tgz", + "integrity": "sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "escape-string-regexp": "^5.0.0", + "unist-util-is": "^6.0.0", + "unist-util-visit-parents": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-from-markdown": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.3.tgz", + "integrity": "sha512-W4mAWTvSlKvf8L6J+VN9yLSqQ9AOAAvHuoDAmPkz4dHf553m5gVj2ejadHJhoJmcmxEnOv6Pa8XJhpxE93kb8Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "@types/unist": "^3.0.0", + "decode-named-character-reference": "^1.0.0", + "devlop": "^1.0.0", + "mdast-util-to-string": "^4.0.0", + "micromark": "^4.0.0", + "micromark-util-decode-numeric-character-reference": "^2.0.0", + "micromark-util-decode-string": "^2.0.0", + "micromark-util-normalize-identifier": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0", + "unist-util-stringify-position": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-gfm": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-3.1.0.tgz", + "integrity": "sha512-0ulfdQOM3ysHhCJ1p06l0b0VKlhU0wuQs3thxZQagjcjPrlFRqY215uZGHHJan9GEAXd9MbfPjFJz+qMkVR6zQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "mdast-util-from-markdown": "^2.0.0", + "mdast-util-gfm-autolink-literal": "^2.0.0", + "mdast-util-gfm-footnote": "^2.0.0", + "mdast-util-gfm-strikethrough": "^2.0.0", + "mdast-util-gfm-table": "^2.0.0", + "mdast-util-gfm-task-list-item": "^2.0.0", + "mdast-util-to-markdown": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-gfm-autolink-literal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-2.0.1.tgz", + "integrity": "sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "ccount": "^2.0.0", + "devlop": "^1.0.0", + "mdast-util-find-and-replace": "^3.0.0", + "micromark-util-character": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-gfm-footnote": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-2.1.0.tgz", + "integrity": "sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "devlop": "^1.1.0", + "mdast-util-from-markdown": "^2.0.0", + "mdast-util-to-markdown": "^2.0.0", + "micromark-util-normalize-identifier": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-gfm-strikethrough": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-2.0.0.tgz", + "integrity": "sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "mdast-util-from-markdown": "^2.0.0", + "mdast-util-to-markdown": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-gfm-table": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-2.0.0.tgz", + "integrity": "sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "devlop": "^1.0.0", + "markdown-table": "^3.0.0", + "mdast-util-from-markdown": "^2.0.0", + "mdast-util-to-markdown": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-gfm-task-list-item": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-2.0.0.tgz", + "integrity": "sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "devlop": "^1.0.0", + "mdast-util-from-markdown": "^2.0.0", + "mdast-util-to-markdown": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-phrasing": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-4.1.0.tgz", + "integrity": "sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-to-hast": { + "version": "13.2.1", + "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz", + "integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "@types/mdast": "^4.0.0", + "@ungap/structured-clone": "^1.0.0", + "devlop": "^1.0.0", + "micromark-util-sanitize-uri": "^2.0.0", + "trim-lines": "^3.0.0", + "unist-util-position": "^5.0.0", + "unist-util-visit": "^5.0.0", + "vfile": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-to-markdown": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.2.tgz", + "integrity": "sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "@types/unist": "^3.0.0", + "longest-streak": "^3.0.0", + "mdast-util-phrasing": "^4.0.0", + "mdast-util-to-string": "^4.0.0", + "micromark-util-classify-character": "^2.0.0", + "micromark-util-decode-string": "^2.0.0", + "unist-util-visit": "^5.0.0", + "zwitch": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-to-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz", + "integrity": "sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdn-data": { + "version": "2.27.1", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz", + "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/micromark": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.2.tgz", + "integrity": "sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "@types/debug": "^4.0.0", + "debug": "^4.0.0", + "decode-named-character-reference": "^1.0.0", + "devlop": "^1.0.0", + "micromark-core-commonmark": "^2.0.0", + "micromark-factory-space": "^2.0.0", + "micromark-util-character": "^2.0.0", + "micromark-util-chunked": "^2.0.0", + "micromark-util-combine-extensions": "^2.0.0", + "micromark-util-decode-numeric-character-reference": "^2.0.0", + "micromark-util-encode": "^2.0.0", + "micromark-util-normalize-identifier": "^2.0.0", + "micromark-util-resolve-all": "^2.0.0", + "micromark-util-sanitize-uri": "^2.0.0", + "micromark-util-subtokenize": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-core-commonmark": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.3.tgz", + "integrity": "sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "decode-named-character-reference": "^1.0.0", + "devlop": "^1.0.0", + "micromark-factory-destination": "^2.0.0", + "micromark-factory-label": "^2.0.0", + "micromark-factory-space": "^2.0.0", + "micromark-factory-title": "^2.0.0", + "micromark-factory-whitespace": "^2.0.0", + "micromark-util-character": "^2.0.0", + "micromark-util-chunked": "^2.0.0", + "micromark-util-classify-character": "^2.0.0", + "micromark-util-html-tag-name": "^2.0.0", + "micromark-util-normalize-identifier": "^2.0.0", + "micromark-util-resolve-all": "^2.0.0", + "micromark-util-subtokenize": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-extension-gfm": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-3.0.0.tgz", + "integrity": "sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "micromark-extension-gfm-autolink-literal": "^2.0.0", + "micromark-extension-gfm-footnote": "^2.0.0", + "micromark-extension-gfm-strikethrough": "^2.0.0", + "micromark-extension-gfm-table": "^2.0.0", + "micromark-extension-gfm-tagfilter": "^2.0.0", + "micromark-extension-gfm-task-list-item": "^2.0.0", + "micromark-util-combine-extensions": "^2.0.0", + "micromark-util-types": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-gfm-autolink-literal": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.1.0.tgz", + "integrity": "sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==", + "dev": true, + "license": "MIT", + "dependencies": { + "micromark-util-character": "^2.0.0", + "micromark-util-sanitize-uri": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-gfm-footnote": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.1.0.tgz", + "integrity": "sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==", + "dev": true, + "license": "MIT", + "dependencies": { + "devlop": "^1.0.0", + "micromark-core-commonmark": "^2.0.0", + "micromark-factory-space": "^2.0.0", + "micromark-util-character": "^2.0.0", + "micromark-util-normalize-identifier": "^2.0.0", + "micromark-util-sanitize-uri": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-gfm-strikethrough": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-2.1.0.tgz", + "integrity": "sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==", + "dev": true, + "license": "MIT", + "dependencies": { + "devlop": "^1.0.0", + "micromark-util-chunked": "^2.0.0", + "micromark-util-classify-character": "^2.0.0", + "micromark-util-resolve-all": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-gfm-table": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.1.tgz", + "integrity": "sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==", + "dev": true, + "license": "MIT", + "dependencies": { + "devlop": "^1.0.0", + "micromark-factory-space": "^2.0.0", + "micromark-util-character": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-gfm-tagfilter": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-2.0.0.tgz", + "integrity": "sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "micromark-util-types": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-gfm-task-list-item": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-2.1.0.tgz", + "integrity": "sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==", + "dev": true, + "license": "MIT", + "dependencies": { + "devlop": "^1.0.0", + "micromark-factory-space": "^2.0.0", + "micromark-util-character": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-factory-destination": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-2.0.1.tgz", + "integrity": "sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-character": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-factory-label": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-2.0.1.tgz", + "integrity": "sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "devlop": "^1.0.0", + "micromark-util-character": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-factory-space": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz", + "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-character": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-factory-title": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-2.0.1.tgz", + "integrity": "sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-factory-space": "^2.0.0", + "micromark-util-character": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-factory-whitespace": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.1.tgz", + "integrity": "sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-factory-space": "^2.0.0", + "micromark-util-character": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-util-character": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz", + "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-util-chunked": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-2.0.1.tgz", + "integrity": "sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-symbol": "^2.0.0" + } + }, + "node_modules/micromark-util-classify-character": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-2.0.1.tgz", + "integrity": "sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-character": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-util-combine-extensions": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.1.tgz", + "integrity": "sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-chunked": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-util-decode-numeric-character-reference": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.2.tgz", + "integrity": "sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-symbol": "^2.0.0" + } + }, + "node_modules/micromark-util-decode-string": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-2.0.1.tgz", + "integrity": "sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "decode-named-character-reference": "^1.0.0", + "micromark-util-character": "^2.0.0", + "micromark-util-decode-numeric-character-reference": "^2.0.0", + "micromark-util-symbol": "^2.0.0" + } + }, + "node_modules/micromark-util-encode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz", + "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT" + }, + "node_modules/micromark-util-html-tag-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.1.tgz", + "integrity": "sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT" + }, + "node_modules/micromark-util-normalize-identifier": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.1.tgz", + "integrity": "sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-symbol": "^2.0.0" + } + }, + "node_modules/micromark-util-resolve-all": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.1.tgz", + "integrity": "sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-util-sanitize-uri": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz", + "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-character": "^2.0.0", + "micromark-util-encode": "^2.0.0", + "micromark-util-symbol": "^2.0.0" + } + }, + "node_modules/micromark-util-subtokenize": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-2.1.0.tgz", + "integrity": "sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "devlop": "^1.0.0", + "micromark-util-chunked": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-util-symbol": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz", + "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT" + }, + "node_modules/micromark-util-types": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz", + "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT" + }, + "node_modules/minimatch": { + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", + "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "brace-expansion": "^5.0.5" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mrmime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz", + "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/nanoid": { + "version": "3.3.12", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", + "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/neotraverse": { + "version": "0.6.18", + "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.18.tgz", + "integrity": "sha512-Z4SmBUweYa09+o6pG+eASabEpP6QkQ70yHj351pQoEXIs8uHbaU2DWVmzBANKgflPa47A50PtB2+NgRpQvr7vA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/nlcst-to-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-4.0.0.tgz", + "integrity": "sha512-YKLBCcUYKAg0FNlOBT6aI91qFmSiFKiluk655WzPF+DDMA02qIyy8uiRqI8QXtcFpEvll12LpL5MXqEmAZ+dcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/nlcst": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/node-fetch-native": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.7.tgz", + "integrity": "sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/node-mock-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/node-mock-http/-/node-mock-http-1.0.4.tgz", + "integrity": "sha512-8DY+kFsDkNXy1sJglUfuODx1/opAGJGyrTuFqEoN90oRc2Vk0ZbD4K2qmKXBBEhZQzdKHIVfEJpDU8Ak2NJEvQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/nodemon": { + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.14.tgz", + "integrity": "sha512-jakjZi93UtB3jHMWsXL68FXSAosbLfY0In5gtKq3niLSkrWznrVBzXFNOEMJUfc9+Ke7SHWoAZsiMkNP3vq6Jw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chokidar": "^3.5.2", + "debug": "^4", + "ignore-by-default": "^1.0.1", + "minimatch": "^10.2.1", + "pstree.remy": "^1.1.8", + "semver": "^7.5.3", + "simple-update-notifier": "^2.0.0", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + }, + "bin": { + "nodemon": "bin/nodemon.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nodemon" + } + }, + "node_modules/nodemon/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/nodemon/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/nodemon/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, + "node_modules/ofetch": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/ofetch/-/ofetch-1.5.1.tgz", + "integrity": "sha512-2W4oUZlVaqAPAil6FUg/difl6YhqhUR7x2eZY4bQCko22UXg3hptq9KLQdqFClV+Wu85UX7hNtdGTngi/1BxcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "destr": "^2.0.5", + "node-fetch-native": "^1.6.7", + "ufo": "^1.6.1" + } + }, + "node_modules/ohash": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz", + "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/oniguruma-parser": { + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/oniguruma-parser/-/oniguruma-parser-0.12.2.tgz", + "integrity": "sha512-6HVa5oIrgMC6aA6WF6XyyqbhRPJrKR02L20+2+zpDtO5QAzGHAUGw5TKQvwi5vctNnRHkJYmjAhRVQF2EKdTQw==", + "dev": true, + "license": "MIT" + }, + "node_modules/oniguruma-to-es": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-4.3.6.tgz", + "integrity": "sha512-csuQ9x3Yr0cEIs/Zgx/OEt9iBw9vqIunAPQkx19R/fiMq2oGVTgcMqO/V3Ybqefr1TBvosI6jU539ksaBULJyA==", + "dev": true, + "license": "MIT", + "dependencies": { + "oniguruma-parser": "^0.12.2", + "regex": "^6.1.0", + "regex-recursion": "^6.0.2" + } + }, + "node_modules/p-limit": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-6.2.0.tgz", + "integrity": "sha512-kuUqqHNUqoIWp/c467RI4X6mmyuojY5jGutNU0wVTmEOOfcuwLqyMVoAi9MKi2Ak+5i9+nhmrK4ufZE8069kHA==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^1.1.1" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-queue": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-8.1.1.tgz", + "integrity": "sha512-aNZ+VfjobsWryoiPnEApGGmf5WmNsCo9xu8dfaYamG5qaLP7ClhLN6NgsFe6SwJ2UbLEBK5dv9x8Mn5+RVhMWQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eventemitter3": "^5.0.1", + "p-timeout": "^6.1.2" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-timeout": { + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz", + "integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/package-manager-detector": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.6.0.tgz", + "integrity": "sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA==", + "dev": true, + "license": "MIT" + }, + "node_modules/parse-latin": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse-latin/-/parse-latin-7.0.0.tgz", + "integrity": "sha512-mhHgobPPua5kZ98EF4HWiH167JWBfl4pvAIXXdbaVohtK7a6YBOy56kvhCqduqyo/f3yrHFWmqmiMg/BkBkYYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/nlcst": "^2.0.0", + "@types/unist": "^3.0.0", + "nlcst-to-string": "^4.0.0", + "unist-util-modify-children": "^4.0.0", + "unist-util-visit-children": "^3.0.0", + "vfile": "^6.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/parse5": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", + "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", + "dev": true, + "license": "MIT", + "dependencies": { + "entities": "^6.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/piccolore": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/piccolore/-/piccolore-0.1.3.tgz", + "integrity": "sha512-o8bTeDWjE086iwKrROaDf31K0qC/BENdm15/uH9usSC/uZjJOKb2YGiVHfLY4GhwsERiPI1jmwI2XrA7ACOxVw==", + "dev": true, + "license": "ISC" + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/postcss": { + "version": "8.5.13", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.13.tgz", + "integrity": "sha512-qif0+jGGZoLWdHey3UFHHWP0H7Gbmsk8T5VEqyYFbWqPr1XqvLGBbk/sl8V5exGmcYJklJOhOQq1pV9IcsiFag==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.11", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/prismjs": { + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz", + "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/property-information": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz", + "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true, + "license": "MIT" + }, + "node_modules/radix3": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/radix3/-/radix3-1.1.2.tgz", + "integrity": "sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==", + "dev": true, + "license": "MIT" + }, + "node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/regex/-/regex-6.1.0.tgz", + "integrity": "sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "regex-utilities": "^2.3.0" + } + }, + "node_modules/regex-recursion": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz", + "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==", + "dev": true, + "license": "MIT", + "dependencies": { + "regex-utilities": "^2.3.0" + } + }, + "node_modules/regex-utilities": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz", + "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==", + "dev": true, + "license": "MIT" + }, + "node_modules/rehype": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/rehype/-/rehype-13.0.2.tgz", + "integrity": "sha512-j31mdaRFrwFRUIlxGeuPXXKWQxet52RBQRvCmzl5eCefn/KGbomK5GMHNMsOJf55fgo3qw5tST5neDuarDYR2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "rehype-parse": "^9.0.0", + "rehype-stringify": "^10.0.0", + "unified": "^11.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/rehype-parse": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-9.0.1.tgz", + "integrity": "sha512-ksCzCD0Fgfh7trPDxr2rSylbwq9iYDkSn8TCDmEJ49ljEUBxDVCzCHv7QNzZOfODanX4+bWQ4WZqLCRWYLfhag==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "hast-util-from-html": "^2.0.0", + "unified": "^11.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/rehype-raw": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/rehype-raw/-/rehype-raw-7.0.0.tgz", + "integrity": "sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "hast-util-raw": "^9.0.0", + "vfile": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/rehype-stringify": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/rehype-stringify/-/rehype-stringify-10.0.1.tgz", + "integrity": "sha512-k9ecfXHmIPuFVI61B9DeLPN0qFHfawM6RsuX48hoqlaKSF61RskNjSm1lI8PhBEM0MRdLxVVm4WmTqJQccH9mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "hast-util-to-html": "^9.0.0", + "unified": "^11.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-gfm": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-4.0.1.tgz", + "integrity": "sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "mdast-util-gfm": "^3.0.0", + "micromark-extension-gfm": "^3.0.0", + "remark-parse": "^11.0.0", + "remark-stringify": "^11.0.0", + "unified": "^11.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-parse": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz", + "integrity": "sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "mdast-util-from-markdown": "^2.0.0", + "micromark-util-types": "^2.0.0", + "unified": "^11.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-rehype": { + "version": "11.1.2", + "resolved": "https://registry.npmjs.org/remark-rehype/-/remark-rehype-11.1.2.tgz", + "integrity": "sha512-Dh7l57ianaEoIpzbp0PC9UKAdCSVklD8E5Rpw7ETfbTl3FqcOOgq5q2LVDhgGCkaBv7p24JXikPdvhhmHvKMsw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "@types/mdast": "^4.0.0", + "mdast-util-to-hast": "^13.0.0", + "unified": "^11.0.0", + "vfile": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-smartypants": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-3.0.2.tgz", + "integrity": "sha512-ILTWeOriIluwEvPjv67v7Blgrcx+LZOkAUVtKI3putuhlZm84FnqDORNXPPm+HY3NdZOMhyDwZ1E+eZB/Df5dA==", + "dev": true, + "license": "MIT", + "dependencies": { + "retext": "^9.0.0", + "retext-smartypants": "^6.0.0", + "unified": "^11.0.4", + "unist-util-visit": "^5.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/remark-stringify": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-11.0.0.tgz", + "integrity": "sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "mdast-util-to-markdown": "^2.0.0", + "unified": "^11.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/retext": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/retext/-/retext-9.0.0.tgz", + "integrity": "sha512-sbMDcpHCNjvlheSgMfEcVrZko3cDzdbe1x/e7G66dFp0Ff7Mldvi2uv6JkJQzdRcvLYE8CA8Oe8siQx8ZOgTcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/nlcst": "^2.0.0", + "retext-latin": "^4.0.0", + "retext-stringify": "^4.0.0", + "unified": "^11.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/retext-latin": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/retext-latin/-/retext-latin-4.0.0.tgz", + "integrity": "sha512-hv9woG7Fy0M9IlRQloq/N6atV82NxLGveq+3H2WOi79dtIYWN8OaxogDm77f8YnVXJL2VD3bbqowu5E3EMhBYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/nlcst": "^2.0.0", + "parse-latin": "^7.0.0", + "unified": "^11.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/retext-smartypants": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/retext-smartypants/-/retext-smartypants-6.2.0.tgz", + "integrity": "sha512-kk0jOU7+zGv//kfjXEBjdIryL1Acl4i9XNkHxtM7Tm5lFiCog576fjNC9hjoR7LTKQ0DsPWy09JummSsH1uqfQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/nlcst": "^2.0.0", + "nlcst-to-string": "^4.0.0", + "unist-util-visit": "^5.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/retext-stringify": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/retext-stringify/-/retext-stringify-4.0.0.tgz", + "integrity": "sha512-rtfN/0o8kL1e+78+uxPTqu1Klt0yPzKuQ2BfWwwfgIUSayyzxpM1PJzkKt4V8803uB9qSy32MvI7Xep9khTpiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/nlcst": "^2.0.0", + "nlcst-to-string": "^4.0.0", + "unified": "^11.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/rollup": { + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.2.tgz", + "integrity": "sha512-J9qZyW++QK/09NyN/zeO0dG/1GdGfyp9lV8ajHnRVLfo/uFsbji5mHnDgn/qYdUHyCkM2N+8VyspgZclfAh0eQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "1.0.8" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.60.2", + "@rollup/rollup-android-arm64": "4.60.2", + "@rollup/rollup-darwin-arm64": "4.60.2", + "@rollup/rollup-darwin-x64": "4.60.2", + "@rollup/rollup-freebsd-arm64": "4.60.2", + "@rollup/rollup-freebsd-x64": "4.60.2", + "@rollup/rollup-linux-arm-gnueabihf": "4.60.2", + "@rollup/rollup-linux-arm-musleabihf": "4.60.2", + "@rollup/rollup-linux-arm64-gnu": "4.60.2", + "@rollup/rollup-linux-arm64-musl": "4.60.2", + "@rollup/rollup-linux-loong64-gnu": "4.60.2", + "@rollup/rollup-linux-loong64-musl": "4.60.2", + "@rollup/rollup-linux-ppc64-gnu": "4.60.2", + "@rollup/rollup-linux-ppc64-musl": "4.60.2", + "@rollup/rollup-linux-riscv64-gnu": "4.60.2", + "@rollup/rollup-linux-riscv64-musl": "4.60.2", + "@rollup/rollup-linux-s390x-gnu": "4.60.2", + "@rollup/rollup-linux-x64-gnu": "4.60.2", + "@rollup/rollup-linux-x64-musl": "4.60.2", + "@rollup/rollup-openbsd-x64": "4.60.2", + "@rollup/rollup-openharmony-arm64": "4.60.2", + "@rollup/rollup-win32-arm64-msvc": "4.60.2", + "@rollup/rollup-win32-ia32-msvc": "4.60.2", + "@rollup/rollup-win32-x64-gnu": "4.60.2", + "@rollup/rollup-win32-x64-msvc": "4.60.2", + "fsevents": "~2.3.2" + } + }, + "node_modules/sax": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz", + "integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=11.0.0" + } + }, + "node_modules/semver": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/sharp": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.5.tgz", + "integrity": "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==", + "dev": true, + "hasInstallScript": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "@img/colour": "^1.0.0", + "detect-libc": "^2.1.2", + "semver": "^7.7.3" + }, + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-darwin-arm64": "0.34.5", + "@img/sharp-darwin-x64": "0.34.5", + "@img/sharp-libvips-darwin-arm64": "1.2.4", + "@img/sharp-libvips-darwin-x64": "1.2.4", + "@img/sharp-libvips-linux-arm": "1.2.4", + "@img/sharp-libvips-linux-arm64": "1.2.4", + "@img/sharp-libvips-linux-ppc64": "1.2.4", + "@img/sharp-libvips-linux-riscv64": "1.2.4", + "@img/sharp-libvips-linux-s390x": "1.2.4", + "@img/sharp-libvips-linux-x64": "1.2.4", + "@img/sharp-libvips-linuxmusl-arm64": "1.2.4", + "@img/sharp-libvips-linuxmusl-x64": "1.2.4", + "@img/sharp-linux-arm": "0.34.5", + "@img/sharp-linux-arm64": "0.34.5", + "@img/sharp-linux-ppc64": "0.34.5", + "@img/sharp-linux-riscv64": "0.34.5", + "@img/sharp-linux-s390x": "0.34.5", + "@img/sharp-linux-x64": "0.34.5", + "@img/sharp-linuxmusl-arm64": "0.34.5", + "@img/sharp-linuxmusl-x64": "0.34.5", + "@img/sharp-wasm32": "0.34.5", + "@img/sharp-win32-arm64": "0.34.5", + "@img/sharp-win32-ia32": "0.34.5", + "@img/sharp-win32-x64": "0.34.5" + } + }, + "node_modules/shiki": { + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-3.23.0.tgz", + "integrity": "sha512-55Dj73uq9ZXL5zyeRPzHQsK7Nbyt6Y10k5s7OjuFZGMhpp4r/rsLBH0o/0fstIzX1Lep9VxefWljK/SKCzygIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/core": "3.23.0", + "@shikijs/engine-javascript": "3.23.0", + "@shikijs/engine-oniguruma": "3.23.0", + "@shikijs/langs": "3.23.0", + "@shikijs/themes": "3.23.0", + "@shikijs/types": "3.23.0", + "@shikijs/vscode-textmate": "^10.0.2", + "@types/hast": "^3.0.4" + } + }, + "node_modules/simple-update-notifier": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true, + "license": "MIT" + }, + "node_modules/smol-toml": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.6.1.tgz", + "integrity": "sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">= 18" + }, + "funding": { + "url": "https://github.com/sponsors/cyyynthia" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/space-separated-tokens": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz", + "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/stringify-entities": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz", + "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==", + "dev": true, + "license": "MIT", + "dependencies": { + "character-entities-html4": "^2.0.0", + "character-entities-legacy": "^3.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.2.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/svgo": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-4.0.1.tgz", + "integrity": "sha512-XDpWUOPC6FEibaLzjfe0ucaV0YrOjYotGJO1WpF0Zd+n6ZGEQUsSugaoLq9QkEZtAfQIxT42UChcssDVPP3+/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "commander": "^11.1.0", + "css-select": "^5.1.0", + "css-tree": "^3.0.1", + "css-what": "^6.1.0", + "csso": "^5.0.5", + "picocolors": "^1.1.1", + "sax": "^1.5.0" + }, + "bin": { + "svgo": "bin/svgo.js" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/svgo" + } + }, + "node_modules/tiny-inflate": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz", + "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==", + "dev": true, + "license": "MIT" + }, + "node_modules/tinyexec": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.1.2.tgz", + "integrity": "sha512-dAqSqE/RabpBKI8+h26GfLq6Vb3JVXs30XYQjdMjaj/c2tS8IYYMbIzP599KtRj7c57/wYApb3QjgRgXmrCukA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, + "node_modules/tinyglobby": { + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz", + "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.5.0", + "picomatch": "^4.0.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/touch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", + "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", + "dev": true, + "license": "ISC", + "bin": { + "nodetouch": "bin/nodetouch.js" + } + }, + "node_modules/trim-lines": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz", + "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/trough": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz", + "integrity": "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/tsconfck": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.6.tgz", + "integrity": "sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==", + "dev": true, + "license": "MIT", + "bin": { + "tsconfck": "bin/tsconfck.js" + }, + "engines": { + "node": "^18 || >=20" + }, + "peerDependencies": { + "typescript": "^5.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, + "license": "0BSD", + "optional": true + }, + "node_modules/type-fest": { + "version": "4.41.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", + "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typescript": { + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "dev": true, + "license": "Apache-2.0", + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/ufo": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.4.tgz", + "integrity": "sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==", + "dev": true, + "license": "MIT" + }, + "node_modules/ultrahtml": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/ultrahtml/-/ultrahtml-1.6.0.tgz", + "integrity": "sha512-R9fBn90VTJrqqLDwyMph+HGne8eqY1iPfYhPzZrvKpIfwkWZbcYlfpsb8B9dTvBfpy1/hqAD7Wi8EKfP9e8zdw==", + "dev": true, + "license": "MIT" + }, + "node_modules/uncrypto": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/uncrypto/-/uncrypto-0.1.3.tgz", + "integrity": "sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true, + "license": "MIT" + }, + "node_modules/undici-types": { + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", + "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true + }, + "node_modules/unified": { + "version": "11.0.5", + "resolved": "https://registry.npmjs.org/unified/-/unified-11.0.5.tgz", + "integrity": "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "bail": "^2.0.0", + "devlop": "^1.0.0", + "extend": "^3.0.0", + "is-plain-obj": "^4.0.0", + "trough": "^2.0.0", + "vfile": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unifont": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/unifont/-/unifont-0.7.4.tgz", + "integrity": "sha512-oHeis4/xl42HUIeHuNZRGEvxj5AaIKR+bHPNegRq5LV1gdc3jundpONbjglKpihmJf+dswygdMJn3eftGIMemg==", + "dev": true, + "license": "MIT", + "dependencies": { + "css-tree": "^3.1.0", + "ofetch": "^1.5.1", + "ohash": "^2.0.11" + } + }, + "node_modules/unist-util-find-after": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-find-after/-/unist-util-find-after-5.0.0.tgz", + "integrity": "sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-is": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz", + "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-modify-children": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-4.0.0.tgz", + "integrity": "sha512-+tdN5fGNddvsQdIzUF3Xx82CU9sMM+fA0dLgR9vOmT0oPT2jH+P1nd5lSqfCfXAw+93NhcXNY2qqvTUtE4cQkw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "array-iterate": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-position": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz", + "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-remove-position": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-5.0.0.tgz", + "integrity": "sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-visit": "^5.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-stringify-position": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", + "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-visit": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.1.0.tgz", + "integrity": "sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0", + "unist-util-visit-parents": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-visit-children": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-3.0.0.tgz", + "integrity": "sha512-RgmdTfSBOg04sdPcpTSD1jzoNBjt9a80/ZCzp5cI9n1qPzLZWF9YdvWGN2zmTumP1HWhXKdUWexjy/Wy/lJ7tA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-visit-parents": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz", + "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unstorage": { + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/unstorage/-/unstorage-1.17.5.tgz", + "integrity": "sha512-0i3iqvRfx29hkNntHyQvJTpf5W9dQ9ZadSoRU8+xVlhVtT7jAX57fazYO9EHvcRCfBCyi5YRya7XCDOsbTgkPg==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "^3.1.3", + "chokidar": "^5.0.0", + "destr": "^2.0.5", + "h3": "^1.15.10", + "lru-cache": "^11.2.7", + "node-fetch-native": "^1.6.7", + "ofetch": "^1.5.1", + "ufo": "^1.6.3" + }, + "peerDependencies": { + "@azure/app-configuration": "^1.8.0", + "@azure/cosmos": "^4.2.0", + "@azure/data-tables": "^13.3.0", + "@azure/identity": "^4.6.0", + "@azure/keyvault-secrets": "^4.9.0", + "@azure/storage-blob": "^12.26.0", + "@capacitor/preferences": "^6 || ^7 || ^8", + "@deno/kv": ">=0.9.0", + "@netlify/blobs": "^6.5.0 || ^7.0.0 || ^8.1.0 || ^9.0.0 || ^10.0.0", + "@planetscale/database": "^1.19.0", + "@upstash/redis": "^1.34.3", + "@vercel/blob": ">=0.27.1", + "@vercel/functions": "^2.2.12 || ^3.0.0", + "@vercel/kv": "^1 || ^2 || ^3", + "aws4fetch": "^1.0.20", + "db0": ">=0.2.1", + "idb-keyval": "^6.2.1", + "ioredis": "^5.4.2", + "uploadthing": "^7.4.4" + }, + "peerDependenciesMeta": { + "@azure/app-configuration": { + "optional": true + }, + "@azure/cosmos": { + "optional": true + }, + "@azure/data-tables": { + "optional": true + }, + "@azure/identity": { + "optional": true + }, + "@azure/keyvault-secrets": { + "optional": true + }, + "@azure/storage-blob": { + "optional": true + }, + "@capacitor/preferences": { + "optional": true + }, + "@deno/kv": { + "optional": true + }, + "@netlify/blobs": { + "optional": true + }, + "@planetscale/database": { + "optional": true + }, + "@upstash/redis": { + "optional": true + }, + "@vercel/blob": { + "optional": true + }, + "@vercel/functions": { + "optional": true + }, + "@vercel/kv": { + "optional": true + }, + "aws4fetch": { + "optional": true + }, + "db0": { + "optional": true + }, + "idb-keyval": { + "optional": true + }, + "ioredis": { + "optional": true + }, + "uploadthing": { + "optional": true + } + } + }, + "node_modules/vfile": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz", + "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "vfile-message": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vfile-location": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.3.tgz", + "integrity": "sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "vfile": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vfile-message": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz", + "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vitefu": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.1.3.tgz", + "integrity": "sha512-ub4okH7Z5KLjb6hDyjqrGXqWtWvoYdU3IGm/NorpgHncKoLTCfRIbvlhBm7r0YstIaQRYlp4yEbFqDcKSzXSSg==", + "dev": true, + "license": "MIT", + "workspaces": [ + "tests/deps/*", + "tests/projects/*", + "tests/projects/workspace/packages/*" + ], + "peerDependencies": { + "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "vite": { + "optional": true + } + } + }, + "node_modules/web-namespaces": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz", + "integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/which-pm-runs": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz", + "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/widest-line": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-5.0.0.tgz", + "integrity": "sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==", + "dev": true, + "license": "MIT", + "dependencies": { + "string-width": "^7.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/wrap-ansi": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/xxhash-wasm": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-1.1.0.tgz", + "integrity": "sha512-147y/6YNh+tlp6nd/2pWq38i9h6mz/EuQ6njIrmW8D1BS5nCqs0P6DG+m6zTGnNz5I+uhZ0SHxBs9BsPrwcKDA==", + "dev": true, + "license": "MIT" + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/yocto-queue": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz", + "integrity": "sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yocto-spinner": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/yocto-spinner/-/yocto-spinner-0.2.3.tgz", + "integrity": "sha512-sqBChb33loEnkoXte1bLg45bEBsOP9N1kzQh5JZNKj/0rik4zAPTNSAVPj3uQAdc6slYJ0Ksc403G2XgxsJQFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yoctocolors": "^2.1.1" + }, + "engines": { + "node": ">=18.19" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yoctocolors": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.2.tgz", + "integrity": "sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/zod": { + "version": "3.25.76", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz", + "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } + }, + "node_modules/zod-to-json-schema": { + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.2.tgz", + "integrity": "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==", + "dev": true, + "license": "ISC", + "peerDependencies": { + "zod": "^3.25.28 || ^4" + } + }, + "node_modules/zod-to-ts": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/zod-to-ts/-/zod-to-ts-1.2.0.tgz", + "integrity": "sha512-x30XE43V+InwGpvTySRNz9kB7qFU8DlyEy7BsSTCHPH1R0QasMmHWZDCzYm6bVXtj/9NNJAZF3jW8rzFvH5OFA==", + "dev": true, + "peerDependencies": { + "typescript": "^4.9.4 || ^5.0.2", + "zod": "^3" + } + }, + "node_modules/zwitch": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz", + "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + } + } +} diff --git a/website/package.json b/website/package.json new file mode 100644 index 0000000..c6d29f1 --- /dev/null +++ b/website/package.json @@ -0,0 +1,17 @@ +{ + "name": "aso-cli-website", + "version": "0.1.0", + "private": true, + "type": "module", + "scripts": { + "dev": "astro dev", + "dev:local": "astro dev --host localhost --port 4321", + "dev:watch": "nodemon --watch src --watch astro.config.mjs --ext astro,css,js,ts,mjs --exec \"npm run dev:local\"", + "build": "astro build", + "preview": "astro preview" + }, + "devDependencies": { + "astro": "^5.18.1", + "nodemon": "^3.1.10" + } +} diff --git a/website/site-config.mjs b/website/site-config.mjs new file mode 100644 index 0000000..dec3d20 --- /dev/null +++ b/website/site-config.mjs @@ -0,0 +1,33 @@ +const DEFAULT_SITE_ORIGIN = "https://asocli.com"; +const DEFAULT_SITE_BASE_PATH = "/"; + +function normalizeOrigin(value) { + return value.trim().replace(/\/+$/, ""); +} + +function normalizeBasePath(value) { + const trimmed = value.trim(); + + if (!trimmed || trimmed === "/") { + return "/"; + } + + return `/${trimmed.replace(/^\/+|\/+$/g, "")}`; +} + +export const siteOrigin = normalizeOrigin( + process.env.PUBLIC_SITE_ORIGIN ?? DEFAULT_SITE_ORIGIN +); + +export const siteBasePath = normalizeBasePath( + process.env.PUBLIC_SITE_BASE_PATH ?? DEFAULT_SITE_BASE_PATH +); + +const baseDirectory = siteBasePath === "/" ? "" : `${siteBasePath.slice(1)}/`; + +export const siteRootUrl = new URL(baseDirectory, `${siteOrigin}/`).toString(); + +export function resolveSiteUrl(pathname = "/") { + const normalizedPath = pathname === "/" ? "" : pathname.replace(/^\/+/, ""); + return new URL(normalizedPath, siteRootUrl).toString(); +} diff --git a/website/src/pages/index.astro b/website/src/pages/index.astro new file mode 100644 index 0000000..93b724d --- /dev/null +++ b/website/src/pages/index.astro @@ -0,0 +1,356 @@ +--- +import iconUrl from "../../../assets/app-icon/aso-icon-readme.png?url"; +import dashboardUrl from "../../../cli/dashboard-ui/public/dashboard.jpg?url"; +import mcpUrl from "../../../cli/dashboard-ui/public/mcp.jpg?url"; +import "../styles/site.css"; +import { resolveSiteUrl, siteOrigin } from "../../site-config.mjs"; +import { + faqEntries, + featureList, + installCommand, + keywordMeta, + npmUrl, + projectName, + repoUrl, + siteDescription, + siteTitle, + socialDescription, +} from "../site-content"; + +const canonicalUrl = resolveSiteUrl("/"); +const iconAbsoluteUrl = new URL(iconUrl, siteOrigin).toString(); +const ogImageUrl = new URL(dashboardUrl, siteOrigin).toString(); +const faqSchema = faqEntries.map(({ question, answer }) => ({ + "@type": "Question", + name: question, + acceptedAnswer: { + "@type": "Answer", + text: answer, + }, +})); +const structuredData = { + "@context": "https://schema.org", + "@graph": [ + { + "@type": "Organization", + "@id": `${canonicalUrl}#organization`, + name: "Semih Cihan", + url: repoUrl, + logo: iconAbsoluteUrl, + sameAs: [repoUrl, npmUrl], + }, + { + "@type": "WebSite", + "@id": `${canonicalUrl}#website`, + url: canonicalUrl, + name: projectName, + description: siteDescription, + publisher: { + "@id": `${canonicalUrl}#organization`, + }, + }, + { + "@type": "SoftwareApplication", + "@id": `${canonicalUrl}#application`, + name: projectName, + url: canonicalUrl, + applicationCategory: "DeveloperApplication", + operatingSystem: "macOS, Linux, Windows", + offers: { + "@type": "Offer", + price: "0", + priceCurrency: "USD", + }, + description: siteDescription, + featureList, + image: ogImageUrl, + screenshot: [ogImageUrl], + downloadUrl: npmUrl, + codeRepository: repoUrl, + creator: { + "@id": `${canonicalUrl}#organization`, + }, + }, + { + "@type": "FAQPage", + "@id": `${canonicalUrl}#faq`, + mainEntity: faqSchema, + }, + ], +}; +--- + + + + + + + {siteTitle} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + ASO CLI icon + ASO CLI + + +
+
+ +
+
+

LOCAL-FIRST APP STORE OPTIMIZATION

+

App Store Optimization research and automation with CLI and MCP.

+

+ ASO CLI is a local-first App Store Optimization tool for keyword research, + keyword evaluation, and automation. Run ASO workflows in terminal, inspect + results in a local dashboard, and plug the same pipeline into agents with + aso-mcp. +

+ +
+
+ {installCommand} + +
+ + + - + + + View on GitHub + +
+ +
    +
  • Free
    • +
  • Open Source
    • +
  • 100% local
    • +
  • MCP
    • +
  • Automation
    • +
  • CLI
    • +
+
+
+ +
+
+

What ASO CLI helps you evaluate

+
+
+

Keyword research

+

+ Explore App Store keyword ideas, popularity context, and long-tail + opportunities before shipping metadata changes. +

+
+
+

Local analysis

+

+ Review rankings, difficulty signals, and brand context in a local dashboard + instead of a hosted SaaS workflow. +

+
+
+

Automation

+

+ Use aso-mcp for agent workflows or pipe + aso keywords ... --stdout into your own scripts. +

+
+
+
+
+ +
+
+

Local dashboard for App Store Optimization workflows

+

+ The website stays focused on discovery. The workflow stays in your local CLI and + local dashboard runtime, where you can inspect keyword results without handing the + project over to a hosted dashboard. +

+ ASO CLI local dashboard screenshot +
+
+ +
+
+

MCP for agent-driven ASO automation

+

+ Use aso-mcp when you want agent-driven app store optimization + automation. It runs the same CLI research pipeline with machine-readable results + so tools and agents can evaluate keywords with the same local-first flow. +

+ 
{`{
+  "mcpServers": {
+    "aso": {
+      "command": "aso-mcp"
+    }
+  }
+}`}
+ ASO MCP workflow screenshot +
+
+ +
+
+

FAQ

+ {faqEntries.map(({ question, answer }) => ( + + ))} +
+
+
+ + + + diff --git a/website/src/pages/llms.txt.ts b/website/src/pages/llms.txt.ts new file mode 100644 index 0000000..67da0dd --- /dev/null +++ b/website/src/pages/llms.txt.ts @@ -0,0 +1,47 @@ +import { resolveSiteUrl } from "../../site-config.mjs"; +import { + featureList, + installCommand, + npmUrl, + projectName, + repoUrl, + siteDescription, +} from "../site-content"; + +export function GET() { + const body = [ + `# ${projectName}`, + "", + `> ${siteDescription}`, + "", + "## Canonical URL", + resolveSiteUrl("/"), + "", + "## Summary", + "- Local-first App Store Optimization CLI and local dashboard.", + "- Supports CLI usage, local dashboard review, and MCP automation via aso-mcp.", + "- Website is a discovery layer; setup, troubleshooting, and releases live in the repository.", + "", + "## Key capabilities", + ...featureList.map((feature) => `- ${feature}`), + "", + "## Install", + `- Command: \`${installCommand}\``, + `- npm: ${npmUrl}`, + "", + "## Important links", + `- Repository: ${repoUrl}`, + `- Setup and troubleshooting: ${repoUrl}#apple-search-ads-setup`, + `- Releases: ${repoUrl}/releases`, + "", + "## Notes for agents", + "- Requires Apple Search Ads setup and linked App Store Connect access for keyword enrichment.", + "- Prefer the repository docs for setup, runtime details, and troubleshooting context.", + ].join("\n"); + + return new Response(body, { + headers: { + "Content-Type": "text/plain; charset=utf-8", + }, + }); +} diff --git a/website/src/pages/robots.txt.ts b/website/src/pages/robots.txt.ts new file mode 100644 index 0000000..cfaf429 --- /dev/null +++ b/website/src/pages/robots.txt.ts @@ -0,0 +1,17 @@ +import { resolveSiteUrl } from "../../site-config.mjs"; + +export function GET() { + const body = [ + "User-agent: *", + "Allow: /", + "", + `Sitemap: ${resolveSiteUrl("/sitemap.xml")}`, + `LLM: ${resolveSiteUrl("/llms.txt")}`, + ].join("\n"); + + return new Response(body, { + headers: { + "Content-Type": "text/plain; charset=utf-8", + }, + }); +} diff --git a/website/src/pages/sitemap.xml.ts b/website/src/pages/sitemap.xml.ts new file mode 100644 index 0000000..0a1e003 --- /dev/null +++ b/website/src/pages/sitemap.xml.ts @@ -0,0 +1,23 @@ +import { resolveSiteUrl } from "../../site-config.mjs"; + +const pages = [ + { + url: resolveSiteUrl("/"), + changefreq: "weekly", + priority: "1.0", + }, +]; + +export function GET() { + const body = `\n\n${pages + .map( + ({ url, changefreq, priority }) => ` \n ${url}\n ${changefreq}\n ${priority}\n ` + ) + .join("\n")}\n\n`; + + return new Response(body, { + headers: { + "Content-Type": "application/xml; charset=utf-8", + }, + }); +} diff --git a/website/src/site-content.ts b/website/src/site-content.ts new file mode 100644 index 0000000..13aa8c9 --- /dev/null +++ b/website/src/site-content.ts @@ -0,0 +1,45 @@ +export const projectName = "ASO CLI"; +export const repoUrl = "https://github.com/semihcihan/App-Store-Optimization-CLI"; +export const npmUrl = "https://www.npmjs.com/package/aso-cli"; +export const installCommand = "npm install -g aso-cli"; +export const siteTitle = "ASO CLI | App Store Optimization Research and Automation"; +export const siteDescription = + "ASO CLI is a local-first App Store Optimization tool for keyword research, keyword evaluation, and automation. Run ASO workflows from the terminal, inspect results in a local dashboard, and automate the same pipeline with MCP."; +export const socialDescription = + "Local-first App Store Optimization with CLI, a local dashboard, and MCP automation."; +export const keywordMeta = + "app store optimization, aso, aso tool, aso cli, keyword research, keyword difficulty, app store keywords, mcp, aso mcp, automation"; + +export const featureList = [ + "App Store keyword research from the command line", + "Local dashboard for reviewing ASO results", + "MCP server for agent-driven automation", + "CLI output modes for custom scripts and workflows", +]; + +export const faqEntries = [ + { + question: "Is this a hosted ASO dashboard?", + answer: + "No. The dashboard runs locally via CLI, keeping your workflow local-first.", + }, + { + question: "What is required before running ASO commands?", + answer: + "You need Apple Search Ads setup and linked App Store Connect access for keyword popularity and enrichment.", + }, + { + question: "Is ASO CLI free and open source?", + answer: "Yes. ASO CLI is free and open source under the MIT License.", + }, + { + question: "Can I automate workflows beyond MCP?", + answer: + "Yes. You can use MCP via aso-mcp or build your own automation using aso keywords output modes inside custom apps and scripts.", + }, + { + question: "Where can I find troubleshooting and release updates?", + answer: + "See the repository setup and troubleshooting guide plus the GitHub releases page for release notes.", + }, +]; diff --git a/website/src/styles/site.css b/website/src/styles/site.css new file mode 100644 index 0000000..c2ba417 --- /dev/null +++ b/website/src/styles/site.css @@ -0,0 +1,498 @@ +:root { + --bg: #0b1115; + --shade-1: #101b21; + --shade-2: #13131d; + --shade-3: #0f1a1f; + --shade-4: #10131a; + --line: #264652; + --text: #d9f3f4; + --muted: #88aeb2; + --accent: #6fffb0; + --accent-2: #57d2ff; + --hero-band: + linear-gradient(130deg, #123845cc 0%, #131b28cc 62%, #1a2030cc 100%), + repeating-linear-gradient( + 90deg, + transparent, + transparent 18px, + color-mix(in oklab, var(--line) 18%, transparent) 18px, + color-mix(in oklab, var(--line) 18%, transparent) 19px + ); +} + +*, +*::before, +*::after { + box-sizing: border-box; +} + +html, +body { + margin: 0; + min-height: 100%; + font-family: + "JetBrains Mono", + ui-sans-serif, + -apple-system, + BlinkMacSystemFont, + "Segoe UI", + sans-serif; + color: var(--text); + background: + radial-gradient(circle at 8% -14%, #1d5863 0%, transparent 42%), + radial-gradient(circle at 94% 0%, #253660 0%, transparent 36%), + linear-gradient(160deg, #0b1216, var(--bg) 52%, #101820); +} + +body { + position: relative; +} + +a { + color: inherit; +} + +.noise { + position: fixed; + inset: 0; + pointer-events: none; + opacity: 0.15; + background-image: radial-gradient(#b6f7fc22 0.7px, transparent 0.7px); + background-size: 5px 5px; +} + +.page { + position: relative; + z-index: 1; +} + +.section-inner { + width: min(980px, calc(100% - 2rem)); + margin: 0 auto; +} + +.topbar-wrap { + padding: 1rem 0; + background: var(--hero-band); +} + +.topbar { + display: flex; + justify-content: space-between; + align-items: center; + gap: 1rem; + border: 1px solid #305463; + border-radius: 16px; + background: color-mix(in oklab, #10222b 86%, black); + padding: 0.85rem 1rem; +} + +.brand { + display: inline-flex; + gap: 0.6rem; + align-items: center; + text-decoration: none; + font-weight: 700; +} + +.brand img { + border-radius: 8px; + box-shadow: 0 0 0 1px #305c65; +} + +nav { + display: inline-flex; + gap: 1rem; +} + +nav a { + text-decoration: none; + color: var(--muted); +} + +nav a:hover { + color: var(--accent); +} + +.hero, +.capabilities, +.showcase, +.mcp, +.faq { + padding: clamp(2.4rem, 7vw, 5rem) 0; + border-top: 1px solid color-mix(in oklab, var(--line) 60%, transparent); +} + +.band-hero { + background: var(--hero-band); +} + +.band-capabilities { + background: + linear-gradient(180deg, color-mix(in oklab, #122630 84%, black), #102028), + repeating-linear-gradient( + 0deg, + transparent, + transparent 24px, + color-mix(in oklab, var(--line) 16%, transparent) 24px, + color-mix(in oklab, var(--line) 16%, transparent) 25px + ); +} + +.band-showcase { + background: linear-gradient(180deg, color-mix(in oklab, var(--shade-1) 90%, black), #0e1a20); +} + +.band-mcp { + background: linear-gradient(180deg, var(--shade-2), var(--shade-3)); +} + +.band-faq { + background: linear-gradient(180deg, var(--shade-3), var(--shade-4)); +} + +.hero .section-inner, +.capabilities .section-inner, +.showcase .section-inner, +.mcp .section-inner, +.faq .section-inner { + text-align: center; +} + +.kicker { + margin: 0; + letter-spacing: 0.12em; + font-size: 0.74rem; + color: var(--accent); +} + +.hero h1 { + margin: 0.85rem auto 0; + line-height: 1.12; + max-width: 18ch; + font-size: clamp(2rem, 5.5vw, 3.5rem); + text-wrap: balance; +} + +.lede { + margin: 1rem auto 0; + max-width: 66ch; + line-height: 1.7; + color: var(--muted); +} + +.lede strong { + color: var(--accent-2); +} + +.cta-stack { + margin-top: 2.5rem; + display: flex; + flex-direction: column; + align-items: center; + gap: 0.9rem; +} + +.install-box { + border: 1px solid #2e3c47; + border-radius: 14px; + background: linear-gradient(180deg, #141821, #12151d); + padding: 0.95rem 3.65rem 0.95rem 1.2rem; + display: inline-flex; + align-items: center; + gap: 0.6rem; + width: fit-content; + max-width: 100%; + margin: 0; + position: relative; + box-shadow: inset 0 1px 0 #ffffff12; +} + +.install-box code { + display: inline-block; + padding: 0; + font-size: 0.94rem; + line-height: 1.2; + color: #e9edf5; + letter-spacing: 0.01em; + font-weight: 500; + overflow-x: auto; + white-space: nowrap; + text-align: left; +} + +.copy-icon-button { + position: absolute; + inset: 0; + display: block; + border: 0; + border-radius: 12px; + background: transparent; + color: #aeb5c0; + cursor: pointer; + padding: 0; + transition: all 180ms ease; +} + +.copy-icon-button svg { + stroke: currentColor; + fill: none; + stroke-width: 1.8; + stroke-linecap: round; + stroke-linejoin: round; +} + +.copy-icon-button:hover { + color: var(--accent); +} + +.copy-icon-button .check-icon { + display: none; +} + +.copy-icon-button .copy-icon, +.copy-icon-button .check-icon { + position: absolute; + right: 0.95rem; + top: 50%; + width: 18px; + height: 18px; + transform: translateY(-50%); +} + +.copy-icon-button.is-copied .copy-icon { + display: none; +} + +.copy-icon-button.is-copied .check-icon { + display: inline-grid; +} + +.copy-icon-button:focus-visible { + outline: 2px solid #66bfff; + outline-offset: 2px; +} + +.github-cta { + width: fit-content; + max-width: 100%; + margin: 0 0 0.5rem; + border-radius: 11px; + border: 1px solid #44657f; + background: linear-gradient(120deg, #152838 0%, #1b2e45 100%); + text-decoration: none; + padding: 0.55rem 0.95rem 0.55rem 0.8rem; + display: inline-flex; + align-items: center; + justify-content: flex-start; + gap: 0.55rem; + color: #e8f4ff; + transition: border-color 180ms ease, box-shadow 180ms ease, transform 180ms ease; +} + +.github-cta:hover { + border-color: #66bfff; + box-shadow: 0 0 0 1px #66bfff44, 0 8px 24px #0f24344d; + transform: translateY(-1px); +} + +.github-mark { + width: 16px; + height: 16px; + display: inline-flex; + align-items: center; + justify-content: center; + place-items: center; + color: #e8f4ff; + flex-shrink: 0; +} + +.github-star-count { + min-width: 2ch; + text-align: right; + font-size: 0.8rem; + font-weight: 700; + letter-spacing: 0.02em; + color: #9cd3ff; +} + +.github-label { + font-size: 0.88rem; + font-weight: 600; + letter-spacing: 0.02em; +} + +.quick-links { + margin-top: 2.15rem; + display: flex; + flex-wrap: wrap; + justify-content: center; + gap: 0.7rem; + list-style: none; + padding: 0; + margin-bottom: 0; +} + +.tag-chip { + display: inline-block; + border: 1px solid #335763; + color: var(--muted); + border-radius: 999px; + padding: 0.36rem 0.78rem; + font-size: 0.88rem; + letter-spacing: 0.01em; + background: color-mix(in oklab, #10212a 88%, transparent); +} + +h2 { + margin: 0; + font-size: clamp(1.18rem, 3vw, 1.58rem); +} + +.capability-grid { + margin-top: 2rem; + display: grid; + grid-template-columns: repeat(3, minmax(0, 1fr)); + gap: 1rem; +} + +.capability-card { + text-align: left; + border: 1px solid color-mix(in oklab, var(--line) 72%, transparent); + border-radius: 18px; + padding: 1.15rem; + background: + linear-gradient(180deg, #13232d, #111920), + radial-gradient(circle at top right, #59d6ff22 0%, transparent 42%); + box-shadow: inset 0 1px 0 #ffffff12; +} + +.capability-card h3 { + margin: 0; + font-size: 1rem; +} + +.capability-card p, +.showcase p, +.mcp p { + color: var(--muted); + line-height: 1.7; +} + +.capability-card p { + margin: 0.8rem 0 0; +} + +.showcase p, +.mcp p { + margin: 0.8rem auto 0; + max-width: 65ch; +} + +.showcase img, +.mcp img { + width: min(940px, 100%); + display: block; + margin: 1rem auto 0; + border-radius: 16px; + border: 1px solid #2d4f59; + box-shadow: 0 20px 48px #00000055; +} + +pre { + margin: 1rem auto 0; + overflow-x: auto; + width: min(520px, 100%); + text-align: left; + border: 1px solid #2d4f59; + border-radius: 12px; + background: #0c151a; + padding: 0.9rem; +} + +pre code { + font-size: 0.84rem; + color: #d5f0f8; +} + +.faq .section-inner { + width: min(860px, calc(100% - 2rem)); +} + +.faq-item { + text-align: left; + border-top: 1px solid #284550; + padding: 0.85rem 0; +} + +.faq-item:first-of-type { + margin-top: 0.8rem; +} + +.faq-item h3 { + margin: 0; + font-weight: 700; + font-size: 1rem; +} + +.faq-item p { + margin: 0.55rem 0 0; + color: var(--muted); + line-height: 1.7; +} + +.faq a { + color: var(--accent-2); +} + +.reveal { + opacity: 0; + transform: translateY(14px); + animation: rise 620ms cubic-bezier(0.2, 0.78, 0.28, 1) forwards; + animation-delay: var(--delay); +} + +@keyframes rise { + to { + opacity: 1; + transform: translateY(0); + } +} + +@media (max-width: 760px) { + .topbar { + flex-direction: column; + align-items: center; + text-align: center; + } + + nav { + flex-wrap: wrap; + justify-content: center; + } + + .capability-grid { + grid-template-columns: 1fr; + } + + .install-box { + max-width: 100%; + padding: 0.78rem 3.1rem 0.78rem 0.9rem; + } + + .install-box code { + font-size: 0.84rem; + } + + .copy-icon-button .copy-icon, + .copy-icon-button .check-icon { + right: 0.75rem; + width: 16px; + height: 16px; + } + + .github-cta { + transform: scale(0.96); + transform-origin: center; + } +} diff --git a/website/tsconfig.json b/website/tsconfig.json new file mode 100644 index 0000000..bcbf8b5 --- /dev/null +++ b/website/tsconfig.json @@ -0,0 +1,3 @@ +{ + "extends": "astro/tsconfigs/strict" +} From f82f43dbfe0a3c2a492e4d158248e140aae88f9c Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Sat, 2 May 2026 12:57:40 +0300 Subject: [PATCH 15/55] fix image aspect ratio --- website/src/pages/index.astro | 2 ++ website/src/styles/site.css | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/website/src/pages/index.astro b/website/src/pages/index.astro index 93b724d..6404784 100644 --- a/website/src/pages/index.astro +++ b/website/src/pages/index.astro @@ -250,6 +250,7 @@ const structuredData = { project over to a hosted dashboard.

ASO CLI local dashboard screenshot ASO MCP workflow screenshot Date: Sat, 2 May 2026 14:31:32 +0300 Subject: [PATCH 16/55] add analytics for web app --- docs/website-architecture.md | 5 + website/package-lock.json | 1068 ++++++++++++++++++++++++++++- website/package.json | 3 + website/src/firebase-analytics.ts | 20 + website/src/pages/index.astro | 6 + 5 files changed, 1090 insertions(+), 12 deletions(-) create mode 100644 website/src/firebase-analytics.ts diff --git a/docs/website-architecture.md b/docs/website-architecture.md index 8c17531..8d05b86 100644 --- a/docs/website-architecture.md +++ b/docs/website-architecture.md @@ -30,6 +30,11 @@ - `llms.txt` - JSON-LD graph for website, software application, and FAQ +## Analytics Contract +- Firebase Analytics is enabled for the website to capture default GA4 web events, including page views. +- Initialization is client-side only from `website/src/pages/index.astro` via `website/src/firebase-analytics.ts`. +- No custom click/CTA event tracking is implemented; behavior is intentionally limited to default analytics signals. + ## Deploy Contract - Netlify is the deployment platform for `website/`. - Root `netlify.toml` defines: diff --git a/website/package-lock.json b/website/package-lock.json index cd428b7..686228d 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -7,6 +7,9 @@ "": { "name": "aso-cli-website", "version": "0.1.0", + "dependencies": { + "firebase": "^12.12.1" + }, "devDependencies": { "astro": "^5.18.1", "nodemon": "^3.1.10" @@ -604,6 +607,648 @@ "node": ">=18" } }, + "node_modules/@firebase/ai": { + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/@firebase/ai/-/ai-2.11.1.tgz", + "integrity": "sha512-WGTF81W3WBKJY+c7xqTzO15OGAkCAs8cpADqflAI0skhTZjIkhF0qyf55rq4Ctt6jKygkv99rPfMrjAHTgXaVQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-check-interop-types": "0.3.3", + "@firebase/component": "0.7.2", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x", + "@firebase/app-types": "0.x" + } + }, + "node_modules/@firebase/analytics": { + "version": "0.10.21", + "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.21.tgz", + "integrity": "sha512-j2y2q65BlgLGB5Pwjhv/Jopw2X/TBTzvAtI5z/DSp56U4wBj7LfhBfzbdCtFPges+Wz0g55GdoawXibOH5jGng==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/installations": "0.6.21", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/analytics-compat": { + "version": "0.2.27", + "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.27.tgz", + "integrity": "sha512-ZObpYpAxL6JfgH7GnvlDD0sbzGZ0o4nijV8skatV9ZX49hJtCYbFqaEcPYptT94rgX1KUoKEderC7/fa7hybtw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/analytics": "0.10.21", + "@firebase/analytics-types": "0.8.3", + "@firebase/component": "0.7.2", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/analytics-types": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.8.3.tgz", + "integrity": "sha512-VrIp/d8iq2g501qO46uGz3hjbDb8xzYMrbu8Tp0ovzIzrvJZ2fvmj649gTjge/b7cCCcjT0H37g1gVtlNhnkbg==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/app": { + "version": "0.14.11", + "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.14.11.tgz", + "integrity": "sha512-yxADFW35LYkP8oSGobGsYIrI42I+GPCvKTNHx4meT9Yq3C950IVz1eANoBk822I9tbKv1wyv9P4Bv1G5TpucFw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "idb": "7.1.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/@firebase/app-check": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.11.2.tgz", + "integrity": "sha512-jcXQVMHAQ5AEKzVD5C7s5fmAYeFOuN6lAJeNTgZK2B9aLnofWaJt8u1A8Idm8gpsBBYSaY3cVyeH5SWMOVPBLQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/app-check-compat": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.4.2.tgz", + "integrity": "sha512-M91NhxqbSkI0ChkJWy69blC+rPr6HEgaeRllddSaU1pQ/7IiegeCQM9pPDIgvWnwnBSzKhUHpe6ro/jhJ+cvzw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-check": "0.11.2", + "@firebase/app-check-types": "0.5.3", + "@firebase/component": "0.7.2", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/app-check-interop-types": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.3.tgz", + "integrity": "sha512-gAlxfPLT2j8bTI/qfe3ahl2I2YcBQ8cFIBdhAQA4I2f3TndcO+22YizyGYuttLHPQEpWkhmpFW60VCFEPg4g5A==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/app-check-types": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/@firebase/app-check-types/-/app-check-types-0.5.3.tgz", + "integrity": "sha512-hyl5rKSj0QmwPdsAxrI5x1otDlByQ7bvNvVt8G/XPO2CSwE++rmSVf3VEhaeOR4J8ZFaF0Z0NDSmLejPweZ3ng==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/app-compat": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.5.11.tgz", + "integrity": "sha512-KaACDjXkK5VLpI01vEs592R7/8s5DjFdIXfKoR385ly1SmK3Tu+jMHCIB4MsiY5jsez6v7VlEX/3rJ90dVkHyA==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app": "0.14.11", + "@firebase/component": "0.7.2", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/@firebase/app-types": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.4.tgz", + "integrity": "sha512-crX9TA5SVYZwLPG7/R16IsH8FLlgkPXjJUVhsVpHVDSqJiq3D/NuFTM5ctxGTExXAOeIn//69tQw47CPerM8MQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/logger": "0.5.0" + } + }, + "node_modules/@firebase/auth": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.13.0.tgz", + "integrity": "sha512-mKkSLNym3UbnnZ06dAmtqzp5EpPGCANGCZDJbkoR135aoUdKG6Aizwcnp29RzsQpwH0nmy5nay17Sfbsh9oY8A==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x", + "@react-native-async-storage/async-storage": "^2.2.0 || ^3.0.0" + }, + "peerDependenciesMeta": { + "@react-native-async-storage/async-storage": { + "optional": true + } + } + }, + "node_modules/@firebase/auth-compat": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.6.5.tgz", + "integrity": "sha512-IfVsafZ3QiXbsydXTP/XMI0wVYbJLI1rkb8Qqf03/h5FnL+upbbPOb+6Yj3RpcX+Y1iP5Uh18lxTHlXfbiyAow==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/auth": "1.13.0", + "@firebase/auth-types": "0.13.0", + "@firebase/component": "0.7.2", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/auth-interop-types": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.4.tgz", + "integrity": "sha512-JPgcXKCuO+CWqGDnigBtvo09HeBs5u/Ktc2GaFj2m01hLarbxthLNm7Fk8iOP1aqAtXV+fnnGj7U28xmk7IwVA==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/auth-types": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.13.0.tgz", + "integrity": "sha512-S/PuIjni0AQRLF+l9ck0YpsMOdE8GO2KU6ubmBB7P+7TJUCQDa3R1dlgYm9UzGbbePMZsp0xzB93f2b/CgxMOg==", + "license": "Apache-2.0", + "peerDependencies": { + "@firebase/app-types": "0.x", + "@firebase/util": "1.x" + } + }, + "node_modules/@firebase/component": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.7.2.tgz", + "integrity": "sha512-iyVDGc6Vjx7Rm0cAdccLH/NG6fADsgJak/XW9IA2lPf8AjIlsemOpFGKczYyPHxm4rnKdR8z6sK4+KEC7NwmEg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/@firebase/data-connect": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@firebase/data-connect/-/data-connect-0.6.0.tgz", + "integrity": "sha512-OiugPRcdlhqXF97oR9CjVObILmsWU0dFUS0gXNYEe4bDfpW8pZmQ5GqhIPPtLWbT/0W2lMJJD7VILFMk+xuHPg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/auth-interop-types": "0.2.4", + "@firebase/component": "0.7.2", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/database": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.1.2.tgz", + "integrity": "sha512-lP96CMjMPy/+d1d9qaaHjHHdzdwvEOuyyLq9ehX89e2XMKwS1jHNzYBO+42bdSumuj5ukPbmnFtViZu8YOMT+w==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-check-interop-types": "0.3.3", + "@firebase/auth-interop-types": "0.2.4", + "@firebase/component": "0.7.2", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "faye-websocket": "0.11.4", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/@firebase/database-compat": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-2.1.3.tgz", + "integrity": "sha512-GMyfWjD8mehjg/QpNkY/tl9G/MoeugPeg91n9D0atggxbWuKF/2KhVPHZDH+XmoP0EKYqMWYTtKxBsaBaNKLYQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/database": "1.1.2", + "@firebase/database-types": "1.0.19", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/@firebase/database-types": { + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.19.tgz", + "integrity": "sha512-FqewjUZmV9LqFfuEnmgdcUpiOUz7qwLXxnm/H8BcMFEzQXtd1yyUDm8ex5VRad2nuTE+ahOuCjUAM/cyDncO+g==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-types": "0.9.4", + "@firebase/util": "1.15.0" + } + }, + "node_modules/@firebase/firestore": { + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.14.0.tgz", + "integrity": "sha512-bZc6YOjRkMBVA16527tgzi6iN9n//xRB3Mmx/R+Gr6UAP/+xrIKOejQIcn1hh+tCzNT8jO0jI+kWox5J4tB/qQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "@firebase/webchannel-wrapper": "1.0.5", + "@grpc/grpc-js": "~1.9.0", + "@grpc/proto-loader": "^0.7.8", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/firestore-compat": { + "version": "0.4.8", + "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.4.8.tgz", + "integrity": "sha512-WK9NJRpnosGD2nuyjdr7K+Ht7AxRYJlTF62myI4rRA7ibJOosbecvjacR5oirJ7s1BgNS6qzcBw7n4fD3a5w1w==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/firestore": "4.14.0", + "@firebase/firestore-types": "3.0.3", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/firestore-types": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-3.0.3.tgz", + "integrity": "sha512-hD2jGdiWRxB/eZWF89xcK9gF8wvENDJkzpVFb4aGkzfEaKxVRD1kjz1t1Wj8VZEp2LCB53Yx1zD8mrhQu87R6Q==", + "license": "Apache-2.0", + "peerDependencies": { + "@firebase/app-types": "0.x", + "@firebase/util": "1.x" + } + }, + "node_modules/@firebase/functions": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.13.3.tgz", + "integrity": "sha512-csO7ckK3SSs+NUZW1nms9EK7ckHe/1QOjiP8uAkCYa7ND18s44vjE9g3KxEeIUpyEPqZaX1EhJuFyZjHigAcYw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-check-interop-types": "0.3.3", + "@firebase/auth-interop-types": "0.2.4", + "@firebase/component": "0.7.2", + "@firebase/messaging-interop-types": "0.2.3", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/functions-compat": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.4.3.tgz", + "integrity": "sha512-BxkEwWgx1of0tKaao/r2VR6WBLk/RAiyztatiONPrPE8gkitFkOnOCxf8i9cUyA5hX5RGt5H30uNn25Q6QNEmQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/functions": "0.13.3", + "@firebase/functions-types": "0.6.3", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/functions-types": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.6.3.tgz", + "integrity": "sha512-EZoDKQLUHFKNx6VLipQwrSMh01A1SaL3Wg6Hpi//x6/fJ6Ee4hrAeswK99I5Ht8roiniKHw4iO0B1Oxj5I4plg==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/installations": { + "version": "0.6.21", + "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.21.tgz", + "integrity": "sha512-xGFGTeICJZ5vhrmmDukeczIcFULFXybojML2+QSDFoKj5A7zbGN7KzFGSKNhDkIxpjzsYG9IleJyUebuAcmqWA==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/util": "1.15.0", + "idb": "7.1.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/installations-compat": { + "version": "0.2.21", + "resolved": "https://registry.npmjs.org/@firebase/installations-compat/-/installations-compat-0.2.21.tgz", + "integrity": "sha512-zahIUkaVKbR8zmTeBHkdfaVl6JGWlhVoSjF7CVH33nFqD3SlPEpEEegn2GNT5iAfsVdtlCyJJ9GW4YKjq+RJKQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/installations": "0.6.21", + "@firebase/installations-types": "0.5.3", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/installations-types": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.5.3.tgz", + "integrity": "sha512-2FJI7gkLqIE0iYsNQ1P751lO3hER+Umykel+TkLwHj6plzWVxqvfclPUZhcKFVQObqloEBTmpi2Ozn7EkCABAA==", + "license": "Apache-2.0", + "peerDependencies": { + "@firebase/app-types": "0.x" + } + }, + "node_modules/@firebase/logger": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.5.0.tgz", + "integrity": "sha512-cGskaAvkrnh42b3BA3doDWeBmuHFO/Mx5A83rbRDYakPjO9bJtRL3dX7javzc2Rr/JHZf4HlterTW2lUkfeN4g==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/@firebase/messaging": { + "version": "0.12.25", + "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.25.tgz", + "integrity": "sha512-7RhDwoDHlOK1/ou0/LeubxmjcngsTjDdrY/ssg2vwAVpUuVAhQzQvuCAOYxcX5wNC1zCgQ54AP1vdngBwbCmOQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/installations": "0.6.21", + "@firebase/messaging-interop-types": "0.2.3", + "@firebase/util": "1.15.0", + "idb": "7.1.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/messaging-compat": { + "version": "0.2.25", + "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.2.25.tgz", + "integrity": "sha512-eoOQqGLtRlseTdiemTN44LlHZpltK5gnhq8XVUuLgtIOG+odtDzrz2UoTpcJWSzaJQVxNLb/x9f39tHdDM4N4w==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/messaging": "0.12.25", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/messaging-interop-types": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.3.tgz", + "integrity": "sha512-xfzFaJpzcmtDjycpDeCUj0Ge10ATFi/VHVIvEEjDNc3hodVBQADZ7BWQU7CuFpjSHE+eLuBI13z5F/9xOoGX8Q==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/performance": { + "version": "0.7.11", + "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.7.11.tgz", + "integrity": "sha512-V3uAhrz7IYJuji+OgT3qYTGKxpek/TViXti9OSsUJ4AexZ3jQjYH5Yrn7JvBxk8MGiSLsC872hh+BxQiPZsm7g==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/installations": "0.6.21", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0", + "web-vitals": "^4.2.4" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/performance-compat": { + "version": "0.2.24", + "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.2.24.tgz", + "integrity": "sha512-YRlejH8wLt7ThWao+HXoKUHUrZKGYq+otxkPS+8nuE5PeN1cBXX7NAJl9ueuUkBwMIrnKdnDqL/voHXxDAAt3g==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/logger": "0.5.0", + "@firebase/performance": "0.7.11", + "@firebase/performance-types": "0.2.3", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/performance-types": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.2.3.tgz", + "integrity": "sha512-IgkyTz6QZVPAq8GSkLYJvwSLr3LS9+V6vNPQr0x4YozZJiLF5jYixj0amDtATf1X0EtYHqoPO48a9ija8GocxQ==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/remote-config": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.8.2.tgz", + "integrity": "sha512-5EXqOThV4upjK9D38d/qOSVwOqRhemlaOFk9vCkMNNALeIlwr+4pLjtLNo4qoY8etQmU/1q4aIATE9N8PFqg0g==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/installations": "0.6.21", + "@firebase/logger": "0.5.0", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/remote-config-compat": { + "version": "0.2.23", + "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.2.23.tgz", + "integrity": "sha512-4+KqRRHEUUmKT6tFmnpWATOsaFfmSuBs1jXH8JzVtMLEYqq/WS9IDM92OdefFDSrAA2xGd0WN004z8mKeIIscw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/logger": "0.5.0", + "@firebase/remote-config": "0.8.2", + "@firebase/remote-config-types": "0.5.0", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/remote-config-types": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.5.0.tgz", + "integrity": "sha512-vI3bqLoF14L/GchtgayMiFpZJF+Ao3uR8WCde0XpYNkSokDpAKca2DxvcfeZv7lZUqkUwQPL2wD83d3vQ4vvrg==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/storage": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.14.2.tgz", + "integrity": "sha512-o/culaTeJ8GRpKXRJov21rux/n9dRaSOWLebyatFP2sqEdCxQPjVA1H9Z2fzYwQxMIU0JVmC7SPPmU11v7L6vQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/storage-compat": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.4.2.tgz", + "integrity": "sha512-R+aB38wxCH5zjIO/xu9KznI7fgiPuZAG98uVm1NcidHyyupGgIDLKigGmRGBZMnxibe/m2oxNKoZpfEbUX2aQQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.7.2", + "@firebase/storage": "0.14.2", + "@firebase/storage-types": "0.8.3", + "@firebase/util": "1.15.0", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/storage-types": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.8.3.tgz", + "integrity": "sha512-+Muk7g9uwngTpd8xn9OdF/D48uiQ7I1Fae7ULsWPuKoCH3HU7bfFPhxtJYzyhjdniowhuDpQcfPmuNRAqZEfvg==", + "license": "Apache-2.0", + "peerDependencies": { + "@firebase/app-types": "0.x", + "@firebase/util": "1.x" + } + }, + "node_modules/@firebase/util": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.15.0.tgz", + "integrity": "sha512-AmWf3cHAOMbrCPG4xdPKQaj5iHnyYfyLKZxwz+Xf55bqKbpAmcYifB4jQinT2W9XhDRHISOoPyBOariJpCG6FA==", + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/@firebase/webchannel-wrapper": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-1.0.5.tgz", + "integrity": "sha512-+uGNN7rkfn41HLO0vekTFhTxk61eKa8mTpRGLO0QSqlQdKvIoGAvLp3ppdVIWbTGYJWM6Kp0iN+PjMIOcnVqTw==", + "license": "Apache-2.0" + }, + "node_modules/@grpc/grpc-js": { + "version": "1.9.15", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz", + "integrity": "sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==", + "license": "Apache-2.0", + "dependencies": { + "@grpc/proto-loader": "^0.7.8", + "@types/node": ">=12.12.47" + }, + "engines": { + "node": "^8.13.0 || >=10.10.0" + } + }, + "node_modules/@grpc/proto-loader": { + "version": "0.7.15", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.15.tgz", + "integrity": "sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==", + "license": "Apache-2.0", + "dependencies": { + "lodash.camelcase": "^4.3.0", + "long": "^5.0.0", + "protobufjs": "^7.2.5", + "yargs": "^17.7.2" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@img/colour": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz", @@ -1109,6 +1754,70 @@ "dev": true, "license": "MIT" }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.5.tgz", + "integrity": "sha512-zgXFLzW3Ap33e6d0Wlj4MGIm6Ce8O89n/apUaGNB/jx+hw+ruWEp7EwGUshdLKVRCxZW12fp9r40E1mQrf/34g==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", + "license": "BSD-3-Clause", + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.1.tgz", + "integrity": "sha512-mnzgDV26ueAvk7rsbt9L7bE0SuAoqyuys/sMMrmVcN5x9VsxpcG3rqAUSgDyLp0UZlmNfIbQ4fHfCtreVBk8Ew==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.1.tgz", + "integrity": "sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg==", + "license": "BSD-3-Clause" + }, "node_modules/@rollup/pluginutils": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz", @@ -1614,10 +2323,7 @@ "version": "24.12.2", "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.2.tgz", "integrity": "sha512-A1sre26ke7HDIuY/M23nd9gfB+nrmhtYyMINbjI1zHJxYteKR6qSMX56FsmjMcDb3SMcjJg5BiRRgOCC/yBD0g==", - "dev": true, "license": "MIT", - "optional": true, - "peer": true, "dependencies": { "undici-types": "~7.16.0" } @@ -2663,6 +3369,93 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/clsx": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", @@ -2673,6 +3466,24 @@ "node": ">=6" } }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, "node_modules/comma-separated-tokens": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz", @@ -3094,6 +3905,15 @@ "@esbuild/win32-x64": "0.27.7" } }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/escape-string-regexp": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", @@ -3128,6 +3948,18 @@ "dev": true, "license": "MIT" }, + "node_modules/faye-websocket": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", + "license": "Apache-2.0", + "dependencies": { + "websocket-driver": ">=0.5.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", @@ -3159,6 +3991,42 @@ "node": ">=8" } }, + "node_modules/firebase": { + "version": "12.12.1", + "resolved": "https://registry.npmjs.org/firebase/-/firebase-12.12.1.tgz", + "integrity": "sha512-ee7xA+bTJLfjB9BP/8FQr3EkxmpAAGc1lNc5QkWgTDpUw24HYXFPm7FEWRdLtGnygxIdYpFmepSc5VjkI6NHhw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/ai": "2.11.1", + "@firebase/analytics": "0.10.21", + "@firebase/analytics-compat": "0.2.27", + "@firebase/app": "0.14.11", + "@firebase/app-check": "0.11.2", + "@firebase/app-check-compat": "0.4.2", + "@firebase/app-compat": "0.5.11", + "@firebase/app-types": "0.9.4", + "@firebase/auth": "1.13.0", + "@firebase/auth-compat": "0.6.5", + "@firebase/data-connect": "0.6.0", + "@firebase/database": "1.1.2", + "@firebase/database-compat": "2.1.3", + "@firebase/firestore": "4.14.0", + "@firebase/firestore-compat": "0.4.8", + "@firebase/functions": "0.13.3", + "@firebase/functions-compat": "0.4.3", + "@firebase/installations": "0.6.21", + "@firebase/installations-compat": "0.2.21", + "@firebase/messaging": "0.12.25", + "@firebase/messaging-compat": "0.2.25", + "@firebase/performance": "0.7.11", + "@firebase/performance-compat": "0.2.24", + "@firebase/remote-config": "0.8.2", + "@firebase/remote-config-compat": "0.2.23", + "@firebase/storage": "0.14.2", + "@firebase/storage-compat": "0.4.2", + "@firebase/util": "1.15.0" + } + }, "node_modules/flattie": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/flattie/-/flattie-1.1.1.tgz", @@ -3207,6 +4075,15 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, "node_modules/get-east-asian-width": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.5.0.tgz", @@ -3480,6 +4357,18 @@ "dev": true, "license": "BSD-2-Clause" }, + "node_modules/http-parser-js": { + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz", + "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==", + "license": "MIT" + }, + "node_modules/idb": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz", + "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==", + "license": "ISC" + }, "node_modules/ignore-by-default": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", @@ -3551,7 +4440,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -3651,6 +4539,18 @@ "node": ">=6" } }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", + "license": "MIT" + }, + "node_modules/long": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz", + "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==", + "license": "Apache-2.0" + }, "node_modules/longest-streak": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz", @@ -4948,6 +5848,30 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/protobufjs": { + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.6.tgz", + "integrity": "sha512-M71sTMB146U3u0di3yup8iM+zv8yPRNQVr1KK4tyBitl3qFvEGucq/rGDRShD2rsJhtN02RJaJ7j5X5hmy8SJg==", + "hasInstallScript": true, + "license": "BSD-3-Clause", + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.5", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.1", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.1", + "@types/node": ">=13.7.0", + "long": "^5.0.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", @@ -5154,6 +6078,15 @@ "url": "https://opencollective.com/unified" } }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/retext": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/retext/-/retext-9.0.0.tgz", @@ -5264,6 +6197,26 @@ "fsevents": "~2.3.2" } }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/sax": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz", @@ -5596,9 +6549,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "dev": true, - "license": "0BSD", - "optional": true + "license": "0BSD" }, "node_modules/type-fest": { "version": "4.41.0", @@ -5660,10 +6611,7 @@ "version": "7.16.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true + "license": "MIT" }, "node_modules/unified": { "version": "11.0.5", @@ -6002,6 +6950,35 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/web-vitals": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-4.2.4.tgz", + "integrity": "sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==", + "license": "Apache-2.0" + }, + "node_modules/websocket-driver": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "license": "Apache-2.0", + "dependencies": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/websocket-extensions": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/which-pm-runs": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz", @@ -6053,16 +7030,83 @@ "dev": true, "license": "MIT" }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/yargs-parser": { "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" } }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/yocto-queue": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz", diff --git a/website/package.json b/website/package.json index c6d29f1..bad15d3 100644 --- a/website/package.json +++ b/website/package.json @@ -13,5 +13,8 @@ "devDependencies": { "astro": "^5.18.1", "nodemon": "^3.1.10" + }, + "dependencies": { + "firebase": "^12.12.1" } } diff --git a/website/src/firebase-analytics.ts b/website/src/firebase-analytics.ts new file mode 100644 index 0000000..6340c37 --- /dev/null +++ b/website/src/firebase-analytics.ts @@ -0,0 +1,20 @@ +import { getApps, initializeApp } from "firebase/app"; +import { getAnalytics, isSupported } from "firebase/analytics"; + +const firebaseConfig = { + apiKey: "AIzaSyAnUVZsMYNs1Y51mZFeHQ_gmWiNyIPgcp0", + authDomain: "aso-cli.firebaseapp.com", + projectId: "aso-cli", + storageBucket: "aso-cli.firebasestorage.app", + messagingSenderId: "353821737266", + appId: "1:353821737266:web:7181c1a9fc0070db72d72b", + measurementId: "G-RWW1YBRPEQ", +}; + +export async function startFirebaseAnalytics() { + const supported = await isSupported(); + if (!supported) return; + + const app = getApps()[0] ?? initializeApp(firebaseConfig); + getAnalytics(app); +} diff --git a/website/src/pages/index.astro b/website/src/pages/index.astro index 6404784..5bca8e0 100644 --- a/website/src/pages/index.astro +++ b/website/src/pages/index.astro @@ -321,6 +321,12 @@ const structuredData = { + + diff --git a/website/src/styles/site.css b/website/src/styles/site.css index a550aef..7c38c27 100644 --- a/website/src/styles/site.css +++ b/website/src/styles/site.css @@ -42,10 +42,13 @@ body { radial-gradient(circle at 8% -14%, #1d5863 0%, transparent 42%), radial-gradient(circle at 94% 0%, #253660 0%, transparent 36%), linear-gradient(160deg, #0b1216, var(--bg) 52%, #101820); + background-color: var(--bg); } body { position: relative; + min-height: 100vh; + min-height: 100dvh; } a { @@ -72,7 +75,7 @@ a { } .topbar-wrap { - padding: 1rem 0; + padding: calc(1rem + env(safe-area-inset-top, 0px)) 0 1rem; background: var(--hero-band); } @@ -443,6 +446,10 @@ pre code { line-height: 1.7; } +.band-faq { + padding-bottom: calc(clamp(2.4rem, 7vw, 5rem) + env(safe-area-inset-bottom, 0px)); +} + .faq a { color: var(--accent-2); } From 7579c33ee0c1bd676944b18259b6c94f41529f36 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Tue, 5 May 2026 22:17:20 +0300 Subject: [PATCH 18/55] Stop startup refresh on auth-required failures --- .../startup-refresh-manager.test.ts | 56 +++++++++ .../startup-refresh-manager.ts | 13 +- cli/dashboard-ui/App.tsx | 73 ++++++++--- cli/dashboard-ui/app.auth.test.tsx | 119 +++++++++++++++++- cli/dashboard-ui/styles.css | 8 +- docs/aso-error-handling.md | 4 +- docs/aso-runtime-flows.md | 3 + 7 files changed, 253 insertions(+), 23 deletions(-) diff --git a/cli/dashboard-server/startup-refresh-manager.test.ts b/cli/dashboard-server/startup-refresh-manager.test.ts index 0fb0f40..098abde 100644 --- a/cli/dashboard-server/startup-refresh-manager.test.ts +++ b/cli/dashboard-server/startup-refresh-manager.test.ts @@ -287,4 +287,60 @@ describe("startup-refresh-manager", () => { ); expect(attempt).toBe(2); }); + + it("stops startup refresh after first auth-required batch failure", async () => { + let attempt = 0; + + const manager = createStartupRefreshManager({ + country: "US", + listKeywords: () => [ + buildKeyword({ + keyword: "k1", + normalizedKeyword: "k1", + orderExpiresAt: "2026-03-06T00:00:00.000Z", + }), + buildKeyword({ + keyword: "k2", + normalizedKeyword: "k2", + orderExpiresAt: "2026-03-06T00:00:00.000Z", + }), + buildKeyword({ + keyword: "k3", + normalizedKeyword: "k3", + orderExpiresAt: "2026-03-06T00:00:00.000Z", + }), + ], + listAppKeywords: () => [ + buildAssociation({ keyword: "k1", appId: "app-1" }), + buildAssociation({ keyword: "k2", appId: "app-1" }), + buildAssociation({ keyword: "k3", appId: "app-1" }), + ], + listAssociatedAppIds: () => new Set(["app-1"]), + listOrderRelevantAppIds: () => new Set(["app-1"]), + enrichKeywords: async () => { + attempt += 1; + throw new Error( + "Apple Search Ads session expired. Reauthentication is required." + ); + }, + isForegroundBusy: () => false, + isAuthReauthRequiredError: (error) => + error instanceof Error && + error.message.includes("Reauthentication is required"), + nowMs: () => Date.parse("2026-03-07T00:00:00.000Z"), + sleep: async () => {}, + keywordBatchSize: 1, + }); + + manager.start(); + await waitForManagerToFinish(manager); + + const state = manager.getState(); + expect(state.status).toBe("failed"); + expect(state.requiresReauthentication).toBe(true); + expect(state.counters.eligibleKeywordCount).toBe(3); + expect(state.counters.refreshedKeywordCount).toBe(0); + expect(state.counters.failedKeywordCount).toBe(1); + expect(attempt).toBe(1); + }); }); diff --git a/cli/dashboard-server/startup-refresh-manager.ts b/cli/dashboard-server/startup-refresh-manager.ts index b97d03b..b65ca23 100644 --- a/cli/dashboard-server/startup-refresh-manager.ts +++ b/cli/dashboard-server/startup-refresh-manager.ts @@ -171,10 +171,13 @@ export function createStartupRefreshManager( let runPromise: Promise | null = null; const setFailure = (error: unknown, metadata: Record) => { + const isAuthReauthRequired = + deps.isAuthReauthRequiredError?.(error) === true; if (!state.lastError) { state.lastError = errorToMessage(error); - state.requiresReauthentication = - deps.isAuthReauthRequiredError?.(error) === true; + } + if (isAuthReauthRequired) { + state.requiresReauthentication = true; } deps.reportError?.(error, metadata); }; @@ -201,12 +204,18 @@ export function createStartupRefreshManager( }, sleep, (error) => deps.isAuthReauthRequiredError?.(error) !== true); state.counters.refreshedKeywordCount += batch.length; } catch (error) { + const isAuthReauthRequired = + deps.isAuthReauthRequiredError?.(error) === true; state.counters.failedKeywordCount += batch.length; setFailure(error, { phase: "startup-keyword-refresh", batchSize: batch.length, keywordPreview: batch.slice(0, 5).map((item) => item.keyword), + isAuthReauthRequired, }); + if (isAuthReauthRequired) { + break; + } } } }; diff --git a/cli/dashboard-ui/App.tsx b/cli/dashboard-ui/App.tsx index d1c8347..f98e22e 100644 --- a/cli/dashboard-ui/App.tsx +++ b/cli/dashboard-ui/App.tsx @@ -458,6 +458,8 @@ export function App() { () => apps.some((app) => Boolean(app.lastKeywordAddedAt)), [apps] ); + const isKeywordMutationBlockedByStartupReauth = + startupRefreshState?.requiresReauthentication === true; const loadApps = useCallback(async (): Promise => { const list = await apiGet(`/api/apps`); @@ -1156,6 +1158,10 @@ export function App() { const submitKeywords = useCallback( async (kws: string[]): Promise => { + if (isKeywordMutationBlockedByStartupReauth) { + setErrorText("Finish Apple reauthentication before adding or retrying keywords."); + return false; + } try { setIsAddingKeywords(true); setErrorText(""); @@ -1193,6 +1199,7 @@ export function App() { loadKeywords, openAuthModalForPendingAdd, openSetupModalForPrimaryAppAccessError, + isKeywordMutationBlockedByStartupReauth, ] ); @@ -1224,6 +1231,10 @@ export function App() { const onRetryFailedKeywords = useCallback(async () => { if (failedKeywordCount <= 0) return; + if (isKeywordMutationBlockedByStartupReauth) { + setErrorText("Finish Apple reauthentication before adding or retrying keywords."); + return; + } try { setIsRetryingFailedKeywords(true); setErrorText(""); @@ -1261,6 +1272,7 @@ export function App() { loadKeywords, openSetupModalForPrimaryAppAccessError, selectedAppId, + isKeywordMutationBlockedByStartupReauth, ]); useEffect(() => { @@ -1724,7 +1736,28 @@ export function App() { const showError = !showLoading && errorText !== ""; const showSuccess = !showLoading && !showError && successText !== ""; const addButtonLabel = isCompactLayout ? "Add" : "Add Keywords"; + const isStartupRefreshAuthRecoveryActive = + isKeywordMutationBlockedByStartupReauth && + activeAuthContext === "startup-refresh" && + (isStartingAuth || + authStatus === "idle" || + authStatus === "in_progress" || + authStatus === "succeeded"); + const keywordMutationStatusText = isStartupRefreshAuthRecoveryActive + ? "Checking Apple session..." + : authCheckLoadingText !== "" + ? "Checking Apple session..." + : isKeywordMutationBlockedByStartupReauth + ? "Apple reauthentication required." + : ""; const startupRefreshBanner = useMemo(() => { + if (keywordMutationStatusText) { + return { + tone: isKeywordMutationBlockedByStartupReauth ? ("error" as const) : ("muted" as const), + action: null, + text: keywordMutationStatusText, + }; + } if (!startupRefreshState) return null; const { eligibleKeywordCount, refreshedKeywordCount } = startupRefreshState.counters; @@ -1744,23 +1777,10 @@ export function App() { if (startupRefreshState.status !== "failed") return null; const progressSuffix = progressLabel ? ` after ${progressLabel}` : ""; if (startupRefreshState.requiresReauthentication) { - if ( - activeAuthContext === "startup-refresh" && - (isStartingAuth || - authStatus === "idle" || - authStatus === "in_progress" || - authStatus === "succeeded") - ) { - return { - tone: "muted" as const, - action: null, - text: `Checking Apple session for background refresh${progressSuffix}...`, - }; - } return { tone: "error" as const, action: null, - text: `Background refresh paused${progressSuffix}. Apple Search Ads session expired.`, + text: "Apple reauthentication required.", }; } const detail = startupRefreshState.lastError?.trim(); @@ -1771,7 +1791,14 @@ export function App() { ? `Background refresh failed${progressSuffix}. ${detail}` : `Background refresh failed${progressSuffix}.`, }; - }, [activeAuthContext, authStatus, isStartingAuth, startupRefreshState]); + }, [ + authCheckLoadingText, + authStatus, + isKeywordMutationBlockedByStartupReauth, + isStartingAuth, + keywordMutationStatusText, + startupRefreshState, + ]); const hasRankFiltersApplied = showRankingColumns && (minRank !== DEFAULT_MIN_RANK || maxRank !== DEFAULT_MAX_RANK); @@ -2065,7 +2092,15 @@ export function App() { onChange={(e) => setAddInput(e.target.value)} /> - @@ -2075,7 +2110,11 @@ export function App() { className="retry-failed-button" type="button" variant="ghost" - disabled={isRetryingFailedKeywords || isColdStart} + disabled={ + isRetryingFailedKeywords || + isColdStart || + isKeywordMutationBlockedByStartupReauth + } onClick={() => { void onRetryFailedKeywords(); }} diff --git a/cli/dashboard-ui/app.auth.test.tsx b/cli/dashboard-ui/app.auth.test.tsx index f2a5656..8a60ed8 100644 --- a/cli/dashboard-ui/app.auth.test.tsx +++ b/cli/dashboard-ui/app.auth.test.tsx @@ -1010,7 +1010,7 @@ describe("dashboard auth modal UI flow", () => { expect( await screen.findByText( - "Checking Apple session for background refresh after 0/1086 keywords..." + "Checking Apple session..." ) ).toBeInTheDocument(); @@ -1023,6 +1023,123 @@ describe("dashboard auth modal UI flow", () => { ).toBeInTheDocument(); }); + it("disables add/retry keyword mutations while startup refresh reauthentication is required", async () => { + let keywordPostCount = 0; + + const fetchMock = jest.fn(async (input: RequestInfo | URL, init?: RequestInit) => { + const url = String(input); + const method = (init?.method ?? "GET").toUpperCase(); + + if (method === "GET" && url === "/api/apps") { + return jsonResponse({ status: 200, body: { success: true, data: [] } }); + } + if (method === "GET" && url.startsWith("/api/aso/keywords?")) { + return jsonResponse({ + status: 200, + body: { + success: true, + data: { + ...emptyKeywordPagedPayload(), + failedCount: 2, + }, + }, + }); + } + if (method === "GET" && url === "/api/aso/refresh-status") { + return jsonResponse({ + status: 200, + body: { + success: true, + data: { + status: "failed", + startedAt: "2026-03-07T00:00:00.000Z", + finishedAt: "2026-03-07T00:00:10.000Z", + lastError: + "Apple Search Ads session expired. Reauthentication is required.", + requiresReauthentication: true, + counters: { + eligibleKeywordCount: 1086, + refreshedKeywordCount: 0, + failedKeywordCount: 1086, + }, + }, + }, + }); + } + if (method === "POST" && url === "/api/aso/auth/start") { + return jsonResponse({ + status: 202, + body: { + success: true, + data: { + status: "in_progress", + updatedAt: "2026-03-07T00:00:11.000Z", + lastError: null, + requiresTerminalAction: false, + canPrompt: true, + }, + }, + }); + } + if (method === "GET" && url === "/api/aso/auth/status") { + return jsonResponse({ + status: 200, + body: { + success: true, + data: { + status: "in_progress", + updatedAt: "2026-03-07T00:00:12.000Z", + lastError: null, + requiresTerminalAction: false, + canPrompt: true, + }, + }, + }); + } + if (method === "POST" && url === "/api/aso/keywords") { + keywordPostCount += 1; + return jsonResponse({ + status: 201, + body: { + success: true, + data: { + cachedCount: 0, + pendingCount: 0, + failedCount: 0, + }, + }, + }); + } + + throw new Error(`Unhandled fetch: ${method} ${url}`); + }); + global.fetch = fetchMock as typeof fetch; + + render(); + + expect( + await screen.findByText( + "Checking Apple session..." + ) + ).toBeInTheDocument(); + expect(screen.getByRole("button", { name: "Add Keywords" })).toBeDisabled(); + expect(screen.getByRole("button", { name: "Retry Failed (2)" })).toBeDisabled(); + + const input = screen.getByPlaceholderText("Add keywords (comma-separated)"); + fireEvent.change(input, { target: { value: "term" } }); + const addForm = document.querySelector("#add-form"); + if (!(addForm instanceof HTMLFormElement)) { + throw new Error("Expected add keywords form to be present."); + } + fireEvent.submit(addForm); + expect(keywordPostCount).toBe(0); + expect( + await screen.findByText( + "Finish Apple reauthentication before adding or retrying keywords." + ) + ).toBeInTheDocument(); + }); + it("restarts startup refresh reauthentication after a later auth-required failure", async () => { let refreshStatusCount = 0; let refreshStartCount = 0; diff --git a/cli/dashboard-ui/styles.css b/cli/dashboard-ui/styles.css index 1f9afdc..791b8b3 100644 --- a/cli/dashboard-ui/styles.css +++ b/cli/dashboard-ui/styles.css @@ -513,7 +513,8 @@ body { .startup-refresh-status { margin: 0 4px 0 0; - max-width: min(52vw, 420px); + flex: 1 1 auto; + max-width: none; display: none; align-items: center; gap: 8px; @@ -526,6 +527,8 @@ body { .startup-refresh-status-copy { margin: 0; + flex: 1 1 auto; + min-width: 0; font-size: 0.78rem; color: var(--muted-foreground); white-space: nowrap; @@ -2080,7 +2083,8 @@ body::before { .startup-refresh-status { margin-right: auto; - max-width: min(56vw, 420px); + flex: 1 1 auto; + max-width: none; } .startup-refresh-status-copy { diff --git a/docs/aso-error-handling.md b/docs/aso-error-handling.md index 4942153..379a682 100644 --- a/docs/aso-error-handling.md +++ b/docs/aso-error-handling.md @@ -29,7 +29,7 @@ Define failure boundaries, retry rules, and recovery behavior across CLI, dashbo - Popularity fetch retries transient responses (`429`, `5xx`, `KWS_NO_ORG_CONTENT_PROVIDERS`) and transient network errors. - App Store web fetches retry `429`, `5xx`, and transient network errors with jittered exponential backoff. - Enrichment applies one bounded retry/backoff cycle for competitive keywords when top-5 difficulty docs are incomplete (`reasonCode=INSUFFICIENT_DOCS` when still unresolved). -- Startup refresh manager retries each unit once and records failures without crashing runtime. +- Startup refresh manager retries each unit once for non-auth failures; auth-required failures are terminal for the current run and stop remaining batches. - Startup refresh auth failures are exposed as structured refresh-status state so the dashboard can prompt for reauthentication instead of silently stopping. - Startup refresh auth failures reuse the same dashboard reauthentication UX as add-keyword: one automatic auth-start attempt, then shared browser prompt / retry handling if user input is needed. - `keywordPipelineService` isolates terminal failures per keyword and stores normalized failure metadata in `aso_keyword_failures` via `keywordWriteRepository` (single write owner). @@ -38,6 +38,8 @@ Define failure boundaries, retry rules, and recovery behavior across CLI, dashbo - Dashboard add-keyword: - If auth is invalid in stage 1, return `AUTH_REQUIRED` (no interactive prompt in request path). - If the configured Primary App ID is inaccessible for the current Apple Ads account, return `PRIMARY_APP_ID_RECONFIGURE_REQUIRED` so the dashboard can reopen the shared Primary App ID setup flow. +- Dashboard startup-refresh auth recovery: + - While refresh status reports `requiresReauthentication=true`, keyword mutations (`Add Keywords`, `Retry Failed`) are disabled until reauthentication succeeds. - If stage-2 enrichment fails, stage-1 writes remain; caller can retry later. - Stage-2 enrichment writes are per-keyword progressive: successful keywords are visible in cache/UI polling as soon as that keyword finishes, while other keywords continue running. - For `appCount >= 5`, enrichment does not persist fallback `difficultyScore=1` when top-5 docs are incomplete; it records a retryable enrichment failure instead. diff --git a/docs/aso-runtime-flows.md b/docs/aso-runtime-flows.md index 535cf59..1efba7d 100644 --- a/docs/aso-runtime-flows.md +++ b/docs/aso-runtime-flows.md @@ -136,9 +136,12 @@ Runtime flow contracts across CLI commands, local dashboard API, and ASO service - difficulty has never been computed - order TTL is stale (owned-associated keywords only; research-only keywords do not use order staleness as a refresh trigger) 3. Run the same keyword pipeline used by CLI fetch in non-interactive mode, in batches while pausing for foreground mutations. + - Non-auth batch failures get one bounded retry. + - Auth-required failures skip retry and stop remaining startup batches for that run. 4. Publish refresh status via `GET /api/aso/refresh-status`, including whether the failure requires Search Ads reauthentication. 5. If auth is required, the dashboard auto-starts the same reauthentication flow used by add-keyword once; silent session reuse stays invisible, while browser prompt steps/failure states surface through the shared auth modal. 6. Allow explicit restart via `POST /api/aso/refresh/start`; the UI uses this after reauthentication or manual retry. +7. While startup refresh is paused on `requiresReauthentication=true`, dashboard keyword mutations (`Add Keywords`, `Retry Failed`) stay disabled until reauthentication succeeds. ## Flow E: App Doc Hydration - `GET /api/apps` (owned app list): From 01622da2e93e972b7f78fdcbc28dd3d57edcfa13 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Wed, 6 May 2026 19:06:03 +0300 Subject: [PATCH 19/55] Clarify startup reauth auto-recovery status --- cli/dashboard-ui/App.tsx | 27 +++-- cli/dashboard-ui/app.auth.test.tsx | 152 ++++++++++++++++++++++++++++- 2 files changed, 168 insertions(+), 11 deletions(-) diff --git a/cli/dashboard-ui/App.tsx b/cli/dashboard-ui/App.tsx index f98e22e..f8bb9eb 100644 --- a/cli/dashboard-ui/App.tsx +++ b/cli/dashboard-ui/App.tsx @@ -1736,15 +1736,22 @@ export function App() { const showError = !showLoading && errorText !== ""; const showSuccess = !showLoading && !showError && successText !== ""; const addButtonLabel = isCompactLayout ? "Add" : "Add Keywords"; - const isStartupRefreshAuthRecoveryActive = + const isStartupRefreshAuthRecoveryAttemptActive = isKeywordMutationBlockedByStartupReauth && activeAuthContext === "startup-refresh" && (isStartingAuth || authStatus === "idle" || - authStatus === "in_progress" || - authStatus === "succeeded"); - const keywordMutationStatusText = isStartupRefreshAuthRecoveryActive - ? "Checking Apple session..." + authStatus === "in_progress"); + const isStartupRefreshResumeInProgress = + isKeywordMutationBlockedByStartupReauth && + (isRestartingStartupRefresh || authStatus === "succeeded"); + const isStartupRefreshAutoRecoveryActive = + isStartupRefreshAuthRecoveryAttemptActive || + isStartupRefreshResumeInProgress; + const keywordMutationStatusText = isStartupRefreshAuthRecoveryAttemptActive + ? "Reauthenticating with Apple..." + : isStartupRefreshResumeInProgress + ? "Resuming background refresh..." : authCheckLoadingText !== "" ? "Checking Apple session..." : isKeywordMutationBlockedByStartupReauth @@ -1753,7 +1760,11 @@ export function App() { const startupRefreshBanner = useMemo(() => { if (keywordMutationStatusText) { return { - tone: isKeywordMutationBlockedByStartupReauth ? ("error" as const) : ("muted" as const), + tone: + isKeywordMutationBlockedByStartupReauth && + !isStartupRefreshAutoRecoveryActive + ? ("error" as const) + : ("muted" as const), action: null, text: keywordMutationStatusText, }; @@ -1792,10 +1803,8 @@ export function App() { : `Background refresh failed${progressSuffix}.`, }; }, [ - authCheckLoadingText, - authStatus, isKeywordMutationBlockedByStartupReauth, - isStartingAuth, + isStartupRefreshAutoRecoveryActive, keywordMutationStatusText, startupRefreshState, ]); diff --git a/cli/dashboard-ui/app.auth.test.tsx b/cli/dashboard-ui/app.auth.test.tsx index 8a60ed8..949fa5e 100644 --- a/cli/dashboard-ui/app.auth.test.tsx +++ b/cli/dashboard-ui/app.auth.test.tsx @@ -1010,7 +1010,7 @@ describe("dashboard auth modal UI flow", () => { expect( await screen.findByText( - "Checking Apple session..." + "Reauthenticating with Apple..." ) ).toBeInTheDocument(); @@ -1119,7 +1119,7 @@ describe("dashboard auth modal UI flow", () => { expect( await screen.findByText( - "Checking Apple session..." + "Reauthenticating with Apple..." ) ).toBeInTheDocument(); expect(screen.getByRole("button", { name: "Add Keywords" })).toBeDisabled(); @@ -1140,6 +1140,154 @@ describe("dashboard auth modal UI flow", () => { ).toBeInTheDocument(); }); + it("shows auto-resume status while startup refresh restart is in flight after auth succeeds", async () => { + let refreshStatusCount = 0; + let refreshStartCount = 0; + let authStartCount = 0; + let resolveRefreshStart: ((value: Response) => void) | null = null; + const refreshStartPromise = new Promise((resolve) => { + resolveRefreshStart = resolve; + }); + + const fetchMock = jest.fn(async (input: RequestInfo | URL, init?: RequestInit) => { + const url = String(input); + const method = (init?.method ?? "GET").toUpperCase(); + + if (method === "GET" && url === "/api/apps") { + return jsonResponse({ status: 200, body: { success: true, data: [] } }); + } + if (method === "GET" && url.startsWith("/api/aso/keywords?")) { + return jsonResponse({ + status: 200, + body: { success: true, data: emptyKeywordPagedPayload() }, + }); + } + if (method === "GET" && url === "/api/aso/refresh-status") { + refreshStatusCount += 1; + if (refreshStatusCount === 1) { + return jsonResponse({ + status: 200, + body: { + success: true, + data: { + status: "failed", + startedAt: "2026-03-07T00:00:00.000Z", + finishedAt: "2026-03-07T00:00:10.000Z", + lastError: + "Apple Search Ads session expired. Reauthentication is required.", + requiresReauthentication: true, + counters: { + eligibleKeywordCount: 1086, + refreshedKeywordCount: 0, + failedKeywordCount: 1086, + }, + }, + }, + }); + } + return jsonResponse({ + status: 200, + body: { + success: true, + data: { + status: "running", + startedAt: "2026-03-07T00:00:20.000Z", + finishedAt: null, + lastError: null, + requiresReauthentication: false, + counters: { + eligibleKeywordCount: 1086, + refreshedKeywordCount: 0, + failedKeywordCount: 0, + }, + }, + }, + }); + } + if (method === "POST" && url === "/api/aso/auth/start") { + authStartCount += 1; + return jsonResponse({ + status: 202, + body: { + success: true, + data: { + status: "in_progress", + updatedAt: "2026-03-07T00:00:11.000Z", + lastError: null, + requiresTerminalAction: false, + canPrompt: true, + }, + }, + }); + } + if (method === "GET" && url === "/api/aso/auth/status") { + return jsonResponse({ + status: 200, + body: { + success: true, + data: { + status: "succeeded", + updatedAt: "2026-03-07T00:00:12.000Z", + lastError: null, + requiresTerminalAction: false, + canPrompt: true, + }, + }, + }); + } + if (method === "POST" && url === "/api/aso/refresh/start") { + refreshStartCount += 1; + return refreshStartPromise; + } + + throw new Error(`Unhandled fetch: ${method} ${url}`); + }); + global.fetch = fetchMock as typeof fetch; + + render(); + + await waitFor(() => expect(authStartCount).toBe(1)); + await waitFor(() => expect(refreshStartCount).toBe(1)); + expect( + await screen.findByText("Resuming background refresh...") + ).toBeInTheDocument(); + expect( + screen.queryByText("Apple reauthentication required.") + ).not.toBeInTheDocument(); + + const finishRefreshStart = + resolveRefreshStart as ((value: Response) => void) | null; + if (!finishRefreshStart) { + throw new Error("Expected startup refresh restart request to be pending."); + } + finishRefreshStart( + jsonResponse({ + status: 202, + body: { + success: true, + data: { + status: "running", + startedAt: "2026-03-07T00:00:20.000Z", + finishedAt: null, + lastError: null, + requiresReauthentication: false, + counters: { + eligibleKeywordCount: 1086, + refreshedKeywordCount: 0, + failedKeywordCount: 0, + }, + }, + }, + }) as Response + ); + + expect( + await screen.findByText( + "Refreshing local data in background (0/1086 keywords)..." + ) + ).toBeInTheDocument(); + }); + it("restarts startup refresh reauthentication after a later auth-required failure", async () => { let refreshStatusCount = 0; let refreshStartCount = 0; From 5b772f2a028637d7128c21c19e7a06ff5b6d30cf Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Thu, 7 May 2026 12:16:14 +0300 Subject: [PATCH 20/55] Shorten startup refresh errors and constrain banner layout --- cli/dashboard-ui/App.tsx | 5 +-- cli/dashboard-ui/app.auth.test.tsx | 54 ++++++++++++++++++++++++++++++ cli/dashboard-ui/styles.css | 14 ++++++++ 3 files changed, 69 insertions(+), 4 deletions(-) diff --git a/cli/dashboard-ui/App.tsx b/cli/dashboard-ui/App.tsx index f8bb9eb..ad83a5b 100644 --- a/cli/dashboard-ui/App.tsx +++ b/cli/dashboard-ui/App.tsx @@ -1794,13 +1794,10 @@ export function App() { text: "Apple reauthentication required.", }; } - const detail = startupRefreshState.lastError?.trim(); return { tone: "error" as const, action: "retry" as const, - text: detail - ? `Background refresh failed${progressSuffix}. ${detail}` - : `Background refresh failed${progressSuffix}.`, + text: `Background refresh failed${progressSuffix}.`, }; }, [ isKeywordMutationBlockedByStartupReauth, diff --git a/cli/dashboard-ui/app.auth.test.tsx b/cli/dashboard-ui/app.auth.test.tsx index 949fa5e..8ea3d4e 100644 --- a/cli/dashboard-ui/app.auth.test.tsx +++ b/cli/dashboard-ui/app.auth.test.tsx @@ -1288,6 +1288,60 @@ describe("dashboard auth modal UI flow", () => { ).toBeInTheDocument(); }); + it("shows concise startup refresh failure text without backend reason details", async () => { + const fetchMock = jest.fn(async (input: RequestInfo | URL, init?: RequestInit) => { + const url = String(input); + const method = (init?.method ?? "GET").toUpperCase(); + + if (method === "GET" && url === "/api/apps") { + return jsonResponse({ status: 200, body: { success: true, data: [] } }); + } + if (method === "GET" && url.startsWith("/api/aso/keywords?")) { + return jsonResponse({ + status: 200, + body: { success: true, data: emptyKeywordPagedPayload() }, + }); + } + if (method === "GET" && url === "/api/aso/refresh-status") { + return jsonResponse({ + status: 200, + body: { + success: true, + data: { + status: "failed", + startedAt: "2026-03-07T00:00:00.000Z", + finishedAt: "2026-03-07T00:00:10.000Z", + lastError: + "All keywords failed (17): up:INSUFFICIENT_DOCS(503), videoleap:INSUFFICIENT_DOCS(503)", + requiresReauthentication: false, + counters: { + eligibleKeywordCount: 517, + refreshedKeywordCount: 500, + failedKeywordCount: 17, + }, + }, + }, + }); + } + + throw new Error(`Unhandled fetch: ${method} ${url}`); + }); + global.fetch = fetchMock as typeof fetch; + + render(); + + expect( + await screen.findByText("Background refresh failed after 500/517 keywords.") + ).toBeInTheDocument(); + expect(screen.queryByText(/INSUFFICIENT_DOCS/)).not.toBeInTheDocument(); + expect( + screen.queryByText(/All keywords failed \(17\)/) + ).not.toBeInTheDocument(); + expect( + screen.getByRole("button", { name: "Retry Refresh" }) + ).toBeInTheDocument(); + }); + it("restarts startup refresh reauthentication after a later auth-required failure", async () => { let refreshStatusCount = 0; let refreshStartCount = 0; diff --git a/cli/dashboard-ui/styles.css b/cli/dashboard-ui/styles.css index 791b8b3..a73bd4d 100644 --- a/cli/dashboard-ui/styles.css +++ b/cli/dashboard-ui/styles.css @@ -509,6 +509,9 @@ body { gap: 10px; padding: 0; min-height: 34px; + width: 100%; + min-width: 0; + overflow: hidden; } .startup-refresh-status { @@ -519,6 +522,7 @@ body { align-items: center; gap: 8px; min-width: 0; + overflow: hidden; } .startup-refresh-status.visible { @@ -529,6 +533,7 @@ body { margin: 0; flex: 1 1 auto; min-width: 0; + max-width: 100%; font-size: 0.78rem; color: var(--muted-foreground); white-space: nowrap; @@ -2079,17 +2084,26 @@ body::before { padding: 0; justify-content: flex-end; gap: 8px; + width: 100%; + min-width: 0; + overflow: hidden; } .startup-refresh-status { margin-right: auto; flex: 1 1 auto; max-width: none; + min-width: 0; + overflow: hidden; } .startup-refresh-status-copy { font-size: 11px; color: #7d7d7d; + max-width: 100%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .table-card { From 97c7b1dc3d40d8651d2551bf36a9c6b7566b6506 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Thu, 7 May 2026 17:05:49 +0300 Subject: [PATCH 21/55] Centralize Apple retry and app doc normalization helpers --- .../startup-refresh-manager.test.ts | 93 +++++++- .../startup-refresh-manager.ts | 33 ++- .../services/aso-app-doc-service.test.ts | 64 ++++++ .../cache-api/services/aso-app-doc-service.ts | 186 ++++++++++++++-- .../services/aso-app-doc-utils.test.ts | 23 ++ .../cache-api/services/aso-app-doc-utils.ts | 12 + .../services/aso-apple-client.test.ts | 10 +- .../cache-api/services/aso-apple-client.ts | 91 ++------ .../services/aso-enrichment-service.test.ts | 206 +++++++++++++++++- .../services/aso-enrichment-service.ts | 116 +++++++--- .../aso-apple-popularity-client.test.ts | 47 ++-- .../keywords/aso-apple-popularity-client.ts | 100 +++------ .../keywords/aso-popularity-service.test.ts | 20 +- .../keywords/aso-popularity-service.ts | 12 +- cli/shared/apple-upstream-error.ts | 14 +- cli/shared/aso-apple-http.ts | 2 + cli/shared/aso-env.ts | 2 +- cli/shared/aso-retry-delay.test.ts | 63 ++++++ cli/shared/aso-retry-delay.ts | 65 ++++++ cli/shared/aso-transient-error.ts | 58 +++++ docs/aso-error-handling.md | 9 +- docs/aso-keyword-fetch-design.md | 1 + docs/aso-runtime-flows.md | 7 +- 23 files changed, 991 insertions(+), 243 deletions(-) create mode 100644 cli/services/cache-api/services/aso-app-doc-utils.test.ts create mode 100644 cli/services/cache-api/services/aso-app-doc-utils.ts create mode 100644 cli/shared/aso-apple-http.ts create mode 100644 cli/shared/aso-retry-delay.test.ts create mode 100644 cli/shared/aso-retry-delay.ts create mode 100644 cli/shared/aso-transient-error.ts diff --git a/cli/dashboard-server/startup-refresh-manager.test.ts b/cli/dashboard-server/startup-refresh-manager.test.ts index 098abde..993537f 100644 --- a/cli/dashboard-server/startup-refresh-manager.test.ts +++ b/cli/dashboard-server/startup-refresh-manager.test.ts @@ -169,7 +169,9 @@ describe("startup-refresh-manager", () => { enrichKeywords: async (_country, items) => { enrichCalls.push(items); if (enrichCalls.length === 1) { - throw new Error("first batch failed"); + throw Object.assign(new Error("transient network failure"), { + code: "ECONNRESET", + }); } }, isForegroundBusy: () => false, @@ -211,7 +213,9 @@ describe("startup-refresh-manager", () => { listAssociatedAppIds: () => new Set(["app-1"]), listOrderRelevantAppIds: () => new Set(["app-1"]), enrichKeywords: async () => { - throw new Error("always fails"); + throw Object.assign(new Error("always fails transiently"), { + code: "ETIMEDOUT", + }); }, isForegroundBusy: () => false, reportError: (error) => { @@ -233,6 +237,41 @@ describe("startup-refresh-manager", () => { expect(errors).toHaveLength(1); }); + it("does not retry deterministic non-transient batch failures", async () => { + let enrichCalls = 0; + + const manager = createStartupRefreshManager({ + country: "US", + listKeywords: () => [ + buildKeyword({ + keyword: "k1", + normalizedKeyword: "k1", + orderExpiresAt: "2026-03-06T00:00:00.000Z", + }), + ], + listAppKeywords: () => [buildAssociation({ keyword: "k1", appId: "app-1" })], + listAssociatedAppIds: () => new Set(["app-1"]), + listOrderRelevantAppIds: () => new Set(["app-1"]), + enrichKeywords: async () => { + enrichCalls += 1; + throw new Error("deterministic failure"); + }, + isForegroundBusy: () => false, + nowMs: () => Date.parse("2026-03-07T00:00:00.000Z"), + sleep: async () => {}, + keywordBatchSize: 25, + }); + + manager.start(); + await waitForManagerToFinish(manager); + + const state = manager.getState(); + expect(state.status).toBe("failed"); + expect(state.counters.refreshedKeywordCount).toBe(0); + expect(state.counters.failedKeywordCount).toBe(1); + expect(enrichCalls).toBe(1); + }); + it("marks auth-required failures and allows restart after failure", async () => { let attempt = 0; @@ -343,4 +382,54 @@ describe("startup-refresh-manager", () => { expect(state.counters.failedKeywordCount).toBe(1); expect(attempt).toBe(1); }); + + it("does not retry exhausted all-keywords-failed batches", async () => { + let enrichCalls = 0; + + const manager = createStartupRefreshManager({ + country: "US", + listKeywords: () => [ + buildKeyword({ + keyword: "k1", + normalizedKeyword: "k1", + orderExpiresAt: "2026-03-06T00:00:00.000Z", + }), + buildKeyword({ + keyword: "k2", + normalizedKeyword: "k2", + orderExpiresAt: "2026-03-06T00:00:00.000Z", + }), + buildKeyword({ + keyword: "k3", + normalizedKeyword: "k3", + orderExpiresAt: "2026-03-06T00:00:00.000Z", + }), + ], + listAppKeywords: () => [ + buildAssociation({ keyword: "k1", appId: "app-1" }), + buildAssociation({ keyword: "k2", appId: "app-1" }), + buildAssociation({ keyword: "k3", appId: "app-1" }), + ], + listAssociatedAppIds: () => new Set(["app-1"]), + listOrderRelevantAppIds: () => new Set(["app-1"]), + enrichKeywords: async () => { + enrichCalls += 1; + throw new Error("All keywords failed (1): k1:INSUFFICIENT_DOCS(503)"); + }, + isForegroundBusy: () => false, + nowMs: () => Date.parse("2026-03-07T00:00:00.000Z"), + sleep: async () => {}, + keywordBatchSize: 1, + }); + + manager.start(); + await waitForManagerToFinish(manager); + + const state = manager.getState(); + expect(state.status).toBe("failed"); + expect(state.counters.eligibleKeywordCount).toBe(3); + expect(state.counters.refreshedKeywordCount).toBe(0); + expect(state.counters.failedKeywordCount).toBe(3); + expect(enrichCalls).toBe(3); + }); }); diff --git a/cli/dashboard-server/startup-refresh-manager.ts b/cli/dashboard-server/startup-refresh-manager.ts index b65ca23..18117b4 100644 --- a/cli/dashboard-server/startup-refresh-manager.ts +++ b/cli/dashboard-server/startup-refresh-manager.ts @@ -1,5 +1,9 @@ import type { StoredAppKeyword, StoredAsoKeyword } from "../db/types"; import { normalizeKeyword } from "../shared/aso-keyword-utils"; +import { + isKnownTransientStatusCode, + isTransientTransportFailure, +} from "../shared/aso-transient-error"; import { isCompleteStoredAsoKeyword, isStoredKeywordOrderFresh, @@ -139,6 +143,25 @@ function errorToMessage(error: unknown): string { return raw.trim() || "Background refresh failed."; } +function isExhaustedBatchFailure(error: unknown): boolean { + if (!(error instanceof Error)) return false; + const message = error.message.trim(); + if (!message) return false; + return message.startsWith("All keywords failed ("); +} + +function isTransientStartupFailure(error: unknown): boolean { + if (!error || typeof error !== "object") return false; + const statusCode = (error as { statusCode?: unknown }).statusCode; + if (typeof statusCode === "number" && isKnownTransientStatusCode(statusCode)) { + return true; + } + return isTransientTransportFailure({ + code: String((error as { code?: unknown }).code ?? ""), + message: String((error as { message?: unknown }).message ?? ""), + }); +} + async function withOneRetry( operation: () => Promise, sleep: (ms: number) => Promise, @@ -201,7 +224,15 @@ export function createStartupRefreshManager( try { await withOneRetry(async () => { await deps.enrichKeywords(deps.country, batch); - }, sleep, (error) => deps.isAuthReauthRequiredError?.(error) !== true); + }, sleep, (error) => { + if (deps.isAuthReauthRequiredError?.(error) === true) { + return false; + } + if (isExhaustedBatchFailure(error)) { + return false; + } + return isTransientStartupFailure(error); + }); state.counters.refreshedKeywordCount += batch.length; } catch (error) { const isAuthReauthRequired = diff --git a/cli/services/cache-api/services/aso-app-doc-service.test.ts b/cli/services/cache-api/services/aso-app-doc-service.test.ts index 47262fc..95ad525 100644 --- a/cli/services/cache-api/services/aso-app-doc-service.test.ts +++ b/cli/services/cache-api/services/aso-app-doc-service.test.ts @@ -117,6 +117,70 @@ describe("aso-app-doc-service", () => { ); }); + it("fills missing date fields from itunes lookup fallback", async () => { + mockedAsoAppleGet + .mockResolvedValueOnce({ + data: { + storePlatformData: { + "product-dv": { + results: { + "10": { + id: "10", + name: "Lookup Missing Dates", + userRating: { value: 4.2, ratingCount: 99 }, + }, + }, + }, + }, + pageData: { + versionHistory: [], + }, + }, + } as never) + .mockResolvedValueOnce({ + data: { + resultCount: 1, + results: [ + { + trackId: 10, + wrapperType: "software", + trackName: "Lookup Missing Dates", + sellerName: "Fallback Seller", + releaseDate: "2024-01-01T00:00:00Z", + currentVersionReleaseDate: "2025-01-01T00:00:00Z", + }, + ], + }, + } as never); + + const result = await fetchAppStoreLookupAppDocs({ + country: "US", + appIds: ["10"], + }); + + expect(result).toEqual([ + expect.objectContaining({ + appId: "10", + country: "US", + name: "Lookup Missing Dates", + releaseDate: "2024-01-01T00:00:00Z", + currentVersionReleaseDate: "2025-01-01T00:00:00Z", + }), + ]); + expect(mockedAsoAppleGet).toHaveBeenNthCalledWith( + 2, + "https://itunes.apple.com/lookup", + expect.objectContaining({ + operation: "itunes.lookup", + params: expect.objectContaining({ + id: "10", + country: "us", + entity: "software", + }), + }) + ); + }); + it("returns cached docs first, fetches missing docs, and persists them", async () => { const repository = createRepository({ getAppDocs: (jest.fn(async () => [ diff --git a/cli/services/cache-api/services/aso-app-doc-service.ts b/cli/services/cache-api/services/aso-app-doc-service.ts index 13fcaa6..e6e3425 100644 --- a/cli/services/cache-api/services/aso-app-doc-service.ts +++ b/cli/services/cache-api/services/aso-app-doc-service.ts @@ -1,8 +1,10 @@ import { computeAppExpiryIsoForApp } from "./aso-keyword-utils"; import type { AsoCacheRepository, AsoAppDoc } from "./aso-types"; +import { normalizeCountryOnAppDocs } from "./aso-app-doc-utils"; import { asoAppleGet } from "./aso-apple-client"; import { logger } from "../../../utils/logger"; import { reportAppleContractChange } from "../../keywords/apple-http-trace"; +import { ASO_APPLE_WEB_USER_AGENT } from "../../../shared/aso-apple-http"; import { assertSupportedCountry, normalizeCountry, @@ -12,6 +14,26 @@ type AppStoreProductVersionHistoryItem = { releaseDate?: string; }; +type ItunesLookupResult = { + trackId?: number; + trackName?: string; + sellerName?: string; + averageUserRating?: number; + userRatingCount?: number; + releaseDate?: string; + currentVersionReleaseDate?: string; + artworkUrl512?: string; + artworkUrl100?: string; + artworkUrl60?: string; + kind?: string; + wrapperType?: string; +}; + +type ItunesLookupResponse = { + resultCount?: number; + results?: ItunesLookupResult[]; +}; + type AppStoreProductLookupPayload = { storePlatformData?: { "product-dv"?: { @@ -55,6 +77,12 @@ function readNumber(value: unknown): number { return typeof value === "number" && Number.isFinite(value) ? value : 0; } +function readString(value: unknown): string | null { + if (typeof value !== "string") return null; + const trimmed = value.trim(); + return trimmed.length > 0 ? trimmed : null; +} + function parseAppDocFromPayload( payload: AppStoreProductLookupPayload, fallbackAppId: string, @@ -139,6 +167,125 @@ function parseAppDocFromPayload( }; } +function splitIntoChunks(items: T[], size: number): T[][] { + const chunkSize = Math.max(1, Math.floor(size)); + const chunks: T[][] = []; + for (let idx = 0; idx < items.length; idx += chunkSize) { + chunks.push(items.slice(idx, idx + chunkSize)); + } + return chunks; +} + +function parseItunesLookupResult( + result: ItunesLookupResult, + country: string +): AsoAppDoc | null { + const kind = readString(result.kind)?.toLowerCase(); + const wrapperType = readString(result.wrapperType)?.toLowerCase(); + if (kind !== "software" && wrapperType !== "software") { + return null; + } + + const trackId = + typeof result.trackId === "number" ? String(result.trackId) : null; + if (!trackId) return null; + const name = readString(result.trackName) ?? ""; + const publisherName = readString(result.sellerName) ?? undefined; + const releaseDate = readString(result.releaseDate); + const currentVersionReleaseDate = readString(result.currentVersionReleaseDate); + const iconUrl = + readString(result.artworkUrl512) ?? + readString(result.artworkUrl100) ?? + readString(result.artworkUrl60); + + return { + appId: trackId, + country, + name, + ...(publisherName ? { publisherName } : {}), + averageUserRating: readNumber(result.averageUserRating), + userRatingCount: readNumber(result.userRatingCount), + releaseDate, + currentVersionReleaseDate, + ...(iconUrl ? { iconArtwork: { url: iconUrl } } : {}), + }; +} + +async function fetchItunesLookupAppDocs(params: { + country: string; + appIds: string[]; +}): Promise> { + const byId = new Map(); + if (params.appIds.length === 0) return byId; + + const country = params.country.toUpperCase(); + const chunks = splitIntoChunks(params.appIds, 50); + for (const chunk of chunks) { + let response; + try { + response = await asoAppleGet( + "https://itunes.apple.com/lookup", + { + operation: "itunes.lookup", + params: { + id: chunk.join(","), + country: country.toLowerCase(), + entity: "software", + }, + headers: { + "User-Agent": ASO_APPLE_WEB_USER_AGENT, + Accept: "application/json,text/plain,*/*", + }, + timeout: 30000, + } + ); + } catch (error) { + logger.debug("[aso-app-lookup] itunes lookup request failed", { + country, + requestedCount: chunk.length, + appIds: chunk, + message: error instanceof Error ? error.message : String(error), + }); + continue; + } + + if (!response || !response.data || typeof response.data !== "object") { + continue; + } + const results = Array.isArray(response.data.results) ? response.data.results : []; + for (const result of results) { + const doc = parseItunesLookupResult(result, country); + if (!doc) continue; + byId.set(doc.appId, doc); + } + } + + return byId; +} + +function mergeFallbackDoc( + existing: AsoAppDoc | undefined, + fallback: AsoAppDoc +): AsoAppDoc { + if (!existing) return fallback; + return { + ...existing, + ...(existing.name.trim() === "" ? { name: fallback.name } : {}), + ...(existing.publisherName ? {} : { publisherName: fallback.publisherName }), + ...(existing.releaseDate ? {} : { releaseDate: fallback.releaseDate }), + ...(existing.currentVersionReleaseDate + ? {} + : { currentVersionReleaseDate: fallback.currentVersionReleaseDate }), + ...(existing.iconArtwork ? {} : { iconArtwork: fallback.iconArtwork }), + averageUserRating: + existing.averageUserRating > 0 + ? existing.averageUserRating + : fallback.averageUserRating, + userRatingCount: + existing.userRatingCount > 0 ? existing.userRatingCount : fallback.userRatingCount, + }; +} + async function fetchAppDocById(country: string, appId: string): Promise { let response; try { @@ -149,8 +296,7 @@ async function fetchAppDocById(country: string, appId: string): Promise ({ - ...doc, - country: normalizedCountry, - })); -} - export async function fetchAppStoreLookupAppDocs(params: { country: string; appIds: string[]; @@ -230,15 +368,35 @@ export async function fetchAppStoreLookupAppDocs(params: { if (params.appIds.length === 0) return []; const uniqueIds = Array.from(new Set(params.appIds.map((id) => id.trim()).filter(Boolean))); const docs = await Promise.all(uniqueIds.map((appId) => fetchAppDocById(country, appId))); - const byId = new Map(docs.filter((doc): doc is AsoAppDoc => doc != null).map((doc) => [doc.appId, doc])); - const parsedDocs = uniqueIds - .map((id) => byId.get(id)) - .filter((doc): doc is AsoAppDoc => doc != null); + const byId = new Map( + docs.filter((doc): doc is AsoAppDoc => doc != null).map((doc) => [doc.appId, doc]) + ); + const unresolvedIds = uniqueIds.filter((id) => { + const doc = byId.get(id); + if (!doc) return true; + return !doc.releaseDate || !doc.currentVersionReleaseDate; + }); + const fallbackById = await fetchItunesLookupAppDocs({ + country, + appIds: unresolvedIds, + }); + for (const id of unresolvedIds) { + const fallback = fallbackById.get(id); + if (!fallback) continue; + const merged = mergeFallbackDoc(byId.get(id), fallback); + byId.set(id, merged); + } + const parsedDocs = uniqueIds.map((id) => byId.get(id)).filter((doc): doc is AsoAppDoc => doc != null); logger.debug("[aso-app-lookup] lookup batch summary", { country: country.toUpperCase(), requestedCount: uniqueIds.length, parsedCount: parsedDocs.length, skippedCount: uniqueIds.length - parsedDocs.length, + unresolvedCount: unresolvedIds.length, + fallbackResolvedCount: unresolvedIds.filter((id) => { + const doc = byId.get(id); + return Boolean(doc?.releaseDate && doc?.currentVersionReleaseDate); + }).length, }); return normalizeCountryOnAppDocs( country, diff --git a/cli/services/cache-api/services/aso-app-doc-utils.test.ts b/cli/services/cache-api/services/aso-app-doc-utils.test.ts new file mode 100644 index 0000000..db81b56 --- /dev/null +++ b/cli/services/cache-api/services/aso-app-doc-utils.test.ts @@ -0,0 +1,23 @@ +import { normalizeCountryOnAppDocs } from "./aso-app-doc-utils"; +import type { AsoAppDoc } from "./aso-types"; + +describe("aso-app-doc-utils", () => { + it("normalizes country on every app doc", () => { + const docs: AsoAppDoc[] = [ + { + appId: "123", + country: "tr", + name: "App", + averageUserRating: 4.5, + userRatingCount: 10, + releaseDate: "2024-01-01", + currentVersionReleaseDate: "2024-02-01", + }, + ]; + + const result = normalizeCountryOnAppDocs("us", docs); + + expect(result[0]?.country).toBe("US"); + expect(result[0]?.appId).toBe("123"); + }); +}); diff --git a/cli/services/cache-api/services/aso-app-doc-utils.ts b/cli/services/cache-api/services/aso-app-doc-utils.ts new file mode 100644 index 0000000..ab33992 --- /dev/null +++ b/cli/services/cache-api/services/aso-app-doc-utils.ts @@ -0,0 +1,12 @@ +import type { AsoAppDoc } from "./aso-types"; + +export function normalizeCountryOnAppDocs( + country: string, + docs: AsoAppDoc[] +): AsoAppDoc[] { + const normalizedCountry = country.toUpperCase(); + return docs.map((doc) => ({ + ...doc, + country: normalizedCountry, + })); +} diff --git a/cli/services/cache-api/services/aso-apple-client.test.ts b/cli/services/cache-api/services/aso-apple-client.test.ts index a46ecf8..59e9883 100644 --- a/cli/services/cache-api/services/aso-apple-client.test.ts +++ b/cli/services/cache-api/services/aso-apple-client.test.ts @@ -25,7 +25,7 @@ describe("aso-apple-client", () => { jest.clearAllMocks(); jest.useFakeTimers(); jest.spyOn(Math, "random").mockReturnValue(0); - process.env.ASO_RETRY_MAX_ATTEMPTS = "4"; + process.env.ASO_RETRY_MAX_ATTEMPTS = "2"; process.env.ASO_RETRY_BASE_DELAY_MS = "1000"; process.env.ASO_RETRY_MAX_DELAY_MS = "30000"; process.env.ASO_RETRY_JITTER_FACTOR = "0.1"; @@ -40,15 +40,13 @@ describe("aso-apple-client", () => { delete process.env.ASO_RETRY_JITTER_FACTOR; }); - it("uses shared retry defaults and retries 500 responses up to attempt 4", async () => { + it("uses shared retry defaults and retries 500 responses up to attempt 2", async () => { const transientError = { response: { status: 500, statusText: "Server Error", headers: {} }, message: "Internal error", }; (mockGet as any) - .mockRejectedValueOnce(transientError) - .mockRejectedValueOnce(transientError) .mockRejectedValueOnce(transientError) .mockResolvedValueOnce({ status: 200, @@ -63,11 +61,9 @@ describe("aso-apple-client", () => { }); await jest.advanceTimersByTimeAsync(1000); - await jest.advanceTimersByTimeAsync(2000); - await jest.advanceTimersByTimeAsync(4000); const response = await promise; expect(response.status).toBe(200); - expect(mockGet).toHaveBeenCalledTimes(4); + expect(mockGet).toHaveBeenCalledTimes(2); }); }); diff --git a/cli/services/cache-api/services/aso-apple-client.ts b/cli/services/cache-api/services/aso-apple-client.ts index ba11ce2..fe37684 100644 --- a/cli/services/cache-api/services/aso-apple-client.ts +++ b/cli/services/cache-api/services/aso-apple-client.ts @@ -2,6 +2,11 @@ import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from "axios"; import { ContextualError } from "../../../utils/error-handling-helpers"; import { logger } from "../../../utils/logger"; import { getAsoResilienceConfig } from "../../../shared/aso-resilience"; +import { getRetryDelayMs } from "../../../shared/aso-retry-delay"; +import { + isRetryableTransientStatusCode, + isTransientTransportFailure, +} from "../../../shared/aso-transient-error"; import { attachAppleHttpTracing } from "../../keywords/apple-http-trace"; const SENSITIVE_HEADER_KEYS = ["authorization", "cookie", "set-cookie", "x-api-key"]; @@ -38,64 +43,14 @@ function sanitizeHeaders( return sanitized; } -function getHeaderValue( - headers: Record | undefined, - headerName: string -): string | undefined { - if (!headers) return undefined; - const match = Object.entries(headers).find( - ([key]) => key.toLowerCase() === headerName.toLowerCase() - ); - if (!match) return undefined; - const value = match[1]; - if (Array.isArray(value)) return value[0]; - return value != null ? String(value) : undefined; -} - function shouldRetry(error: AxiosError): boolean { - if (error.response?.status != null) { - return error.response.status === 429 || error.response.status >= 500; - } - const code = error.code ?? ""; - if ( - code === "ECONNRESET" || - code === "ETIMEDOUT" || - code === "UND_ERR_CONNECT_TIMEOUT" || - code === "UND_ERR_SOCKET" || - code === "UND_ERR_ABORTED" || - code === "UND_ERR_DESTROYED" - ) { + if (isRetryableTransientStatusCode(error.response?.status)) { return true; } - const message = (error.message ?? "").toLowerCase(); - return message.includes("network") || message.includes("timeout") || message.includes("fetch failed"); -} - -function calculateJitteredDelay(baseDelay: number): number { - const { jitterFactor, maxDelayMs } = getAsoResilienceConfig(); - const delayWithJitter = baseDelay + Math.random() * jitterFactor * baseDelay; - return Math.min(maxDelayMs, delayWithJitter); -} - -function parseRetryAfterMs(error: AxiosError): number | null { - if (error.response?.status !== 429) return null; - const retryAfterRaw = getHeaderValue( - error.response.headers as Record | undefined, - "retry-after" - ); - if (!retryAfterRaw) return null; - - const retryAfterSeconds = Number.parseInt(retryAfterRaw, 10); - if (Number.isFinite(retryAfterSeconds)) { - return Math.max(0, retryAfterSeconds * 1000); - } - - const retryAfterDateMs = Date.parse(retryAfterRaw); - if (Number.isFinite(retryAfterDateMs)) { - return Math.max(0, retryAfterDateMs - Date.now()); - } - - return null; + return isTransientTransportFailure({ + code: error.code, + message: error.message, + }); } async function waitBeforeRetry( @@ -103,25 +58,13 @@ async function waitBeforeRetry( attempt: number, delayMs: number ): Promise { - const retryAfterMs = parseRetryAfterMs(error); - if (retryAfterMs != null) { - const waitedMs = calculateJitteredDelay(retryAfterMs); - await new Promise((resolve) => setTimeout(resolve, waitedMs)); - return waitedMs; - } - - if (error.response?.status === 429) { - const { rateLimitBaseDelayMs, maxDelayMs } = getAsoResilienceConfig(); - const exponentialDelay = rateLimitBaseDelayMs * Math.pow(2, attempt - 1); - const waitedMs = calculateJitteredDelay( - Math.min(maxDelayMs, exponentialDelay) - ); - await new Promise((resolve) => setTimeout(resolve, waitedMs)); - return waitedMs; - } - - const exponentialDelay = delayMs * Math.pow(2, attempt - 1); - const waitedMs = calculateJitteredDelay(exponentialDelay); + const waitedMs = getRetryDelayMs({ + statusCode: error.response?.status, + headers: error.response?.headers as Record | undefined, + attempt, + defaultBaseDelayMs: delayMs, + rateLimitBaseDelayMs: getAsoResilienceConfig().rateLimitBaseDelayMs, + }); await new Promise((resolve) => setTimeout(resolve, waitedMs)); return waitedMs; } diff --git a/cli/services/cache-api/services/aso-enrichment-service.test.ts b/cli/services/cache-api/services/aso-enrichment-service.test.ts index b156c11..0872831 100644 --- a/cli/services/cache-api/services/aso-enrichment-service.test.ts +++ b/cli/services/cache-api/services/aso-enrichment-service.test.ts @@ -1,5 +1,9 @@ import { jest } from "@jest/globals"; -import { enrichKeyword, refreshKeywordOrder } from "./aso-enrichment-service"; +import { + __resetIncompleteTopDocLookupCooldownForTests, + enrichKeyword, + refreshKeywordOrder, +} from "./aso-enrichment-service"; import { asoAppleGet } from "./aso-apple-client"; import { fetchAppStoreLookupAppDocs } from "./aso-app-doc-service"; import { fetchAppStoreAdditionalLocalizations } from "./aso-app-store-details"; @@ -51,9 +55,15 @@ function buildSearchHtmlForIds( options?: { developerNamesById?: Record; ratingCountById?: Record; + kindsById?: Record; + resultTypesById?: Record; } ): string { const items = ids.map((id, index) => ({ + ...(options?.kindsById?.[id] ? { $kind: options.kindsById[id] } : {}), + ...(options?.resultTypesById?.[id] + ? { resultType: options.resultTypesById[id] } + : {}), lockup: { adamId: id, title: `App ${id}`, @@ -108,6 +118,7 @@ function buildCompleteCachedTopDocs( describe("aso-enrichment-service", () => { beforeEach(() => { jest.clearAllMocks(); + __resetIncompleteTopDocLookupCooldownForTests(); mockedFetchAppStoreAdditionalLocalizations.mockResolvedValue({}); }); @@ -333,6 +344,199 @@ describe("aso-enrichment-service", () => { ); }); + it("applies lookup cooldown for unresolved top-app docs across nearby keywords", async () => { + mockedAsoAppleGet.mockResolvedValue({ + data: buildSearchHtmlForIds(["1", "2", "3", "4", "5"]), + } as never); + mockedFetchAppStoreLookupAppDocs.mockResolvedValue([ + { + appId: "1", + country: "US", + name: "Lookup 1 Missing Dates", + averageUserRating: 4.8, + userRatingCount: 1111, + releaseDate: null, + currentVersionReleaseDate: null, + }, + ]); + + const getAppDocs = async () => [ + { + appId: "1", + country: "US", + name: "Cached 1", + averageUserRating: 4.7, + userRatingCount: 1000, + expiresAt: "2099-01-01T00:00:00.000Z", + releaseDate: null, + currentVersionReleaseDate: null, + }, + { + appId: "2", + country: "US", + name: "Cached 2", + averageUserRating: 4.6, + userRatingCount: 2000, + expiresAt: "2099-01-01T00:00:00.000Z", + releaseDate: "2024-01-01T00:00:00.000Z", + currentVersionReleaseDate: "2025-01-01T00:00:00.000Z", + }, + { + appId: "3", + country: "US", + name: "Cached 3", + averageUserRating: 4.5, + userRatingCount: 3000, + expiresAt: "2099-01-01T00:00:00.000Z", + releaseDate: "2024-01-01T00:00:00.000Z", + currentVersionReleaseDate: "2025-01-01T00:00:00.000Z", + }, + { + appId: "4", + country: "US", + name: "Cached 4", + averageUserRating: 4.4, + userRatingCount: 4000, + expiresAt: "2099-01-01T00:00:00.000Z", + releaseDate: "2024-01-01T00:00:00.000Z", + currentVersionReleaseDate: "2025-01-01T00:00:00.000Z", + }, + { + appId: "5", + country: "US", + name: "Cached 5", + averageUserRating: 4.3, + userRatingCount: 5000, + expiresAt: "2099-01-01T00:00:00.000Z", + releaseDate: "2024-01-01T00:00:00.000Z", + currentVersionReleaseDate: "2025-01-01T00:00:00.000Z", + }, + ]; + + await expect( + enrichKeyword( + { + keyword: "word game", + country: "US", + popularity: 66, + }, + { getAppDocs } + ) + ).rejects.toThrow("Insufficient top-app docs for difficulty scoring"); + + expect(mockedFetchAppStoreLookupAppDocs).toHaveBeenCalledTimes(2); + + await expect( + enrichKeyword( + { + keyword: "word game plus", + country: "US", + popularity: 66, + }, + { getAppDocs } + ) + ).rejects.toThrow("Insufficient top-app docs for difficulty scoring"); + + expect(mockedFetchAppStoreLookupAppDocs).toHaveBeenCalledTimes(2); + }); + + it("skips bundle search results when building top app ids for difficulty docs", async () => { + const bundleId = "1814195639"; + mockedAsoAppleGet.mockResolvedValue({ + data: buildSearchHtmlForIds( + ["1", "2", bundleId, "3", "4"], + ["5", "6"], + { + kindsById: { + [bundleId]: "BundleSearchResult", + }, + resultTypesById: { + [bundleId]: "bundle", + }, + } + ), + } as never); + mockedFetchAppStoreLookupAppDocs.mockResolvedValue([ + { + appId: "1", + country: "US", + name: "Lookup 1", + averageUserRating: 4.8, + userRatingCount: 1000, + releaseDate: "2024-01-01T00:00:00.000Z", + currentVersionReleaseDate: "2025-01-01T00:00:00.000Z", + }, + { + appId: "2", + country: "US", + name: "Lookup 2", + averageUserRating: 4.7, + userRatingCount: 2000, + releaseDate: "2024-01-01T00:00:00.000Z", + currentVersionReleaseDate: "2025-01-01T00:00:00.000Z", + }, + { + appId: "3", + country: "US", + name: "Lookup 3", + averageUserRating: 4.6, + userRatingCount: 3000, + releaseDate: "2024-01-01T00:00:00.000Z", + currentVersionReleaseDate: "2025-01-01T00:00:00.000Z", + }, + { + appId: "4", + country: "US", + name: "Lookup 4", + averageUserRating: 4.5, + userRatingCount: 4000, + releaseDate: "2024-01-01T00:00:00.000Z", + currentVersionReleaseDate: "2025-01-01T00:00:00.000Z", + }, + { + appId: "5", + country: "US", + name: "Lookup 5", + averageUserRating: 4.4, + userRatingCount: 5000, + releaseDate: "2024-01-01T00:00:00.000Z", + currentVersionReleaseDate: "2025-01-01T00:00:00.000Z", + }, + ]); + + const result = await enrichKeyword( + { + keyword: "youtube", + country: "US", + popularity: 92, + }, + { + getAppDocs: async () => [], + } + ); + + expect(result.orderedAppIds.slice(0, 5)).toEqual(["1", "2", "3", "4", "5"]); + expect(result.orderedAppIds).not.toContain(bundleId); + const lookupCalls = mockedFetchAppStoreLookupAppDocs.mock.calls.map( + (call) => call[0] + ); + expect(lookupCalls).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + country: "US", + appIds: ["1", "2", "3", "4"], + }), + expect.objectContaining({ + country: "US", + appIds: ["5"], + }), + ]) + ); + for (const call of lookupCalls) { + expect(call?.appIds ?? []).not.toContain(bundleId); + } + }); + it("matches keywords per localization and does not mix words across localizations", async () => { mockedAsoAppleGet.mockResolvedValue({ data: buildSearchHtmlForIds(["1", "2", "3", "4", "5"]), diff --git a/cli/services/cache-api/services/aso-enrichment-service.ts b/cli/services/cache-api/services/aso-enrichment-service.ts index e9e4571..ab5901b 100644 --- a/cli/services/cache-api/services/aso-enrichment-service.ts +++ b/cli/services/cache-api/services/aso-enrichment-service.ts @@ -8,11 +8,13 @@ import { fetchAppStoreAdditionalLocalizations, fetchAppStoreLocalizedAppData, } from "./aso-app-store-details"; +import { normalizeCountryOnAppDocs } from "./aso-app-doc-utils"; import { fetchAppStoreLookupAppDocs } from "./aso-app-doc-service"; import type { AsoAppDoc, AsoAppDocIcon } from "./aso-types"; import { asoAppleGet } from "./aso-apple-client"; import { reportAppleContractChange } from "../../keywords/apple-http-trace"; import { getStorefrontDefaultLanguage } from "../../../shared/aso-storefront-localizations"; +import { ASO_APPLE_WEB_USER_AGENT } from "../../../shared/aso-apple-http"; import type { KeywordMatchType } from "../../../shared/aso-keyword-match"; import { calculateAppDifficultyBreakdown, @@ -56,6 +58,8 @@ interface AmpSearchResponse { shelves?: Array<{ contentType?: string; items?: Array<{ + $kind?: string; + resultType?: string; lockup?: AmpSearchLockup; }>; }>; @@ -73,12 +77,47 @@ const MZSEARCH_PLATFORM_ID_JSON = 29; const STORE_FRONT_ID_BY_COUNTRY: Record = { US: 143441, }; -const DEFAULT_APPLE_WEB_USER_AGENT = - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.1.1 Safari/605.1.15"; const MZSEARCH_ORDER_URL = "https://search.itunes.apple.com/WebObjects/MZSearch.woa/wa/search"; const APPSTORE_SEARCH_URL = "https://apps.apple.com/us/iphone/search"; const INSUFFICIENT_DOCS_RETRY_COUNT = 1; const INSUFFICIENT_DOCS_RETRY_BACKOFF_MS = 150; +const INCOMPLETE_TOP_DOC_LOOKUP_COOLDOWN_MS = 10 * 60 * 1000; +const incompleteTopDocLookupCooldownUntilByAppId = new Map(); + +function isIncompleteTopDocLookupOnCooldown( + appId: string, + nowMs: number = Date.now() +): boolean { + const cooldownUntil = incompleteTopDocLookupCooldownUntilByAppId.get(appId); + if (cooldownUntil == null) return false; + if (cooldownUntil <= nowMs) { + incompleteTopDocLookupCooldownUntilByAppId.delete(appId); + return false; + } + return true; +} + +function markIncompleteTopDocLookupCooldown( + appIds: string[], + nowMs: number = Date.now() +): void { + if (appIds.length === 0) return; + const cooldownUntil = nowMs + INCOMPLETE_TOP_DOC_LOOKUP_COOLDOWN_MS; + for (const appId of appIds) { + incompleteTopDocLookupCooldownUntilByAppId.set(appId, cooldownUntil); + } +} + +function clearIncompleteTopDocLookupCooldown(appIds: string[]): void { + if (appIds.length === 0) return; + for (const appId of appIds) { + incompleteTopDocLookupCooldownUntilByAppId.delete(appId); + } +} + +export function __resetIncompleteTopDocLookupCooldownForTests(): void { + incompleteTopDocLookupCooldownUntilByAppId.clear(); +} class InsufficientDifficultyDocsError extends Error { readonly code = "INSUFFICIENT_DOCS"; @@ -279,8 +318,7 @@ async function fetchPopularityOrderedIds(params: { term: params.keyword, }, headers: { - "User-Agent": - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.1.1 Safari/605.1.15", + "User-Agent": ASO_APPLE_WEB_USER_AGENT, "Accept-Language": "en-US,en;q=0.9", Cookie: "dslang=US-EN", "x-apple-store-front": getStoreFrontHeader(params.country), @@ -366,6 +404,18 @@ function lockupToAppDoc(lockup: AmpSearchLockup, country: string): AsoAppDoc | n }; } +function isAppLikeSearchResultItem(item: { + $kind?: string; + resultType?: string; +}): boolean { + const kind = (item.$kind ?? "").trim(); + const resultType = (item.resultType ?? "").trim().toLowerCase(); + if (kind === "BundleSearchResult" || resultType === "bundle") { + return false; + } + return true; +} + async function fetchSearchPageOrderedData(params: { keyword: string; country: string; @@ -377,7 +427,7 @@ async function fetchSearchPageOrderedData(params: { operation: "appstore.search-page", params: { term: params.keyword }, headers: { - "User-Agent": DEFAULT_APPLE_WEB_USER_AGENT, + "User-Agent": ASO_APPLE_WEB_USER_AGENT, Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Accept-Language": "en-US,en;q=0.9", }, @@ -401,6 +451,9 @@ async function fetchSearchPageOrderedData(params: { const appDocs: AsoAppDoc[] = []; const leadingOrderedIds: string[] = []; for (const item of searchShelf?.items || []) { + if (!isAppLikeSearchResultItem(item)) { + continue; + } const lockup = item?.lockup; if (!lockup) continue; const doc = lockupToAppDoc(lockup, params.country); @@ -616,14 +669,6 @@ function mergeSearchFieldsIntoAppDoc( }; } -function normalizeCountryOnAppDocs(country: string, appDocs: AsoAppDoc[]): AsoAppDoc[] { - const normalizedCountry = country.toUpperCase(); - return appDocs.map((doc) => ({ - ...doc, - country: normalizedCountry, - })); -} - async function hydrateMissingAdditionalLocalizations(params: { appDocs: AsoAppDoc[]; appIds: string[]; @@ -763,14 +808,32 @@ async function backfillMissingTopDifficultyDocs(params: { } if (missingTopIds.length > 0) { - const lookedUpDocs = normalizeCountryOnAppDocs( - params.country, - await buildAppDocsFromLookup({ - appIds: missingTopIds, - country: params.country, - }) + const nowMs = Date.now(); + const lookupEligibleMissingTopIds = missingTopIds.filter( + (appId) => !isIncompleteTopDocLookupOnCooldown(appId, nowMs) ); - mergedDocs = mergeAppDocsById(mergedDocs, lookedUpDocs); + if (lookupEligibleMissingTopIds.length > 0) { + const lookedUpDocs = normalizeCountryOnAppDocs( + params.country, + await buildAppDocsFromLookup({ + appIds: lookupEligibleMissingTopIds, + country: params.country, + }) + ); + mergedDocs = mergeAppDocsById(mergedDocs, lookedUpDocs); + missingTopIds = listIncompleteTopDifficultyDocIds({ + orderedAppIds: params.orderedAppIds, + appDocs: mergedDocs, + }); + const unresolvedLookups = lookupEligibleMissingTopIds.filter((appId) => + missingTopIds.includes(appId) + ); + markIncompleteTopDocLookupCooldown(unresolvedLookups, nowMs); + } + const resolvedTopIds = params.orderedAppIds + .slice(0, TOP_DIFFICULTY_DOC_LIMIT) + .filter((appId) => !missingTopIds.includes(appId)); + clearIncompleteTopDocLookupCooldown(resolvedTopIds); } return reorderAppDocsForTopDifficultyIds({ @@ -879,12 +942,13 @@ export async function enrichKeyword( const searchDoc = searchDocByAppId.get(id); if (!searchDoc) return false; const c = cachedByAppId.get(id); - return ( - !c || - Date.parse(c.expiresAt ?? "0") <= now || - !c.releaseDate || - !c.currentVersionReleaseDate - ); + const hasStaleOrMissingCache = !c || Date.parse(c.expiresAt ?? "0") <= now; + const hasIncompleteDifficultyFields = + c != null && (!c.releaseDate || !c.currentVersionReleaseDate); + if (!hasStaleOrMissingCache && !hasIncompleteDifficultyFields) { + return false; + } + return !isIncompleteTopDocLookupOnCooldown(id, now); }); const lookupDetailsByAppId = idsThatNeedLookup.length > 0 diff --git a/cli/services/keywords/aso-apple-popularity-client.test.ts b/cli/services/keywords/aso-apple-popularity-client.test.ts index 09aafe2..9124f9a 100644 --- a/cli/services/keywords/aso-apple-popularity-client.test.ts +++ b/cli/services/keywords/aso-apple-popularity-client.test.ts @@ -19,7 +19,7 @@ describe("aso-apple-popularity-client", () => { jest.clearAllMocks(); jest.useFakeTimers(); jest.spyOn(Math, "random").mockReturnValue(0); - process.env.ASO_RETRY_MAX_ATTEMPTS = "4"; + process.env.ASO_RETRY_MAX_ATTEMPTS = "2"; process.env.ASO_RETRY_BASE_DELAY_MS = "1000"; process.env.ASO_RETRY_MAX_DELAY_MS = "30000"; process.env.ASO_RETRY_JITTER_FACTOR = "0.1"; @@ -34,7 +34,7 @@ describe("aso-apple-popularity-client", () => { delete process.env.ASO_RETRY_JITTER_FACTOR; }); - it("retries KWS_NO_ORG_CONTENT_PROVIDERS up to 3 times and succeeds", async () => { + it("retries KWS_NO_ORG_CONTENT_PROVIDERS once and succeeds", async () => { (mockPost as any) .mockResolvedValueOnce({ status: 403, @@ -51,21 +51,6 @@ describe("aso-apple-popularity-client", () => { }, }, }) - .mockResolvedValueOnce({ - status: 403, - data: { - status: "error", - requestID: "req2", - error: { - errors: [ - { - messageCode: "KWS_NO_ORG_CONTENT_PROVIDERS", - message: "No org content providers", - }, - ], - }, - }, - }) .mockResolvedValueOnce({ status: 200, data: { status: "success", data: [{ name: "z", popularity: 9 }] }, @@ -73,10 +58,9 @@ describe("aso-apple-popularity-client", () => { const promise = requestPopularitiesWithKwsRetry(["z"], "cookie=value", "adam"); await jest.advanceTimersByTimeAsync(1000); - await jest.advanceTimersByTimeAsync(2000); const result = await promise; - expect(mockPost).toHaveBeenCalledTimes(3); + expect(mockPost).toHaveBeenCalledTimes(2); expect(result.statusCode).toBe(200); expect(result.data.status).toBe("success"); }); @@ -104,11 +88,9 @@ describe("aso-apple-popularity-client", () => { "adam" ); await jest.advanceTimersByTimeAsync(1000); - await jest.advanceTimersByTimeAsync(2000); - await jest.advanceTimersByTimeAsync(4000); const result = await promise; - expect(mockPost).toHaveBeenCalledTimes(4); + expect(mockPost).toHaveBeenCalledTimes(2); expect(result.statusCode).toBe(403); expect(result.data.error?.errors?.[0]?.messageCode).toBe( "KWS_NO_ORG_CONTENT_PROVIDERS" @@ -146,7 +128,6 @@ describe("aso-apple-popularity-client", () => { code: "ECONNRESET", }); (mockPost as any) - .mockRejectedValueOnce(networkError) .mockRejectedValueOnce(networkError) .mockResolvedValueOnce({ status: 200, @@ -155,10 +136,26 @@ describe("aso-apple-popularity-client", () => { const promise = requestPopularitiesWithKwsRetry(["z"], "cookie=value", "adam"); await jest.advanceTimersByTimeAsync(1000); - await jest.advanceTimersByTimeAsync(2000); const result = await promise; - expect(mockPost).toHaveBeenCalledTimes(3); + expect(mockPost).toHaveBeenCalledTimes(2); expect(result.statusCode).toBe(200); }); + + it("does not retry when maxAttempts override is 1", async () => { + (mockPost as any).mockResolvedValue({ + status: 503, + data: { status: "error", requestID: "req-no-retry" }, + }); + + const result = await requestPopularitiesWithKwsRetry( + ["z"], + "cookie=value", + "adam", + { maxAttempts: 1 } + ); + + expect(mockPost).toHaveBeenCalledTimes(1); + expect(result.statusCode).toBe(503); + }); }); diff --git a/cli/services/keywords/aso-apple-popularity-client.ts b/cli/services/keywords/aso-apple-popularity-client.ts index bcefe33..1dfe92d 100644 --- a/cli/services/keywords/aso-apple-popularity-client.ts +++ b/cli/services/keywords/aso-apple-popularity-client.ts @@ -1,6 +1,12 @@ import axios from "axios"; import { logger } from "../../utils/logger"; import { getAsoResilienceConfig } from "../../shared/aso-resilience"; +import { getRetryDelayMs as getSharedRetryDelayMs } from "../../shared/aso-retry-delay"; +import { + isKnownTransientStatusCode, + isRetryableTransientStatusCode, + isTransientTransportFailure, +} from "../../shared/aso-transient-error"; import { attachAppleHttpTracing, withAppleHttpTraceContext, @@ -9,7 +15,6 @@ import { const APPLE_POPULARITY_URL = "https://app-ads.apple.com/cm/api/v2/keywords/popularities"; const KWS_NO_ORG_CONTENT_PROVIDERS = "KWS_NO_ORG_CONTENT_PROVIDERS"; -const TRANSIENT_STATUS_CODES = new Set([429, 500, 502, 503, 504]); export interface PopularityItem { name: string; @@ -96,98 +101,45 @@ async function requestPopularitiesOnce( } } -function getHeaderValue( - headers: Record | undefined, - headerName: string -): string | undefined { - if (!headers) return undefined; - const match = Object.entries(headers).find( - ([key]) => key.toLowerCase() === headerName.toLowerCase() - ); - if (!match) return undefined; - const value = match[1]; - if (Array.isArray(value)) return value[0] != null ? String(value[0]) : undefined; - return value != null ? String(value) : undefined; -} - -function parseRetryAfterMs(headers: Record | undefined): number | null { - const retryAfterRaw = getHeaderValue(headers, "retry-after"); - if (!retryAfterRaw) return null; - - const retryAfterSeconds = Number.parseInt(retryAfterRaw, 10); - if (Number.isFinite(retryAfterSeconds)) { - return Math.max(0, retryAfterSeconds * 1000); - } - - const retryAfterDateMs = Date.parse(retryAfterRaw); - if (Number.isFinite(retryAfterDateMs)) { - return Math.max(0, retryAfterDateMs - Date.now()); - } - - return null; -} - -function calculateJitteredDelay(baseDelayMs: number): number { - const { jitterFactor, maxDelayMs } = getAsoResilienceConfig(); - const jittered = baseDelayMs + Math.random() * jitterFactor * baseDelayMs; - return Math.min(maxDelayMs, jittered); -} - function getRetryDelayMs(params: { statusCode: number; headers?: Record; attempt: number; }): number { - const retryAfterMs = - params.statusCode === 429 ? parseRetryAfterMs(params.headers) : null; - if (retryAfterMs != null) { - return calculateJitteredDelay(retryAfterMs); - } - - const { baseDelayMs, rateLimitBaseDelayMs, maxDelayMs } = - getAsoResilienceConfig(); - const fallbackBaseDelayMs = - params.statusCode === 429 ? rateLimitBaseDelayMs : baseDelayMs; - const exponentialDelay = - fallbackBaseDelayMs * Math.pow(2, params.attempt - 1); - return Math.min(maxDelayMs, calculateJitteredDelay(exponentialDelay)); + const { baseDelayMs, rateLimitBaseDelayMs } = getAsoResilienceConfig(); + return getSharedRetryDelayMs({ + statusCode: params.statusCode, + headers: params.headers, + attempt: params.attempt, + defaultBaseDelayMs: baseDelayMs, + rateLimitBaseDelayMs, + }); } function isTransientStatus(statusCode: number, data: PopularityResponse): boolean { if (isNoOrgContentProvidersError(statusCode, data)) return true; - return TRANSIENT_STATUS_CODES.has(statusCode); + return isKnownTransientStatusCode(statusCode); } function isTransientAxiosError(error: unknown): boolean { if (!axios.isAxiosError(error)) return false; - if (error.response?.status != null) { - return error.response.status === 429 || error.response.status >= 500; - } - const code = error.code ?? ""; - if ( - code === "ECONNRESET" || - code === "ETIMEDOUT" || - code === "UND_ERR_CONNECT_TIMEOUT" || - code === "UND_ERR_SOCKET" || - code === "UND_ERR_ABORTED" || - code === "UND_ERR_DESTROYED" - ) { - return true; - } - const message = (error.message ?? "").toLowerCase(); - return ( - message.includes("network") || - message.includes("timeout") || - message.includes("fetch failed") - ); + if (isRetryableTransientStatusCode(error.response?.status)) return true; + return isTransientTransportFailure({ + code: error.code, + message: error.message, + }); } export async function requestPopularitiesWithKwsRetry( terms: string[], cookieHeader: string, - adamId: string + adamId: string, + options?: { maxAttempts?: number } ): Promise<{ statusCode: number; data: PopularityResponse; attempts: number }> { - const { maxAttempts } = getAsoResilienceConfig(); + const maxAttempts = Math.max( + 1, + options?.maxAttempts ?? getAsoResilienceConfig().maxAttempts + ); for (let attempt = 1; attempt <= maxAttempts; attempt += 1) { try { const response = await requestPopularitiesOnce(terms, cookieHeader, adamId); diff --git a/cli/services/keywords/aso-popularity-service.test.ts b/cli/services/keywords/aso-popularity-service.test.ts index b3838c5..e9835f5 100644 --- a/cli/services/keywords/aso-popularity-service.test.ts +++ b/cli/services/keywords/aso-popularity-service.test.ts @@ -79,7 +79,8 @@ describe("AsoPopularityService", () => { expect(mockRequestPopularitiesWithKwsRetry).toHaveBeenCalledWith( ["keyword", "another"], "cookie=value", - expect.any(String) + expect.any(String), + undefined ); expect(asoAuthService.getCookieHeader).toHaveBeenCalledWith( "https://app-ads.apple.com/cm/api/v2/keywords/popularities" @@ -158,7 +159,8 @@ describe("AsoPopularityService", () => { expect(mockRequestPopularitiesWithKwsRetry).toHaveBeenCalledWith( ["x"], "new-cookie", - expect.any(String) + expect.any(String), + undefined ); }); @@ -339,6 +341,20 @@ describe("AsoPopularityService", () => { keyword: "bad", stage: "popularity", }); + expect(mockRequestPopularitiesWithKwsRetry).toHaveBeenNthCalledWith( + 2, + ["good"], + "cookie=value", + expect.any(String), + { maxAttempts: 1 } + ); + expect(mockRequestPopularitiesWithKwsRetry).toHaveBeenNthCalledWith( + 3, + ["bad"], + "cookie=value", + expect.any(String), + { maxAttempts: 1 } + ); }); }); }); diff --git a/cli/services/keywords/aso-popularity-service.ts b/cli/services/keywords/aso-popularity-service.ts index b999c7d..f710db8 100644 --- a/cli/services/keywords/aso-popularity-service.ts +++ b/cli/services/keywords/aso-popularity-service.ts @@ -177,7 +177,8 @@ export class AsoPopularityService { } const requestWithAuthRecovery = async ( terms: string[], - stageLabel: string + stageLabel: string, + options?: { maxAttempts?: number } ): Promise<{ statusCode: number; data: PopularityResponse; attempts: number }> => { logger.debug( `[aso-popularity] sending ${stageLabel} request cookieHeaderLength=${cookieHeader.length} terms=${terms.length}` @@ -185,7 +186,8 @@ export class AsoPopularityService { let response = await requestPopularitiesWithKwsRetry( terms, cookieHeader, - adamId + adamId, + options ); logPopularityResponse(stageLabel, response.statusCode, response.data); @@ -202,7 +204,8 @@ export class AsoPopularityService { response = await requestPopularitiesWithKwsRetry( terms, cookieHeader, - adamId + adamId, + options ); logPopularityResponse( `${stageLabel}-post-reauth`, @@ -371,7 +374,8 @@ export class AsoPopularityService { try { const singleResponse = await requestWithAuthRecovery( [term], - `isolation:${term}` + `isolation:${term}`, + { maxAttempts: 1 } ); if ( singleResponse.statusCode === 200 && diff --git a/cli/shared/apple-upstream-error.ts b/cli/shared/apple-upstream-error.ts index 6434f29..d22cda8 100644 --- a/cli/shared/apple-upstream-error.ts +++ b/cli/shared/apple-upstream-error.ts @@ -1,14 +1,11 @@ import axios from "axios"; import { getErrorBugsnagMetadata } from "../services/telemetry/bugsnag-metadata"; +import { + isKnownTransientStatusCode, + isTransientTransportFailure, +} from "./aso-transient-error"; -const RETRYABLE_STATUS_CODES = new Set([429, 500, 502, 503, 504]); const RETRYABLE_MESSAGE_SNIPPETS = [ - "network", - "timeout", - "timed out", - "fetch failed", - "socket", - "connect", "rate limit", "too many requests", ]; @@ -101,7 +98,8 @@ function normalizeReasonCode(rawCode: string | undefined, fallback: string): str } function inferRetryable(statusCode: number | undefined, message: string): boolean { - if (statusCode != null && RETRYABLE_STATUS_CODES.has(statusCode)) return true; + if (isKnownTransientStatusCode(statusCode)) return true; + if (isTransientTransportFailure({ message })) return true; const lower = message.toLowerCase(); return RETRYABLE_MESSAGE_SNIPPETS.some((snippet) => lower.includes(snippet)); } diff --git a/cli/shared/aso-apple-http.ts b/cli/shared/aso-apple-http.ts new file mode 100644 index 0000000..985a3ec --- /dev/null +++ b/cli/shared/aso-apple-http.ts @@ -0,0 +1,2 @@ +export const ASO_APPLE_WEB_USER_AGENT = + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.1.1 Safari/605.1.15"; diff --git a/cli/shared/aso-env.ts b/cli/shared/aso-env.ts index 5e3e7f0..32ac452 100644 --- a/cli/shared/aso-env.ts +++ b/cli/shared/aso-env.ts @@ -8,7 +8,7 @@ export const ASO_DEFAULTS = { appleWidgetKeyFallback: "a01459d797984726ee0914a7097e53fad42b70e1f08d09294d14523a1d4f61e1", authMode: "auto", - retryMaxAttempts: 4, + retryMaxAttempts: 2, retryBaseDelayMs: 1000, retryMaxDelayMs: 30000, rateLimitBaseDelayMs: 5000, diff --git a/cli/shared/aso-retry-delay.test.ts b/cli/shared/aso-retry-delay.test.ts new file mode 100644 index 0000000..2a88591 --- /dev/null +++ b/cli/shared/aso-retry-delay.test.ts @@ -0,0 +1,63 @@ +import { jest } from "@jest/globals"; +import { + getHeaderValue, + parseRetryAfterMs, + calculateJitteredDelay, + getRetryDelayMs, +} from "./aso-retry-delay"; + +describe("aso-retry-delay", () => { + beforeEach(() => { + jest.restoreAllMocks(); + jest.spyOn(Math, "random").mockReturnValue(0); + process.env.ASO_RETRY_MAX_DELAY_MS = "30000"; + process.env.ASO_RETRY_JITTER_FACTOR = "0.1"; + }); + + afterEach(() => { + jest.restoreAllMocks(); + delete process.env.ASO_RETRY_MAX_DELAY_MS; + delete process.env.ASO_RETRY_JITTER_FACTOR; + }); + + it("reads header values case-insensitively", () => { + expect(getHeaderValue({ "Retry-After": "2" }, "retry-after")).toBe("2"); + }); + + it("parses retry-after seconds", () => { + expect(parseRetryAfterMs({ "retry-after": "2" })).toBe(2000); + }); + + it("parses retry-after dates", () => { + jest.spyOn(Date, "now").mockReturnValue(1_000); + expect(parseRetryAfterMs({ "retry-after": "Thu, 01 Jan 1970 00:00:03 GMT" })).toBe( + 2000 + ); + }); + + it("computes jittered delay with max cap", () => { + expect(calculateJitteredDelay(5000)).toBe(5000); + expect(calculateJitteredDelay(40000)).toBe(30000); + }); + + it("prefers retry-after for 429", () => { + const delay = getRetryDelayMs({ + statusCode: 429, + headers: { "retry-after": "2" }, + attempt: 1, + defaultBaseDelayMs: 1000, + rateLimitBaseDelayMs: 3000, + }); + expect(delay).toBe(2000); + }); + + it("uses exponential fallback for non-429", () => { + const delay = getRetryDelayMs({ + statusCode: 503, + attempt: 2, + defaultBaseDelayMs: 1000, + rateLimitBaseDelayMs: 3000, + }); + expect(delay).toBe(2000); + }); +}); diff --git a/cli/shared/aso-retry-delay.ts b/cli/shared/aso-retry-delay.ts new file mode 100644 index 0000000..7215cb5 --- /dev/null +++ b/cli/shared/aso-retry-delay.ts @@ -0,0 +1,65 @@ +import { getAsoResilienceConfig } from "./aso-resilience"; + +export function getHeaderValue( + headers: Record | undefined, + headerName: string +): string | undefined { + if (!headers) return undefined; + const match = Object.entries(headers).find( + ([key]) => key.toLowerCase() === headerName.toLowerCase() + ); + if (!match) return undefined; + const value = match[1]; + if (Array.isArray(value)) { + return value[0] != null ? String(value[0]) : undefined; + } + return value != null ? String(value) : undefined; +} + +export function parseRetryAfterMs( + headers: Record | undefined +): number | null { + const retryAfterRaw = getHeaderValue(headers, "retry-after"); + if (!retryAfterRaw) return null; + + const retryAfterSeconds = Number.parseInt(retryAfterRaw, 10); + if (Number.isFinite(retryAfterSeconds)) { + return Math.max(0, retryAfterSeconds * 1000); + } + + const retryAfterDateMs = Date.parse(retryAfterRaw); + if (Number.isFinite(retryAfterDateMs)) { + return Math.max(0, retryAfterDateMs - Date.now()); + } + + return null; +} + +export function calculateJitteredDelay(baseDelayMs: number): number { + const { jitterFactor, maxDelayMs } = getAsoResilienceConfig(); + const jittered = baseDelayMs + Math.random() * jitterFactor * baseDelayMs; + return Math.min(maxDelayMs, jittered); +} + +export function getRetryDelayMs(params: { + statusCode?: number; + headers?: Record; + attempt: number; + defaultBaseDelayMs: number; + rateLimitBaseDelayMs: number; +}): number { + const retryAfterMs = + params.statusCode === 429 ? parseRetryAfterMs(params.headers) : null; + if (retryAfterMs != null) { + return calculateJitteredDelay(retryAfterMs); + } + + const { maxDelayMs } = getAsoResilienceConfig(); + const fallbackBaseDelayMs = + params.statusCode === 429 + ? params.rateLimitBaseDelayMs + : params.defaultBaseDelayMs; + const exponentialDelay = + fallbackBaseDelayMs * Math.pow(2, params.attempt - 1); + return Math.min(maxDelayMs, calculateJitteredDelay(exponentialDelay)); +} diff --git a/cli/shared/aso-transient-error.ts b/cli/shared/aso-transient-error.ts new file mode 100644 index 0000000..6e3fa23 --- /dev/null +++ b/cli/shared/aso-transient-error.ts @@ -0,0 +1,58 @@ +const KNOWN_TRANSIENT_STATUS_CODES = new Set([429, 500, 502, 503, 504]); + +const TRANSIENT_NETWORK_ERROR_CODES = new Set([ + "ECONNRESET", + "ETIMEDOUT", + "UND_ERR_CONNECT_TIMEOUT", + "UND_ERR_SOCKET", + "UND_ERR_ABORTED", + "UND_ERR_DESTROYED", +]); + +const TRANSIENT_MESSAGE_SNIPPETS = [ + "network", + "timeout", + "timed out", + "fetch failed", + "socket", + "connect", +]; + +export function isRetryableTransientStatusCode( + statusCode: number | undefined +): boolean { + return typeof statusCode === "number" && (statusCode === 429 || statusCode >= 500); +} + +export function isKnownTransientStatusCode( + statusCode: number | undefined +): boolean { + return ( + typeof statusCode === "number" && + Number.isFinite(statusCode) && + KNOWN_TRANSIENT_STATUS_CODES.has(statusCode) + ); +} + +export function isTransientNetworkErrorCode(code: string | undefined): boolean { + if (!code) return false; + return TRANSIENT_NETWORK_ERROR_CODES.has(code.trim().toUpperCase()); +} + +export function hasTransientMessageSignal(message: string | undefined): boolean { + if (!message) return false; + const normalized = message.toLowerCase(); + return TRANSIENT_MESSAGE_SNIPPETS.some((snippet) => + normalized.includes(snippet) + ); +} + +export function isTransientTransportFailure(params: { + code?: string; + message?: string; +}): boolean { + return ( + isTransientNetworkErrorCode(params.code) || + hasTransientMessageSignal(params.message) + ); +} diff --git a/docs/aso-error-handling.md b/docs/aso-error-handling.md index 379a682..383654f 100644 --- a/docs/aso-error-handling.md +++ b/docs/aso-error-handling.md @@ -26,10 +26,13 @@ Define failure boundaries, retry rules, and recovery behavior across CLI, dashbo ## Retry Policy - Shared resilience config lives in `cli/shared/aso-resilience.ts` (env defaults/parsing centralized in `cli/shared/aso-env.ts`). -- Popularity fetch retries transient responses (`429`, `5xx`, `KWS_NO_ORG_CONTENT_PROVIDERS`) and transient network errors. -- App Store web fetches retry `429`, `5xx`, and transient network errors with jittered exponential backoff. +- Popularity fetch retries transient responses (`429`, `5xx`, `KWS_NO_ORG_CONTENT_PROVIDERS`) and transient network errors with bounded request attempts (default: 2 total attempts, i.e. one retry). +- App Store web fetches retry `429`, `5xx`, and transient network errors with jittered exponential backoff using the same bounded request-attempt policy (default: 2 total attempts). +- Popularity batch isolation requests (`one keyword per request` after a terminal batch failure) run single-attempt (`maxAttempts=1`) to avoid retry multiplication. - Enrichment applies one bounded retry/backoff cycle for competitive keywords when top-5 difficulty docs are incomplete (`reasonCode=INSUFFICIENT_DOCS` when still unresolved). -- Startup refresh manager retries each unit once for non-auth failures; auth-required failures are terminal for the current run and stop remaining batches. +- Enrichment applies a short in-process cooldown for top-app IDs that still return incomplete lookup docs, so nearby keywords do not repeat the same expensive lookup loop immediately. +- App-doc hydration now falls back to iTunes Lookup for IDs that App Store lookup leaves missing/incomplete, reducing false `INSUFFICIENT_DOCS` failures caused by lookup payload gaps. +- Startup refresh manager retries each unit once for transient non-auth failures; it does not retry exhausted `All keywords failed (...)` batch failures, and auth-required failures are terminal for the current run and stop remaining batches. - Startup refresh auth failures are exposed as structured refresh-status state so the dashboard can prompt for reauthentication instead of silently stopping. - Startup refresh auth failures reuse the same dashboard reauthentication UX as add-keyword: one automatic auth-start attempt, then shared browser prompt / retry handling if user input is needed. - `keywordPipelineService` isolates terminal failures per keyword and stores normalized failure metadata in `aso_keyword_failures` via `keywordWriteRepository` (single write owner). diff --git a/docs/aso-keyword-fetch-design.md b/docs/aso-keyword-fetch-design.md index 5eb83e6..964b176 100644 --- a/docs/aso-keyword-fetch-design.md +++ b/docs/aso-keyword-fetch-design.md @@ -91,6 +91,7 @@ Also covers MCP keyword evaluation entrypoint (`aso_evaluate_keywords`) that eva - Fallback ordering source: MZSearch. - App detail sources: - App Store lookup payloads for competitor docs and release-date fields. + - iTunes Lookup fallback (`itunes.apple.com/lookup`) for top-app IDs that are missing or incomplete from App Store lookup, so release-date fields can still be hydrated for difficulty scoring. - Localized app-page `serialized-server-data` JSON for `title`, `subtitle`, `icon`, `ratingAverage`, `totalNumberOfRatings`. - During enrichment, top difficulty docs aggregate additional locale `name/subtitle` into `aso_apps.additionalLocalizations` for per-localization keyword matching. - When search-page lockups are sparse but `nextPage` contributes top ids, enrichment backfills those missing top ids from cached competitor docs and App Lookup before difficulty scoring. diff --git a/docs/aso-runtime-flows.md b/docs/aso-runtime-flows.md index 1efba7d..48ac243 100644 --- a/docs/aso-runtime-flows.md +++ b/docs/aso-runtime-flows.md @@ -44,13 +44,17 @@ Runtime flow contracts across CLI commands, local dashboard API, and ASO service 2. Cache lookup (`/aso/cache-lookup`). 3. Classify misses: - popularity missing/expired -> fetch popularity from Search Ads, then full enrich. + - popularity request retries are request-scoped and bounded (default: 2 total attempts); keyword-level isolation requests after terminal batch failure are single-attempt to avoid retry fan-out. - popularity fresh + difficulty/order incomplete -> full enrich with cached popularity. - popularity fresh + difficulty complete + order expired -> order-only refresh. - when `--min-popularity` is set, rows below threshold are marked `filteredOut(low_popularity)` and skip enrich/difficulty calculation. 4. Persist popularity-only local rows for keywords awaiting full enrich. 5. Enrich required keywords (`/aso/enrich`) and persist enriched keywords + competitor app docs. + - Search-page bundle results are excluded from top-app difficulty input; only app-like results feed top-id difficulty hydration. - For top difficulty docs, enrichment fetches configured additional locales for the country and stores locale-keyed `name/subtitle` under competitor docs (`aso_apps.additionalLocalizations`) for per-localization keyword matching. + - Top-id doc hydration uses App Store lookup first, then iTunes Lookup fallback when release-date fields remain missing/incomplete for those IDs. - For `appCount>=5`, enrichment backfills missing top ids from cache/lookup and retries unresolved ids once; if still incomplete, keyword enrichment fails with `INSUFFICIENT_DOCS` instead of persisting fallback score `1`. + - When the same top app id keeps returning incomplete lookup docs, enrichment applies a short in-process cooldown before trying that id again for nearby keywords. - During enrichment, brand classification is computed as `isBrandKeyword` from top-doc publisher signals (`publisherName`) after hydration/backfill; this is a flag only and does not adjust difficulty scores. 6. Refresh order-only keywords and persist updated `orderedAppIds` + `appCount` without refetching popularity. - Order refresh may include lightweight app metadata from search-page parsing, but Flow A persists only keyword order fields in this step; competitor doc cache (`aso_apps`) is hydrated later by Flow E endpoints when docs are missing/expired. @@ -136,7 +140,8 @@ Runtime flow contracts across CLI commands, local dashboard API, and ASO service - difficulty has never been computed - order TTL is stale (owned-associated keywords only; research-only keywords do not use order staleness as a refresh trigger) 3. Run the same keyword pipeline used by CLI fetch in non-interactive mode, in batches while pausing for foreground mutations. - - Non-auth batch failures get one bounded retry. + - Transient non-auth batch failures get one bounded retry. + - Exhausted `All keywords failed (...)` batch failures are not retried at startup-manager level. - Auth-required failures skip retry and stop remaining startup batches for that run. 4. Publish refresh status via `GET /api/aso/refresh-status`, including whether the failure requires Search Ads reauthentication. 5. If auth is required, the dashboard auto-starts the same reauthentication flow used by add-keyword once; silent session reuse stays invisible, while browser prompt steps/failure states surface through the shared auth modal. From 5308448b9f49a26302b766db76521327487fa2b6 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Thu, 7 May 2026 17:40:05 +0300 Subject: [PATCH 22/55] Thicken dashboard borders and lighten row states --- cli/dashboard-ui/styles.css | 135 +++++++++++++++++++++-------------- cli/dashboard-ui/ui/base.css | 8 +-- 2 files changed, 84 insertions(+), 59 deletions(-) diff --git a/cli/dashboard-ui/styles.css b/cli/dashboard-ui/styles.css index a73bd4d..ebb96fe 100644 --- a/cli/dashboard-ui/styles.css +++ b/cli/dashboard-ui/styles.css @@ -71,7 +71,7 @@ body { .sidebar-header { padding: 18px; - border-bottom: 1px solid var(--border); + border-bottom: 2px solid var(--border); background: linear-gradient( 180deg, color-mix(in oklab, var(--primary) 14%, transparent), @@ -169,7 +169,7 @@ body { gap: 10px; align-items: center; padding: 8px 10px; - border: 1px solid color-mix(in oklab, var(--border) 90%, transparent); + border: 2px solid color-mix(in oklab, var(--border) 90%, transparent); border-radius: 10px; background: color-mix(in oklab, var(--card) 90%, transparent); color: var(--foreground); @@ -199,7 +199,7 @@ body { width: 1rem; height: 1rem; border-radius: 999px; - border: 1px solid color-mix(in oklab, var(--primary) 58%, transparent); + border: 2px solid color-mix(in oklab, var(--primary) 58%, transparent); color: var(--primary); font-size: 0.72rem; line-height: 1; @@ -222,7 +222,7 @@ body { display: inline-flex; align-items: center; justify-content: center; - border: 1px solid color-mix(in oklab, var(--border) 80%, transparent); + border: 2px solid color-mix(in oklab, var(--border) 80%, transparent); background: color-mix(in oklab, var(--muted) 72%, transparent); color: var(--muted-foreground); font-size: 0.95rem; @@ -293,7 +293,7 @@ body { grid-template-columns: 45px 1fr; gap: 10px; align-items: center; - border: 1px solid transparent; + border: 2px solid transparent; border-radius: 10px; padding: 9px; background: transparent; @@ -333,7 +333,7 @@ body { align-items: center; justify-content: center; font-size: 0.75rem; - border: 1px solid color-mix(in oklab, var(--primary) 46%, transparent); + border: 2px solid color-mix(in oklab, var(--primary) 46%, transparent); background: color-mix(in oklab, var(--primary) 14%, transparent); color: var(--muted-foreground); font-weight: 700; @@ -478,7 +478,7 @@ body { width: 45px; height: 45px; border-radius: 8px; - border: 1px solid color-mix(in oklab, var(--primary) 52%, transparent); + border: 2px solid color-mix(in oklab, var(--primary) 52%, transparent); background: color-mix(in oklab, var(--primary) 24%, transparent); display: inline-flex; align-items: center; @@ -611,14 +611,20 @@ body { border-color: color-mix(in oklab, var(--onboarding-green) 74%, white); color: white; box-shadow: - inset 0 0 0 1px color-mix(in oklab, var(--onboarding-green) 48%, transparent), + inset 0 0 0 1px + color-mix(in oklab, var(--onboarding-green) 48%, transparent), 0 0 0 1px color-mix(in oklab, var(--onboarding-green) 24%, transparent); } #add-keywords.onboarding-highlight { border-color: color-mix(in oklab, var(--onboarding-green) 72%, white); - box-shadow: inset 0 0 0 1px color-mix(in oklab, var(--onboarding-green) 52%, transparent); - background: color-mix(in oklab, var(--onboarding-green) 8%, var(--background)); + box-shadow: inset 0 0 0 1px + color-mix(in oklab, var(--onboarding-green) 52%, transparent); + background: color-mix( + in oklab, + var(--onboarding-green) 8%, + var(--background) + ); } @keyframes onboarding-inner-pulse { @@ -758,7 +764,7 @@ td { th:not(:last-child), td:not(:last-child) { - border-right: 1px solid color-mix(in oklab, var(--border) 86%, transparent); + border-right: 2px solid color-mix(in oklab, var(--border) 86%, transparent); } tbody tr { @@ -802,7 +808,8 @@ th.sortable { th.sortable.active { color: color-mix(in oklab, var(--foreground) 88%, var(--primary)); background: color-mix(in oklab, var(--primary) 20%, var(--card)); - box-shadow: inset 0 -2px 0 color-mix(in oklab, var(--primary) 72%, transparent); + box-shadow: inset 0 -2px 0 + color-mix(in oklab, var(--primary) 72%, transparent); } .sort-label { @@ -831,7 +838,8 @@ th.sortable.active { .keyword-filter-th.active { color: color-mix(in oklab, var(--foreground) 88%, var(--primary)); background: color-mix(in oklab, var(--primary) 20%, var(--card)); - box-shadow: inset 0 -2px 0 color-mix(in oklab, var(--primary) 72%, transparent); + box-shadow: inset 0 -2px 0 + color-mix(in oklab, var(--primary) 72%, transparent); } .keyword-header .column-sort-button { @@ -865,7 +873,7 @@ th.sortable.active { min-width: 2rem; height: 1.8rem; padding: 0 8px; - border: 1px solid color-mix(in oklab, var(--border) 92%, transparent); + border: 2px solid color-mix(in oklab, var(--border) 92%, transparent); border-radius: 999px; font-size: 0.78rem; line-height: 1.2; @@ -905,7 +913,7 @@ th.sortable.active { min-width: 170px; max-width: 240px; padding: 8px; - border: 1px solid var(--border); + border: 2px solid var(--border); border-radius: 10px; background: var(--card); box-shadow: 0 10px 24px @@ -917,10 +925,11 @@ th.sortable.active { position: fixed; min-width: 160px; padding: 6px; - border: 1px solid var(--border); + border: 2px solid var(--border); border-radius: 10px; background: var(--card); - box-shadow: 0 10px 24px color-mix(in oklab, var(--foreground) 14%, transparent); + box-shadow: 0 10px 24px + color-mix(in oklab, var(--foreground) 14%, transparent); z-index: 16; display: grid; gap: 4px; @@ -1124,7 +1133,7 @@ tbody tr.selected:hover td { justify-content: space-between; gap: 12px; padding: 12px 16px; - border-bottom: 1px solid var(--border); + border-bottom: 2px solid var(--border); } .dialog-header h2 { @@ -1134,7 +1143,7 @@ tbody tr.selected:hover td { } .dialog-close { - border: 1px solid color-mix(in oklab, var(--border) 90%, transparent); + border: 2px solid color-mix(in oklab, var(--border) 90%, transparent); background: transparent; color: var(--foreground); border-radius: 999px; @@ -1232,7 +1241,7 @@ tbody tr.selected:hover td { display: flex; align-items: center; gap: 10px; - border: 1px solid color-mix(in oklab, var(--border) 86%, transparent); + border: 2px solid color-mix(in oklab, var(--border) 86%, transparent); border-radius: 12px; padding: 10px 12px; background: color-mix(in oklab, var(--card) 90%, transparent); @@ -1311,7 +1320,7 @@ tbody tr.selected:hover td { .top-app-card { display: grid; gap: 8px; - border: 1px solid color-mix(in oklab, var(--border) 88%, transparent); + border: 2px solid color-mix(in oklab, var(--border) 88%, transparent); border-radius: 12px; padding: 9px 10px; background: color-mix(in oklab, var(--card) 90%, transparent); @@ -1465,7 +1474,7 @@ tbody tr.selected:hover td { width: 100%; max-width: 100%; height: auto; - border: 1px solid color-mix(in oklab, var(--border) 88%, transparent); + border: 2px solid color-mix(in oklab, var(--border) 88%, transparent); border-radius: 10px; background: color-mix(in oklab, var(--card) 92%, transparent); } @@ -1686,17 +1695,17 @@ tbody tr.selected:hover td { --accent: #87bdef; --accent-foreground: #ffffff; --destructive: #ef4444; - --border: rgba(255, 255, 255, 0.07); - --input: rgba(255, 255, 255, 0.1); - --divider: rgba(255, 255, 255, 0.045); + --border: rgba(255, 255, 255, 0.1); + --input: rgba(255, 255, 255, 0.12); + --divider: rgba(255, 255, 255, 0.06); --row-odd: #0b0b0f; - --row-even: #0d0d12; - --row-hover: #101019; - --row-selected: #151522; + --row-even: #121219; + --row-hover: #1a1a26; + --row-selected: #242438; --ring: rgba(112, 172, 231, 0.34); --sidebar: var(--bg-1); --sidebar-foreground: #a0a0a0; - --sidebar-border: rgba(255, 255, 255, 0.08); + --sidebar-border: rgba(255, 255, 255, 0.11); --ok: #22c55e; --danger: #ef4444; --radius-sm: 8px; @@ -1713,8 +1722,16 @@ body, body { position: relative; background: - radial-gradient(circle at 92% 8%, rgba(112, 172, 231, 0.1), transparent 30%), - radial-gradient(circle at 4% 92%, rgba(112, 172, 231, 0.08), transparent 28%), + radial-gradient( + circle at 92% 8%, + rgba(112, 172, 231, 0.1), + transparent 30% + ), + radial-gradient( + circle at 4% 92%, + rgba(112, 172, 231, 0.08), + transparent 28% + ), linear-gradient(180deg, var(--bg-0) 0%, var(--bg-1) 100%); } @@ -1733,20 +1750,23 @@ body::before { .ui-card { background: var(--bg-1); - border: 1px solid var(--border); + border: 2px solid var(--border); border-radius: var(--radius-lg); box-shadow: none; backdrop-filter: none; } .ui-btn { - border: 1px solid var(--border); + border: 2px solid var(--border); border-radius: var(--radius-sm); background: var(--muted); color: var(--foreground); font-size: 12px; letter-spacing: 0.02em; - transition: border-color 0.15s ease, color 0.15s ease, background-color 0.15s ease; + transition: + border-color 0.15s ease, + color 0.15s ease, + background-color 0.15s ease; transform: none; box-shadow: none; } @@ -1777,7 +1797,7 @@ body::before { .ui-input { background: var(--bg-1); - border: 1px solid var(--input); + border: 2px solid var(--input); border-radius: var(--radius-sm); color: var(--foreground); box-shadow: none; @@ -1794,7 +1814,7 @@ body::before { } .ui-badge { - border: 1px solid rgba(112, 172, 231, 0.34); + border: 2px solid rgba(112, 172, 231, 0.34); border-radius: 999px; background: rgba(112, 172, 231, 0.1); color: #d1e8fa; @@ -1818,14 +1838,14 @@ body::before { .sidebar { background: var(--sidebar); - border: 1px solid var(--sidebar-border); + border: 2px solid var(--sidebar-border); border-radius: var(--radius-lg); animation: dashboard-slide-left 0.24s ease-out both; } .sidebar-header { padding: 14px; - border-bottom: 1px solid var(--sidebar-border); + border-bottom: 2px solid var(--sidebar-border); background: transparent; } @@ -1843,7 +1863,7 @@ body::before { .sidebar-brand-icon { width: 26px; height: 26px; - border: 1px solid var(--border); + border: 2px solid var(--border); box-shadow: none; } @@ -1909,12 +1929,14 @@ body::before { } .app-item { - border: 1px solid transparent; + border: 2px solid transparent; border-radius: var(--radius-md); background: transparent; padding: 8px; gap: 8px; - transition: border-color 0.15s ease, background-color 0.15s ease; + transition: + border-color 0.15s ease, + background-color 0.15s ease; } .app-item:hover { @@ -1939,13 +1961,13 @@ body::before { } .app-fallback { - border: 1px solid var(--border); + border: 2px solid var(--border); background: var(--bg-2); color: #808080; } .research-icon { - border: 1px solid rgba(112, 172, 231, 0.36); + border: 2px solid rgba(112, 172, 231, 0.36); background: rgba(112, 172, 231, 0.12); } @@ -2107,7 +2129,7 @@ body::before { } .table-card { - border: 1px solid var(--border); + border: 2px solid var(--border); background: var(--bg-1); } @@ -2147,7 +2169,7 @@ th { letter-spacing: 0.09em; text-transform: uppercase; background: var(--bg-1); - border-bottom: 1px solid var(--divider); + border-bottom: 2px solid var(--divider); } th:not(:last-child), @@ -2186,7 +2208,7 @@ th.sortable.active, .filter-trigger { min-width: 32px; height: 26px; - border: 1px solid var(--border); + border: 2px solid var(--border); border-radius: 999px; color: #7f7f7f; background: var(--bg-2); @@ -2201,14 +2223,14 @@ th.sortable.active, .filter-dropdown-menu, .keyword-action-menu { - border: 1px solid var(--border); + border: 2px solid var(--border); border-radius: var(--radius-md); background: var(--bg-1); box-shadow: 0 12px 24px rgba(0, 0, 0, 0.4); } .keyword-action-item { - border: 1px solid transparent; + border: 2px solid transparent; border-radius: var(--radius-sm); font-size: 12px; color: var(--foreground); @@ -2236,7 +2258,7 @@ th.sortable.active, } .filter-options-vertical button { - border: 1px solid transparent; + border: 2px solid transparent; border-radius: var(--radius-sm); color: var(--foreground); font-size: 11px; @@ -2287,7 +2309,7 @@ td.updated-value { } .favorite-heart-button { - border: 1px solid transparent; + border: 2px solid transparent; border-radius: 999px; background: transparent; color: #6f6f6f; @@ -2297,7 +2319,10 @@ td.updated-value { align-items: center; justify-content: center; cursor: pointer; - transition: border-color 0.15s ease, background-color 0.15s ease, color 0.15s ease; + transition: + border-color 0.15s ease, + background-color 0.15s ease, + color 0.15s ease; } .favorite-heart-button:hover:not(:disabled), @@ -2377,7 +2402,7 @@ td.updated-value { } .dialog-card { - border: 1px solid var(--border); + border: 2px solid var(--border); border-radius: var(--radius-lg); background: var(--bg-1); animation: dialog-pop-in 0.18s ease-out both; @@ -2385,7 +2410,7 @@ td.updated-value { .dialog-header { padding: 10px 14px; - border-bottom: 1px solid var(--border); + border-bottom: 2px solid var(--border); } .dialog-header h2 { @@ -2400,7 +2425,7 @@ td.updated-value { width: 28px; height: 28px; font-size: 16px; - border: 1px solid var(--border); + border: 2px solid var(--border); border-radius: var(--radius-sm); color: #8a8a8a; background: var(--bg-2); @@ -2468,7 +2493,7 @@ td.updated-value { } .top-app-card { - border: 1px solid var(--border); + border: 2px solid var(--border); border-radius: var(--radius-md); padding: 8px; background: var(--bg-1); diff --git a/cli/dashboard-ui/ui/base.css b/cli/dashboard-ui/ui/base.css index 1e02343..e14d634 100644 --- a/cli/dashboard-ui/ui/base.css +++ b/cli/dashboard-ui/ui/base.css @@ -1,14 +1,14 @@ .ui-card { background: linear-gradient(165deg, rgba(255, 255, 255, 0.02), rgba(255, 255, 255, 0)), color-mix(in oklab, var(--card) 84%, transparent); - border: 1px solid var(--border); + border: 2px solid var(--border); border-radius: calc(var(--radius) + 4px); backdrop-filter: blur(8px); box-shadow: 0 12px 42px rgba(0, 0, 0, 0.28); } .ui-btn { - border: 1px solid transparent; + border: 2px solid transparent; border-radius: var(--radius); background: var(--primary); color: var(--primary-foreground); @@ -47,7 +47,7 @@ } .ui-input { - border: 1px solid var(--input); + border: 2px solid var(--input); border-radius: var(--radius); padding: 0.56rem 0.62rem; background: color-mix(in oklab, var(--background) 90%, transparent); @@ -75,7 +75,7 @@ display: inline-flex; align-items: center; border-radius: 999px; - border: 1px solid color-mix(in oklab, var(--primary) 45%, transparent); + border: 2px solid color-mix(in oklab, var(--primary) 45%, transparent); padding: 0.26rem 0.64rem; font-size: 0.78rem; color: color-mix(in oklab, var(--foreground) 95%, var(--primary)); From 20194c0745e16446d9962b78e2ca8af35ceca977 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Thu, 7 May 2026 18:06:44 +0300 Subject: [PATCH 23/55] Enhance position history chart and date formatting --- cli/dashboard-ui/App.tsx | 218 +++++++++++++++++++++++++++----- cli/dashboard-ui/app-helpers.ts | 11 +- cli/dashboard-ui/styles.css | 47 +++++-- 3 files changed, 228 insertions(+), 48 deletions(-) diff --git a/cli/dashboard-ui/App.tsx b/cli/dashboard-ui/App.tsx index ad83a5b..c135966 100644 --- a/cli/dashboard-ui/App.tsx +++ b/cli/dashboard-ui/App.tsx @@ -108,6 +108,12 @@ type KeywordPositionHistoryPayload = { keyword: string; points: KeywordHistoryPoint[]; }; +type PositionHistoryHoverPoint = { + x: number; + y: number; + capturedAt: string; + position: number; +}; type FilterMenuKey = "popularity" | "difficulty" | "brand" | "favorite" | "rank"; type KeywordActionMenuState = { @@ -178,11 +184,14 @@ const SIDEBAR_SELECTION_CONTROL_SELECTOR = ".app-id-copy-target, .app-id-copy-ic const KEYWORDS_PAGE_SIZE = 100; const POSITION_HISTORY_CHART_WIDTH = 760; const POSITION_HISTORY_CHART_HEIGHT = 250; +const POSITION_HISTORY_RANK_MIN = 1; +const POSITION_HISTORY_RANK_MAX = 200; +const POSITION_HISTORY_RANK_TICKS = [25, 50, 75, 100, 125, 150, 175, 200]; const POSITION_HISTORY_CHART_PADDING = { - top: 16, - right: 16, - bottom: 32, - left: 40, + top: 14, + right: 44, + bottom: 34, + left: 18, }; type StartupRefreshStatus = "idle" | "running" | "completed" | "failed"; @@ -337,6 +346,8 @@ export function App() { >([]); const [positionHistoryLoading, setPositionHistoryLoading] = useState(false); const [positionHistoryError, setPositionHistoryError] = useState(""); + const [positionHistoryHoverPoint, setPositionHistoryHoverPoint] = + useState(null); const [startupRefreshState, setStartupRefreshState] = useState(null); const [displayLocale] = useState(() => getBrowserLocale()); @@ -793,6 +804,11 @@ export function App() { return () => document.removeEventListener("keydown", onEscape); }, [positionHistoryKeyword]); + useEffect(() => { + if (positionHistoryKeyword) return; + setPositionHistoryHoverPoint(null); + }, [positionHistoryKeyword]); + useEffect(() => { const shouldPoll = !startupRefreshState || @@ -1405,6 +1421,7 @@ export function App() { setPositionHistoryKeyword(rowKeyword); setPositionHistoryPoints([]); setPositionHistoryError(""); + setPositionHistoryHoverPoint(null); setPositionHistoryLoading(true); try { const data = await apiGet( @@ -1504,7 +1521,7 @@ export function App() { const positions = sorted.map((point) => point.position); const bestPosition = Math.min(...positions); const worstPosition = Math.max(...positions); - const yRange = Math.max(1, worstPosition - bestPosition); + const yRange = POSITION_HISTORY_RANK_MAX - POSITION_HISTORY_RANK_MIN; const minTimestamp = Date.parse(sorted[0].capturedAt); const maxTimestamp = Date.parse(sorted[sorted.length - 1].capturedAt); const xRange = Math.max(1, maxTimestamp - minTimestamp); @@ -1514,9 +1531,13 @@ export function App() { const x = POSITION_HISTORY_CHART_PADDING.left + ((timestamp - minTimestamp) / xRange) * innerWidth; + const clampedPosition = Math.max( + POSITION_HISTORY_RANK_MIN, + Math.min(POSITION_HISTORY_RANK_MAX, point.position) + ); const y = POSITION_HISTORY_CHART_PADDING.top + - ((point.position - bestPosition) / yRange) * innerHeight; + ((clampedPosition - POSITION_HISTORY_RANK_MIN) / yRange) * innerHeight; return { x, y, @@ -1529,20 +1550,89 @@ export function App() { .map((point, index) => `${index === 0 ? "M" : "L"} ${point.x} ${point.y}`) .join(" "); + const yTicks = POSITION_HISTORY_RANK_TICKS.map((rank) => ({ + rank, + y: + POSITION_HISTORY_CHART_PADDING.top + + ((rank - POSITION_HISTORY_RANK_MIN) / yRange) * innerHeight, + })); + + const monthFormatter = new Intl.DateTimeFormat(displayLocale, { month: "short" }); + const firstMonthStart = Date.UTC( + new Date(minTimestamp).getUTCFullYear(), + new Date(minTimestamp).getUTCMonth(), + 1 + ); + const lastMonthStart = Date.UTC( + new Date(maxTimestamp).getUTCFullYear(), + new Date(maxTimestamp).getUTCMonth(), + 1 + ); + const monthTicks: Array<{ label: string; x: number }> = []; + for (let cursor = firstMonthStart; cursor <= lastMonthStart; ) { + const x = + POSITION_HISTORY_CHART_PADDING.left + + ((cursor - minTimestamp) / xRange) * innerWidth; + monthTicks.push({ + label: monthFormatter.format(new Date(cursor)), + x: Math.min( + chartWidth - POSITION_HISTORY_CHART_PADDING.right, + Math.max(POSITION_HISTORY_CHART_PADDING.left, x) + ), + }); + const nextMonth = new Date(cursor); + nextMonth.setUTCMonth(nextMonth.getUTCMonth() + 1); + cursor = nextMonth.getTime(); + } + return { chartWidth, chartHeight, points, linePath, - firstDateLabel: formatCalendarDate(sorted[0].capturedAt, displayLocale) ?? "-", - lastDateLabel: - formatCalendarDate(sorted[sorted.length - 1].capturedAt, displayLocale) ?? - "-", + yTicks, + monthTicks, bestPosition, worstPosition, }; }, [displayLocale, positionHistoryPoints]); + const positionHistoryTooltip = useMemo(() => { + if (!positionHistoryChart || !positionHistoryHoverPoint) return null; + const dateLabel = + formatCalendarDate(positionHistoryHoverPoint.capturedAt, displayLocale) ?? + positionHistoryHoverPoint.capturedAt; + const rankLabel = `Rank ${positionHistoryHoverPoint.position}`; + const width = Math.max( + 110, + dateLabel.length * 7 + 16, + rankLabel.length * 7 + 16 + ); + const height = 40; + const safeTop = 4; + const safeLeft = 4; + const safeRight = positionHistoryChart.chartWidth - width - 4; + const safeBottom = positionHistoryChart.chartHeight - height - 4; + let x = positionHistoryHoverPoint.x + 12; + if (x > safeRight) { + x = positionHistoryHoverPoint.x - width - 12; + } + x = Math.max(safeLeft, Math.min(safeRight, x)); + let y = positionHistoryHoverPoint.y - height - 10; + if (y < safeTop) { + y = positionHistoryHoverPoint.y + 10; + } + y = Math.max(safeTop, Math.min(safeBottom, y)); + return { + x, + y, + width, + height, + dateLabel, + rankLabel, + }; + }, [displayLocale, positionHistoryChart, positionHistoryHoverPoint]); + const getFilterLabel = (key: FilterMenuKey): string | null => { switch (key) { case "popularity": @@ -2638,7 +2728,10 @@ export function App() { {positionHistoryKeyword ? (
setPositionHistoryKeyword(null)} + onClick={() => { + setPositionHistoryHoverPoint(null); + setPositionHistoryKeyword(null); + }} role="presentation" >
setPositionHistoryKeyword(null)} + onClick={() => { + setPositionHistoryHoverPoint(null); + setPositionHistoryKeyword(null); + }} > × @@ -2682,9 +2778,6 @@ export function App() { Worst rank: {positionHistoryChart.worstPosition} - - Points: {positionHistoryChart.points.length} -
- + {positionHistoryChart.yTicks.map((tick) => ( + + + + {tick.rank} + + + ))} + {positionHistoryChart.monthTicks.map((tick, index) => ( + + + + {tick.label} + + + ))} setPositionHistoryHoverPoint(point)} + onMouseLeave={() => setPositionHistoryHoverPoint(null)} + onFocus={() => setPositionHistoryHoverPoint(point)} + onBlur={() => setPositionHistoryHoverPoint(null)} > - {`${formatCalendarDate(point.capturedAt, displayLocale) ?? point.capturedAt}: #${point.position}`} + {`${formatCalendarDate(point.capturedAt, displayLocale) ?? point.capturedAt} • Rank ${point.position}`} ))} + {positionHistoryTooltip ? ( + + + + {positionHistoryTooltip.dateLabel} + + + {positionHistoryTooltip.rankLabel} + + + ) : null} -
- {positionHistoryChart.firstDateLabel} - {positionHistoryChart.lastDateLabel} -
) : null} diff --git a/cli/dashboard-ui/app-helpers.ts b/cli/dashboard-ui/app-helpers.ts index a2259e7..4a76841 100644 --- a/cli/dashboard-ui/app-helpers.ts +++ b/cli/dashboard-ui/app-helpers.ts @@ -385,22 +385,25 @@ export const formatDate = (value?: string, locale?: string): string => { const diffMs = Date.now() - updatedAt.getTime(); if (diffMs < 0) return absoluteDate; - const numberFormatter = new Intl.NumberFormat(locale); + const relativeFormatter = new Intl.RelativeTimeFormat(locale, { + numeric: "always", + style: "short", + }); const minuteMs = 60 * 1000; const hourMs = 60 * minuteMs; const dayMs = 24 * hourMs; if (diffMs < hourMs) { const minutes = Math.max(1, Math.floor(diffMs / minuteMs)); - return `${numberFormatter.format(minutes)} min ago`; + return relativeFormatter.format(-minutes, "minute"); } if (diffMs < dayMs) { const hours = Math.floor(diffMs / hourMs); - return `${numberFormatter.format(hours)} hr ago`; + return relativeFormatter.format(-hours, "hour"); } if (diffMs <= 7 * dayMs) { const days = Math.floor(diffMs / dayMs); - return `${numberFormatter.format(days)} d ago`; + return relativeFormatter.format(-days, "day"); } return absoluteDate; diff --git a/cli/dashboard-ui/styles.css b/cli/dashboard-ui/styles.css index ebb96fe..f3fd1c9 100644 --- a/cli/dashboard-ui/styles.css +++ b/cli/dashboard-ui/styles.css @@ -1474,8 +1474,6 @@ tbody tr.selected:hover td { width: 100%; max-width: 100%; height: auto; - border: 2px solid color-mix(in oklab, var(--border) 88%, transparent); - border-radius: 10px; background: color-mix(in oklab, var(--card) 92%, transparent); } @@ -1484,6 +1482,15 @@ tbody tr.selected:hover td { stroke-width: 1; } +.position-history-guide-line { + stroke: color-mix(in oklab, var(--border) 78%, transparent); + stroke-width: 1; +} + +.position-history-guide-line-vertical { + stroke-dasharray: 3 4; +} + .position-history-line { fill: none; stroke: color-mix(in oklab, var(--primary) 84%, white); @@ -1494,14 +1501,29 @@ tbody tr.selected:hover td { .position-history-point { fill: color-mix(in oklab, var(--primary) 78%, white); + stroke: color-mix(in oklab, var(--card) 90%, transparent); + stroke-width: 1.5; } -.position-history-axis-labels { - display: flex; - justify-content: space-between; - gap: 12px; - color: var(--muted-foreground); - font-size: 0.78rem; +.position-history-tick-label { + fill: var(--muted-foreground); + font-size: 0.72rem; + letter-spacing: 0.01em; +} + +.position-history-tooltip-bg { + fill: color-mix(in oklab, var(--card) 95%, black); + stroke: color-mix(in oklab, var(--border) 85%, transparent); + stroke-width: 1; +} + +.position-history-tooltip-line { + fill: color-mix(in oklab, var(--foreground) 94%, white); + font-size: 0.72rem; +} + +.position-history-tooltip-line-rank { + font-weight: 600; } .hidden { @@ -1698,10 +1720,9 @@ tbody tr.selected:hover td { --border: rgba(255, 255, 255, 0.1); --input: rgba(255, 255, 255, 0.12); --divider: rgba(255, 255, 255, 0.06); - --row-odd: #0b0b0f; - --row-even: #121219; - --row-hover: #1a1a26; - --row-selected: #242438; + --row-odd: #15181d; + --row-hover: #162336; + --row-selected: #1e3048; --ring: rgba(112, 172, 231, 0.34); --sidebar: var(--bg-1); --sidebar-foreground: #a0a0a0; @@ -2286,7 +2307,7 @@ tbody tr:nth-child(odd) td { } tbody tr:nth-child(even) td { - background: var(--row-even); + background: transparent; } tbody tr:hover td, From 6da147eeae6129382e75f9e711904fdae5ab505d Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Thu, 7 May 2026 18:07:37 +0300 Subject: [PATCH 24/55] update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 91949ec..752a084 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aso-cli", - "version": "0.10.0", + "version": "0.11.0", "description": "Local App Store Optimization CLI", "main": "cli/dist/cli.js", "bin": { From 4aa21a1af55ab0b2b2756bc37e9a350e4763be65 Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Thu, 7 May 2026 18:15:41 +0300 Subject: [PATCH 25/55] Fix ci --- cli/dashboard-ui/app-helpers.test.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/dashboard-ui/app-helpers.test.tsx b/cli/dashboard-ui/app-helpers.test.tsx index 1e862d1..f7d069f 100644 --- a/cli/dashboard-ui/app-helpers.test.tsx +++ b/cli/dashboard-ui/app-helpers.test.tsx @@ -304,9 +304,9 @@ describe("app-helpers", () => { expect(getBrowserLocale()).toBe("tr-TR"); Date.now = () => Date.parse("2026-03-12T12:00:00.000Z"); - expect(formatDate("2026-03-12T11:50:00.000Z", "en-US")).toContain("min ago"); - expect(formatDate("2026-03-12T09:00:00.000Z", "en-US")).toContain("hr ago"); - expect(formatDate("2026-03-10T12:00:00.000Z", "en-US")).toContain("d ago"); + expect(formatDate("2026-03-12T11:50:00.000Z", "en-US")).toMatch(/\bmin\.?\s+ago\b/); + expect(formatDate("2026-03-12T09:00:00.000Z", "en-US")).toMatch(/\bhr\.?\s+ago\b/); + expect(formatDate("2026-03-10T12:00:00.000Z", "en-US")).toMatch(/\b\d+\s+day?s?\.?\s+ago\b/); expect(formatDate("bad-date", "en-US")).toBe("-"); expect(formatDate(undefined, "en-US")).toBe("-"); From be885e2d74ec7af59b4efaf6042678ec7dc87f5c Mon Sep 17 00:00:00 2001 From: Semih Cihan Date: Sat, 9 May 2026 10:31:11 +0300 Subject: [PATCH 26/55] remove faq item --- website/src/pages/index.astro | 22 +--------------------- website/src/site-content.ts | 5 ----- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/website/src/pages/index.astro b/website/src/pages/index.astro index 3655095..583db84 100644 --- a/website/src/pages/index.astro +++ b/website/src/pages/index.astro @@ -296,27 +296,7 @@ const structuredData = { {faqEntries.map(({ question, answer }) => ( ))} diff --git a/website/src/site-content.ts b/website/src/site-content.ts index 13aa8c9..8e009b2 100644 --- a/website/src/site-content.ts +++ b/website/src/site-content.ts @@ -37,9 +37,4 @@ export const faqEntries = [ answer: "Yes. You can use MCP via aso-mcp or build your own automation using aso keywords output modes inside custom apps and scripts.", }, - { - question: "Where can I find troubleshooting and release updates?", - answer: - "See the repository setup and troubleshooting guide plus the GitHub releases page for release notes.", - }, ]; From f1c2104affd59884d09ef51cde282c51f8847267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20G=C3=BCldal=C4=B1?= Date: Sat, 23 May 2026 23:57:24 +0300 Subject: [PATCH 27/55] feat(storefronts): add shared multi-country storefront config module --- cli/shared/aso-storefronts.test.ts | 38 ++++++++++++++ cli/shared/aso-storefronts.ts | 82 ++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 cli/shared/aso-storefronts.test.ts create mode 100644 cli/shared/aso-storefronts.ts diff --git a/cli/shared/aso-storefronts.test.ts b/cli/shared/aso-storefronts.test.ts new file mode 100644 index 0000000..8e3f9a5 --- /dev/null +++ b/cli/shared/aso-storefronts.test.ts @@ -0,0 +1,38 @@ +import { + getStorefrontConfig, + isSupportedCountry, + listSupportedCountries, + SUPPORTED_COUNTRIES, +} from "./aso-storefronts"; + +describe("aso-storefronts", () => { + it("returns US config by default", () => { + const config = getStorefrontConfig("US"); + expect(config.storefrontId).toBe(143441); + expect(config.appStoreUrlSegment).toBe("us"); + expect(config.acceptLanguage).toBe("en-US,en;q=0.9"); + expect(config.dslangCookie).toBe("US-EN"); + }); + + it("normalizes lowercase input", () => { + expect(getStorefrontConfig("us").storefrontId).toBe(143441); + }); + + it("throws on unknown country", () => { + expect(() => getStorefrontConfig("ZZ")).toThrow(/Unsupported country/); + }); + + it("supports the canonical six countries", () => { + expect(listSupportedCountries()).toEqual(["US", "TR", "DE", "GB", "FR", "IT"]); + }); + + it("isSupportedCountry is case-insensitive and rejects unknowns", () => { + expect(isSupportedCountry("tr")).toBe(true); + expect(isSupportedCountry("ZZ")).toBe(false); + }); + + it("each supported country has a unique storefront id", () => { + const ids = SUPPORTED_COUNTRIES.map((c) => getStorefrontConfig(c).storefrontId); + expect(new Set(ids).size).toBe(ids.length); + }); +}); diff --git a/cli/shared/aso-storefronts.ts b/cli/shared/aso-storefronts.ts new file mode 100644 index 0000000..9639d1c --- /dev/null +++ b/cli/shared/aso-storefronts.ts @@ -0,0 +1,82 @@ +export const SUPPORTED_COUNTRIES = ["US", "TR", "DE", "GB", "FR", "IT"] as const; +export type SupportedCountry = (typeof SUPPORTED_COUNTRIES)[number]; + +export const DEFAULT_SUPPORTED_COUNTRY: SupportedCountry = "US"; + +export type StorefrontConfig = { + country: SupportedCountry; + storefrontId: number; + appStoreUrlSegment: string; + acceptLanguage: string; + dslangCookie: string; +}; + +const CONFIGS: Record = { + US: { + country: "US", + storefrontId: 143441, + appStoreUrlSegment: "us", + acceptLanguage: "en-US,en;q=0.9", + dslangCookie: "US-EN", + }, + TR: { + country: "TR", + storefrontId: 143480, + appStoreUrlSegment: "tr", + acceptLanguage: "tr-TR,tr;q=0.9,en;q=0.6", + dslangCookie: "TR-TR", + }, + DE: { + country: "DE", + storefrontId: 143443, + appStoreUrlSegment: "de", + acceptLanguage: "de-DE,de;q=0.9,en;q=0.6", + dslangCookie: "DE-DE", + }, + GB: { + country: "GB", + storefrontId: 143444, + appStoreUrlSegment: "gb", + acceptLanguage: "en-GB,en;q=0.9", + dslangCookie: "GB-EN", + }, + FR: { + country: "FR", + storefrontId: 143442, + appStoreUrlSegment: "fr", + acceptLanguage: "fr-FR,fr;q=0.9,en;q=0.6", + dslangCookie: "FR-FR", + }, + IT: { + country: "IT", + storefrontId: 143450, + appStoreUrlSegment: "it", + acceptLanguage: "it-IT,it;q=0.9,en;q=0.6", + dslangCookie: "IT-IT", + }, +}; + +export function isSupportedCountry(input: string): input is SupportedCountry { + return (SUPPORTED_COUNTRIES as readonly string[]).includes(input.toUpperCase()); +} + +export function listSupportedCountries(): SupportedCountry[] { + return [...SUPPORTED_COUNTRIES]; +} + +export function getStorefrontConfig(country: string): StorefrontConfig { + const normalized = country.toUpperCase(); + if (!isSupportedCountry(normalized)) { + throw new Error(`Unsupported country code: ${country}`); + } + return CONFIGS[normalized]; +} + +export function getStorefrontIdForCountry(country: string): number { + return getStorefrontConfig(country).storefrontId; +} + +export function getAppStoreSearchUrl(country: string): string { + const segment = getStorefrontConfig(country).appStoreUrlSegment; + return `https://apps.apple.com/${segment}/iphone/search`; +} From 3fd7f73796362be9e25d1e6d2df47e8fdf31770d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20G=C3=BCldal=C4=B1?= Date: Sun, 24 May 2026 00:03:05 +0300 Subject: [PATCH 28/55] refactor(storefronts): tighten public API and document storefront IDs (review fixes) --- cli/shared/aso-storefronts.test.ts | 26 ++++++++++++++++++++------ cli/shared/aso-storefronts.ts | 26 +++++++++++++++----------- 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/cli/shared/aso-storefronts.test.ts b/cli/shared/aso-storefronts.test.ts index 8e3f9a5..7c7e3ae 100644 --- a/cli/shared/aso-storefronts.test.ts +++ b/cli/shared/aso-storefronts.test.ts @@ -1,12 +1,13 @@ import { + getAppStoreDslangCookieHeader, + getAppStoreUrlSegment, getStorefrontConfig, isSupportedCountry, - listSupportedCountries, SUPPORTED_COUNTRIES, } from "./aso-storefronts"; describe("aso-storefronts", () => { - it("returns US config by default", () => { + it("returns US config", () => { const config = getStorefrontConfig("US"); expect(config.storefrontId).toBe(143441); expect(config.appStoreUrlSegment).toBe("us"); @@ -22,8 +23,8 @@ describe("aso-storefronts", () => { expect(() => getStorefrontConfig("ZZ")).toThrow(/Unsupported country/); }); - it("supports the canonical six countries", () => { - expect(listSupportedCountries()).toEqual(["US", "TR", "DE", "GB", "FR", "IT"]); + it("exposes the canonical six countries in order", () => { + expect([...SUPPORTED_COUNTRIES]).toEqual(["US", "TR", "DE", "GB", "FR", "IT"]); }); it("isSupportedCountry is case-insensitive and rejects unknowns", () => { @@ -31,8 +32,21 @@ describe("aso-storefronts", () => { expect(isSupportedCountry("ZZ")).toBe(false); }); - it("each supported country has a unique storefront id", () => { - const ids = SUPPORTED_COUNTRIES.map((c) => getStorefrontConfig(c).storefrontId); + it("each supported country has a unique storefront id and url segment", () => { + const configs = SUPPORTED_COUNTRIES.map((c) => getStorefrontConfig(c)); + const ids = configs.map((c) => c.storefrontId); + const segments = configs.map((c) => c.appStoreUrlSegment); expect(new Set(ids).size).toBe(ids.length); + expect(new Set(segments).size).toBe(segments.length); + }); + + it("getAppStoreDslangCookieHeader returns the full Cookie header value", () => { + expect(getAppStoreDslangCookieHeader("US")).toBe("dslang=US-EN"); + expect(getAppStoreDslangCookieHeader("TR")).toBe("dslang=TR-TR"); + }); + + it("getAppStoreUrlSegment returns lowercase segment", () => { + expect(getAppStoreUrlSegment("US")).toBe("us"); + expect(getAppStoreUrlSegment("de")).toBe("de"); }); }); diff --git a/cli/shared/aso-storefronts.ts b/cli/shared/aso-storefronts.ts index 9639d1c..3cd5f95 100644 --- a/cli/shared/aso-storefronts.ts +++ b/cli/shared/aso-storefronts.ts @@ -1,16 +1,25 @@ export const SUPPORTED_COUNTRIES = ["US", "TR", "DE", "GB", "FR", "IT"] as const; export type SupportedCountry = (typeof SUPPORTED_COUNTRIES)[number]; -export const DEFAULT_SUPPORTED_COUNTRY: SupportedCountry = "US"; - export type StorefrontConfig = { country: SupportedCountry; storefrontId: number; appStoreUrlSegment: string; acceptLanguage: string; + /** + * Apple's `dslang` cookie value (region-language). Used in the + * `Cookie: dslang=` header for App Store HTML scraping. + */ dslangCookie: string; }; +// Apple App Store storefront identifiers. The storefront ID is the value Apple +// puts in the `X-Apple-Store-Front` HTTP header and the Search Ads +// `storefronts` request field. Apple does not publish this table officially; +// the canonical community reference is: +// https://gist.github.com/daktak/f887352d564b54f9e529404cc0eb60d5 +// Verified 2026-05 by issuing a `lookup?country=` against the iTunes API +// for each entry and confirming results returned localized content. const CONFIGS: Record = { US: { country: "US", @@ -60,10 +69,6 @@ export function isSupportedCountry(input: string): input is SupportedCountry { return (SUPPORTED_COUNTRIES as readonly string[]).includes(input.toUpperCase()); } -export function listSupportedCountries(): SupportedCountry[] { - return [...SUPPORTED_COUNTRIES]; -} - export function getStorefrontConfig(country: string): StorefrontConfig { const normalized = country.toUpperCase(); if (!isSupportedCountry(normalized)) { @@ -72,11 +77,10 @@ export function getStorefrontConfig(country: string): StorefrontConfig { return CONFIGS[normalized]; } -export function getStorefrontIdForCountry(country: string): number { - return getStorefrontConfig(country).storefrontId; +export function getAppStoreUrlSegment(country: string): string { + return getStorefrontConfig(country).appStoreUrlSegment; } -export function getAppStoreSearchUrl(country: string): string { - const segment = getStorefrontConfig(country).appStoreUrlSegment; - return `https://apps.apple.com/${segment}/iphone/search`; +export function getAppStoreDslangCookieHeader(country: string): string { + return `dslang=${getStorefrontConfig(country).dslangCookie}`; } From 805eb6560a9abb4fcd816f624ad39408c016873f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20G=C3=BCldal=C4=B1?= Date: Sun, 24 May 2026 00:06:35 +0300 Subject: [PATCH 29/55] feat(policy): whitelist 6 supported countries via shared storefronts module --- cli/domain/keywords/policy.test.ts | 15 +++++++++++++++ cli/domain/keywords/policy.ts | 12 ++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 cli/domain/keywords/policy.test.ts diff --git a/cli/domain/keywords/policy.test.ts b/cli/domain/keywords/policy.test.ts new file mode 100644 index 0000000..3f2739f --- /dev/null +++ b/cli/domain/keywords/policy.test.ts @@ -0,0 +1,15 @@ +import { assertSupportedCountry } from "./policy"; + +describe("assertSupportedCountry", () => { + it.each(["US", "TR", "DE", "GB", "FR", "IT"])("accepts %s", (code) => { + expect(() => assertSupportedCountry(code)).not.toThrow(); + }); + + it.each(["JP", "BR", "ZZ", ""])("rejects %s", (code) => { + expect(() => assertSupportedCountry(code)).toThrow(/Unsupported country/); + }); + + it("normalizes case", () => { + expect(() => assertSupportedCountry("tr")).not.toThrow(); + }); +}); diff --git a/cli/domain/keywords/policy.ts b/cli/domain/keywords/policy.ts index 3f8ddfb..701cae4 100644 --- a/cli/domain/keywords/policy.ts +++ b/cli/domain/keywords/policy.ts @@ -1,3 +1,8 @@ +import { + isSupportedCountry, + SUPPORTED_COUNTRIES, +} from "../../shared/aso-storefronts"; + export const DEFAULT_ASO_COUNTRY = "US" as const; export function normalizeKeyword(keyword: string): string { @@ -20,7 +25,10 @@ export function normalizeCountry(input: string | undefined | null): string { } export function assertSupportedCountry(country: string): void { - if (normalizeCountry(country) !== DEFAULT_ASO_COUNTRY) { - throw new Error("Only US is supported for now"); + const normalized = normalizeCountry(country); + if (!isSupportedCountry(normalized)) { + throw new Error( + `Unsupported country "${country}". Supported: ${[...SUPPORTED_COUNTRIES].join(", ")}` + ); } } From 73c6eeabdcd0b622485bbb7845f095ea69356d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20G=C3=BCldal=C4=B1?= Date: Sun, 24 May 2026 00:09:19 +0300 Subject: [PATCH 30/55] test(app-doc-service): remove stale US-only guard assertion (now supports TR/DE/GB/FR/IT) --- .../cache-api/services/aso-app-doc-service.test.ts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cli/services/cache-api/services/aso-app-doc-service.test.ts b/cli/services/cache-api/services/aso-app-doc-service.test.ts index 95ad525..5eff1b2 100644 --- a/cli/services/cache-api/services/aso-app-doc-service.test.ts +++ b/cli/services/cache-api/services/aso-app-doc-service.test.ts @@ -372,18 +372,4 @@ describe("aso-app-doc-service", () => { expect(result).toEqual([]); expect(mockedAsoAppleGet).not.toHaveBeenCalled(); }); - - it("throws for non-US country", async () => { - const repository = createRepository({ - getAppDocs: (jest.fn(async () => []) as unknown) as AsoCacheRepository["getAppDocs"], - }); - - await expect( - getAsoAppDocs({ - country: "TR", - appIds: ["1"], - repository, - }) - ).rejects.toThrow("Only US is supported for now"); - }); }); From 2a242d64beb9696527fe1b11f05788ea09bd5dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20G=C3=BCldal=C4=B1?= Date: Sun, 24 May 2026 00:14:01 +0300 Subject: [PATCH 31/55] feat(localizations): add TR/DE/GB/FR/IT storefront language configs --- .../aso-storefront-localizations.test.ts | 23 ++++++++++++++ cli/shared/aso-storefront-localizations.ts | 30 +++++++++++++------ 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/cli/shared/aso-storefront-localizations.test.ts b/cli/shared/aso-storefront-localizations.test.ts index 70dc28d..f9b846a 100644 --- a/cli/shared/aso-storefront-localizations.test.ts +++ b/cli/shared/aso-storefront-localizations.test.ts @@ -1,6 +1,7 @@ import { ASO_STOREFRONT_LANGUAGES_BY_COUNTRY, getStorefrontAdditionalLanguages, + getStorefrontDefaultLanguage, getStorefrontLanguageConfig, getStorefrontLanguages, } from "./aso-storefront-localizations"; @@ -23,3 +24,25 @@ describe("aso storefront localizations", () => { expect(getStorefrontLanguages("CA")).toEqual(["en-CA"]); }); }); + +describe("aso-storefront-localizations", () => { + it.each([ + ["US", "en-US"], + ["TR", "tr"], + ["DE", "de-DE"], + ["GB", "en-GB"], + ["FR", "fr-FR"], + ["IT", "it"], + ])("returns %s default language as %s", (country, expected) => { + expect(getStorefrontDefaultLanguage(country)).toBe(expected); + }); + + it("TR additional languages include en-US for fallback discovery", () => { + const additional = getStorefrontAdditionalLanguages("TR"); + expect(additional).toContain("en-US"); + }); + + it("unknown country falls back to US default", () => { + expect(getStorefrontDefaultLanguage("ZZ")).toBe("en-US"); + }); +}); diff --git a/cli/shared/aso-storefront-localizations.ts b/cli/shared/aso-storefront-localizations.ts index 156aacb..18198e1 100644 --- a/cli/shared/aso-storefront-localizations.ts +++ b/cli/shared/aso-storefront-localizations.ts @@ -17,17 +17,29 @@ export const ASO_STOREFRONT_LANGUAGES_BY_COUNTRY: Record< US: { defaultLanguage: "en-US", additionalLanguages: [ - "ar", - "zh-Hans", - "zh-Hant", - "fr-FR", - "ko-KR", - "pt-BR", - "ru-RU", - "es-MX", - "vi", + "ar", "zh-Hans", "zh-Hant", "fr-FR", "ko-KR", "pt-BR", "ru-RU", "es-MX", "vi", ], }, + TR: { + defaultLanguage: "tr", + additionalLanguages: ["en-US"], + }, + DE: { + defaultLanguage: "de-DE", + additionalLanguages: ["en-GB", "en-US"], + }, + GB: { + defaultLanguage: "en-GB", + additionalLanguages: ["en-US"], + }, + FR: { + defaultLanguage: "fr-FR", + additionalLanguages: ["en-GB", "en-US"], + }, + IT: { + defaultLanguage: "it", + additionalLanguages: ["en-GB", "en-US"], + }, }; export function getStorefrontLanguageConfig( From ee3445a5b4782a92f6f6a65470ffab650a8e2a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20G=C3=BCldal=C4=B1?= Date: Sun, 24 May 2026 00:19:28 +0300 Subject: [PATCH 32/55] feat(db): add country column to projects table (default US, backfilled) --- cli/db/projects-country.test.ts | 42 +++++++++++++++++++++++++++++++++ cli/db/store.ts | 25 ++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 cli/db/projects-country.test.ts diff --git a/cli/db/projects-country.test.ts b/cli/db/projects-country.test.ts new file mode 100644 index 0000000..eb57d8e --- /dev/null +++ b/cli/db/projects-country.test.ts @@ -0,0 +1,42 @@ +import path from "path"; +import fs from "fs"; +import os from "os"; +import { getDb, resetDbForTests } from "./store"; + +function withTempDb(fn: () => T): T { + const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "aso-db-test-")); + process.env.ASO_DB_PATH = path.join(tmp, "test.sqlite"); + resetDbForTests(); + try { + return fn(); + } finally { + resetDbForTests(); + fs.rmSync(tmp, { recursive: true, force: true }); + delete process.env.ASO_DB_PATH; + } +} + +describe("projects.country migration", () => { + it("creates the country column with US default on fresh DB", () => { + withTempDb(() => { + const db = getDb(); + const cols = db.prepare(`PRAGMA table_info(projects)`).all() as Array<{ + name: string; + dflt_value: string | null; + notnull: number; + }>; + const countryCol = cols.find((c) => c.name === "country"); + expect(countryCol).toBeDefined(); + expect(countryCol?.notnull).toBe(1); + expect(countryCol?.dflt_value).toMatch(/'?US'?/); + }); + }); + + it("backfills US for any legacy projects row", () => { + withTempDb(() => { + const db = getDb(); + const row = db.prepare(`SELECT country FROM projects WHERE id = 'default'`).get() as { country: string }; + expect(row.country).toBe("US"); + }); + }); +}); diff --git a/cli/db/store.ts b/cli/db/store.ts index 6f90037..33088f4 100644 --- a/cli/db/store.ts +++ b/cli/db/store.ts @@ -35,12 +35,25 @@ function ensureProjectsTable(database: Database.Database): void { id TEXT PRIMARY KEY, name TEXT NOT NULL UNIQUE COLLATE NOCASE, color TEXT NOT NULL DEFAULT '${DEFAULT_PROJECT_COLOR}', + country TEXT NOT NULL DEFAULT 'US', created_at TEXT NOT NULL, updated_at TEXT NOT NULL ); `); } +function ensureProjectsCountryColumn(database: Database.Database): void { + const columns = database + .prepare(`PRAGMA table_info(projects)`) + .all() as Array<{ name?: string }>; + const hasCountry = columns.some((c) => c.name === "country"); + if (!hasCountry) { + database.exec( + `ALTER TABLE projects ADD COLUMN country TEXT NOT NULL DEFAULT 'US'` + ); + } +} + function ensureDefaultProjectRow(database: Database.Database): void { const now = new Date().toISOString(); database @@ -257,6 +270,7 @@ function initializeDatabase(database: Database.Database): void { ON aso_keyword_failures(country, stage); `); ensureProjectsTable(database); + ensureProjectsCountryColumn(database); ensureDefaultProjectRow(database); ensureProjectIdColumnOnOwnedApps(database); ensureOwnedAppsProjectIndexes(database); @@ -291,3 +305,14 @@ export function closeDbForTests(): void { db.close(); db = null; } + +export function resetDbForTests(): void { + if (db) { + try { + db.close(); + } catch { + // already closed + } + db = null; + } +} From b75959b982db038d4cabe63d4d9ce709071d11ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20G=C3=BCldal=C4=B1?= Date: Sun, 24 May 2026 00:24:31 +0300 Subject: [PATCH 33/55] feat(project-types): add country field with supported-country validator Adds ProjectCountry = SupportedCountry, DEFAULT_PROJECT_COUNTRY = "US", isValidProjectCountry() type predicate, and widens ProjectCreateRequest / ProjectUpdateRequest with optional country. Project.country is now required. Co-Authored-By: Claude Sonnet 4.6 --- cli/shared/project-types.test.ts | 11 +++++++++++ cli/shared/project-types.ts | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/cli/shared/project-types.test.ts b/cli/shared/project-types.test.ts index c7e689a..f87422b 100644 --- a/cli/shared/project-types.test.ts +++ b/cli/shared/project-types.test.ts @@ -6,6 +6,7 @@ import { PROJECT_NAME_MAX_LENGTH, ensureUniqueSlug, isValidProjectColor, + isValidProjectCountry, slugifyProjectName, validateProjectName, } from "./project-types"; @@ -113,3 +114,13 @@ describe("project-types helpers", () => { }); }); }); + +describe("isValidProjectCountry", () => { + it.each(["US", "TR", "de", "gb"])("accepts %s", (c) => { + expect(isValidProjectCountry(c)).toBe(true); + }); + + it.each(["ZZ", "", 42, null, undefined])("rejects %s", (c) => { + expect(isValidProjectCountry(c)).toBe(false); + }); +}); diff --git a/cli/shared/project-types.ts b/cli/shared/project-types.ts index 1c236bd..8c825ce 100644 --- a/cli/shared/project-types.ts +++ b/cli/shared/project-types.ts @@ -1,3 +1,8 @@ +import { + isSupportedCountry, + type SupportedCountry, +} from "./aso-storefronts"; + export const DEFAULT_PROJECT_ID = "default"; export const DEFAULT_PROJECT_NAME = "Default"; @@ -16,10 +21,15 @@ export type ProjectColor = (typeof PROJECT_COLORS)[number]; export const DEFAULT_PROJECT_COLOR: ProjectColor = "slate"; +export type ProjectCountry = SupportedCountry; + +export const DEFAULT_PROJECT_COUNTRY: ProjectCountry = "US"; + export type Project = { id: string; name: string; color: ProjectColor; + country: ProjectCountry; createdAt: string; updatedAt: string; }; @@ -32,11 +42,13 @@ export type ProjectSummary = Project & { export type ProjectCreateRequest = { name: string; color?: ProjectColor; + country?: ProjectCountry; }; export type ProjectUpdateRequest = { name?: string; color?: ProjectColor; + country?: ProjectCountry; }; export const PROJECT_NAME_MIN_LENGTH = 1; @@ -50,6 +62,10 @@ export function isValidProjectColor(value: unknown): value is ProjectColor { ); } +export function isValidProjectCountry(value: unknown): value is ProjectCountry { + return typeof value === "string" && isSupportedCountry(value); +} + export type ProjectNameValidation = | { ok: true; value: string } | { ok: false; reason: "empty" | "too_long" }; From 5a92acf4f9e8da086a688e5b88230e0f35b4571b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20G=C3=BCldal=C4=B1?= Date: Sun, 24 May 2026 00:30:23 +0300 Subject: [PATCH 34/55] wip(projects): membership-based multi-project app sharing (checkpoint) --- README.md | 1 + cli/dashboard-server/apps-handler.ts | 36 +- cli/dashboard-server/server.routes.test.ts | 8 + cli/dashboard-server/server.ts | 4 +- cli/dashboard-ui/App.tsx | 91 ++++- cli/dashboard-ui/app-helpers.ts | 35 +- cli/dashboard-ui/app.behaviors.test.tsx | 36 +- .../components/ProjectCreateDialog.tsx | 141 ++++++++ .../components/ProjectManageDialog.tsx | 244 +++++++++++++ .../components/ProjectSelector.tsx | 126 +++++++ .../components/ProjectsMigrationBanner.tsx | 69 ++++ cli/dashboard-ui/hooks/use-current-project.ts | 188 ++++++++++ cli/dashboard-ui/styles.css | 333 ++++++++++++++++++ cli/db/owned-apps.ts | 81 +++-- cli/db/projects.test.ts | 8 + cli/db/projects.ts | 59 +++- cli/db/store.ts | 31 ++ docs/aso-runtime-flows.md | 2 + 18 files changed, 1419 insertions(+), 74 deletions(-) create mode 100644 cli/dashboard-ui/components/ProjectCreateDialog.tsx create mode 100644 cli/dashboard-ui/components/ProjectManageDialog.tsx create mode 100644 cli/dashboard-ui/components/ProjectSelector.tsx create mode 100644 cli/dashboard-ui/components/ProjectsMigrationBanner.tsx create mode 100644 cli/dashboard-ui/hooks/use-current-project.ts diff --git a/README.md b/README.md index 1159827..8b4c137 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Research ASO keywords, inspect competition, and manage results from one local-fi - Keyword scoring with popularity + difficulty + brand classification in one command - Local ASO dashboard for reviewing keyword/app data - Compare apps across keywords from the dashboard — pick multiple apps plus a keyword set and see a side-by-side rank matrix (including apps that don't currently track the keyword) +- Projects (workspaces) to isolate apps and research keyword pools by category (e.g. gold tracker vs halal food scanner) — switch projects from the sidebar header with zero keyword bleed between contexts - MCP tool (`aso_evaluate_keywords`) for agent workflows and automated keyword research

ASO Dashboard

diff --git a/cli/dashboard-server/apps-handler.ts b/cli/dashboard-server/apps-handler.ts index fcd347a..a6c47dc 100644 --- a/cli/dashboard-server/apps-handler.ts +++ b/cli/dashboard-server/apps-handler.ts @@ -1,8 +1,9 @@ import * as http from "http"; import { + addAppToProject, deleteOwnedAppById, getOwnedAppById, - moveAppToProject, + removeAppFromProject, upsertOwnedApps, upsertOwnedAppSnapshots, } from "../db/owned-apps"; @@ -143,6 +144,7 @@ export function createAppsHandlers(deps: CreateAppsHandlersDeps) { const country = deps.hydrationCountry; upsertOwnedApps([{ id: appId, kind: "owned", name: appId, projectId }]); + addAppToProject(appId, projectId); let hydratedName = appId; try { const snapshots = await deps.fetchOwnedAppSnapshotsFromApi(country, [appId]); @@ -187,6 +189,7 @@ export function createAppsHandlers(deps: CreateAppsHandlersDeps) { ensureDefaultResearchAppExists(projectId); const id = nextResearchAppId(slug); upsertOwnedApps([{ id, kind: "research", name, projectId }]); + addAppToProject(id, projectId); deps.sendJson(res, 201, { success: true, data: { @@ -198,7 +201,8 @@ export function createAppsHandlers(deps: CreateAppsHandlersDeps) { async function handleApiAppsDelete( req: http.IncomingMessage, - res: http.ServerResponse + res: http.ServerResponse, + projectId: string = DEFAULT_PROJECT_ID ): Promise { const body = await deps.parseJsonBody(req, res); if (!body) { @@ -227,11 +231,20 @@ export function createAppsHandlers(deps: CreateAppsHandlersDeps) { return; } - const removedKeywordCount = deleteAppKeywordsByAppId(appId); - const removedAppCount = deleteOwnedAppById(appId); - if (removedAppCount === 0) { - deps.sendApiError(res, 404, "NOT_FOUND", "App not found."); - return; + // Remove the app from the current project. If no other project still + // lists it, fully delete the app + keyword data. This lets an app live + // in multiple projects at once. + const { remainingProjects } = removeAppFromProject(appId, projectId); + let removedKeywordCount = 0; + let fullyDeleted = false; + if (remainingProjects === 0) { + removedKeywordCount = deleteAppKeywordsByAppId(appId); + const removedAppCount = deleteOwnedAppById(appId); + if (removedAppCount === 0) { + deps.sendApiError(res, 404, "NOT_FOUND", "App not found."); + return; + } + fullyDeleted = true; } deps.sendJson(res, 200, { @@ -239,6 +252,8 @@ export function createAppsHandlers(deps: CreateAppsHandlersDeps) { data: { id: appId, removedKeywordCount, + fullyDeleted, + remainingProjects, }, }); } @@ -285,16 +300,13 @@ export function createAppsHandlers(deps: CreateAppsHandlersDeps) { ); return; } - const moved = moveAppToProject(normalized, project.id); - if (!moved) { - deps.sendApiError(res, 404, "NOT_FOUND", "App not found."); - return; - } + const added = addAppToProject(normalized, project.id); deps.sendJson(res, 200, { success: true, data: { id: normalized, projectId: project.id, + addedMembership: added, }, }); } diff --git a/cli/dashboard-server/server.routes.test.ts b/cli/dashboard-server/server.routes.test.ts index 042aaa5..8f3fbd7 100644 --- a/cli/dashboard-server/server.routes.test.ts +++ b/cli/dashboard-server/server.routes.test.ts @@ -42,6 +42,12 @@ jest.mock("../db/owned-apps", () => ({ listOwnedApps: jest.fn(() => []), upsertOwnedApps: jest.fn(), upsertOwnedAppSnapshots: jest.fn(), + addAppToProject: jest.fn(() => true), + removeAppFromProject: jest.fn(() => ({ + removed: true, + remainingProjects: 0, + })), + listAppProjectIds: jest.fn(() => []), })); jest.mock("../db/app-keywords", () => ({ @@ -435,6 +441,8 @@ describe("dashboard server routes", () => { data: { id: "123", removedKeywordCount: 3, + fullyDeleted: true, + remainingProjects: 0, }, }); }); diff --git a/cli/dashboard-server/server.ts b/cli/dashboard-server/server.ts index 191fafd..4e6cbee 100644 --- a/cli/dashboard-server/server.ts +++ b/cli/dashboard-server/server.ts @@ -558,8 +558,10 @@ export function createServerRequestHandler(): http.RequestListener { } if (req.method === "DELETE" && pathname === "/api/apps") { + const projectId = resolveProjectId(query, res, sendApiError); + if (!projectId) return; await runAsForegroundMutation(() => - appsHandlers.handleApiAppsDelete(req, res) + appsHandlers.handleApiAppsDelete(req, res, projectId) ); return; } diff --git a/cli/dashboard-ui/App.tsx b/cli/dashboard-ui/App.tsx index 193dfc8..6e25fd3 100644 --- a/cli/dashboard-ui/App.tsx +++ b/cli/dashboard-ui/App.tsx @@ -1,6 +1,9 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { Badge, Button, Card, Input } from "./ui-react"; -import { DEFAULT_RESEARCH_APP_ID } from "../shared/aso-research"; +import { + DEFAULT_RESEARCH_APP_ID, + researchAppIdForProject, +} from "../shared/aso-research"; import { DEFAULT_ASO_COUNTRY, apiGet, @@ -36,6 +39,11 @@ import { KeywordActionMenu } from "./components/keyword-action-menu"; import { AddAppDialog } from "./components/add-app-dialog"; import { AppActionMenu } from "./components/app-action-menu"; import { CompareView } from "./components/CompareView"; +import { ProjectSelector } from "./components/ProjectSelector"; +import { ProjectCreateDialog } from "./components/ProjectCreateDialog"; +import { ProjectManageDialog } from "./components/ProjectManageDialog"; +import { ProjectsMigrationBanner } from "./components/ProjectsMigrationBanner"; +import { useCurrentProject } from "./hooks/use-current-project"; import { DASHBOARD_FILTER_DEFAULTS, DASHBOARD_FILTER_OPTIONS, @@ -317,6 +325,13 @@ export function App() { const [keywordActionMenu, setKeywordActionMenu] = useState(null); const [appActionMenu, setAppActionMenu] = useState(null); const [compareOpen, setCompareOpen] = useState(false); + const [projectCreateOpen, setProjectCreateOpen] = useState(false); + const [projectManageOpen, setProjectManageOpen] = useState(false); + const projectContext = useCurrentProject(); + const currentProjectId = projectContext.currentProject?.id ?? null; + const currentResearchAppId = currentProjectId + ? researchAppIdForProject(currentProjectId) + : DEFAULT_RESEARCH_APP_ID; const [researchSectionCollapsed, setResearchSectionCollapsed] = useState(false); const [sidebarCollapsed, setSidebarCollapsed] = useState(false); @@ -369,7 +384,7 @@ export function App() { const selectedApp = appById.get(selectedAppId); const selectedAppName = selectedApp?.name ?? - (selectedAppId === DEFAULT_RESEARCH_APP_ID ? "Research" : selectedAppId); + (selectedAppId === currentResearchAppId ? "Research" : selectedAppId); const isSelectedAppResearch = selectedApp?.kind === "research"; const showRankingColumns = !isSelectedAppResearch; const { @@ -464,7 +479,7 @@ export function App() { ? "No keywords yet for this app." : "No keywords match the current search/filters."; const hasAnyAddedNonDefaultApp = useMemo( - () => apps.some((app) => app.id !== DEFAULT_RESEARCH_APP_ID), + () => apps.some((app) => app.id !== currentResearchAppId), [apps] ); const hasAnyAddedKeyword = useMemo( @@ -474,11 +489,14 @@ export function App() { const isKeywordMutationBlockedByStartupReauth = startupRefreshState?.requiresReauthentication === true; + const refreshProjects = projectContext.refresh; const loadApps = useCallback(async (): Promise => { const list = await apiGet(`/api/apps`); setApps(list); + // Keep project dropdown counts in sync after any app mutation that calls loadApps. + void refreshProjects().catch(() => {}); return list; - }, []); + }, [refreshProjects]); const restartStartupRefresh = useCallback(async (): Promise => { try { @@ -624,7 +642,7 @@ export function App() { setHasCachedData(true); let activeAppId = selectedAppIdRef.current; if ( - activeAppId === DEFAULT_RESEARCH_APP_ID && + activeAppId === currentResearchAppId && !list.some((a) => a.id === activeAppId) ) { const firstResearch = list.find((a) => a.kind === "research"); @@ -633,9 +651,9 @@ export function App() { setSelectedAppId(firstResearch.id); } } - if (activeAppId !== DEFAULT_RESEARCH_APP_ID && !list.some((a) => a.id === activeAppId)) { - activeAppId = DEFAULT_RESEARCH_APP_ID; - setSelectedAppId(DEFAULT_RESEARCH_APP_ID); + if (activeAppId !== currentResearchAppId && !list.some((a) => a.id === activeAppId)) { + activeAppId = currentResearchAppId; + setSelectedAppId(currentResearchAppId); } await loadKeywords(activeAppId, 1); keywordQueryKeyRef.current = buildKeywordQueryKey(activeAppId); @@ -707,6 +725,14 @@ export function App() { void loadApps().catch(() => {}); }, [startupRefreshState, loadApps]); + useEffect(() => { + if (!currentProjectId) return; + void loadApps().catch(() => {}); + if (selectedAppId) { + void loadKeywords(selectedAppId, 1).catch(() => {}); + } + }, [currentProjectId]); + useEffect(() => { if (isCompactLayout && sidebarCollapsed) { setSidebarCollapsed(false); @@ -978,10 +1004,10 @@ export function App() { let nextSelectedAppId = selectedAppIdRef.current; if (!list.some((app) => app.id === nextSelectedAppId) || nextSelectedAppId === appId) { const fallbackApp = - list.find((app) => app.id === DEFAULT_RESEARCH_APP_ID) ?? + list.find((app) => app.id === currentResearchAppId) ?? list.find((app) => app.kind === "research") ?? list[0]; - nextSelectedAppId = fallbackApp?.id ?? DEFAULT_RESEARCH_APP_ID; + nextSelectedAppId = fallbackApp?.id ?? currentResearchAppId; setSelectedAppId(nextSelectedAppId); } await loadKeywords(nextSelectedAppId, 1); @@ -997,7 +1023,7 @@ export function App() { const onSidebarAppContextMenuOpen = useCallback( (event: React.MouseEvent, app: AppItem) => { - if (app.id === DEFAULT_RESEARCH_APP_ID) return; + if (app.id === currentResearchAppId) return; if (isSidebarSelectionControlTarget(event.target)) return; event.preventDefault(); event.stopPropagation(); @@ -1912,12 +1938,23 @@ export function App() { const keywordPageLabel = Math.min(keywordPage, keywordTotalPages); return (
-
+ + {errorText ? (

{errorText}

) : null} diff --git a/cli/dashboard-ui/hooks/use-current-project.ts b/cli/dashboard-ui/hooks/use-current-project.ts index d443fe4..f3333d7 100644 --- a/cli/dashboard-ui/hooks/use-current-project.ts +++ b/cli/dashboard-ui/hooks/use-current-project.ts @@ -11,6 +11,7 @@ import { type ProjectColor, type ProjectSummary, } from "../../shared/project-types"; +import type { SupportedCountry } from "../../shared/aso-storefronts"; const CURRENT_PROJECT_STORAGE_KEY = "aso-current-project-id"; @@ -25,10 +26,11 @@ export type UseCurrentProjectResult = { createProject: (input: { name: string; color?: ProjectColor; + country?: SupportedCountry; }) => Promise; updateProject: ( projectId: string, - patch: { name?: string; color?: ProjectColor } + patch: { name?: string; color?: ProjectColor; country?: SupportedCountry } ) => Promise; deleteProject: ( projectId: string @@ -121,7 +123,11 @@ export function useCurrentProject(): UseCurrentProjectResult { ); const createProject = useCallback( - async (input: { name: string; color?: ProjectColor }) => { + async (input: { + name: string; + color?: ProjectColor; + country?: SupportedCountry; + }) => { const created = await apiWrite( "POST", "/api/projects", @@ -137,7 +143,7 @@ export function useCurrentProject(): UseCurrentProjectResult { const updateProject = useCallback( async ( projectId: string, - patch: { name?: string; color?: ProjectColor } + patch: { name?: string; color?: ProjectColor; country?: SupportedCountry } ) => { const updated = await apiWrite( "PATCH", From f344b7de2612920b3c0264085fc0dc7434e74371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20G=C3=BCldal=C4=B1?= Date: Sun, 24 May 2026 01:33:41 +0300 Subject: [PATCH 47/55] feat(ui): country editing in manage dialog and flag badge on selector chip Add CountrySelector to each row of ProjectManageDialog so users can change a project's storefront, and prefix the country flag emoji to the project name in the ProjectSelector chip and dropdown rows. Also add country: "US" to the project mock in app.behaviors.test.tsx so it matches the now-required Project.country field. --- cli/dashboard-ui/app.behaviors.test.tsx | 1 + cli/dashboard-ui/components/ProjectManageDialog.tsx | 10 +++++++++- cli/dashboard-ui/components/ProjectSelector.tsx | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/cli/dashboard-ui/app.behaviors.test.tsx b/cli/dashboard-ui/app.behaviors.test.tsx index f8d1e24..5c22452 100644 --- a/cli/dashboard-ui/app.behaviors.test.tsx +++ b/cli/dashboard-ui/app.behaviors.test.tsx @@ -276,6 +276,7 @@ function buildFetchMock(params: { id: "default", name: "Default", color: "slate", + country: "US", createdAt: "2024-01-01T00:00:00.000Z", updatedAt: "2024-01-01T00:00:00.000Z", appCount: 0, diff --git a/cli/dashboard-ui/components/ProjectManageDialog.tsx b/cli/dashboard-ui/components/ProjectManageDialog.tsx index dd1fce3..3736632 100644 --- a/cli/dashboard-ui/components/ProjectManageDialog.tsx +++ b/cli/dashboard-ui/components/ProjectManageDialog.tsx @@ -6,6 +6,8 @@ import { type ProjectColor, type ProjectSummary, } from "../../shared/project-types"; +import type { SupportedCountry } from "../../shared/aso-storefronts"; +import { CountrySelector } from "./CountrySelector"; type ProjectManageDialogProps = { open: boolean; @@ -14,7 +16,7 @@ type ProjectManageDialogProps = { onClose: () => void; onUpdate: ( projectId: string, - patch: { name?: string; color?: ProjectColor } + patch: { name?: string; color?: ProjectColor; country?: SupportedCountry } ) => Promise; onDelete: (projectId: string) => Promise; }; @@ -177,6 +179,12 @@ export function ProjectManageDialog({ /> ))} + void onUpdate(project.id, { country })} + disabled={isBusy === project.id} + /> + + + + + ) : null} ); diff --git a/cli/dashboard-ui/hooks/use-add-app-search.ts b/cli/dashboard-ui/hooks/use-add-app-search.ts index 9d9095c..6bd83e9 100644 --- a/cli/dashboard-ui/hooks/use-add-app-search.ts +++ b/cli/dashboard-ui/hooks/use-add-app-search.ts @@ -1,6 +1,5 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { - DEFAULT_ASO_COUNTRY, apiGet, toActionableErrorMessage, } from "../app-helpers"; @@ -149,8 +148,12 @@ export function useAddAppSearch() { setAddAppSearchResults([]); const debounceTimer = window.setTimeout(() => { + // No `country` query param: the server authoritatively resolves the + // storefront from the current project via resolveCountryForProject(). + // Sending a client-side override would be misleading dead code at best + // and a privilege-escalation surface at worst. void apiGet( - `/api/aso/apps/search?country=${DEFAULT_ASO_COUNTRY}&term=${encodeURIComponent(term)}&limit=${APP_SEARCH_LIMIT}` + `/api/aso/apps/search?term=${encodeURIComponent(term)}&limit=${APP_SEARCH_LIMIT}` ) .then((payload) => { if (requestId !== addAppSearchRequestIdRef.current) return; diff --git a/cli/services/cache-api/services/aso-app-doc-service.ts b/cli/services/cache-api/services/aso-app-doc-service.ts index 6585d11..3310baa 100644 --- a/cli/services/cache-api/services/aso-app-doc-service.ts +++ b/cli/services/cache-api/services/aso-app-doc-service.ts @@ -1,3 +1,4 @@ +import axios from "axios"; import { computeAppExpiryIsoForApp } from "./aso-keyword-utils"; import type { AsoCacheRepository, AsoAppDoc } from "./aso-types"; import { normalizeCountryOnAppDocs } from "./aso-app-doc-utils"; @@ -300,18 +301,32 @@ async function fetchAppDocById(country: string, appId: string): Promise` rejects the - // X-Apple-Store-Front header) doesn't reject the surrounding - // Promise.all and abort the iTunes lookup fallback that handles - // these cases. - return null; + // Swallow ONLY client errors (4xx). `apps.apple.com/app/id` returns + // HTTP 400 with the X-Apple-Store-Front header for many non-US + // storefronts (TR, etc.); returning null lets the iTunes lookup + // fallback in fetchAppStoreLookupAppDocs handle the unresolved id. + // + // Re-throw 5xx / network / timeout so Promise.all surfaces real upstream + // failures to telemetry instead of masquerading them as "this app + // doesn't exist on this storefront." + if ( + typeof statusCode === "number" && + statusCode >= 400 && + statusCode < 500 + ) { + return null; + } + throw error; } const payload = parseAppStorePayload(response.data); diff --git a/cli/services/cache-api/services/aso-enrichment-service.ts b/cli/services/cache-api/services/aso-enrichment-service.ts index 6f26a4f..d9ba55d 100644 --- a/cli/services/cache-api/services/aso-enrichment-service.ts +++ b/cli/services/cache-api/services/aso-enrichment-service.ts @@ -614,7 +614,15 @@ async function buildAppDocsFromLookup(params: { country: params.country, appIds: params.appIds, }); - } catch { + } catch (error) { + // Don't crash the enrichment pipeline if app-doc lookup fails entirely, + // but log it so real Apple outages surface in telemetry instead of + // silently degrading to "no difficulty data". + logger.debug("[aso-enrichment] app-doc lookup failed; difficulty will be unavailable", { + country: params.country, + appIdsCount: params.appIds.length, + message: error instanceof Error ? error.message : String(error), + }); lookupDocs = []; } diff --git a/cli/services/keywords/aso-apple-popularity-client.ts b/cli/services/keywords/aso-apple-popularity-client.ts index 77f4e00..728f83b 100644 --- a/cli/services/keywords/aso-apple-popularity-client.ts +++ b/cli/services/keywords/aso-apple-popularity-client.ts @@ -16,6 +16,15 @@ import { const APPLE_POPULARITY_URL = "https://app-ads.apple.com/cm/api/v2/keywords/popularities"; const KWS_NO_ORG_CONTENT_PROVIDERS = "KWS_NO_ORG_CONTENT_PROVIDERS"; +/** + * Sentinel `internalErrorCode` written on the synthesized 200 response when + * `treatNoOrgAsNull` translates a real KWS_NO_ORG_CONTENT_PROVIDERS 403. + * Downstream parsers use this to distinguish "Apple has no popularity for + * this keyword" (skip) from "user lacks storefront access" (record as 0 + * sentinel so order/difficulty stages still run). + */ +export const NO_ORG_TRANSLATED_INTERNAL_CODE = + "ASO_NO_ORG_TRANSLATED_TO_NULL"; export interface PopularityItem { name: string; @@ -172,6 +181,7 @@ export async function requestPopularitiesWithKwsRetry( statusCode: 200, data: { status: "ok", + internalErrorCode: NO_ORG_TRANSLATED_INTERNAL_CODE, data: terms.map((name) => ({ name, popularity: null })), }, attempts: attempt, diff --git a/cli/services/keywords/aso-popularity-service.test.ts b/cli/services/keywords/aso-popularity-service.test.ts index 3d76009..643830c 100644 --- a/cli/services/keywords/aso-popularity-service.test.ts +++ b/cli/services/keywords/aso-popularity-service.test.ts @@ -15,6 +15,7 @@ jest.mock("../auth/aso-auth-service", () => ({ jest.mock("./aso-apple-popularity-client", () => ({ requestPopularitiesWithKwsRetry: jest.fn(), + NO_ORG_TRANSLATED_INTERNAL_CODE: "ASO_NO_ORG_TRANSLATED_TO_NULL", })); jest.mock("./aso-adam-id-service", () => ({ @@ -81,14 +82,17 @@ describe("AsoPopularityService", () => { "cookie=value", expect.any(String), "US", - { treatNoOrgAsNull: false } + { treatNoOrgAsNull: true } ); expect(asoAuthService.getCookieHeader).toHaveBeenCalledWith( "https://app-ads.apple.com/cm/api/v2/keywords/popularities" ); }); - it("records null popularity as 0 so the keyword still flows through the pipeline", async () => { + it("skips genuine null popularity from real Apple responses (legacy US behavior)", async () => { + // No `internalErrorCode` on the response — this is a genuine Apple null, + // not the synthesized-from-403 case. Behavior must match pre-PR US: + // skip the null, leave the keyword pending for a future retry. mockRequestPopularitiesWithKwsRetry.mockResolvedValue({ statusCode: 200, attempts: 1, @@ -108,7 +112,7 @@ describe("AsoPopularityService", () => { "c", ]); - expect(result).toEqual({ a: 1, b: 0, c: 3 }); + expect(result).toEqual({ a: 1, c: 3 }); }); it("throws ContextualError on non-200 response", async () => { @@ -162,7 +166,7 @@ describe("AsoPopularityService", () => { "new-cookie", expect.any(String), "US", - { treatNoOrgAsNull: false } + { treatNoOrgAsNull: true } ); }); @@ -349,7 +353,7 @@ describe("AsoPopularityService", () => { "cookie=value", expect.any(String), "US", - { maxAttempts: 1, treatNoOrgAsNull: false } + { maxAttempts: 1, treatNoOrgAsNull: true } ); expect(mockRequestPopularitiesWithKwsRetry).toHaveBeenNthCalledWith( 3, @@ -357,7 +361,7 @@ describe("AsoPopularityService", () => { "cookie=value", expect.any(String), "US", - { maxAttempts: 1, treatNoOrgAsNull: false } + { maxAttempts: 1, treatNoOrgAsNull: true } ); }); @@ -387,7 +391,7 @@ describe("AsoPopularityService", () => { ); }); - it("forwards lowercase 'us' as treatNoOrgAsNull=false (US match is case-insensitive)", async () => { + it("always opts into treatNoOrgAsNull regardless of country (no US-special case)", async () => { mockRequestPopularitiesWithKwsRetry.mockResolvedValue({ statusCode: 200, attempts: 1, @@ -404,7 +408,7 @@ describe("AsoPopularityService", () => { "cookie=value", expect.any(String), "us", - { treatNoOrgAsNull: false } + { treatNoOrgAsNull: true } ); }); }); @@ -417,14 +421,17 @@ describe("AsoPopularityService country threading", () => { jest.mocked(getConfiguredAsoAdamId).mockReturnValue("1234567890"); }); - it("forwards country to popularity client and writes popularity:null when storefront lacks org access", async () => { - // Mock returns null popularity for all terms — simulates the treatNoOrgAsNull - // degraded path where the Apple API returns null instead of a numeric score + it("forwards country to popularity client and writes popularity:0 when storefront lacks org access", async () => { + // Mock returns the synthesized response (internalErrorCode is the + // marker the client sets when translating KWS_NO_ORG_CONTENT_PROVIDERS + // into null entries). Service must persist 0 sentinel so the keyword + // continues through the order/difficulty pipeline. mockRequestPopularitiesWithKwsRetry.mockResolvedValue({ statusCode: 200, attempts: 1, data: { status: "success", + internalErrorCode: "ASO_NO_ORG_TRANSLATED_TO_NULL", data: [ { name: "uygulama", popularity: null }, { name: "oyun", popularity: null }, @@ -454,7 +461,7 @@ describe("AsoPopularityService country threading", () => { expect(result.failedKeywords).toHaveLength(0); }); - it("uses treatNoOrgAsNull=false when country is US (preserves loud failure)", async () => { + it("opts into treatNoOrgAsNull for US too — a US developer without org access deserves the same graceful degradation as TR", async () => { mockRequestPopularitiesWithKwsRetry.mockResolvedValue({ statusCode: 200, attempts: 1, @@ -471,7 +478,7 @@ describe("AsoPopularityService country threading", () => { "cookie=value", expect.any(String), "US", - { treatNoOrgAsNull: false } + { treatNoOrgAsNull: true } ); }); }); diff --git a/cli/services/keywords/aso-popularity-service.ts b/cli/services/keywords/aso-popularity-service.ts index 45a2141..d6f1f00 100644 --- a/cli/services/keywords/aso-popularity-service.ts +++ b/cli/services/keywords/aso-popularity-service.ts @@ -3,6 +3,7 @@ import { logger } from "../../utils/logger"; import { asoAuthService } from "../auth/aso-auth-service"; import { getConfiguredAsoAdamId } from "./aso-adam-id-service"; import { + NO_ORG_TRANSLATED_INTERNAL_CODE, requestPopularitiesWithKwsRetry, type PopularityResponse, } from "./aso-apple-popularity-client"; @@ -141,7 +142,13 @@ export class AsoPopularityService { if (keywords.length > ASO_MAX_KEYWORDS) { throw new ContextualError(ASO_MAX_KEYWORDS_PER_CALL_ERROR); } - const treatNoOrgAsNull = country.toUpperCase() !== "US"; + // Always opt into the synthesized-null degradation. The previous + // `country !== "US"` heuristic encoded the assumption that only US + // accounts have org access — wrong axis. A US developer without + // Search Ads org access deserves the same graceful degradation as a + // TR developer; both end up with popularity:null (sentinel-encoded + // downstream as 0) so the order/difficulty stages still run. + const treatNoOrgAsNull = true; const sanitizedToOriginal = new Map(); for (const keyword of keywords) { @@ -259,6 +266,16 @@ export class AsoPopularityService { return result; } + // Distinguish synthesized null (from treatNoOrgAsNull translating a + // 403 KWS_NO_ORG_CONTENT_PROVIDERS into a fake 200) from a genuine + // null in a real Apple response. The synthesized case marks itself + // with NO_ORG_TRANSLATED_INTERNAL_CODE so we can persist 0 here as + // the "no-storefront-access" sentinel and keep order/difficulty + // stages running. A genuine null from a real Apple response keeps + // the pre-existing US behavior (skip, leave the keyword pending so + // it can be retried). + const isSynthesizedNoOrg = + response.data.internalErrorCode === NO_ORG_TRANSLATED_INTERNAL_CODE; let invalidItemCount = 0; for (const item of response.data.data || []) { if (!item || typeof item.name !== "string") { @@ -267,13 +284,13 @@ export class AsoPopularityService { } const originalKeyword = sanitizedToOriginal.get(item.name); if (!originalKeyword) continue; - // Apple returns popularity=null when (a) the user's Search Ads account - // lacks org access for this storefront (treatNoOrgAsNull synthesized - // this), or (b) Apple has no popularity data for this keyword. - // Persist 0 as a sentinel so the order/difficulty pipeline still runs; - // the keyword surfaces in the UI with popularity=0 instead of getting - // stuck in "pending" forever. - result[originalKeyword] = item.popularity ?? 0; + if (item.popularity === null) { + if (isSynthesizedNoOrg) { + result[originalKeyword] = 0; + } + continue; + } + result[originalKeyword] = item.popularity; } if (invalidItemCount > 0) { reportAppleContractChange({ From 4818e5d966d27061b2eb3c398e930b01a1f8c6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20G=C3=BCldal=C4=B1?= Date: Sun, 24 May 2026 18:23:19 +0300 Subject: [PATCH 55/55] feat: rebrand as @onlyilkr/aso-cli v1.0.0 (actively maintained fork) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - package.json: rename to scoped package @onlyilkr/aso-cli, bump to 1.0.0, add publishConfig.access=public, point repository/homepage/bugs at the fork, list İlker as author, retain Semih as contributor - LICENSE: add fork copyright line while preserving original MIT terms - README: add 'actively maintained fork' banner at the top, update install instructions to the new scoped package name, add migration note for users upgrading from upstream aso-cli (binary 'aso' is unchanged) The CLI command name (aso) is preserved for muscle-memory compatibility; only the npm install identifier changes. --- LICENSE | 3 ++- README.md | 22 ++++++++++++++++++---- package.json | 24 +++++++++++++++++++----- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/LICENSE b/LICENSE index 28c23da..05bfeb5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License -Copyright (c) 2026 Semih Cihan +Copyright (c) 2026 Semih Cihan (original work, https://github.com/semihcihan/App-Store-Optimization-CLI) +Copyright (c) 2026 İlker Güldalı (multi-storefront fork and subsequent enhancements, https://github.com/onlyilkr/App-Store-Optimization-CLI) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 73c9083..fd0ec1f 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,13 @@

- npm version + npm version License: MIT - Node.js - CI + Node.js

+> 📌 **Actively maintained fork** of [semihcihan/App-Store-Optimization-CLI](https://github.com/semihcihan/App-Store-Optimization-CLI). The upstream repository became inactive; this fork carries the project forward with **multi-storefront support (US/TR/DE/GB/FR/IT)**, ongoing bugfixes, and feature work. Full credit to [Semih Cihan](https://github.com/semihcihan) for the original foundation — see [LICENSE](./LICENSE). + Research ASO keywords, inspect competition, and manage results from one local-first CLI. ## What Is It? @@ -40,11 +41,24 @@ The dashboard keywords shown above were discovered and added automatically by an ## Install ```bash -npm install -g aso-cli +npm install -g @onlyilkr/aso-cli ``` +The CLI command is still `aso` (binary name is unchanged for muscle-memory compatibility with the upstream package). + Note: requires Node.js `>=18.14.1`. +### Migrating from `aso-cli` (upstream) + +If you previously installed `aso-cli`, uninstall it first to avoid `aso` binary conflicts: + +```bash +npm uninstall -g aso-cli +npm install -g @onlyilkr/aso-cli +``` + +Your local database (`~/.aso/aso-db.sqlite`) and any saved credentials are preserved — this fork is backward-compatible with upstream data. + ## Apple Search Ads Setup ASO commands require Apple Search Ads setup. diff --git a/package.json b/package.json index af49cd2..215bf41 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,15 @@ { - "name": "aso-cli", - "version": "0.11.0", - "description": "Local App Store Optimization CLI", + "name": "@onlyilkr/aso-cli", + "version": "1.0.0", + "description": "Multi-storefront ASO CLI (US/TR/DE/GB/FR/IT) — actively maintained fork of aso-cli", "main": "cli/dist/cli.js", "bin": { "aso": "cli/dist/cli.js", "aso-mcp": "cli/dist/mcp.js" }, + "publishConfig": { + "access": "public" + }, "scripts": { "check:node": "node scripts/check-node-version.js", "prebuild": "npm run check:node && npm run generate-mcp-content", @@ -46,11 +49,22 @@ "app-store", "keyword-research", "app-store-optimization", + "multi-storefront", + "turkey", + "europe", "mcp" ], "repository": { "type": "git", - "url": "git+https://github.com/semihcihan/App-Store-Optimization-CLI.git" + "url": "git+https://github.com/onlyilkr/App-Store-Optimization-CLI.git" + }, + "bugs": { + "url": "https://github.com/onlyilkr/App-Store-Optimization-CLI/issues" + }, + "author": { + "name": "İlker Güldalı", + "email": "guldaliilker@gmail.com", + "url": "https://github.com/onlyilkr" }, "contributors": [ { @@ -63,7 +77,7 @@ "node": ">=18.14.1", "npm": ">=8.0.0" }, - "homepage": "https://github.com/semihcihan/App-Store-Optimization-CLI", + "homepage": "https://github.com/onlyilkr/App-Store-Optimization-CLI", "files": [ "cli/dist/", "README.md",