pinomad 0.3.0 → 0.5.0

package/dist/{chunk-kxws8b83.js → chunk-5ng86fmy.js}

@@ -2,10 +2,10 @@
 import {
   main,
   restartService
-} from "./chunk-t9y2wfk5.js";
-import"./chunk-3tf23vjq.js";
-import"./chunk-bggesvnj.js";
-import"./chunk-c155p0t0.js";
+} from "./chunk-aqj4wg33.js";
+import"./chunk-1d9sppj0.js";
+import"./chunk-m4q9wafw.js";
+import"./chunk-hsp12cjt.js";
 import"./chunk-cjfmfyjb.js";
 import"./chunk-df32avw6.js";
 export {

package/dist/chunk-9d59jjmt.js

@@ -0,0 +1,144 @@
+#!/usr/bin/env node
+import {
+  assertSecureServerOrigin,
+  probeServerAccounts,
+  runServerOperation
+} from "./chunk-26d04z02.js";
+import {
+  loadHostKey,
+  loadRelayKey,
+  writeServerConfig
+} from "./chunk-ebfaf3k2.js";
+import {
+  relayHostId
+} from "./chunk-kmbh44dt.js";
+import {
+  argValue,
+  installSpec,
+  restartService,
+  serviceManager,
+  withoutRelayArgs
+} from "./chunk-aqj4wg33.js";
+import {
+  commandHint,
+  hostEntry
+} from "./chunk-1d9sppj0.js";
+import"./chunk-m4q9wafw.js";
+import"./chunk-hsp12cjt.js";
+import {
+  DEFAULT_DATA_DIR
+} from "./chunk-cjfmfyjb.js";
+import"./chunk-df32avw6.js";
+
+// apps/host/src/cli/join.ts
+import { mkdir } from "node:fs/promises";
+import { homedir, hostname } from "node:os";
+import { resolve } from "node:path";
+import { parseArgs } from "node:util";
+var message = (error) => error instanceof Error ? error.message : String(error);
+async function joinServer(args, deps) {
+  const origin = args.origin.replace(/\/+$/, "");
+  const dataDir = resolve(args.dataDir);
+  assertSecureServerOrigin(origin);
+  await mkdir(dataDir, { recursive: true });
+  const signingKey = await loadRelayKey(dataDir);
+  const hostKey = await loadHostKey(dataDir);
+  const hostId = relayHostId(signingKey.publicKey);
+  const manager = deps?.manager ?? serviceManager();
+  const installed = await manager.state().then((state) => state.installed, () => false);
+  const previous = installed ? await manager.read() : undefined;
+  if (previous !== undefined && resolve(previous.dataDir) !== dataDir) {
+    throw new Error(`the installed service uses a different data dir (${previous.dataDir}); ` + `join it with --data-dir ${previous.dataDir} or uninstall the service first`);
+  }
+  const probe = await probeServerAccounts(origin, deps?.fetch);
+  if (probe === "unreachable")
+    throw new Error(`cannot reach ${origin} — check the address and that the server is up`);
+  if (probe === "disabled") {
+    throw new Error(`${origin} does not run server accounts — the server is too old or was started without a data dir`);
+  }
+  const reply = await runServerOperation({
+    origin,
+    signingKey,
+    noisePublicKey: hostKey.publicKey,
+    op: "join",
+    joinToken: args.token,
+    name: args.name ?? deps?.hostname ?? hostname()
+  });
+  if (reply.t === "refused") {
+    throw new Error(reply.reason === "expired_token" ? "the join token expired — generate a fresh one" : reply.reason === "invalid_token" ? "the join token is invalid or already spent — generate a fresh one" : `the server refused the join: ${reply.reason}`);
+  }
+  if (reply.t !== "joined")
+    throw new Error(`unexpected answer to join: ${reply.t}`);
+  const username = reply.username;
+  let service;
+  try {
+    await writeServerConfig(dataDir, { origin });
+    const freshSpec = installSpec(["--data-dir", dataDir], {
+      execPath: process.execPath,
+      env: process.env,
+      home: homedir(),
+      cwd: process.cwd(),
+      mainPath: hostEntry.script,
+      entryArgs: hostEntry.args
+    });
+    if (!installed) {
+      await manager.install(freshSpec);
+      service = "installed";
+    } else {
+      const spec = previous === undefined ? freshSpec : { ...previous, hostArgs: withoutRelayArgs(previous.hostArgs) };
+      const port = argValue(spec.hostArgs, "--port");
+      const code = await restartService({
+        force: false,
+        argv: ["--data-dir", dataDir, ...port === undefined ? [] : ["--url", `ws://127.0.0.1:${port}`]],
+        manager,
+        restart: async () => {
+          await manager.install(spec);
+        }
+      });
+      service = code === 0 ? "updated" : "failed";
+    }
+  } catch (error) {
+    throw new Error(`joined ${username} at ${origin}, but local setup failed: ${message(error)}
+` + `generate a fresh join token and run the command again (re-joining the same host is safe)`);
+  }
+  return { hostId, username, origin, service };
+}
+async function main(argv) {
+  const { values, positionals } = parseArgs({
+    args: [...argv],
+    allowPositionals: true,
+    options: { "data-dir": { type: "string" }, name: { type: "string" } }
+  });
+  const [origin, token] = positionals;
+  if (origin === undefined || token === undefined) {
+    console.error(`usage: ${commandHint("join")} <server-origin> <join-token> [--data-dir DIR] [--name NAME]`);
+    process.exit(1);
+  }
+  try {
+    const outcome = await joinServer({
+      origin,
+      token,
+      dataDir: values["data-dir"] ?? DEFAULT_DATA_DIR,
+      ...values.name === undefined ? {} : { name: values.name }
+    });
+    console.log(`host id: ${outcome.hostId}`);
+    console.log(`joined ${outcome.username} at ${outcome.origin}`);
+    if (outcome.service === "installed")
+      console.log("service installed and started");
+    else if (outcome.service === "updated")
+      console.log("service definition updated; host restarted when idle");
+    else {
+      console.error("joined, but the service restart did not finish — check `service status`");
+      process.exitCode = 1;
+    }
+  } catch (error) {
+    console.error(message(error));
+    process.exitCode = 1;
+  }
+}
+if (false)
+  ;
+export {
+  main,
+  joinServer
+};

package/dist/{chunk-t9y2wfk5.js → chunk-aqj4wg33.js}

@@ -2,10 +2,10 @@ import {
   commandHint,
   hostEntry,
   packagedVersion
-} from "./chunk-3tf23vjq.js";
+} from "./chunk-1d9sppj0.js";
 import {
   connectRemoteDurable
-} from "./chunk-bggesvnj.js";
+} from "./chunk-m4q9wafw.js";
 import {
   DEFAULT_DATA_DIR,
   hostAddress
@@ -66,6 +66,86 @@ function installSpec(argv, inputs) {
 }
 var launchdPlistPath = (home) => join(home, "Library", "LaunchAgents", "pinomad.host.plist");
 var systemdUnitPath = (home) => join(home, ".config", "systemd", "user", "pinomad.service");
+function argValue(args, flag) {
+  let value;
+  for (let i = 0;i < args.length; i += 1) {
+    const arg = args[i];
+    if (arg === flag)
+      value = args[i + 1];
+    else if (arg.startsWith(`${flag}=`))
+      value = arg.slice(flag.length + 1);
+  }
+  return value;
+}
+function withoutRelayArgs(args) {
+  const out = [];
+  for (let i = 0;i < args.length; i += 1) {
+    const arg = args[i];
+    if (arg === "--relay") {
+      i += 1;
+      continue;
+    }
+    if (arg.startsWith("--relay="))
+      continue;
+    out.push(arg);
+  }
+  return out;
+}
+var unescapeExec = (value) => value.replace(/\\(.)/g, "$1");
+var unspecify = (value) => value.replace(/%%/g, "%").replace(/\$\$/g, "$");
+var xmlUnescape = (value) => value.replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
+function specFromProgram(program, env, home) {
+  const at = program.indexOf("--data-dir");
+  if (program.length < 4 || at < 2 || program[at + 1] === undefined) {
+    throw new Error("service definition has no --data-dir argument boundary");
+  }
+  return {
+    nodePath: program[0],
+    mainPath: program[1],
+    entryArgs: program.slice(2, at),
+    dataDir: program[at + 1],
+    hostArgs: program.slice(at + 2),
+    env: {
+      PATH: env.PATH ?? "",
+      ...env.LANG === undefined ? {} : { LANG: env.LANG },
+      ...env.LC_ALL === undefined ? {} : { LC_ALL: env.LC_ALL }
+    },
+    home
+  };
+}
+function specFromSystemdUnit(text) {
+  const exec = /^ExecStart=(.*)$/m.exec(text)?.[1];
+  if (exec === undefined)
+    throw new Error("service unit has no ExecStart");
+  const program = [...exec.matchAll(/"((?:[^"\\]|\\.)*)"/g)].map((match) => unspecify(unescapeExec(match[1])));
+  const env = {};
+  const envLine = /^Environment=(.*)$/m.exec(text)?.[1] ?? "";
+  for (const match of envLine.matchAll(/"([^"]*)"/g)) {
+    const pair = unspecify(match[1]);
+    const eq = pair.indexOf("=");
+    if (eq > 0)
+      env[pair.slice(0, eq)] = pair.slice(eq + 1);
+  }
+  const workdir = /^WorkingDirectory=(.*)$/m.exec(text)?.[1];
+  if (workdir === undefined)
+    throw new Error("service unit has no WorkingDirectory");
+  return specFromProgram(program, env, unspecify(workdir));
+}
+function specFromLaunchdPlist(text) {
+  const array = /<key>ProgramArguments<\/key>\s*<array>([\s\S]*?)<\/array>/.exec(text)?.[1];
+  if (array === undefined)
+    throw new Error("plist has no ProgramArguments");
+  const program = [...array.matchAll(/<string>([\s\S]*?)<\/string>/g)].map((match) => xmlUnescape(match[1]));
+  const env = {};
+  const dict = /<key>EnvironmentVariables<\/key>\s*<dict>([\s\S]*?)<\/dict>/.exec(text)?.[1] ?? "";
+  for (const match of dict.matchAll(/<key>([\s\S]*?)<\/key>\s*<string>([\s\S]*?)<\/string>/g)) {
+    env[xmlUnescape(match[1])] = xmlUnescape(match[2]);
+  }
+  const workdir = /<key>WorkingDirectory<\/key>\s*<string>([\s\S]*?)<\/string>/.exec(text)?.[1];
+  if (workdir === undefined)
+    throw new Error("plist has no WorkingDirectory");
+  return specFromProgram(program, env, xmlUnescape(workdir));
+}
 var xmlEscape = (value) => value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
 function launchdPlist(spec) {
   const program = [spec.nodePath, spec.mainPath, ...spec.entryArgs, "--data-dir", spec.dataDir, ...spec.hostArgs];
@@ -214,6 +294,10 @@ var launchd = {
     process.stdout.write(`${all.slice(-lines).join(`
 `)}
 `);
+  },
+  async read() {
+    const text = await readFile(launchdPlistPath(homedir()), "utf8").then((value) => value, (error) => error.code === "ENOENT" ? undefined : Promise.reject(error));
+    return text === undefined ? undefined : specFromLaunchdPlist(text);
   }
 };
 var systemd = {
@@ -273,6 +357,10 @@ var systemd = {
       stdio: "inherit"
     });
     await new Promise((resolve2) => journal.once("exit", () => resolve2()));
