pinomad 0.13.0 → 0.14.1

package/dist/{chunk-t91zt5f0.js → chunk-hg9gs396.js}

@@ -3,7 +3,7 @@ import {
   generateKeyPair,
   keyPairFromPrivate,
   toBase64Url
-} from "./chunk-pqe7q1s7.js";
+} from "./chunk-6vbp1vva.js";
 
 // apps/host/src/devices.ts
 import { link, readFile, unlink, writeFile } from "node:fs/promises";

package/dist/chunk-mdjk0s0t.js

@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+import {
+  joinServer,
+  main
+} from "./chunk-5ayqca95.js";
+import"./chunk-63ymn5c9.js";
+import"./chunk-6j6hkfbj.js";
+import"./chunk-hg9gs396.js";
+import"./chunk-nq57fdnq.js";
+import"./chunk-9trbbz4r.js";
+import"./chunk-pte4peaf.js";
+import"./chunk-e59k3bmz.js";
+import"./chunk-kzbzacz9.js";
+import"./chunk-mxwcnnkg.js";
+import"./chunk-1mjbt2z2.js";
+import"./chunk-6vbp1vva.js";
+import"./chunk-ngf1zatm.js";
+import"./chunk-ega1wnkg.js";
+import"./chunk-df32avw6.js";
+export {
+  main,
+  joinServer
+};

package/dist/{chunk-wd7aracm.js → chunk-mxwcnnkg.js}

@@ -1,27 +1,3 @@
-import {
-  ProtocolMismatchError,
-  connectRemoteDurable
-} from "./chunk-4fferbxw.js";
-import {
-  isParseArgsError
-} from "./chunk-kzbzacz9.js";
-import {
-  DEFAULT_DATA_DIR,
-  hostAddress
-} from "./chunk-ngf1zatm.js";
-import {
-  commandHint,
-  hostEntry,
-  packagedVersion
-} from "./chunk-s0h7c7da.js";
-
-// apps/host/src/cli/service.ts
-import { execFile as execFile2 } from "node:child_process";
-import { homedir as homedir2 } from "node:os";
-import { resolve as resolve2 } from "node:path";
-import { fileURLToPath } from "node:url";
-import { parseArgs, promisify as promisify2 } from "node:util";
-
 // apps/host/src/service/definition.ts
 import { join, resolve } from "node:path";
 var LAUNCHER_EXECUTABLE = "pinomad-host";
