charness 3.8.0 → 3.9.0

package/dist/runnerUtility/serviceCommon.js

@@ -0,0 +1,209 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rootUid = exports.commandTimeoutMs = void 0;
+exports.fail = fail;
+exports.formatSystemStepAnswer = formatSystemStepAnswer;
+exports.parseSystemStepAnswer = parseSystemStepAnswer;
+exports.getLaunchdFiles = getLaunchdFiles;
+exports.resolveMacAccount = resolveMacAccount;
+exports.resolveLinuxAccount = resolveLinuxAccount;
+exports.writeDefinition = writeDefinition;
+exports.readPreviousDefinitions = readPreviousDefinitions;
+exports.restorePreviousDefinitions = restorePreviousDefinitions;
+exports.bootOutAndWaitUntilGone = bootOutAndWaitUntilGone;
+exports.stopLaunchdJobs = stopLaunchdJobs;
+exports.installLaunchdJobs = installLaunchdJobs;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const commandRunner_1 = require("../selfUpdate/commandRunner");
+/**
+ * @description What the account's own service install (`serviceManager.ts`, needs the installed package and so its dependencies) and the
+ * admin's root step (`adminService.ts`, runs from a root-owned copy of the package that has NO dependencies) share: the result shape, the
+ * account lookups, the launchd job loader with its rollback, and the definition files. Node built-ins only, because the root step may
+ * import nothing else.
+ */
+exports.commandTimeoutMs = 60 * 1000;
+exports.rootUid = 0;
+const wheelGid = 0;
+const unitFileMode = 0o644;
+const logsDirMode = 0o700;
+const unloadPollMs = 300;
+const unloadPollAttempts = 10;
+function fail(...lines) {
+    return { ok: false, lines };
+}
+function formatSystemStepAnswer(answer) {
+    return `${JSON.stringify(answer)}\n`;
+}
+/** @description The answer in the LAST non-empty line of `output`, or `null` when there is none that reads as one. */
+function parseSystemStepAnswer(output) {
+    const lastLine = output.split('\n').map((line) => line.trim()).filter((line) => line !== '').at(-1);
+    if (lastLine === undefined)
+        return null;
+    try {
+        const parsed = JSON.parse(lastLine);
+        if (parsed.ok === true && typeof parsed.hadService === 'boolean')
+            return { ok: true, hadService: parsed.hadService };
+        if (parsed.ok === false && Array.isArray(parsed.lines) && parsed.lines.every((line) => typeof line === 'string'))
+            return { ok: false, lines: parsed.lines };
+    }
+    catch {
+        return null;
+    }
+    return null;
+}
+function getLaunchdFiles(isSystem, homeDir, names, daemonsDir) {
+    const directory = isSystem ? daemonsDir : path.join(homeDir, 'Library', 'LaunchAgents');
+    return { directory, link: path.join(directory, `${names.launchdLink}.plist`), pueued: path.join(directory, `${names.launchdPueued}.plist`) };
+}
+/**
+ * The account from `id` and the directory service (`dscl`). A home folder that cannot be read from there is NOT guessed: root writes
+ * definitions that name it, so no answer means no account.
+ */
+async function resolveMacAccount(name, runner) {
+    const uid = await runner('id', ['-u', name], { timeoutMs: exports.commandTimeoutMs });
+    const gid = await runner('id', ['-g', name], { timeoutMs: exports.commandTimeoutMs });
+    if (!uid.ok || !gid.ok)
+        return null;
+    const home = await runner('dscl', ['.', '-read', `/Users/${name}`, 'NFSHomeDirectory'], { timeoutMs: exports.commandTimeoutMs });
+    const homeDir = home.ok ? /NFSHomeDirectory:\s*(\S.*)$/m.exec(home.stdout)?.[1].trim() : undefined;
+    if (homeDir === undefined || !path.isAbsolute(homeDir))
+        return null;
+    return { name, uid: Number(uid.stdout.trim()), gid: Number(gid.stdout.trim()), homeDir };
+}
+/** `getent passwd <name>` → `name:x:uid:gid:gecos:home:shell`. */
+async function resolveLinuxAccount(name, runner) {
+    const entry = await runner('getent', ['passwd', name], { timeoutMs: exports.commandTimeoutMs });
+    if (!entry.ok)
+        return null;
+    const [accountName, , uid, gid, , homeDir] = entry.stdout.trim().split(':');
+    if (accountName !== name || homeDir === undefined || homeDir === '' || !/^\d+$/.test(uid) || !/^\d+$/.test(gid))
+        return null;
+    return { name, uid: Number(uid), gid: Number(gid), homeDir };
+}
+function writeDefinition(filePath, text) {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    fs.writeFileSync(filePath, text, { mode: unitFileMode });
+    fs.chmodSync(filePath, unitFileMode);
+}
+/** @description The files of a service that already exists, as they are now: a failed re-install puts them back instead of tearing the working service down. */
+function readPreviousDefinitions(files) {
+    return files.map((file) => ({ file, content: fs.existsSync(file) ? fs.readFileSync(file, 'utf8') : null }));
+}
+/** @description Put `previous` back: a file that existed gets its text again, one this install made new (it had no earlier version) is removed. */
+function restorePreviousDefinitions(previous) {
+    for (const { file, content } of previous) {
+        if (content === null)
+            fs.rmSync(file, { force: true });
+        else
+            writeDefinition(file, content);
+    }
+}
+/**
+ * @description Boot a job out and wait (bounded: 3 s) until launchd no longer has it loaded; `false` when it still is. A `bootstrap` right
+ * after a `bootout` often fails with error 5 while launchd is still tearing the old job down, and a check right after it can find the job
+ * «still loaded»: `print` succeeds only for a job that is still loaded.
+ */
+async function bootOutAndWaitUntilGone(label, domain, runner) {
+    await runner('launchctl', ['bootout', `${domain}/${label}`], { timeoutMs: exports.commandTimeoutMs });
+    for (let attempt = 0; attempt < unloadPollAttempts; attempt += 1) {
+        const loaded = await runner('launchctl', ['print', `${domain}/${label}`], { timeoutMs: exports.commandTimeoutMs });
+        if (!loaded.ok)
+            return true;
+        await new Promise((resolve) => { setTimeout(resolve, unloadPollMs); });
+    }
+    return false;
+}
+async function stopLaunchdJobs(labels, domain, runner) {
+    for (const label of labels) {
+        if (!(await bootOutAndWaitUntilGone(label, domain, runner)))
+            return `${label} is still loaded in ${domain}`;
+    }
+    return null;
+}
+/** @description Load the jobs in order; stops at the first that fails. `touchedFiles` are the definitions it had rewritten (and booted out the old job of) by then, the failing one included. */
+async function loadLaunchdJobs(entries, plan) {
+    const touchedFiles = [];
+    for (const { job, file } of entries) {
+        if (plan.isLogDirMade)
+            fs.mkdirSync(path.dirname(job.logPath), { recursive: true, mode: logsDirMode });
+        touchedFiles.push(file);
+        writeDefinition(file, plan.render(job));
+        plan.giveToRoot?.(file, exports.rootUid, wheelGid);
+        await bootOutAndWaitUntilGone(job.label, plan.domain, plan.runner);
+        const boot = await plan.runner('launchctl', ['bootstrap', plan.domain, file], { timeoutMs: exports.commandTimeoutMs });
+        if (!boot.ok)
+            return { ...fail(`launchctl bootstrap ${plan.domain} failed for ${job.label}: ${(0, commandRunner_1.getOutputTail)(boot, 1)}`), touchedFiles };
+    }
+    return { ok: true, lines: [], touchedFiles };
+}
+/**
+ * @description Write and load the queue's job, then the link's. A failure rolls back: a first install is stopped and its files removed; a
+ * re-install gets its earlier definitions back and loaded again, as far as it was touched, and says honestly whether that worked.
+ */
+async function installLaunchdJobs(plan) {
+    const { files, names, hadService, runner, domain } = plan;
+    const previous = hadService ? readPreviousDefinitions([files.pueued, files.link]) : [];
+    const loaded = await loadLaunchdJobs([{ job: plan.jobs.pueued, file: files.pueued }, { job: plan.jobs.link, file: files.link }], plan);
+    if (loaded.ok)
+        return { ok: true, lines: [] };
+    if (hadService) {
+        // A re-install that fails must not leave the working service unloaded: the definitions this pass rewrote come back, and launchd
+        // loads those jobs again. A job the pass never reached keeps running untouched. Each load is checked and the answer is honest.
+        const touched = previous.filter((entry) => loaded.touchedFiles.includes(entry.file));
+        restorePreviousDefinitions(touched);
+        const notLoaded = [];
+        for (const { file, content } of touched) {
+            const label = file === files.link ? names.launchdLink : names.launchdPueued;
+            await bootOutAndWaitUntilGone(label, domain, runner);
+            if (content === null)
+                continue;
+            plan.giveToRoot?.(file, exports.rootUid, wheelGid);
+            const reboot = await runner('launchctl', ['bootstrap', domain, file], { timeoutMs: exports.commandTimeoutMs });
+            if (!reboot.ok)
+                notLoaded.push(label);
+        }
+        return fail(...loaded.lines, notLoaded.length === 0
+            ? 'The service installed before was loaded again as it was.'
+            : `The service installed before could NOT be loaded again (${notLoaded.join(', ')}): ${plan.retryText}`);
+    }
+    await stopLaunchdJobs([names.launchdLink, names.launchdPueued], domain, runner);
+    for (const file of [files.link, files.pueued])
+        fs.rmSync(file, { force: true });
+    await plan.forgetFirstInstall();
+    return fail(...loaded.lines, 'Nothing was left installed.');
+}
+//# sourceMappingURL=serviceCommon.js.map