+  },
+  async read() {
+    const text = await readFile(systemdUnitPath(homedir()), "utf8").then((value) => value, (error) => error.code === "ENOENT" ? undefined : Promise.reject(error));
+    return text === undefined ? undefined : specFromSystemdUnit(text);
   }
 };
 function serviceManager(platform = process.platform) {
@@ -339,8 +427,12 @@ async function status(argv) {
     console.log(`host: unreachable (${message(error)})`);
   }
 }
-async function restartService({ force, argv }) {
-  const manager = serviceManager();
+async function restartService({
+  force,
+  argv,
+  manager = serviceManager(),
+  restart
+}) {
   if (!(await manager.state()).installed) {
     console.log(`service not installed (${commandHint("service")} install)`);
     return 1;
@@ -360,7 +452,7 @@ async function restartService({ force, argv }) {
       remote.close();
     } catch {}
   }
-  await manager.restart();
+  await (restart?.() ?? manager.restart());
   if (address === undefined) {
     console.log("restart requested (host address unknown; not polling)");
     return 0;
@@ -427,4 +519,4 @@ async function main(argv) {
 if (false)
   ;
 
-export { serviceManager, restartService, main };
+export { installSpec, argValue, withoutRelayArgs, serviceManager, restartService, main };

package/dist/{chunk-n60kkf1m.js → chunk-crv3dqzp.js}

@@ -2,14 +2,14 @@
 import {
   restartService,
   serviceManager
-} from "./chunk-t9y2wfk5.js";
+} from "./chunk-aqj4wg33.js";
 import {
   globalPrefixOf,
   packageDir,
   packagedVersion
-} from "./chunk-3tf23vjq.js";
-import"./chunk-bggesvnj.js";
-import"./chunk-c155p0t0.js";
+} from "./chunk-1d9sppj0.js";
+import"./chunk-m4q9wafw.js";
+import"./chunk-hsp12cjt.js";
 import"./chunk-cjfmfyjb.js";
 import"./chunk-df32avw6.js";