@@ -219,37 +195,6 @@ WantedBy=default.target
 `;
 }
 
-// apps/host/src/service/idle.ts
-async function waitForIdle(remote, onBusy) {
-  if (remote.view.current().tasks === undefined)
-    await remote.controller.toggleTasks();
-  let announced = false;
-  await new Promise((resolve2) => {
-    const check = () => {
-      const view = remote.view.current();
-      if (view.connection !== "connected") {
-        unsubscribe();
-        resolve2();
-        return;
-      }
-      const tasks = view.tasks;
-      if (tasks === undefined)
-        return;
-      if (Object.keys(tasks.tasks).length === 0) {
-        unsubscribe();
-        resolve2();
-        return;
-      }
-      if (!announced) {
-        announced = true;
-        onBusy(tasks);
-      }
-    };
-    const unsubscribe = remote.view.subscribe(check);
-    check();
-  });
-}
-
 // apps/host/src/service/manager.ts
 import { execFile, spawn } from "node:child_process";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
@@ -428,251 +373,4 @@ function serviceManager(platform = process.platform) {
   throw new Error(`service commands support macOS and Linux, not ${platform}`);
 }
 
-// apps/host/src/cli/service.ts
-var run2 = promisify2(execFile2);
-var repoRoot = fileURLToPath(new URL("../../../../", import.meta.url));
-var message = (error) => error instanceof Error ? error.message : String(error);
-function connectToHost(url, token, timeoutMs = 3000) {
-  const connecting = connectRemoteDurable({ url, token, reconnectDelayMs: { min: 200, max: 2000 } });
-  const timedOut = Symbol("timedOut");
-  return Promise.race([
-    connecting,
-    new Promise((resolve3) => {
-      const timer = setTimeout(() => resolve3(timedOut), timeoutMs);
-      timer.unref();
-    })
-  ]).then((winner) => {
-    if (winner !== timedOut)
-      return winner;
-    connecting.then((remote) => remote.close(), () => {});
-    throw new Error("connect timed out");
-  });
-}
-async function install(argv) {
-  const spec = installSpec(argv, {
-    execPath: process.execPath,
-    env: process.env,
-    home: homedir2(),
-    cwd: process.cwd(),
-    mainPath: hostEntry.script,
-    entryArgs: hostEntry.args
-  });
-  const path = await serviceManager().install(spec);
-  console.log(`installed ${path}`);
-  console.log(`data dir: ${spec.dataDir}`);
-  console.log(`browser link: ${commandHint("link")}    pairing QR: ${commandHint("pair")}`);
-}
-async function waitUntilIdle(address, connect, log) {
-  try {
-    const remote = await connect(address.url, address.token);
-    await waitForIdle(remote, (tasks) => {
-      log("waiting for running tasks to finish (Ctrl-C to cancel)");
-      for (const task of Object.values(tasks.tasks)) {
-        log(`  ${task.kind} in conversation ${task.conversationId}`);
-      }
-    });
-    remote.close();
-  } catch {}
-}
-async function stopService({
-  force,
-  argv,
-  manager = serviceManager(),
-  connect = connectToHost,
-  log = (line) => console.log(line),
-  logError = (line) => console.error(line)
-}) {
-  const state = await manager.state();
-  if (!state.installed) {
-    log(`service not installed (${commandHint("service")} install)`);
-    return 1;
-  }
-  if (state.stopped) {
-    log("already stopped");
-    return 0;
-  }
-  if (!force) {
-    const spec = argv.length === 0 ? await manager.read() : undefined;
-    const port = spec === undefined ? undefined : argValue(spec.hostArgs, "--port");
-    const flags = spec === undefined ? argv : ["--data-dir", spec.dataDir, ...port === undefined ? [] : ["--url", `ws://127.0.0.1:${port}`]];
-    const address = await hostAddress(flags).catch((error) => {
-      if (isParseArgsError(error))
-        throw error;
-      return;
-    });
-    if (address !== undefined)
-      await waitUntilIdle(address, connect, log);
-  }
-  const holdInterrupt = () => {};
-  process.on("SIGINT", holdInterrupt);
-  try {
-    await manager.stop();
-  } finally {
-    process.off("SIGINT", holdInterrupt);
-  }
-  const after = await manager.state();
-  if (!after.stopped) {
-    logError(`the host is still running (${after.detail}); run \`${commandHint("service")} stop\` again`);
-    return 1;
-  }
-  log(`stopped; it stays off, also after a restart, until \`${commandHint("service")} start\``);
-  return 0;
-}
-async function startService({
-  manager = serviceManager(),
-  log = (line) => console.log(line)
-} = {}) {
-  if (!(await manager.state()).installed) {
-    log(`service not installed (${commandHint("service")} install)`);
-    return 1;
-  }
-  await manager.start();
-  log("started");
-  return 0;
-}
-async function versionLine() {
-  if (packagedVersion !== undefined)
-    return `version: ${packagedVersion}`;
-  const head = await run2("git", ["rev-parse", "--short", "HEAD"], { cwd: repoRoot }).then(({ stdout }) => stdout.trim(), () => "unknown");
-  return `checkout: ${head}`;
-}
-async function reachabilityLine(argv) {
-  try {
-    const { url, token } = await hostAddress(argv);
-    const remote = await connectToHost(url, token);
-    if (remote.view.current().tasks === undefined)
-      await remote.controller.toggleTasks();
-    const tasks = remote.view.current().tasks;
-    const count = tasks === undefined ? 0 : Object.keys(tasks.tasks).length;
-    remote.close();
-    return `host: reachable at ${url}, ${count} live task${count === 1 ? "" : "s"}`;
-  } catch (error) {
-    if (isParseArgsError(error))
-      throw error;
-    return `host: unreachable (${message(error)})`;
-  }
-}
-var serviceStatusJson = (state) => JSON.stringify({
-  installed: state.installed,
-  stopped: state.stopped,
-  running: state.running,
-  ...state.pid === undefined ? {} : { pid: state.pid },
-  detail: state.detail
-});
-async function status(argv) {
-  const state = await serviceManager().state();
-  if (argv.includes("--json")) {
-    console.log(serviceStatusJson(state));
-    return;
-  }
-  console.log(`service: ${state.installed ? state.detail : "not installed"}`);
-  console.log(await versionLine());
-  console.log(await reachabilityLine(argv));
-}
-async function restartService({
-  force,
-  argv,
-  manager = serviceManager(),
-  restart,
-  connect = connectToHost,
-  pollTimeoutMs = 30000,
-  pollDelayMs = 500
-}) {
-  const state = await manager.state();
-  if (!state.installed) {
-    console.log(`service not installed (${commandHint("service")} install)`);
-    return 1;
-  }
-  if (state.stopped && restart === undefined) {
-    console.log(`service stopped (${commandHint("service")} start)`);
-    return 1;
-  }
-  const address = await hostAddress(argv).catch((error) => {
-    if (isParseArgsError(error))
-      throw error;
-    return;
-  });
-  if (!force && address !== undefined)
-    await waitUntilIdle(address, connect, (line) => console.log(line));
-  await (restart?.() ?? manager.restart());
-  if (address === undefined) {
-    console.log("restart requested (host address unknown; not polling)");
-    return 0;
-  }
-  const deadline = Date.now() + pollTimeoutMs;
-  for (;; ) {
-    try {
-      const remote = await connect(address.url, address.token, 2000);
-      remote.close();
-      console.log(`host restarted, reachable at ${address.url}`);
-      return 0;
-    } catch (error) {
-      if (error instanceof ProtocolMismatchError && error.direction === "client-older") {
-        const newer = error.hostVersion ?? `protocol major ${error.hostMajor}`;
-        console.log(`host restarted (${newer}, newer than this upgrader), reachable at ${address.url}`);
-        return 0;
-      }
-      if (Date.now() > deadline) {
-        console.error(`host did not answer within ${pollTimeoutMs / 1000}s after restart: ${message(error)}`);
-        return 1;
-      }
-      await new Promise((resolve3) => setTimeout(resolve3, pollDelayMs));
-    }
-  }
-}
-async function logs(argv) {
-  const { values } = parseArgs({
-    args: [...argv],
-    options: {
-      follow: { type: "boolean", default: false },
-      lines: { type: "string", short: "n", default: "100" },
-      "data-dir": { type: "string" }
-    }
-  });
-  const dataDir = resolve2(values["data-dir"] ?? DEFAULT_DATA_DIR);
-  await serviceManager().logs(dataDir, Number(values.lines), values.follow);
-}
-async function main(argv) {
-  const [command, ...args] = argv;
-  try {
-    switch (command) {
-      case "install":
-        await install(args);
-        break;
-      case "uninstall":
-        await serviceManager().uninstall();
-        console.log("uninstalled");
-        break;
-      case "status":
-        await status(args);
-        break;
-      case "restart": {
-        const force = args.includes("--force");
-        process.exitCode = await restartService({ force, argv: args.filter((arg) => arg !== "--force") });
-        break;
-      }
-      case "stop": {
-        const force = args.includes("--force");
-        process.exitCode = await stopService({ force, argv: args.filter((arg) => arg !== "--force") });
-        break;
-      }
-      case "start":
-        process.exitCode = await startService();
-        break;
-      case "logs":
-        await logs(args);
-        break;
-      default:
-        console.error(`usage: ${commandHint("service")} install|uninstall|status|restart|stop|start|logs`);
-        process.exitCode = 1;
-    }
-  } catch (error) {
-    if (isParseArgsError(error))
-      throw error;
-    console.error(message(error));
-    process.exitCode = 1;
-  }
-}
-if (false) {}
-
-export { LAUNCHER_EXECUTABLE, isLauncher, installSpec, argValue, withoutArg, withoutRelayArgs, serviceManager, stopService, startService, versionLine, reachabilityLine, serviceStatusJson, restartService, main };
+export { LAUNCHER_EXECUTABLE, isLauncher, installSpec, argValue, withoutArg, withoutRelayArgs, serviceManager };

