moshcode 0.77.0 → 0.78.0

package/examples/templates/bun-caddy-sqlite/deploy/moshcode-dns.service

@@ -7,8 +7,22 @@
 # and every Moshpit name stops resolving with no obvious cause. This unit is
 # the missing half.
 #
-#   sudo cp deploy/moshcode-dns.service /etc/systemd/system/
-#   sudo systemctl enable --now moshcode-dns
+# GENERATE IT, DO NOT COPY THIS ONE:
+#
+#   moshcode dns service --write     # this user's own service, needs no root
+#   moshcode dns service --system | sudo tee /etc/systemd/system/moshcode-dns.service
+#
+# `dns service` writes ExecStart from the running process, so it names the node
+# that demonstrably works and the install that is actually on the box. A static
+# file cannot: moshcode installs under $HOME, and its wrapper execs whatever
+# `node` is first on PATH — which on any mise, nvm or asdf machine is another
+# shim under $HOME. systemd has neither on its PATH and, with ProtectHome or
+# DynamicUser set, could not read them if it did. A unit that gets this wrong
+# fails at 203/EXEC with nothing useful in the journal.
+#
+# What is left below therefore assumes the one case it can safely assume: both
+# moshcode and node installed system-wide, service running as root. Check
+# `systemctl status moshcode-dns` before believing it.
 #
 # Install this on machines that need to REACH Moshpit names. A box that only
 # serves one does not need it — Caddy answers whatever Host header arrives and
@@ -22,18 +36,15 @@ Before=systemd-resolved.service
 
 [Service]
 Type=simple
-# Port 5354 is unprivileged, so this does not need root. The trade-off is that
-# the parking responder cannot take port 80 and falls back to the public
-# parking address — which only affects names that point nowhere yet.
-ExecStart=/usr/bin/env moshcode dns start --port 5354
+# Port 5354 is unprivileged, so this does not need root for the DNS side. The
+# trade-off is that the parking responder cannot take port 80 and falls back to
+# the public parking address — which only affects names that point nowhere yet.
+ExecStart=/usr/local/bin/moshcode dns start --port 5354
 Restart=always
 RestartSec=2
 
-DynamicUser=yes
 NoNewPrivileges=yes
 PrivateTmp=yes
-ProtectSystem=strict
-ProtectHome=yes
 
 [Install]
 WantedBy=multi-user.target

package/examples/templates/caddy-proxy/deploy/moshcode-dns.service

@@ -7,8 +7,22 @@
 # and every Moshpit name stops resolving with no obvious cause. This unit is
 # the missing half.
 #
-#   sudo cp deploy/moshcode-dns.service /etc/systemd/system/
-#   sudo systemctl enable --now moshcode-dns
+# GENERATE IT, DO NOT COPY THIS ONE:
+#
+#   moshcode dns service --write     # this user's own service, needs no root
+#   moshcode dns service --system | sudo tee /etc/systemd/system/moshcode-dns.service
+#
+# `dns service` writes ExecStart from the running process, so it names the node
+# that demonstrably works and the install that is actually on the box. A static
+# file cannot: moshcode installs under $HOME, and its wrapper execs whatever
+# `node` is first on PATH — which on any mise, nvm or asdf machine is another
+# shim under $HOME. systemd has neither on its PATH and, with ProtectHome or
+# DynamicUser set, could not read them if it did. A unit that gets this wrong
+# fails at 203/EXEC with nothing useful in the journal.
+#
+# What is left below therefore assumes the one case it can safely assume: both
+# moshcode and node installed system-wide, service running as root. Check
+# `systemctl status moshcode-dns` before believing it.
 #
 # Install this on machines that need to REACH Moshpit names. A box that only
 # serves one does not need it — Caddy answers whatever Host header arrives and
@@ -22,18 +36,15 @@ Before=systemd-resolved.service
 
 [Service]
 Type=simple
-# Port 5354 is unprivileged, so this does not need root. The trade-off is that
-# the parking responder cannot take port 80 and falls back to the public
-# parking address — which only affects names that point nowhere yet.
-ExecStart=/usr/bin/env moshcode dns start --port 5354
+# Port 5354 is unprivileged, so this does not need root for the DNS side. The
+# trade-off is that the parking responder cannot take port 80 and falls back to
+# the public parking address — which only affects names that point nowhere yet.
+ExecStart=/usr/local/bin/moshcode dns start --port 5354
 Restart=always
 RestartSec=2
 
-DynamicUser=yes
 NoNewPrivileges=yes
 PrivateTmp=yes
-ProtectSystem=strict
-ProtectHome=yes
 
 [Install]
 WantedBy=multi-user.target

package/examples/templates/caddy-static/deploy/moshcode-dns.service

