wikimemory 0.2.5 → 0.2.7

package/dist/npm-cli/scripts/cli.js

@@ -3,7 +3,7 @@ import { mkdir } from "node:fs/promises";
 import process from "node:process";
 import { WIKIMEMORY_VERSION } from "../src/version.js";
 import { deploymentArguments, installArguments } from "./cli-options.js";
-import { deploymentPaths } from "./deployment-record.js";
+import { deploymentPaths, requireInstalledDeployment } from "./deployment-record.js";
 import { packageRoot } from "./package-root.js";
 import { conciseError } from "./subprocess.js";
 const [command, ...args] = process.argv.slice(2);
@@ -34,6 +34,19 @@ async function main() {
     }
     const parsed = deploymentArguments(args);
     const paths = deploymentPaths(parsed.deployment);
+    const requiresInstalledDeployment = !parsed.remaining.includes("--help") &&
+        (command === "recover" ||
+            command === "status" ||
+            command === "passkeys" ||
+            command === "connect" ||
+            command === "uninstall" ||
+            (command === "upgrade" && !parsed.remaining.includes("--record")));
+    if (requiresInstalledDeployment) {
+        const requirement = command === "recover" || command === "passkeys" || command === "uninstall"
+            ? "config"
+            : "record";
+        await requireInstalledDeployment(parsed.deployment, requirement);
+    }
     if (command === "install" || command === "recover") {
         await mkdir(paths.directory, { recursive: true, mode: 0o700 });
         process.env["WIKIMEMORY_PACKAGE_ROOT"] = root;

package/dist/npm-cli/scripts/deployment-record.js

@@ -1,4 +1,4 @@
-import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { access, mkdir, readdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { z } from "zod";
@@ -44,6 +44,43 @@ export function deploymentPaths(deployment = "wikimemory") {
         passkeyClient: join(directory, "passkey-client.json")
     };
 }
+export async function requireInstalledDeployment(deployment, requirement = "record") {
+    const requestedPaths = deploymentPaths(deployment);
+    const requested = requirement === "record" ? requestedPaths.record : requestedPaths.config;
+    try {
+        await access(requested);
+        return;
+    }
+    catch (error) {
+        if (!(error instanceof Error && "code" in error && error.code === "ENOENT"))
+            throw error;
+    }
+    const configRoot = process.env["XDG_CONFIG_HOME"] ?? join(homedir(), ".config");
+    const deploymentsRoot = join(configRoot, "wikimemory", "deployments");
+    let installed = [];
+    try {
+        const entries = (await readdir(deploymentsRoot, { withFileTypes: true })).filter((entry) => entry.isDirectory() && DEPLOYMENT_NAME.test(entry.name));
+        const candidates = await Promise.all(entries.map(async (entry) => {
+            try {
+                await access(join(deploymentsRoot, entry.name, "deployment.json"));
+                return entry.name;
+            }
+            catch (error) {
+                if (error instanceof Error && "code" in error && error.code === "ENOENT")
+                    return null;
+                throw error;
+            }
+        }));
+        installed = candidates.filter((name) => name !== null).sort();
+    }
+    catch (error) {
+        if (!(error instanceof Error && "code" in error && error.code === "ENOENT"))
+            throw error;
+    }
+    if (installed.length === 0)
+        throw new Error(`No deployment named “${deployment}”. Run wikimemory install first.`);
+    throw new Error(`No deployment named “${deployment}”. Installed: ${installed.join(", ")}. Use --deployment NAME.`);
+}
 export function deploymentRecordFromConfig(configText, installedVersion, kvName) {
     const config = PRODUCTION_CONFIG_SCHEMA.parse(JSON.parse(configText));
     const database = config.d1_databases.at(0);

package/dist/npm-cli/scripts/deployment-wait.js

@@ -0,0 +1,4 @@
+export const DEPLOYMENT_VERIFY_ATTEMPTS = 25;
+export function deploymentVerifyDelay(completedAttempt) {
+    return Math.min(1000 * 2 ** completedAttempt, 5000);
+}

package/dist/npm-cli/scripts/setup.js

@@ -9,6 +9,7 @@ import { pathToFileURL } from "node:url";
 import { z } from "zod";
 import { WIKIMEMORY_VERSION } from "../src/version.js";
 import { deploymentRecordFromConfig, writeDeploymentRecord } from "./deployment-record.js";
+import { DEPLOYMENT_VERIFY_ATTEMPTS, deploymentVerifyDelay } from "./deployment-wait.js";
 import { installedRecordPath, packageRoot, setupRuntime } from "./lifecycle-runtime.js";
 import { commandFailureMessage, conciseError, runCommand } from "./subprocess.js";
 export { commandFailureMessage } from "./subprocess.js";
@@ -319,7 +320,7 @@ function bootstrapSecret() {
     const hash = createHash("sha256").update(raw, "utf8").digest("hex");
     return { raw, hash };
 }
-export async function verifyEndpoint(origin, path, expectedStatus, fetcher = fetch, sleeper = sleep, attempts = 6) {
+export async function verifyEndpoint(origin, path, expectedStatus, fetcher = fetch, sleeper = sleep, attempts = DEPLOYMENT_VERIFY_ATTEMPTS) {
     let finalDetail = "no response";
     for (let attempt = 0; attempt < attempts; attempt += 1) {
         try {
@@ -344,7 +345,7 @@ export async function verifyEndpoint(origin, path, expectedStatus, fetcher = fet
             finalDetail = error instanceof Error ? error.message : "Unknown request failure";
         }
         if (attempt + 1 < attempts)
-            await sleeper(250 * 2 ** attempt);
+            await sleeper(deploymentVerifyDelay(attempt));
     }
     throw new Error(`Deployment ${path} check failed after ${attempts} attempts: ${finalDetail}`);
 }

package/dist/npm-cli/scripts/status.js

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { deploymentRecordPath, readDeploymentRecord } from "./deployment-record.js";
+import { isReactApplicationShell } from "./web-shell.js";
 const HEALTH_SCHEMA = z.object({
     status: z.literal("ok"),
     service: z.literal("wikimemory"),
@@ -29,7 +30,7 @@ export async function deploymentStatus(deployment) {
         throw new Error("Health and schema versions disagree");
     if (discovery.resource !== `${record.origin}/mcp`)
         throw new Error("OAuth discovery reports an unexpected MCP resource");
-    if (!(await appResponse.text()).includes('<div id="root"></div>'))
+    if (!isReactApplicationShell(await appResponse.text()))
         throw new Error("React application shell verification failed");
     return {
         deployment,

package/dist/npm-cli/scripts/upgrade.js

@@ -6,8 +6,10 @@ import process from "node:process";
 import { createInterface } from "node:readline/promises";
 import { z } from "zod";
 import { deploymentRecordPath, readDeploymentRecord, writeDeploymentRecord } from "./deployment-record.js";
+import { DEPLOYMENT_VERIFY_ATTEMPTS, deploymentVerifyDelay } from "./deployment-wait.js";
 import { packageRoot } from "./package-root.js";
 import { commandFailureMessage, runCommand } from "./subprocess.js";
+import { isReactApplicationShell } from "./web-shell.js";
 const PACKAGE_ROOT = packageRoot();
 const DEPLOYMENT_NAME = /^[a-z0-9][a-z0-9-]{0,62}$/u;
 const MIGRATION_NAME = /^\d{4}_[a-z0-9_]+\.sql$/u;
@@ -173,7 +175,7 @@ async function responseJson(response, label) {
         throw new Error(`${label} returned non-JSON content`);
     }
 }
-export async function verifyRelease(origin, manifest, fetcher = fetch, sleeper = sleep, attempts = 6) {
+export async function verifyRelease(origin, manifest, fetcher = fetch, sleeper = sleep, attempts = DEPLOYMENT_VERIFY_ATTEMPTS) {
     let finalError;
     for (let attempt = 0; attempt < attempts; attempt += 1) {
         try {
@@ -203,14 +205,14 @@ export async function verifyRelease(origin, manifest, fetcher = fetch, sleeper =
             if (!discovery.ok)
                 throw new Error(`OAuth protected-resource discovery returned HTTP ${discovery.status}`);
             const app = await fetcher(`${origin}/app`, { redirect: "error" });
-            if (!app.ok || !(await app.text()).includes('<div id="root"></div>'))
+            if (!app.ok || !isReactApplicationShell(await app.text()))
                 throw new Error("React application verification failed");
             return;
         }
         catch (error) {
             finalError = error;
             if (attempt + 1 < attempts)
-                await sleeper(250 * 2 ** attempt);
+                await sleeper(deploymentVerifyDelay(attempt));
         }
     }
     const detail = finalError instanceof Error ? finalError.message : "Unknown verification failure";

package/dist/npm-cli/scripts/web-shell.js

@@ -0,0 +1,5 @@
+const ROOT_CONTAINER = /<div\s+id=["']root["'][^>]*>/u;
+const MODULE_ASSET = /<script\s+[^>]*type=["']module["'][^>]*src=["']\/assets\//u;
+export function isReactApplicationShell(html) {
+    return ROOT_CONTAINER.test(html) && MODULE_ASSET.test(html);
+}

package/dist/npm-cli/src/version.js

@@ -1,2 +1,2 @@
-export const WIKIMEMORY_VERSION = "0.2.5";
+export const WIKIMEMORY_VERSION = "0.2.7";
 export const LATEST_SCHEMA_VERSION = "0004_credential_bound_registration_tokens.sql";

package/dist/web/assets/index-9nkjx7L3.css

@@ -0,0 +1 @@
+:root{--lightningcss-light:initial;--lightningcss-dark: ;color-scheme:light dark;--bg:#f5f6f8;--panel:#fff;--ink:#19211e;--muted:#66716c;--line:#dfe4e1;--accent:#176b52;--danger:#a83a3a}@media (prefers-color-scheme:dark){:root{--lightningcss-light: ;--lightningcss-dark:initial}}html{text-size-adjust:100%}*{box-sizing:border-box}body{background:var(--bg);color:var(--ink);margin:0;font:400 1rem/1.6 ui-sans-serif,system-ui,sans-serif}a{color:var(--accent)}header{border-bottom:1px solid var(--line);background:var(--panel);flex-wrap:wrap;align-items:center;gap:.5rem;padding:.75rem max(1rem,50% - 36rem);display:flex}header a{padding:.4rem;text-decoration:none}.brand{align-items:center;gap:.5rem;margin-right:auto;font-weight:800;display:flex}.brand span{background:var(--accent);color:#fff;border-radius:.55rem;place-items:center;width:2rem;height:2rem;display:grid}main{width:min(72rem,100% - 2rem);margin:auto;padding:3rem 0 6rem}.center{place-items:center;min-height:100vh;padding:1rem;display:grid}.center .panel{width:min(32rem,100%)}h1,h2{line-height:1.2}.lede,.muted,small{color:var(--muted)}.panel,.card{border:1px solid var(--line);background:var(--panel);border-radius:.85rem;padding:1.25rem}.panel{margin-bottom:1rem}.grid{grid-template-columns:repeat(auto-fill,minmax(min(100%,19rem),1fr));gap:1rem;display:grid}.meta{flex-wrap:wrap;gap:.4rem;display:flex}.meta span{background:#e7f4ef;border-radius:999px;padding:.1rem .45rem;font-size:.8rem}.search{gap:.5rem;margin:1rem 0 2rem;display:flex}input{background:var(--panel);width:100%;color:inherit;font:inherit;border:1px solid #b8c2bd;border-radius:.55rem;padding:.7rem}label{margin:1rem 0;font-weight:650;display:block}button,.button{border:1px solid var(--accent);background:var(--accent);color:#fff;cursor:pointer;border-radius:.55rem;padding:.7rem .95rem;font:600 .9rem system-ui;text-decoration:none;display:inline-flex}button:disabled{opacity:.5}.danger{border-color:var(--danger);color:var(--danger);background:0 0;margin-top:.5rem}.list{padding:0;list-style:none}.list li{border-bottom:1px solid var(--line);padding:.75rem 0}.list small{display:block}.notice{border-left:.3rem solid var(--accent);background:#e7f4ef;padding:.7rem 1rem}.document-body{border:1px solid var(--line);background:var(--panel);color:inherit;font:inherit;white-space:pre-wrap;overflow-wrap:anywhere;border-radius:.85rem;margin:2rem 0;padding:1.25rem;overflow-x:auto}.metadata{gap:.5rem;margin:1.5rem 0;display:grid}.metadata div{grid-template-columns:minmax(7rem,.25fr) 1fr;gap:1rem;display:grid}.metadata dt{color:var(--muted);font-weight:650}.metadata dd{margin:0}@media (prefers-color-scheme:dark){:root{--bg:#111714;--panel:#19201d;--ink:#edf3ef;--muted:#a6b0ab;--line:#2c3732;--accent:#74c9aa;--danger:#ef8585}.meta span,.notice{background:#183a2f}}