wikimemory 0.2.5 → 0.2.6

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,18 @@ async function main() {
     }
     const parsed = deploymentArguments(args);
     const paths = deploymentPaths(parsed.deployment);
+    const requiresInstalledDeployment = 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/upgrade.js

@@ -6,6 +6,7 @@ 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";
 const PACKAGE_ROOT = packageRoot();
@@ -173,7 +174,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 {
@@ -210,7 +211,7 @@ export async function verifyRelease(origin, manifest, fetcher = fetch, sleeper =
         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/src/version.js

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