diffwiki 0.17.0 → 0.17.1-rc.202608210907.d3afab7

package/dist/bin.js

@@ -1,9 +1,12 @@
 #!/usr/bin/env node
 
+// src/bin.ts
+import { ensureHome } from "diffwiki-core";
+
 // src/cli.ts
 import { spawn as spawn4 } from "child_process";
-import path4 from "path";
-import { fileURLToPath as fileURLToPath4 } from "url";
+import path5 from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
 import { Command, Option } from "commander";
 import {
   addExternalCollection,
@@ -72,12 +75,40 @@ var splitTags = (raw) => raw.flatMap((t) => t.split(",")).map((t) => t.trim()).f
 import { spawn } from "child_process";
 import { platform } from "os";
 import fs from "fs/promises";
-import path from "path";
+import path2 from "path";
 import http from "http";
 import { resolveHome } from "diffwiki-core";
+
+// src/app.ts
+import { existsSync } from "fs";
+import path from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+var APP_SPEC = `diffwiki-app@${version}`;
+function workspaceAppBin(localBin) {
+  const candidates = [
+    path.resolve(path.dirname(fileURLToPath2(import.meta.url)), "../../../apps/wiki/bin", localBin),
+    path.resolve(process.cwd(), "apps/wiki/bin", localBin)
+  ];
+  return candidates.find((p) => existsSync(p));
+}
+function resolveAppLaunch(opts = {}) {
+  const localBin = opts.localBin ?? "wiki-server.mjs";
+  const override = process.env.DIFFWIKI_APP_CMD;
+  if (override) {
+    const [cmd, ...args] = override.split(" ");
+    return { cmd, args, source: "override", spec: override };
+  }
+  const spec = process.env.DIFFWIKI_APP_SPEC;
+  if (spec) return { cmd: "npx", args: ["-y", spec], source: "spec", spec };
+  const local = workspaceAppBin(localBin);
+  if (local) return { cmd: "node", args: [local], source: "local", spec: local };
+  return { cmd: "npx", args: ["-y", APP_SPEC], source: "npx", spec: APP_SPEC };
+}
+
+// src/ui-server.ts
 var DEFAULT_PORT = 4321;
 function statePath() {
-  return path.join(resolveHome(), "ui.json");
+  return path2.join(resolveHome(), "ui.json");
 }
 async function readState() {
   try {
@@ -132,8 +163,24 @@ function waitForServer(url, timeoutMs = 3e4) {
     tick();
   });
 }
+function childExited(child, timeoutMs = 0) {
+  if (timeoutMs === 0) return Promise.resolve(child.exitCode !== null || child.signalCode !== null);
+  return new Promise((resolve) => {
+    const onExit = () => {
+      clearTimeout(timer);
+      resolve(true);
+    };
+    const timer = setTimeout(() => {
+      child.off("exit", onExit);
+      resolve(false);
+    }, timeoutMs);
+    child.once("exit", onExit);
+    if (child.exitCode !== null || child.signalCode !== null) onExit();
+  });
+}
 async function startUi(port = DEFAULT_PORT) {
-  const child = spawn("npx", ["-y", "diffwiki-app@latest", "--port", String(port)], {
+  const { cmd, args } = resolveAppLaunch();
+  const child = spawn(cmd, [...args, "--port", String(port)], {
     env: { ...process.env, PORT: String(port), HOST: "127.0.0.1" },
     detached: true,
     stdio: "ignore"
@@ -152,7 +199,7 @@ async function startUi(port = DEFAULT_PORT) {
     startedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
   await writeState(state);
-  return state;
+  return { state, child };
 }
 async function stopUi() {
   const state = await readState();
@@ -168,20 +215,11 @@ async function stopUi() {
 
 // src/exporter.ts
 import { spawn as spawn2 } from "child_process";
-import fs2 from "fs";
-import path2 from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import path3 from "path";
 import { listCollections, resolveCollectionSelection, InvalidExportSelectionError } from "diffwiki-core";
 var splitGlobs = (v) => (v ?? "").split(",").map((s) => s.trim()).filter(Boolean);
-function localAppExporter() {
-  const candidates = [
-    path2.resolve(path2.dirname(fileURLToPath2(import.meta.url)), "../../../apps/wiki/bin/export.mjs"),
-    path2.resolve(process.cwd(), "apps/wiki/bin/export.mjs")
-  ];
-  return candidates.find((p) => fs2.existsSync(p));
-}
 async function runExport(opts) {
-  const out = path2.resolve(opts.out);
+  const out = path3.resolve(opts.out);
   const filter = splitGlobs(opts.filter);
   const exclude = splitGlobs(opts.exclude);
   if (!opts.project && (filter.length > 0 || exclude.length > 0)) {
@@ -189,19 +227,17 @@ async function runExport(opts) {
     const { errors } = resolveCollectionSelection(names, { filter, exclude });
     if (errors.length > 0) throw new InvalidExportSelectionError(errors);
   }
-  const local = localAppExporter();
-  const override = process.env.DIFFWIKI_APP_CMD ?? (local ? `node ${local}` : void 0);
-  const [cmd, ...prefix] = override ? override.split(" ") : ["npx", "-y", "diffwiki-app@latest"];
-  const args = [...prefix, "export", "--out", out, "--base", opts.base];
-  if (opts.filter) args.push("--filter", opts.filter);
-  if (opts.exclude) args.push("--exclude", opts.exclude);
+  const { cmd, args, source, spec } = resolveAppLaunch({ localBin: "export.mjs" });
+  const appArgs = [...args, "export", "--out", out, "--base", opts.base];
+  if (opts.filter) appArgs.push("--filter", opts.filter);
+  if (opts.exclude) appArgs.push("--exclude", opts.exclude);
   if (opts.project) {
-    args.push("--project");
-    if (typeof opts.project === "string") args.push(opts.project);
+    appArgs.push("--project");
+    if (typeof opts.project === "string") appArgs.push(opts.project);
   }
-  if (override) console.log(`Exporting via ${override}`);
+  if (source === "override") console.log(`Exporting via ${spec}`);
   await new Promise((resolve, reject) => {
-    const child = spawn2(cmd, args, { stdio: "inherit", env: process.env });
+    const child = spawn2(cmd, appArgs, { stdio: "inherit", env: process.env });
     child.on("error", reject);
     child.on("close", (code) => code === 0 ? resolve() : reject(new Error(`export failed (exit ${code})`)));
   });
@@ -209,12 +245,10 @@ async function runExport(opts) {
 }
 
 // src/preview.ts
-import { existsSync } from "fs";
-import fs3 from "fs/promises";
+import fs2 from "fs/promises";
 import net from "net";
-import path3 from "path";
+import path4 from "path";
 import { spawn as spawn3 } from "child_process";
-import { fileURLToPath as fileURLToPath3 } from "url";
 import { seedProjectHome } from "diffwiki-core";
 async function findFreePort(start, host = "127.0.0.1") {
   const isFree = (port) => new Promise((resolve) => {
@@ -228,29 +262,16 @@ async function findFreePort(start, host = "127.0.0.1") {
   }
   throw new Error(`No free port available in ${start}..${start + 99}`);
 }
-function launchCommand() {
-  const override = process.env.DIFFWIKI_APP_CMD;
-  if (override) {
-    const [cmd, ...prefix] = override.split(" ");
-    return { cmd, prefix };
-  }
-  const candidates = [
-    path3.resolve(path3.dirname(fileURLToPath3(import.meta.url)), "../../../apps/wiki/bin/wiki-server.mjs"),
-    path3.resolve(process.cwd(), "apps/wiki/bin/wiki-server.mjs")
-  ];
-  const local = candidates.find((p) => existsSync(p));
-  return local ? { cmd: "node", prefix: [local] } : { cmd: "npx", prefix: ["-y", "diffwiki-app@latest"] };
-}
 async function runPreview(opts) {
-  const root = path3.resolve(opts.cwd);
+  const root = path4.resolve(opts.cwd);
   const { home, entries } = await seedProjectHome(root);
-  const { cmd, prefix } = launchCommand();
+  const { cmd, args } = resolveAppLaunch();
   const port = await findFreePort(opts.port);
   const url = `http://127.0.0.1:${port}`;
-  console.log(`Previewing ${entries.length} collection(s) from ${path3.join(root, "diffwiki.yaml")}`);
+  console.log(`Previewing ${entries.length} collection(s) from ${path4.join(root, "diffwiki.yaml")}`);
   if (port !== opts.port) console.log(`Port ${opts.port} is in use \u2014 using ${port} instead.`);
   console.log(`Starting UI at ${url} \u2026  (Ctrl-C to stop)`);
-  const child = spawn3(cmd, [...prefix, "--port", String(port)], {
+  const child = spawn3(cmd, [...args, "--port", String(port)], {
     env: {
       ...process.env,
       DIFFWIKI_HOME: home,
@@ -289,7 +310,7 @@ async function runPreview(opts) {
     const finish = () => {
       process.off("SIGINT", stop);
       process.off("SIGTERM", stop);
-      void fs3.rm(home, { recursive: true, force: true });
+      void fs2.rm(home, { recursive: true, force: true });
       resolve();
     };
     child.on("close", finish);
@@ -493,7 +514,7 @@ async function doctorAction(opts) {
   }
 }
 function bundledTemplatesDir() {
-  return path4.resolve(path4.dirname(fileURLToPath4(import.meta.url)), "..", "templates");
+  return path5.resolve(path5.dirname(fileURLToPath3(import.meta.url)), "..", "templates");
 }
 async function templatesInitAction() {
   const { seeded, skipped, dir } = await seedTemplates(bundledTemplatesDir());
@@ -570,17 +591,45 @@ async function lintAction(opts) {
 ${result.fileCount} file(s), ${result.errorCount} error(s), ${result.warnCount} warning(s)`);
   if (result.errorCount > 0) process.exitCode = 1;
 }
+function exitReason(child) {
+  if (child.exitCode !== null) return `exit ${child.exitCode}`;
+  if (child.signalCode !== null) return `signal ${child.signalCode}`;
+  return "unexpectedly";
+}
 async function upAction(opts) {
   const existing = await readState();
   if (existing && isAlive(existing.pid)) {
     console.log(`UI already running at ${existing.url} (pid ${existing.pid})`);
     return;
   }
-  const state = await startUi(Number(opts.port));
+  const { state, child } = await startUi(Number(opts.port));
   const ok = await waitForServer(state.url);
-  console.log(
-    ok ? `UI started at ${state.url} (pid ${state.pid})` : `Launched (pid ${state.pid}) but ${state.url} did not respond yet \u2014 check \`diffwiki ui status\``
-  );
+  const exited = await childExited(child, ok ? 2e3 : 0);
+  if (exited) {
+    await stopUi();
+    if (ok) {
+      const held = await waitForServer(state.url, 1500);
+      if (held) {
+        console.error(`Port ${state.port} is already in use by another process \u2014 the diffwiki app could not bind.`);
+        console.error(`Stop that process, or start the UI on a free port: \`diffwiki ui up --port <port>\`.`);
+      } else {
+        console.error(
+          `The diffwiki app started serving on ${state.url} but exited again (${exitReason(child)}) \u2014 check \`diffwiki ui status\`.`
+        );
+      }
+    } else {
+      console.error(
+        `The diffwiki app exited (${exitReason(child)}) before it could serve ${state.url} \u2014 check \`diffwiki ui status\`.`
+      );
+    }
+    process.exitCode = 1;
+    return;
+  }
+  if (ok) {
+    console.log(`UI started at ${state.url} (pid ${state.pid})`);
+    return;
+  }
+  console.log(`Launched (pid ${state.pid}) but ${state.url} did not respond yet \u2014 check \`diffwiki ui status\``);
 }
 async function downAction() {
   const stopped = await stopUi();
@@ -597,7 +646,8 @@ async function statusAction() {
 async function openAction(opts) {
   let state = await readState();
   if (!state || !isAlive(state.pid)) {
-    state = await startUi(Number(opts.port));
+    const started = await startUi(Number(opts.port));
+    state = started.state;
     await waitForServer(state.url);
   }
   const coll = await resolveCwdCollection(process.cwd());
@@ -686,7 +736,7 @@ function createProgram() {
   );
   site.command("preview").description("Preview the site from the repo diffwiki.yaml (ignores global collections)").option("-p, --port <port>", "port to serve on", "4321").action(withErrors((opts) => previewAction(opts)));
   const ui = program.command("ui").description("Run the local diffwiki app server");
-  ui.command("up").description("Start the diffwiki UI (latest published diffwiki-app)").option("-p, --port <port>", "port to serve on", "4321").action(withErrors((opts) => upAction(opts)));
+  ui.command("up").description("Start the diffwiki UI (runs the matching published diffwiki-app)").option("-p, --port <port>", "port to serve on", "4321").action(withErrors((opts) => upAction(opts)));
   ui.command("down").description("Stop the running diffwiki UI").action(withErrors(downAction));
   ui.command("status").description("Show whether the diffwiki UI is running").action(withErrors(statusAction));
   ui.command("open").description("Open the diffwiki UI in the browser (starting it if needed)").option("-p, --port <port>", "port to serve on", "4321").action(withErrors((opts) => openAction(opts)));
@@ -709,14 +759,14 @@ function createProgram() {
 // src/logging.ts
 import { mkdirSync } from "fs";
 import os from "os";
-import path5 from "path";
+import path6 from "path";
 import { configureSync, getConfig } from "@logtape/logtape";
 import { getRotatingFileSink } from "@logtape/file";
 import { resolveLogLevel } from "diffwiki-core";
 var configured = false;
 function diffwikiHome() {
   const override = process.env.DIFFWIKI_HOME;
-  return override && override.length > 0 ? override : path5.join(os.homedir(), ".diffwiki");
+  return override && override.length > 0 ? override : path6.join(os.homedir(), ".diffwiki");
 }
 function resolveCliLevel(argv) {
   if (argv.includes("-v") || argv.includes("--verbose")) return "debug";
@@ -733,9 +783,9 @@ function configureCliLogging(argv = process.argv) {
   if (configured || getConfig() != null) return;
   configured = true;
   const level = resolveCliLevel(argv);
-  const logsDir = path5.join(diffwikiHome(), "logs");
+  const logsDir = path6.join(diffwikiHome(), "logs");
   mkdirSync(logsDir, { recursive: true });
-  const logFile = path5.join(logsDir, "diffwiki.log");
+  const logFile = path6.join(logsDir, "diffwiki.log");
   const stderrSink = (record) => {
     process.stderr.write(formatLine(record) + "\n");
   };
@@ -754,4 +804,5 @@ function configureCliLogging(argv = process.argv) {
 
 // src/bin.ts
 configureCliLogging(process.argv);
-createProgram().parseAsync(process.argv);
+await ensureHome();
+await createProgram().parseAsync(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diffwiki",
-  "version": "0.17.0",
+  "version": "0.17.1-rc.202608210907.d3afab7",
   "description": "diffwiki command-line interface",
   "license": "MIT",
   "type": "module",
@@ -18,7 +18,7 @@
     "@logtape/logtape": "^2.2.4",
     "@logtape/file": "^2.2.4",
     "commander": "^13.0.0",
-    "diffwiki-core": "0.17.0"
+    "diffwiki-core": "0.17.1-rc.202608210907.d3afab7"
   },
   "devDependencies": {
     "@types/node": "^22.0.0"