@@ -7,8 +7,22 @@
 # and every Moshpit name stops resolving with no obvious cause. This unit is
 # the missing half.
 #
-#   sudo cp deploy/moshcode-dns.service /etc/systemd/system/
-#   sudo systemctl enable --now moshcode-dns
+# GENERATE IT, DO NOT COPY THIS ONE:
+#
+#   moshcode dns service --write     # this user's own service, needs no root
+#   moshcode dns service --system | sudo tee /etc/systemd/system/moshcode-dns.service
+#
+# `dns service` writes ExecStart from the running process, so it names the node
+# that demonstrably works and the install that is actually on the box. A static
+# file cannot: moshcode installs under $HOME, and its wrapper execs whatever
+# `node` is first on PATH — which on any mise, nvm or asdf machine is another
+# shim under $HOME. systemd has neither on its PATH and, with ProtectHome or
+# DynamicUser set, could not read them if it did. A unit that gets this wrong
+# fails at 203/EXEC with nothing useful in the journal.
+#
+# What is left below therefore assumes the one case it can safely assume: both
+# moshcode and node installed system-wide, service running as root. Check
+# `systemctl status moshcode-dns` before believing it.
 #
 # Install this on machines that need to REACH Moshpit names. A box that only
 # serves one does not need it — Caddy answers whatever Host header arrives and
@@ -22,18 +36,15 @@ Before=systemd-resolved.service
 
 [Service]
 Type=simple
-# Port 5354 is unprivileged, so this does not need root. The trade-off is that
-# the parking responder cannot take port 80 and falls back to the public
-# parking address — which only affects names that point nowhere yet.
-ExecStart=/usr/bin/env moshcode dns start --port 5354
+# Port 5354 is unprivileged, so this does not need root for the DNS side. The
+# trade-off is that the parking responder cannot take port 80 and falls back to
+# the public parking address — which only affects names that point nowhere yet.
+ExecStart=/usr/local/bin/moshcode dns start --port 5354
 Restart=always
 RestartSec=2
 
-DynamicUser=yes
 NoNewPrivileges=yes
 PrivateTmp=yes
