hub-runner 0.1.1 → 0.1.2

package/bin/hub-runner.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { existsSync, readFileSync, rmSync } from 'node:fs';
 import { spawn } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
 import { setTimeout as sleep } from 'node:timers/promises';
 import { credentialsFile, logFile } from '../lib/paths.mjs';
 import { kickstart, loaded, start, stop } from '../lib/launchd.mjs';
@@ -17,16 +18,23 @@ const USAGE = `hub-runner login | start [--take-over] | stop | restart | status
   logs       the runner's log; -f follows it
   logout     stop the runner and forget the sign-in`;
 
-/** SIGUSR2 drains the runner (open turns finish, nothing new starts) and it exits 6; then launchd starts it again. */
+/** SIGUSR2 drains the runner (open turns finish, nothing new starts) and it exits 6; then launchd starts it again.
+ * The signal, the wait and the kickstart all run in a detached process: run from a bot the runner hosts, this CLI is
+ * in the runner's process group, which launchd kills when the runner exits. */
 async function restart() {
   const runner = live();
-  if (runner) {
-    console.log(`waiting for open turns on pid ${runner.pid} to finish`);
-    process.kill(runner.pid, 'SIGUSR2');
-    while (alive(runner.pid)) await sleep(250);
-    const { exitCode } = read(runner.pid);
-    if (exitCode !== 6) throw new Error(`the runner ended during the drain with exit code ${exitCode}, not 6: see \`hub-runner logs\`, then run \`hub-runner start\``);
-  }
+  if (!runner) return kickstart();
+  console.log(`waiting for open turns on pid ${runner.pid} to finish`);
+  const relaunch = spawn(process.execPath, [fileURLToPath(import.meta.url), 'relaunch', String(runner.pid)], { detached: true, stdio: ['ignore', 'ignore', 'inherit'] });
+  const code = await new Promise((resolve, reject) => relaunch.on('error', reject).on('exit', resolve));
+  if (code !== 0) process.exitCode = 1;
+}
+
+async function relaunch(pid) {
+  process.kill(pid, 'SIGUSR2');
+  while (alive(pid)) await sleep(250);
+  const { exitCode } = read(pid);
+  if (exitCode !== 6) throw new Error(`the runner ended during the drain with exit code ${exitCode}, not 6: see \`hub-runner logs\`, then run \`hub-runner start\``);
   kickstart();
 }
 
@@ -54,6 +62,7 @@ try {
     case 'start': start({ takeOver: args.includes('--take-over') }); console.log('started: see `hub-runner status`'); break;
     case 'stop': stop(); break;
     case 'restart': await restart(); break;
+    case 'relaunch': await relaunch(Number(args[0])); break;
     case 'status': status(); break;
     case 'logs': logs(args.includes('-f')); break;
     case 'logout': stop(); rmSync(credentialsFile(), { force: true }); break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hub-runner",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "Apache-2.0",
   "description": "Runs a hub workspace's Mac bots on this Mac under launchd, with no app needed.",
   "type": "module",