package/dist/runnerUtility/serviceCommon.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serviceCommon.js","sourceRoot":"","sources":["../../src/runnerUtility/serviceCommon.ts"],"names":[],"mappings":"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"}

package/dist/runnerUtility/serviceManager.d.ts

@@ -1,16 +1,11 @@
 import { type CommandRunner } from '../selfUpdate/commandRunner';
 import { type RunnerHomePaths } from './runnerHome';
+import { type ServiceResult, type SystemStepAnswer } from './serviceCommon';
 export type ServiceKind = 'user-service' | 'system-service';
-export interface TargetAccount {
-    name: string;
-    uid: number;
-    gid: number;
-    homeDir: string;
-}
 export interface ServiceDeps {
     runner: CommandRunner;
     platform: NodeJS.Platform;
-    /** The uid of this process (a `--system` install must be root). */
+    /** The uid of this process. */
     uid: number;
     /** Is `pid` the runner's link (alive and running `runnerCli.js run`)? A stale or reused pid in `status.json` is not. */
     checkIsRunnerLink: (pid: number) => boolean;
@@ -18,22 +13,15 @@ export interface ServiceDeps {
     accountName: string;
     homeDir: string;
     nodePath: string;
-    /** Where LaunchDaemons live (`/Library/LaunchDaemons`; a test's own folder). */
+    /** Where LaunchDaemons live (`/Library/LaunchDaemons`; a test's own folder): read to see whether an always-on service is gone. */
     launchDaemonsDir: string;
-    /** Give a file to an account (`fs.chownSync`; a test is not root). */
-    chown: (filePath: string, uid: number, gid: number) => void;
-    /** Who `--user <name>` names; `null` when there is no such account. */
-    resolveAccount: (name: string) => Promise<TargetAccount | null>;
 }
 export interface ServiceRequest {
     isSystem: boolean;
     /** `--user`: required with `--system`. */
     userName: string | null;
 }
-export interface ServiceResult {
-    ok: boolean;
-    lines: string[];
-}
+export type { ServiceResult } from './serviceCommon';
 export type ServiceCommandParsing = {
     ok: true;
     action: 'install' | 'uninstall';
@@ -42,13 +30,22 @@ export type ServiceCommandParsing = {
     ok: false;
     error: string;
 };
-/** @description `install|uninstall [--system --user <name>]`. */
+/** @description `install|uninstall [--system --user <name>]` (the pair is read only to be refused with the way that works). */
 export declare function parseServiceCommand(args: readonly string[]): ServiceCommandParsing;
 export declare function createServiceDeps(): ServiceDeps;
 /** @description The kind written by the last install, or `null`. */
 export declare function readServiceKind(paths: RunnerHomePaths): ServiceKind | null;
+/** The admin's commands that remove a runner's always-on service: plain `launchctl` and `rm`, no charness code runs as root. */
+export declare function formatSystemServiceRemoval(paths: RunnerHomePaths, daemonsDir: string): string[];
 /** @description `service install` for `request`. */
 export declare function installService(request: ServiceRequest, deps: ServiceDeps): Promise<ServiceResult>;
 /** @description `service uninstall` for `request`. */
 export declare function uninstallService(request: ServiceRequest, deps: ServiceDeps): Promise<ServiceResult>;
+/**
+ * @description `service system-step prepare|abandon` — the ACCOUNT's side of the always-on install, run by the admin step
+ * (`adminService.ts`) through `sudo -u <account>`, never by hand. `prepare` does what must be true before the daemons start (the same as a
+ * user service's install, `prepareManagedStart`, and the account must be paired and have no LaunchAgents) and answers in one JSON line;
+ * `abandon` forgets the record `prepare` wrote when the daemons could not be loaded and nothing was left installed.
+ */
+export declare function runSystemStep(step: string, deps: ServiceDeps): Promise<SystemStepAnswer>;
 //# sourceMappingURL=serviceManager.d.ts.map

package/dist/runnerUtility/serviceManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serviceManager.d.ts","sourceRoot":"","sources":["../../src/runnerUtility/serviceManager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAI7E,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAiCxE,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,gBAAgB,CAAC;AAE5D,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,aAAa,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,mEAAmE;IACnE,GAAG,EAAE,MAAM,CAAC;IACZ,wHAAwH;IACxH,iBAAiB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IAC5C,wDAAwD;IACxD,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,gFAAgF;IAChF,gBAAgB,EAAE,MAAM,CAAC;IACzB,sEAAsE;IACtE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,uEAAuE;IACvE,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,OAAO,CAAC;IAClB,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,MAAM,qBAAqB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,WAAW,CAAC;IAAC,OAAO,EAAE,cAAc,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1I,iEAAiE;AACjE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,qBAAqB,CAgBlF;AAWD,wBAAgB,iBAAiB,IAAI,WAAW,CAa/C;AAED,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,WAAW,GAAG,IAAI,CAO1E;AAqRD,oDAAoD;AACpD,wBAAsB,cAAc,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAMvG;AAED,sDAAsD;AACtD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAKzG"}
+{"version":3,"file":"serviceManager.d.ts","sourceRoot":"","sources":["../../src/runnerUtility/serviceManager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAI7E,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EAUL,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AA8BzB,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,gBAAgB,CAAC;AAE5D,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,aAAa,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,+BAA+B;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,wHAAwH;IACxH,iBAAiB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IAC5C,wDAAwD;IACxD,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,kIAAkI;IAClI,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,OAAO,CAAC;IAClB,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,MAAM,qBAAqB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,WAAW,CAAC;IAAC,OAAO,EAAE,cAAc,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1I,+HAA+H;AAC/H,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,qBAAqB,CAgBlF;AAED,wBAAgB,iBAAiB,IAAI,WAAW,CAW/C;AAED,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,WAAW,GAAG,IAAI,CAO1E;AAwID,gIAAgI;AAChI,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAQ/F;AAkCD,oDAAoD;AACpD,wBAAsB,cAAc,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAOvG;AAED,sDAAsD;AACtD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAMzG;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiB9F"}