-ProtectSystem=strict
-ProtectHome=yes
 
 [Install]
 WantedBy=multi-user.target

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moshcode",
-  "version": "0.77.0",
+  "version": "0.78.0",
   "type": "module",
   "description": "moshcode \u2014 a metal wrapper for coding engines and native UGig/CoinPay workflow CLIs, with OpenPRD and moshscript",
   "repository": {

package/src/cli-schema.mjs

@@ -390,7 +390,7 @@ export const CORE_CLI_COMMANDS = [
       ["--no-proxy", "with enable: answer origins rather than the local proxy", ""],
     ],
     examples: [
-      ["sudo moshcode dns enable", "route Moshpit endings here"],
+      ["moshcode dns enable", "route Moshpit endings here (it escalates itself)"],
       ["moshcode dns resolve blue.eggs", "what a machine actually gets"],
     ],
     seeAlso: ["doh", "site"],
@@ -1009,7 +1009,16 @@ export const DNS_VERBS = [
   { name: "refresh", description: "re-apply routing for endings claimed since" },
   { name: "start", description: "run the bridge in the foreground" },
   { name: "install", description: "print the resolver config without applying it" },
-  { name: "service", description: "install or remove the background service" },
+  {
+    name: "service",
+    description: "keep the bridge running across reboots — the half `enable` does not survive",
+    synopsis: [
+      ["moshcode dns service", "print the unit for this install, change nothing"],
+      ["moshcode dns service --write", "install and start it as this user; needs no root"],
+      ["moshcode dns service --system", "a system unit instead — place it with sudo tee"],
+      ["moshcode dns service --remove", "stop it and take the unit away"],
+    ],
+  },
   { name: "tlds", description: "list the endings claimed in the Pit" },
   { name: "resolve", description: "what a name resolves to, and why" },
   { name: "trust", description: "trust one name's certificate, after checking it against the registry pin" },

package/src/dns-service.mjs

@@ -0,0 +1,157 @@
+// Keeping the bridge running across reboots.
+//
+// `dns enable` sets up two halves with different lifetimes: a systemd-resolved
+// drop-in, which is a file and survives a reboot on its own, and the bridge
+// process, which does not. After a restart the routing still points at a port
+// with nothing behind it and every Moshpit name stops resolving with no
+// obvious cause. This is the missing half, and it is why Moshpit DNS has held
+// on servers — which got a unit installed by hand — and quietly fallen over on
+// desktops, which never did.
+//
+// The unit is *generated* rather than shipped as a file, because no static
+// unit can be correct for this tool. moshcode installs under the invoking
+// user's $HOME, and its wrapper execs whatever `node` is first on PATH — which
+// on any mise, nvm or asdf box is another shim under $HOME. The unit that
+// shipped in examples/templates said:
+//
+//     ExecStart=/usr/bin/env moshcode dns start --port 5354
+//     DynamicUser=yes
+//     ProtectHome=yes
+//
+// and could not start on an ordinary install three times over: `moshcode` is
+// not on systemd's PATH, the `node` its wrapper needs is not on it either, and
+// ProtectHome hides the install from the service even if both had been found.
+// It starts only where moshcode and node are both installed system-wide, which
+// is the server case — the one that was already working.
+//
+// So the unit is written from the running process instead. `process.execPath`
+// is an interpreter demonstrably able to run this code, because it is running
+// it, and the entry is the script this very command was invoked from. Nothing
+// is guessed and nothing depends on PATH.
+import { spawn } from "node:child_process";
+import { mkdir, rm, writeFile } from "node:fs/promises";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+
+export const UNIT_NAME = "moshcode-dns.service";
+
+/**
+ * Where the unit goes, and which systemctl reaches it.
+ *
+ * The user scope is the default because it is the one that fits how moshcode
+ * is installed: a per-user tool, run by the user who owns the install, with
+ * $HOME and the mise shims reachable exactly as they are in a shell. It also
+ * puts the pidfile where the unprivileged `dns status` looks — systemd sets
+ * XDG_RUNTIME_DIR for user units, so `pidfilePath()` resolves to
+ * /run/user/<uid>/moshpit-dns.pid for the daemon and for the person asking
+ * after it. Under a system unit those are two different paths.
+ */
+export function servicePaths({ system = false, home = homedir() } = {}) {
+  return system
+    ? { path: join("/etc/systemd/system", UNIT_NAME), systemctl: ["systemctl"], scope: "system" }
+    : { path: join(home, ".config/systemd/user", UNIT_NAME), systemctl: ["systemctl", "--user"], scope: "user" };
+}
+
+/**
+ * The unit text, pinned to this install.
+ *
+ * `ProtectHome` is deliberately absent rather than set to a weaker value: the
+ * whole program lives under $HOME, so there is no setting of it that both
+ * protects anything and lets the service start. The hardening that survives is
+ * the hardening that does not contradict where the code is.
+ */
+export function serviceUnit({
+  system = false,
+  execPath = process.execPath,
+  entry,
+  port,
+  registryBase = null,
+  user = process.env.USER || process.env.LOGNAME,
+} = {}) {
+  if (!entry) throw new Error("serviceUnit needs the entry script to run");
+
+  const args = [entry, "dns", "start", "--port", String(port)];
+  if (registryBase) args.push("--registry", registryBase);
+  const exec = [execPath, ...args].map((part) => (/\s/.test(part) ? JSON.stringify(part) : part)).join(" ");
+
+  const lines = [
+    "# Generated by `moshcode dns service`. Regenerate it rather than editing:",
+    "# the paths below are this install's, and a moshcode or node that moves",
+    "# leaves a unit that fails at 203/EXEC with nothing else to say.",
+    "[Unit]",
+    "Description=Moshpit DNS bridge",
+    "Documentation=https://github.com/moshcoder/moshcode",
+    "After=network-online.target",
+    "Wants=network-online.target",
+    "",
+    "[Service]",
+    "Type=simple",
+    `ExecStart=${exec}`,
+    "Restart=always",
+    "RestartSec=2",
+    // 5354 is unprivileged, so nothing here needs root or a capability.
+    "NoNewPrivileges=yes",
+    "PrivateTmp=yes",
+  ];
+
+  if (system) {
+    // A system unit has no user of its own, so it has to be told which install
+    // to run — and it is the only scope where that question has a wrong answer.
+    lines.push(`User=${user}`);
+  }
+
+  lines.push(
+    "",
+    "[Install]",
+    system ? "WantedBy=multi-user.target" : "WantedBy=default.target",
+    "",
+  );
+  return lines.join("\n");
+}
+
+function run(command, args) {
+  return new Promise((resolve) => {
+    const child = spawn(command, args, { stdio: ["ignore", "pipe", "pipe"] });
+    let err = "";
+    child.stderr.on("data", (d) => (err += d));
+    child.on("error", (error) => resolve({ ok: false, error: error.message }));
+    child.on("exit", (code) => resolve({ ok: code === 0, error: err.trim() }));
+  });
+}
+
+/** Write the unit and start it. Returns the steps taken, in order, for printing. */
+export async function installService(unit, { system = false, home = homedir(), exec = run } = {}) {
+  const { path, systemctl, scope } = servicePaths({ system, home });
+  const steps = [];
+  try {
+    await mkdir(dirname(path), { recursive: true });
+    await writeFile(path, unit);
+    steps.push({ step: `wrote ${path}`, ok: true });
+  } catch (error) {
+    return { ok: false, path, scope, steps: [{ step: `could not write ${path}: ${error.message}`, ok: false }] };
+  }
+
+  const [cmd, ...flags] = systemctl;
+  for (const args of [[...flags, "daemon-reload"], [...flags, "enable", "--now", UNIT_NAME]]) {
+    const result = await exec(cmd, args);
+    steps.push({ step: `${cmd} ${args.join(" ")}`, ok: result.ok, error: result.error });
+    if (!result.ok) return { ok: false, path, scope, steps };
+  }
+  return { ok: true, path, scope, steps };
+}
+
+/** Stop it and take the unit away. Missing is not a failure — removal is idempotent. */
+export async function removeService({ system = false, home = homedir(), exec = run } = {}) {
+  const { path, systemctl, scope } = servicePaths({ system, home });
+  const [cmd, ...flags] = systemctl;
+  const steps = [];
+  for (const args of [[...flags, "disable", "--now", UNIT_NAME]]) {
+    const result = await exec(cmd, args);
+    steps.push({ step: `${cmd} ${args.join(" ")}`, ok: result.ok, error: result.error });
+  }
+  await rm(path, { force: true });
+  steps.push({ step: `removed ${path}`, ok: true });
+  const reload = await exec(cmd, [...flags, "daemon-reload"]);
+  steps.push({ step: `${cmd} ${[...flags, "daemon-reload"].join(" ")}`, ok: reload.ok, error: reload.error });
+  return { ok: true, path, scope, steps };
+}

package/src/dns.mjs

@@ -2278,6 +2278,7 @@ import { applyTrust, applyUntrust, createAutoTrust, trustName, verifyStockTls }
 import { readFile, writeFile } from "node:fs/promises";
 import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+import { installService, removeService, serviceUnit, servicePaths, UNIT_NAME } from "./dns-service.mjs";
 import {
   applyPlan, daemonStatus, describePlan, detectPlatform, disablePlan, enablePlan,
   probeResolver, requiredPort, startDaemon, stopDaemon,
@@ -2310,6 +2311,10 @@ const USAGE = `moshcode dns — resolve Moshpit names on this machine
                                  lands on the Pit; --parking-port N, --no-parking-http
                                  --no-filter runs it with blocklists off
   moshcode dns install [--write] print the resolver config without applying it
+  moshcode dns service           print a systemd unit that keeps the bridge
+                                 running across reboots; --write installs and
+                                 starts it, --system for a system unit rather
+                                 than this user's, --remove takes it away
 
   moshcode dns filter            block ads, trackers, malware and phishing at the
                                  resolver — \`moshcode dns filter help\` for the verbs
@@ -2684,6 +2689,53 @@ export async function dnsCommand(args = [], out = console.log, deps = {}) {
     return 0;
   }
 
+  // The half of `enable` that a reboot takes away. Kept a separate verb rather
+  // than folded into `enable`, because installing a service is exactly the kind
+  // of thing that must stay something a person asked for.
+  if (sub === "service") {
+    const system = rest.includes("--system");
+    const { path: unitPath, systemctl, scope } = servicePaths({ system });
+
+    const report = (steps) => {
+      for (const s of steps) out(`${s.ok ? "ok" : "!!"} ${s.step}${s.error ? ` — ${s.error}` : ""}`);
+    };
+
+    if (rest.includes("--remove")) {
+      report((await removeService({ system })).steps);
+      out("");
+      out("the routing is untouched — `moshcode dns disable` is what removes that");
+      return 0;
+    }
+
+    const unit = serviceUnit({ system, entry: cliEntry(), port, registryBase });
+
+    if (rest.includes("--write")) {
+      const result = await installService(unit, { system });
+      report(result.steps);
+      if (!result.ok) {
+        out("");
+        out(system
+          ? `(writing ${unitPath} needs root — pipe it instead: moshcode dns service --system | sudo tee ${unitPath})`
+          : "(the user scope needs no privileges — this failure is something else)");
+        return 1;
+      }
+      out("");
+      out(`the bridge now starts with the machine (${scope} scope)`);
+      if (!system) {
+        const who = process.env.USER || process.env.LOGNAME || "$USER";
+        out(`  a user service stops at logout — to survive one: loginctl enable-linger ${who}`);
+      }
+      out("  check it: moshcode dns status");
+      return 0;
+    }
+
+    out(`# ${unitPath}`);
+    out(unit);
+    out(`# install it with: moshcode dns service --write${system ? " --system" : ""}`);
+    out(`# then: ${systemctl.join(" ")} status ${UNIT_NAME}`);
+    return 0;
+  }
+
   if (sub === "enable" || sub === "disable") {
     const platform = platformImpl();
     if (!platform) {