hub-runner 0.2.5 → 0.2.6

package/lib/launchd.mjs

@@ -1,9 +1,9 @@
 // The runner's launchd job: a plist in the user's LaunchAgents, loaded in the GUI domain, so it starts at login and
 // outlives every app. `RunAtLoad` without `KeepAlive`: a crash waits for `hub-runner start`.
 import { execFileSync, spawnSync } from 'node:child_process';
-import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
-import { dirname } from 'node:path';
-import { LABEL, credentialsFile, logFile, mainFile, plistFile, runnerDir, version } from './paths.mjs';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { LABEL, appHome, credentialsFile, logFile, mainFile, plistFile, runnerDir, version } from './paths.mjs';
 import { deviceName } from './device.mjs';
 
 const xml = (s) => String(s).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
@@ -31,9 +31,19 @@ function bootout() {
   }
 }
 
-export function plist({ takeOver }) {
+/** What the job runs: the app's install through its `current` symlink, or this npm install with the shell's pnpm. */
+function program(home) {
+  if (home) {
+    const bin = join(home, 'bin');
+    return { node: join(bin, 'node'), main: join(home, 'hub-runner', 'main.mjs'), pnpm: join(bin, 'pnpm'), path: `${bin}:${process.env.PATH}`, build: readFileSync(join(home, 'build'), 'utf8').trim() };
+  }
   const pnpm = execFileSync('/bin/sh', ['-c', 'command -v pnpm'], { encoding: 'utf8' }).trim();
-  const env = { HUB_PNPM: pnpm, PATH: process.env.PATH, HUB_RUNNER_DIR: runnerDir(), HUB_RUNNER_BUILD: version(), HUB_DEVICE_NAME: deviceName(), ...(takeOver ? { HUB_RUNNER_TAKE_OVER: '1' } : {}) };
+  return { node: process.execPath, main: mainFile(), pnpm, path: process.env.PATH, build: version() };
+}
+
+export function plist({ takeOver }) {
+  const run = program(appHome());
+  const env = { HUB_PNPM: run.pnpm, PATH: run.path, HUB_RUNNER_DIR: runnerDir(), HUB_RUNNER_BUILD: run.build, HUB_DEVICE_NAME: deviceName(), ...(takeOver ? { HUB_RUNNER_TAKE_OVER: '1' } : {}) };
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -42,8 +52,8 @@ export function plist({ takeOver }) {
   <string>${LABEL}</string>
   <key>ProgramArguments</key>
   <array>
-    <string>${xml(process.execPath)}</string>
-    <string>${xml(mainFile())}</string>
+    <string>${xml(run.node)}</string>
+    <string>${xml(run.main)}</string>
   </array>
   <key>WorkingDirectory</key>
   <string>${xml(runnerDir())}</string>
@@ -77,9 +87,11 @@ export function stop() {
   if (loaded()) bootout();
 }
 
-/** Starts the loaded job again, or loads it from the plist the last `start` wrote. */
+/** Starts the loaded job again, or loads it from the plist the last `start` wrote. The app's install writes the plist
+ * again first, because its `HUB_RUNNER_BUILD` names the version `current` points at now. */
 export function kickstart() {
-  if (loaded()) launchctl(['kickstart', '-k', `${domain()}/${LABEL}`]);
+  if (appHome()) start();
+  else if (loaded()) launchctl(['kickstart', '-k', `${domain()}/${LABEL}`]);
   else if (existsSync(plistFile())) launchctl(['bootstrap', domain(), plistFile()]);
   else throw new Error('not started yet: run `hub-runner start`');
 }

package/lib/paths.mjs

@@ -10,3 +10,6 @@ export const logFile = () => join(runnerDir(), 'runner.log');
 export const plistFile = () => join(homedir(), 'Library', 'LaunchAgents', `${LABEL}.plist`);
 export const mainFile = () => new URL('../main.mjs', import.meta.url).pathname;
 export const version = () => JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;
+// The Hub app's own install (native/Sources/HubCore/RunnerInstall.swift): Node, pnpm and this package under the
+// `current` symlink the app moves on each update, so the launchd job always runs the version the app installed last.
+export const appHome = () => process.env.HUB_RUNNER_HOME || null;

package/main.mjs

@@ -5005,6 +5005,7 @@ var deviceFile = join16(dir, "device-id");
 if (!existsSync11(deviceFile)) writeFileSync7(deviceFile, randomUUID());
 var device = readFileSync10(deviceFile, "utf8").trim();
 var credentials = process.env.HUB_URL || process.env.HUB_SESSION ? { hubUrl: need("HUB_URL"), session: need("HUB_SESSION"), bypass: process.env.HUB_PROTECTION_BYPASS || void 0 } : JSON.parse(readFileSync10(join16(dir, "credentials.json"), "utf8"));
+if ("workspace" in credentials && credentials.workspace) status("starting", { workspace: credentials.workspace });
 var deviceName = process.env.HUB_DEVICE_NAME || device;
 var started = await run3({
   hubUrl: credentials.hubUrl.replace(/\/$/, ""),

package/package.json

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