package/dist/chunk-pte4peaf.js

@@ -0,0 +1,315 @@
+import {
+  ProtocolMismatchError,
+  connectRemoteDurable
+} from "./chunk-e59k3bmz.js";
+import {
+  isParseArgsError
+} from "./chunk-kzbzacz9.js";
+import {
+  argValue,
+  installSpec,
+  serviceManager
+} from "./chunk-mxwcnnkg.js";
+import {
+  DEFAULT_DATA_DIR,
+  hostAddress
+} from "./chunk-ngf1zatm.js";
+import {
+  commandHint,
+  hostEntry,
+  packagedVersion
+} from "./chunk-ega1wnkg.js";
+
+// apps/host/src/cli/service.ts
+import { execFile } from "node:child_process";
+import { homedir } from "node:os";
+import { resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { parseArgs, promisify } from "node:util";
+
+// apps/host/src/service/idle.ts
+async function waitForIdle(remote, onBusy) {
+  if (remote.view.current().tasks === undefined)
+    await remote.controller.toggleTasks();
+  let announced = false;
+  await new Promise((resolve) => {
+    const check = () => {
+      const view = remote.view.current();
+      if (view.connection !== "connected") {
+        unsubscribe();
+        resolve();
+        return;
+      }
+      const tasks = view.tasks;
+      if (tasks === undefined)
+        return;
+      if (Object.keys(tasks.tasks).length === 0) {
+        unsubscribe();
+        resolve();
+        return;
+      }
+      if (!announced) {
+        announced = true;
+        onBusy(tasks);
+      }
+    };
+    const unsubscribe = remote.view.subscribe(check);
+    check();
+  });
+}
+
+// apps/host/src/cli/service.ts
+var run = promisify(execFile);
+var repoRoot = fileURLToPath(new URL("../../../../", import.meta.url));
+var message = (error) => error instanceof Error ? error.message : String(error);
+function connectToHost(url, token, timeoutMs = 3000) {
+  const connecting = connectRemoteDurable({ url, token, reconnectDelayMs: { min: 200, max: 2000 } });
+  const timedOut = Symbol("timedOut");
+  return Promise.race([
+    connecting,
+    new Promise((resolve2) => {
+      const timer = setTimeout(() => resolve2(timedOut), timeoutMs);
+      timer.unref();
+    })
+  ]).then((winner) => {
+    if (winner !== timedOut)
+      return winner;
+    connecting.then((remote) => remote.close(), () => {});
+    throw new Error("connect timed out");
+  });
+}
+async function install(argv) {
+  const spec = installSpec(argv, {
+    execPath: process.execPath,
+    env: process.env,
+    home: homedir(),
+    cwd: process.cwd(),
+    mainPath: hostEntry.script,
+    entryArgs: hostEntry.args
+  });
+  const path = await serviceManager().install(spec);
+  console.log(`installed ${path}`);
+  console.log(`data dir: ${spec.dataDir}`);
+  console.log(`browser link: ${commandHint("link")}    pairing QR: ${commandHint("pair")}`);
+}
+async function waitUntilIdle(address, connect, log) {
+  try {
+    const remote = await connect(address.url, address.token);
+    await waitForIdle(remote, (tasks) => {
+      log("waiting for running tasks to finish (Ctrl-C to cancel)");
+      for (const task of Object.values(tasks.tasks)) {
+        log(`  ${task.kind} in conversation ${task.conversationId}`);
+      }
+    });
+    remote.close();
+  } catch {}
+}
+async function stopService({
+  force,
+  argv,
+  manager = serviceManager(),
+  connect = connectToHost,
+  log = (line) => console.log(line),
+  logError = (line) => console.error(line)
+}) {
+  const state = await manager.state();
+  if (!state.installed) {
+    log(`service not installed (${commandHint("service")} install)`);
+    return 1;
+  }
+  if (state.stopped) {
+    log("already stopped");
+    return 0;
+  }
+  if (!force) {
+    const spec = argv.length === 0 ? await manager.read() : undefined;
+    const port = spec === undefined ? undefined : argValue(spec.hostArgs, "--port");
+    const flags = spec === undefined ? argv : ["--data-dir", spec.dataDir, ...port === undefined ? [] : ["--url", `ws://127.0.0.1:${port}`]];
+    const address = await hostAddress(flags).catch((error) => {
+      if (isParseArgsError(error))
+        throw error;
+      return;
+    });
+    if (address !== undefined)
+      await waitUntilIdle(address, connect, log);
+  }
+  const holdInterrupt = () => {};
+  process.on("SIGINT", holdInterrupt);
+  try {
+    await manager.stop();
+  } finally {
+    process.off("SIGINT", holdInterrupt);
+  }
+  const after = await manager.state();
+  if (!after.stopped) {
+    logError(`the host is still running (${after.detail}); run \`${commandHint("service")} stop\` again`);
+    return 1;
+  }
+  log(`stopped; it stays off, also after a restart, until \`${commandHint("service")} start\``);
+  return 0;
+}
+async function startService({
+  manager = serviceManager(),
+  log = (line) => console.log(line)
+} = {}) {
+  if (!(await manager.state()).installed) {
+    log(`service not installed (${commandHint("service")} install)`);
+    return 1;
+  }
+  await manager.start();
+  log("started");
+  return 0;
+}
+async function versionLine() {
+  if (packagedVersion !== undefined)
+    return `version: ${packagedVersion}`;
+  const head = await run("git", ["rev-parse", "--short", "HEAD"], { cwd: repoRoot }).then(({ stdout }) => stdout.trim(), () => "unknown");
+  return `checkout: ${head}`;
+}
+async function reachabilityLine(argv) {
+  try {
+    const { url, token } = await hostAddress(argv);
+    const remote = await connectToHost(url, token);
+    if (remote.view.current().tasks === undefined)
+      await remote.controller.toggleTasks();
+    const tasks = remote.view.current().tasks;
+    const count = tasks === undefined ? 0 : Object.keys(tasks.tasks).length;
+    remote.close();
+    return `host: reachable at ${url}, ${count} live task${count === 1 ? "" : "s"}`;
+  } catch (error) {
+    if (isParseArgsError(error))
+      throw error;
+    return `host: unreachable (${message(error)})`;
+  }
+}
+var serviceStatusJson = (state) => JSON.stringify({
+  installed: state.installed,
+  stopped: state.stopped,
+  running: state.running,
+  ...state.pid === undefined ? {} : { pid: state.pid },
+  detail: state.detail
+});
+async function status(argv) {
+  const state = await serviceManager().state();
+  if (argv.includes("--json")) {
+    console.log(serviceStatusJson(state));
+    return;
+  }
+  console.log(`service: ${state.installed ? state.detail : "not installed"}`);
+  console.log(await versionLine());
+  console.log(await reachabilityLine(argv));
+}
+async function restartService({
+  force,
+  argv,
+  manager = serviceManager(),
+  restart,
+  connect = connectToHost,
+  pollTimeoutMs = 30000,
+  pollDelayMs = 500
+}) {
+  const state = await manager.state();
+  if (!state.installed) {
+    console.log(`service not installed (${commandHint("service")} install)`);
+    return 1;
+  }
+  if (state.stopped && restart === undefined) {
+    console.log(`service stopped (${commandHint("service")} start)`);
+    return 1;
+  }
+  const address = await hostAddress(argv).catch((error) => {
+    if (isParseArgsError(error))
+      throw error;
+    return;
+  });
+  if (!force && address !== undefined)
+    await waitUntilIdle(address, connect, (line) => console.log(line));
+  await (restart?.() ?? manager.restart());
+  if (address === undefined) {
+    console.log("restart requested (host address unknown; not polling)");
+    return 0;
+  }
+  return awaitRestarted(address, { connect, pollTimeoutMs, pollDelayMs });
+}
+async function awaitRestarted(address, {
+  connect = connectToHost,
+  pollTimeoutMs = 30000,
+  pollDelayMs = 500
+} = {}) {
+  const deadline = Date.now() + pollTimeoutMs;
+  for (;; ) {
+    try {
+      const remote = await connect(address.url, address.token, 2000);
+      remote.close();
+      console.log(`host restarted, reachable at ${address.url}`);
+      return 0;
+    } catch (error) {
+      if (error instanceof ProtocolMismatchError && error.direction === "client-older") {
+        const newer = error.hostVersion ?? `protocol major ${error.hostMajor}`;
+        console.log(`host restarted (${newer}, newer than this upgrader), reachable at ${address.url}`);
+        return 0;
+      }
+      if (Date.now() > deadline) {
+        console.error(`host did not answer within ${pollTimeoutMs / 1000}s after restart: ${message(error)}`);
+        return 1;
+      }
+      await new Promise((resolve2) => setTimeout(resolve2, pollDelayMs));
+    }
+  }
+}
+async function logs(argv) {
+  const { values } = parseArgs({
+    args: [...argv],
+    options: {
+      follow: { type: "boolean", default: false },
+      lines: { type: "string", short: "n", default: "100" },
+      "data-dir": { type: "string" }
+    }
+  });
+  const dataDir = resolve(values["data-dir"] ?? DEFAULT_DATA_DIR);
+  await serviceManager().logs(dataDir, Number(values.lines), values.follow);
+}
+async function main(argv) {
+  const [command, ...args] = argv;
+  try {
+    switch (command) {
+      case "install":
+        await install(args);
+        break;
+      case "uninstall":
+        await serviceManager().uninstall();
+        console.log("uninstalled");
+        break;
+      case "status":
+        await status(args);
+        break;
+      case "restart": {
+        const force = args.includes("--force");
+        process.exitCode = await restartService({ force, argv: args.filter((arg) => arg !== "--force") });
+        break;
+      }
+      case "stop": {
+        const force = args.includes("--force");
+        process.exitCode = await stopService({ force, argv: args.filter((arg) => arg !== "--force") });
+        break;
+      }
+      case "start":
+        process.exitCode = await startService();
+        break;
+      case "logs":
+        await logs(args);
+        break;
+      default:
+        console.error(`usage: ${commandHint("service")} install|uninstall|status|restart|stop|start|logs`);
+        process.exitCode = 1;
+    }
+  } catch (error) {
+    if (isParseArgsError(error))
+      throw error;
+    console.error(message(error));
+    process.exitCode = 1;
+  }
+}
+if (false) {}
+
+export { connectToHost, stopService, startService, versionLine, reachabilityLine, serviceStatusJson, restartService, awaitRestarted, main };