npm - conductor-remote - Versions diffs - 1.24.0 → 1.24.2 - Mend

conductor-remote 1.24.0 → 1.24.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/README.md +12 -29
package/bin/cli.js +7 -0
package/dist/assets/{index-CKMPOrHs.js → index-Cc72wJyy.js} +2 -2
package/dist/index.html +1 -1
package/dist/sw.js +1 -1
package/dist-node/scripts/nosleep.js +17 -8
package/dist-node/scripts/service.js +75 -5
package/dist-node/src/server.js +9 -0
package/dist-node/src/tailscale.js +50 -0
package/package.json +1 -1

package/dist/index.html CHANGED Viewed

@@ -13,7 +13,7 @@
 		<title>Conductor Remote</title>
 		<!-- Runs before the module bundle so it can catch a stale shell that fails to boot. -->
 		<script src="/self-heal.js"></script>
-		<script type="module" crossorigin src="/assets/index-CKMPOrHs.js"></script>
+		<script type="module" crossorigin src="/assets/index-Cc72wJyy.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/index-D6B0k-tm.css">
 	<link rel="manifest" href="/manifest.webmanifest"></head>
 	<body>

package/dist/sw.js CHANGED Viewed

	@@ -1 +1 @@
1	- if(!self.define){let e,i={};const s=(s,n)=>(s=new URL(s+".js",n).href,i[s]\|\|new Promise(i=>{if("document"in self){const e=document.createElement("script");e.src=s,e.onload=i,document.head.appendChild(e)}else e=s,importScripts(s),i()}).then(()=>{let e=i[s];if(!e)throw new Error(`Module ${s} didn’t register its module`);return e}));self.define=(n,r)=>{const o=e\|\|("document"in self?document.currentScript.src:"")\|\|location.href;if(i[o])return;let l={};const t=e=>s(e,o),c={module:{uri:o},exports:l,require:t};i[o]=Promise.all(n.map(e=>c[e]\|\|t(e))).then(e=>(r(...e),l))}}define(["./workbox-9c191d2f"],function(e){"use strict";self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"self-heal.js",revision:"49bd63adb25a09341f8d2610e8bd3c76"},{url:"index.html",revision:"~~73af7d827d5e4e46f01875f350c4cd1d~~"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-D6B0k-tm.css",revision:null},{url:"assets/index-~~CKMPOrHs~~.js",revision:null},{url:"apple-touch-icon.png",revision:"2b9301416b880d45d4bb655f2600d1f2"},{url:"icon-192.png",revision:"c5e01ac58768627e18ee7b8b6a9239ef"},{url:"icon-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon-maskable-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon.svg",revision:"c1aee186821798733dd477e69a0ef243"},{url:"manifest.webmanifest",revision:"cf88fbc5755108a7fe0616fa160a8a15"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/index.html"),{denylist:[/^\/api\//]}))});
1	+ if(!self.define){let e,i={};const s=(s,n)=>(s=new URL(s+".js",n).href,i[s]\|\|new Promise(i=>{if("document"in self){const e=document.createElement("script");e.src=s,e.onload=i,document.head.appendChild(e)}else e=s,importScripts(s),i()}).then(()=>{let e=i[s];if(!e)throw new Error(`Module ${s} didn’t register its module`);return e}));self.define=(n,r)=>{const o=e\|\|("document"in self?document.currentScript.src:"")\|\|location.href;if(i[o])return;let l={};const t=e=>s(e,o),c={module:{uri:o},exports:l,require:t};i[o]=Promise.all(n.map(e=>c[e]\|\|t(e))).then(e=>(r(...e),l))}}define(["./workbox-9c191d2f"],function(e){"use strict";self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"self-heal.js",revision:"49bd63adb25a09341f8d2610e8bd3c76"},{url:"index.html",revision:"3129d4691e071b4f7fbba97436b7a149"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-D6B0k-tm.css",revision:null},{url:"assets/index-Cc72wJyy.js",revision:null},{url:"apple-touch-icon.png",revision:"2b9301416b880d45d4bb655f2600d1f2"},{url:"icon-192.png",revision:"c5e01ac58768627e18ee7b8b6a9239ef"},{url:"icon-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon-maskable-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon.svg",revision:"c1aee186821798733dd477e69a0ef243"},{url:"manifest.webmanifest",revision:"cf88fbc5755108a7fe0616fa160a8a15"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/index.html"),{denylist:[/^\/api\//]}))});

package/dist-node/scripts/nosleep.js CHANGED Viewed

@@ -37,15 +37,24 @@ function main() {
     }
     const arg = process.argv[2];
     const seconds = parseDuration(arg);
-    // Do everything as a single root shell: set the keep-awake, then either sleep for
-    // the duration or idle forever, and ALWAYS restore on exit via the trap. One sudo
-    // prompt covers set + restore, and the trap fires even on Ctrl-C / kill. Mirror the
-    // proven battery setup — disablesleep + standby + Power Nap off — so the system
-    // stays genuinely awake (not just idle-awake) with the lid shut.
+    // Do everything as a single root shell: capture the CURRENT power settings, flip them
+    // to keep the Mac awake, and ALWAYS restore *those captured values* on exit via the
+    // trap — never assume defaults, or we'd clobber a value you (or a config profile) had
+    // deliberately set. One sudo prompt covers the whole window; the trap fires even on
+    // Ctrl-C / kill. `disablesleep` is global (reported as `SleepDisabled` by `pmset -g`);
+    // `standby`/`powernap` are per-source, so read them from the Battery Power block.
     const sleepStep = seconds !== null ? `sleep ${seconds}` : 'while :; do sleep 86400; done';
-    const set = 'pmset -a disablesleep 1 standby 0 powernap 0';
-    const restore = 'pmset -a disablesleep 0 standby 1 powernap 1';
-    const script = `${set} && trap '${restore}' EXIT INT TERM && ${sleepStep}`;
+    const battValue = (key) => `pmset -g custom | awk '/^Battery Power:/{b=1;next} /^AC Power:/{b=0} b&&$1=="${key}"{print $2;exit}'`;
+    const script = [
+        `sb=$(${battValue('standby')})`,
+        `pn=$(${battValue('powernap')})`,
+        "ds=$(pmset -g | awk '/SleepDisabled/{print $2;exit}')",
+        // Arm the restore-to-captured before changing anything, so even a failed set reverts.
+        `trap "pmset -b standby \${sb:-1} powernap \${pn:-1}; pmset -a disablesleep \${ds:-0}" EXIT INT TERM`,
+        'pmset -b standby 0 powernap 0',
+        'pmset -a disablesleep 1',
+        sleepStep
+    ].join('\n');
     console.info('conductor-remote nosleep — keeping this Mac awake (incl. lid-closed system sleep).');
     console.info(seconds !== null ? `Duration: ${arg} — Ctrl-C to stop early.` : 'Runs until you press Ctrl-C.');
     // Be honest: this handles sleep only. It does NOT enable sending with the lid shut

package/dist-node/scripts/service.js CHANGED Viewed

@@ -8,12 +8,12 @@
  *
  * `yarn deploy` builds dist/ first, then runs `install`.
  */
-import { execFileSync } from 'node:child_process';
+import { execFileSync, spawnSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { packageRoot } from "../src/pkg-root.js";
-import { exposeStorePath, magicDnsName, normalizeExposeMode, relayPort, tailscaleBin } from "../src/tailscale.js";
+import { driftWarningLines, exposeStorePath, magicDnsName, normalizeExposeMode, relayPort, tailscaleBin, writeUrlHost } from "../src/tailscale.js";
 import { qrLines } from "./qr.js";
 const LABEL = 'no.adluna.conductor-remote';
 const projectDir = packageRoot(import.meta.dirname);
@@ -30,6 +30,7 @@ const FLAG_ENV = {
     '--expose': 'EXPOSE',
     '--port': 'RELAY_PORT',
     '--host': 'RELAY_HOST',
+    '--hostname': 'RELAY_HOSTNAME',
     '--token': 'RELAY_TOKEN',
     '--write-strategy': 'WRITE_STRATEGY',
     '--auto-update': 'AUTO_UPDATE',
@@ -59,8 +60,10 @@ function applyFlags(argv) {
         process.env[envKey] = value;
     }
 }
-// argv[2] is the subcommand (see bottom); flags follow it.
-applyFlags(process.argv.slice(3));
+// argv[2] is the subcommand (see bottom); flags follow it. `logs` parses its own args (it takes -n /
+// --no-follow, which applyFlags would reject as unknown flags), so skip the shared flag pass for it.
+if ((process.argv[2] ?? 'status') !== 'logs')
+    applyFlags(process.argv.slice(3));
 function xml(s) {
     return s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 }
@@ -275,6 +278,42 @@ function ensureServeOnly(bin, url, state) {
         console.info(`      tailscale serve --bg ${RELAY_PORT}`);
     }
 }
+/**
+ * Persist a stable Tailscale device name so this node's MagicDNS URL — the origin the installed PWA is
+ * bolted to — can't drift out from under it. Tailscale otherwise *derives* the name from the Mac's
+ * LocalHostName, which a macOS update or a network/settings reset can silently clear; the name then moves
+ * (e.g. `mac` → `macbook-pro`), the URL changes, and every home-screen PWA pinned to the old origin dies
+ * with an unexplained "failed to fetch". We pin `--hostname`/`RELAY_HOSTNAME` when given (also the way to
+ * *rename* — `--hostname mac` restores a drifted node), else re-pin whatever name the node already has: a
+ * no-op on today's URL, but it turns an auto-derived name into an explicit one Tailscale won't re-derive.
+ * Best-effort — a failure just leaves the name auto-derived, exactly as before this ran.
+ */
+function pinHostname(bin) {
+    const label = (dns) => (dns ?? '').split('.')[0];
+    const current = label(magicDnsName(bin));
+    const desired = (process.env.RELAY_HOSTNAME ?? '').trim() || current;
+    if (!desired)
+        return; // node name unknown and none requested — nothing to pin
+    try {
+        execFileSync(bin, ['set', `--hostname=${desired}`], { stdio: 'pipe' });
+    }
+    catch (err) {
+        console.info(`  ⚠ could not pin tailscale hostname to "${desired}" (${err instanceof Error ? err.message.trim() : err}) — name stays auto-derived.`);
+        return;
+    }
+    if (desired === current) {
+        console.info(`✓ tailscale device name pinned to "${desired}" (won't drift on an OS hostname change)`);
+        return;
+    }
+    // A rename: wait briefly for MagicDNS to reflect it, so the URL and Funnel cert below use the new name.
+    for (let i = 0; i < 12 && label(magicDnsName(bin)) !== desired; i++)
+        sleepSync(500);
+    const actual = label(magicDnsName(bin));
+    if (actual === desired)
+        console.info(`✓ tailscale device renamed "${current || '<derived>'}" → "${desired}" and pinned`);
+    else
+        console.info(`  ⚠ requested hostname "${desired}" but the tailnet assigned "${actual}" (name likely already taken) — your URL is https://${actual}.…`);
+}
 /**
  * Front the loopback relay with a stable HTTPS URL, either publicly (`tailscale funnel`, the default) or
  * tailnet-only (`tailscale serve`), per resolveExposeMode(). Idempotent — flips Funnel off when switching
@@ -292,7 +331,10 @@ function ensureTailscale() {
         console.info(`      tailscale funnel --bg ${RELAY_PORT}   # public, or \`serve\` for tailnet-only`);
         return;
     }
+    pinHostname(bin);
     const dns = magicDnsName(bin);
+    if (dns)
+        writeUrlHost(dns); // baseline for drift detection (server startup + `service status` compare against this)
     const url = `https://${dns ?? '<node>'}/`;
     const mode = resolveExposeMode();
     const state = tailscaleState(bin, dns);
@@ -340,6 +382,11 @@ function printUrl() {
     const token = currentToken();
     const frag = `#token=${token ?? '<starts on first run>'}`;
     const bin = tailscaleBin();
+    if (bin) {
+        const drift = driftWarningLines(bin);
+        if (drift.length)
+            console.info(`\n${drift.join('\n')}`);
+    }
     const dns = bin ? magicDnsName(bin) : null;
     const state = bin ? tailscaleState(bin, dns) : { proxyOk: false, funnelOn: false };
     if (dns && state.proxyOk) {
@@ -416,6 +463,26 @@ function status() {
     }
     printUrl();
 }
+/**
+ * Stream the LaunchAgent's stdout+stderr logs (the same files the plist points at). Follows both by default
+ * — `--no-follow` for a one-shot tail, `-n N` for depth. Pure `tail` passthrough so Ctrl-C just detaches.
+ */
+function logs() {
+    const files = ['relay.log', 'relay.err.log'].map(f => path.join(logDir, f)).filter(f => fs.existsSync(f));
+    if (files.length === 0) {
+        console.info(`no logs yet in ${logDir}/ — the relay writes there once the LaunchAgent is running (\`conductor-remote service install\`).`);
+        return;
+    }
+    const argv = process.argv.slice(3);
+    const follow = !argv.includes('--no-follow');
+    const nAt = argv.indexOf('-n');
+    const count = nAt !== -1 && argv[nAt + 1] ? argv[nAt + 1] : '200';
+    const args = ['-n', count, ...(follow ? ['-F'] : []), ...files];
+    const res = spawnSync('tail', args, { stdio: 'inherit' });
+    // tail exits 0 normally; Ctrl-C kills it via SIGINT (null status). Only surface a genuine non-zero exit.
+    if (typeof res.status === 'number' && res.status !== 0)
+        process.exit(res.status);
+}
 const cmd = process.argv[2] ?? 'status';
 switch (cmd) {
     case 'install':
@@ -430,9 +497,12 @@ switch (cmd) {
     case 'status':
         status();
         break;
+    case 'logs':
+        logs();
+        break;
     default:
         console.error(`unknown command: ${cmd}\n` +
-            'usage: service.ts <install|uninstall|restart|status> [flags]\n' +
+            'usage: service.ts <install|uninstall|restart|status|logs> [flags]\n' +
             `  flags (install): ${Object.keys(FLAG_ENV).join(', ')}`);
         process.exit(1);
 }

package/dist-node/src/server.js CHANGED Viewed

@@ -11,6 +11,7 @@ import { workspaceDiff } from "./git.js";
 import { mergePr } from "./merge.js";
 import { attachPrStatus } from "./pr.js";
 import { Reads } from "./reads.js";
+import { driftWarningLines, tailscaleBin } from "./tailscale.js";
 import { describeActuator, newChat, pickActuator } from "./writes.js";
 const cfg = loadConfig();
 const db = new ConductorDb(cfg.dbPath);
@@ -256,6 +257,14 @@ server.listen(cfg.port, cfg.host, () => {
         `  Local:  http://${cfg.host}:${cfg.port}/#token=${cfg.token}`,
         '  Phone:  fronted by `tailscale funnel`/`serve` — run `yarn service status` for the HTTPS URL'
     ].join('\n'));
+    // Loud, actionable warning in relay.log if the node's MagicDNS name drifted from the saved phone URL's host
+    // (a renamed node silently bricks the installed PWA). No-ops until a drift-aware deploy recorded a baseline.
+    const tsBin = tailscaleBin();
+    if (tsBin) {
+        const drift = driftWarningLines(tsBin);
+        if (drift.length)
+            console.info(`\n${drift.join('\n')}`);
+    }
     // Keep the managed global daemon current — no-ops for dev checkouts / unmanaged runs (see autoupdate.ts).
     startAutoUpdate();
     // Keep the phone's public URL reachable — re-registers Funnel when its ingress goes stale after a

package/dist-node/src/tailscale.js CHANGED Viewed

@@ -72,3 +72,53 @@ export function readExposeMode() {
     }
     return 'public';
 }
+/** Where the phone-URL host (this node's MagicDNS name at deploy time) is recorded, so a later drift is detectable. */
+export function urlHostStorePath() {
+    return path.join(os.homedir(), 'Library', 'Application Support', 'conductor-remote', 'url-host');
+}
+/** The MagicDNS name the saved phone URL was issued for, or null if never deployed with a drift-aware build. */
+export function readUrlHost() {
+    try {
+        return fs.readFileSync(urlHostStorePath(), 'utf8').trim() || null;
+    }
+    catch {
+        return null;
+    }
+}
+/** Record the name the phone URL uses now, so a future rename can be flagged. Best-effort. */
+export function writeUrlHost(name) {
+    try {
+        fs.mkdirSync(path.dirname(urlHostStorePath()), { recursive: true });
+        fs.writeFileSync(urlHostStorePath(), name);
+    }
+    catch {
+        // non-fatal: drift detection is a convenience, not a correctness requirement
+    }
+}
+/**
+ * Has this node's MagicDNS name drifted from the one the saved phone URL points at? Tailscale derives the
+ * name from the Mac's hostname unless pinned (see service.ts ▸ pinHostname), and an OS update/reset can move
+ * it — silently bricking the installed PWA, which is bolted to the old origin. Returns both names when they
+ * disagree so callers can warn; null when there's no baseline yet or they still match.
+ */
+export function hostDrift(bin) {
+    const expected = readUrlHost();
+    if (!expected)
+        return null;
+    const current = magicDnsName(bin);
+    if (!current || current === expected)
+        return null;
+    return { expected, current };
+}
+/** Ready-to-print, actionable warning lines if the phone URL's host drifted; empty when all is well. */
+export function driftWarningLines(bin) {
+    const drift = hostDrift(bin);
+    if (!drift)
+        return [];
+    return [
+        `  ⚠ Tailscale device name changed: "${drift.expected}" → "${drift.current}".`,
+        `    The saved phone URL https://${drift.expected}/ no longer resolves — the installed PWA will fail to load.`,
+        `    Restore the old URL:  conductor-remote service install --hostname ${drift.expected.split('.')[0]}`,
+        `    …or re-add the PWA at the new URL:  https://${drift.current}/`
+    ];
+}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "conductor-remote",
-	"version": "1.24.0",
+	"version": "1.24.2",
 	"type": "module",
 	"packageManager": "yarn@4.15.0",
 	"description": "Phone control panel for local Conductor agents. Reads ride SQLite + git; prompts ride Conductor's own dispatch path.",