dsh-update-status 0.3.1 → 0.4.0

package/lib/service-cli.js

@@ -1,344 +1,67 @@
-import { createRequire } from "node:module";
-import { accessSync, constants, existsSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
-import { dirname, isAbsolute, join, resolve } from "node:path";
-import { homedir } from "node:os";
-import { createServer } from "node:net";
+import { a as WINDOWS_TASK_NAME, c as parseSystemdMainPid, d as bootStampFile, f as countRecentRestarts, h as serviceLogDir, i as SYSTEMD_UNIT, l as parseWindowsTaskRunning, n as specFromArgs, s as parseLaunchdTrackedPid, t as planFor, u as RESTART_STORM_WINDOW_MS } from "./plan-BornHBEZ.js";
+import { accessSync, constants, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
 import { spawnSync } from "node:child_process";
-//#region src/service/plan.ts
-/** Build transparent per-OS user-service definitions; do not install them here. */
-const SERVICE_LABEL = "com.idoall.dsh-update-status.web";
-const SUPERVISOR_MARKER = "dsh-update-status";
-function xml(value) {
-	return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
-}
-function systemd(value) {
-	return value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
-}
-function powerShell(value) {
-	return value.replace(/'/g, "''");
-}
-function boundedPort(value) {
-	const port = typeof value === "number" ? value : Number(value);
-	if (!Number.isInteger(port) || port < 1 || port > 65535) throw new Error("`--port` must be an integer from 1 to 65535");
-	return port;
-}
-function valueAfter(args, flag) {
-	const index = args.indexOf(flag);
-	if (index < 0) return void 0;
-	const value = args[index + 1];
-	if (value === void 0 || value.startsWith("--")) throw new Error(`missing value after ${flag}`);
-	return value;
-}
-/**
-* Resolve the real JS file behind `@deepseek-ai/dsh`'s `bin.dsh`, using the
-* selected profile as a Node resolution anchor. This avoids platform shell
-* shims (`dsh.cmd`) and keeps every native service on `node <absolute-js>`.
-*/
-function dshPathOf(env, profile, dshHome, override) {
-	const fromArg = override?.trim();
-	if (fromArg !== void 0 && fromArg !== "") return isAbsolute(fromArg) ? fromArg : resolve(env.cwd, fromArg);
-	const home = dshHome ?? join(env.home || homedir(), ".dsh");
-	try {
-		const anchor = join(home, "profiles", profile, "dsh-update-status-service-resolver.cjs");
-		const manifestPath = createRequire(anchor).resolve("@deepseek-ai/dsh/package.json");
-		const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
-		if (manifest.name !== "@deepseek-ai/dsh" || typeof manifest.bin?.dsh !== "string") throw new Error("invalid dsh package manifest");
-		return realpathSync(join(dirname(manifestPath), manifest.bin.dsh));
-	} catch (error) {
-		throw new Error(`cannot resolve @deepseek-ai/dsh from profile ${profile}; rerun with --dsh /absolute/path/to/lib/bin.js (${error instanceof Error ? error.message : String(error)})`);
-	}
-}
-function servicePlatform(value) {
-	if (value === "darwin" || value === "linux" || value === "win32") return value;
-	throw new Error(`unsupported platform: ${value}; supported: macOS, Linux, Windows`);
-}
-function specFromArgs(args, env) {
-	const platform = servicePlatform(env.platform);
-	const profile = valueAfter(args, "--profile") ?? env.env.DSH_PROFILE ?? "web";
-	const workspace = valueAfter(args, "--workspace");
-	if (workspace === void 0) throw new Error("`--workspace` is required and must be the absolute directory DSH should use");
-	const host = valueAfter(args, "--host") ?? "127.0.0.1";
-	const port = boundedPort(valueAfter(args, "--port") ?? 3080);
-	const home = env.home || homedir();
-	const dshHome = valueAfter(args, "--dsh-home") ?? (env.env.DSH_HOME?.trim() || void 0);
-	if (dshHome !== void 0 && !isAbsolute(dshHome)) throw new Error("`--dsh-home` must be an absolute path");
-	const logDir = valueAfter(args, "--log-dir") ?? join(dshHome ?? join(home, ".dsh"), "logs");
-	const dshPath = dshPathOf(env, profile, dshHome, valueAfter(args, "--dsh"));
-	const nodePath = valueAfter(args, "--node") ?? env.execPath;
-	if (!isAbsolute(nodePath)) throw new Error("`--node` must be an absolute executable path");
-	if (!isAbsolute(dshPath)) throw new Error("`--dsh` must be an absolute executable path");
-	if (!isAbsolute(workspace)) throw new Error("`--workspace` must be an absolute path");
-	if (!isAbsolute(logDir)) throw new Error("`--log-dir` must be an absolute path");
-	return {
-		schemaVersion: 1,
-		platform,
-		label: SERVICE_LABEL,
-		nodePath,
-		dshPath,
-		profile,
-		workspace,
-		host,
-		port,
-		home,
-		...dshHome === void 0 ? {} : { dshHome },
-		logDir,
-		supervisorMarker: SUPERVISOR_MARKER
-	};
-}
-function pathsFor(spec) {
-	const root = spec.dshHome ?? join(spec.home, ".dsh");
-	const stdoutFile = join(spec.logDir, "dsh-web-service.stdout.log");
-	const stderrFile = join(spec.logDir, "dsh-web-service.stderr.log");
-	if (spec.platform === "darwin") return {
-		stateFile: join(root, "dsh-update-status-service.json"),
-		definitionFile: join(spec.home, "Library", "LaunchAgents", `${spec.label}.plist`),
-		stdoutFile,
-		stderrFile
-	};
-	if (spec.platform === "linux") return {
-		stateFile: join(root, "dsh-update-status-service.json"),
-		definitionFile: join(spec.home, ".config", "systemd", "user", "dsh-update-status-web.service"),
-		stdoutFile,
-		stderrFile
-	};
-	const base = envLocalAppData(spec);
-	return {
-		stateFile: join(root, "dsh-update-status-service.json"),
-		definitionFile: join(base, "dsh-update-status", "dsh-web-task.xml"),
-		wrapperFile: join(base, "dsh-update-status", "dsh-web-supervisor.ps1"),
-		stdoutFile,
-		stderrFile
-	};
-}
-function envLocalAppData(spec) {
-	return join(spec.home, "AppData", "Local");
-}
-function webArguments(spec) {
-	return [
-		spec.dshPath,
-		"--profile",
-		spec.profile,
-		"--host",
-		spec.host,
-		"--port",
-		String(spec.port),
-		"--no-open"
-	];
-}
-function launchdDefinition(spec, paths) {
-	const args = [spec.nodePath, ...webArguments(spec)].map((value) => `    <string>${xml(value)}</string>`).join("\n");
-	const envXml = [
-		["HOME", spec.home],
-		["PATH", `${dirname(spec.nodePath)}:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin`],
-		["DSH_WEB_SUPERVISOR", spec.supervisorMarker],
-		...spec.dshHome === void 0 ? [] : [["DSH_HOME", spec.dshHome]]
-	].map(([key, value]) => `    <key>${xml(key)}</key>\n    <string>${xml(value)}</string>`).join("\n");
-	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">
-<dict>
-  <key>Label</key>
-  <string>${xml(spec.label)}</string>
-  <key>ProgramArguments</key>
-  <array>
-${args}
-  </array>
-  <key>WorkingDirectory</key>
-  <string>${xml(spec.workspace)}</string>
-  <key>RunAtLoad</key>
-  <true/>
-  <key>KeepAlive</key>
-  <true/>
-  <key>ThrottleInterval</key>
-  <integer>3</integer>
-  <key>EnvironmentVariables</key>
-  <dict>
-${envXml}
-  </dict>
-  <key>StandardOutPath</key>
-  <string>${xml(paths.stdoutFile)}</string>
-  <key>StandardErrorPath</key>
-  <string>${xml(paths.stderrFile)}</string>
-</dict>
-</plist>
-`;
-}
-function systemdDefinition(spec) {
-	const command = [spec.nodePath, ...webArguments(spec)].map((value) => `"${systemd(value)}"`).join(" ");
-	const env = [
-		`Environment="HOME=${systemd(spec.home)}"`,
-		`Environment="PATH=${systemd(`${dirname(spec.nodePath)}:/usr/local/bin:/usr/bin:/bin`)}"`,
-		`Environment="DSH_WEB_SUPERVISOR=${spec.supervisorMarker}"`,
-		...spec.dshHome === void 0 ? [] : [`Environment="DSH_HOME=${systemd(spec.dshHome)}"`]
-	].join("\n");
-	return `[Unit]
-Description=DSH Web managed by dsh-update-status
-After=network-online.target
-
-[Service]
-Type=simple
-WorkingDirectory="${systemd(spec.workspace)}"
-${env}
-ExecStart=${command}
-Restart=on-failure
-RestartSec=3
-
-[Install]
-WantedBy=default.target
-`;
-}
-function windowsWrapper(spec, paths) {
-	const node = powerShell(spec.nodePath);
-	const dsh = powerShell(spec.dshPath);
-	const workspace = powerShell(spec.workspace);
-	const out = powerShell(paths.stdoutFile);
-	const err = powerShell(paths.stderrFile);
-	const home = powerShell(spec.home);
-	const dshHome = spec.dshHome === void 0 ? "" : `$env:DSH_HOME = '${powerShell(spec.dshHome)}'\n`;
-	return `$ErrorActionPreference = 'Stop'
-$env:HOME = '${home}'
-$env:DSH_WEB_SUPERVISOR = '${spec.supervisorMarker}'
-${dshHome}Set-Location -LiteralPath '${workspace}'
-while ($true) {
-  & '${node}' '${dsh}' --profile '${powerShell(spec.profile)}' --host '${powerShell(spec.host)}' --port '${String(spec.port)}' --no-open 1>> '${out}' 2>> '${err}'
-  $exitCode = $LASTEXITCODE
-  Start-Sleep -Seconds 3
-  # The user service owns deliberate restarts (exit 42) and unexpected exits.
-  # Manual uninstall stops the scheduled task, which ends this wrapper.
-}
-`;
-}
-function windowsDefinition(spec, paths) {
-	const wrapper = paths.wrapperFile;
-	if (wrapper === void 0) throw new Error("Windows service plan requires a wrapper path");
-	return `<?xml version="1.0" encoding="UTF-8"?>
-<Task version="1.4" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
-  <RegistrationInfo><Description>DSH Web managed by dsh-update-status</Description></RegistrationInfo>
-  <Triggers><LogonTrigger><Enabled>true</Enabled></LogonTrigger></Triggers>
-  <Principals><Principal id="Author"><LogonType>InteractiveToken</LogonType><RunLevel>LeastPrivilege</RunLevel></Principal></Principals>
-  <Settings><MultipleInstancesPolicy>IgnoreNew</MultipleInstancesPolicy><StartWhenAvailable>true</StartWhenAvailable><ExecutionTimeLimit>PT0S</ExecutionTimeLimit></Settings>
-  <Actions Context="Author"><Exec><Command>powershell.exe</Command><Arguments>-NoProfile -ExecutionPolicy Bypass -File &quot;${xml(wrapper)}&quot;</Arguments></Exec></Actions>
-</Task>
-`;
-}
-/** Generate a service plan without writing, starting, or stopping anything. */
-function planFor(spec, uid = 0) {
-	const paths = pathsFor(spec);
+import { createServer } from "node:net";
+async function observeServiceState(spec, run, uid) {
 	if (spec.platform === "darwin") {
-		const domain = `gui/${uid}`;
-		return {
-			spec,
-			paths,
-			definition: launchdDefinition(spec, paths),
-			installCommand: [
-				"launchctl",
-				"bootstrap",
-				domain,
-				paths.definitionFile
-			],
-			startCommand: [
-				"launchctl",
-				"kickstart",
-				"-k",
-				`${domain}/${spec.label}`
-			],
-			statusCommand: [
-				"launchctl",
-				"print",
-				`${domain}/${spec.label}`
-			],
-			stopCommand: [
-				"launchctl",
-				"bootout",
-				`${domain}/${spec.label}`
-			],
-			uninstallCommand: [
-				"launchctl",
-				"bootout",
-				`${domain}/${spec.label}`
-			]
+		const result = run("launchctl", ["print", `gui/${String(uid)}/${spec.label}`]);
+		const pid = parseLaunchdTrackedPid(result.stdout);
+		return pid === void 0 ? { running: false } : {
+			running: true,
+			pid
 		};
 	}
-	if (spec.platform === "linux") return {
-		spec,
-		paths,
-		definition: systemdDefinition(spec),
-		installCommand: [
-			"systemctl",
+	if (spec.platform === "linux") {
+		const result = run("systemctl", [
 			"--user",
-			"daemon-reload"
-		],
-		startCommand: [
-			"systemctl",
-			"--user",
-			"enable",
-			"--now",
-			"dsh-update-status-web.service"
-		],
-		statusCommand: [
-			"systemctl",
-			"--user",
-			"status",
-			"dsh-update-status-web.service"
-		],
-		stopCommand: [
-			"systemctl",
-			"--user",
-			"disable",
-			"--now",
-			"dsh-update-status-web.service"
-		],
-		uninstallCommand: [
-			"systemctl",
-			"--user",
-			"disable",
-			"--now",
-			"dsh-update-status-web.service"
-		]
-	};
-	return {
-		spec,
-		paths,
-		definition: windowsDefinition(spec, paths),
-		wrapper: windowsWrapper(spec, paths),
-		installCommand: [
-			"schtasks.exe",
-			"/Create",
-			"/TN",
-			"DSH Update Status Web",
-			"/XML",
-			paths.definitionFile,
-			"/F"
-		],
-		startCommand: [
-			"schtasks.exe",
-			"/Run",
-			"/TN",
-			"DSH Update Status Web"
-		],
-		statusCommand: [
-			"schtasks.exe",
-			"/Query",
-			"/TN",
-			"DSH Update Status Web",
-			"/V",
-			"/FO",
-			"LIST"
-		],
-		stopCommand: [
-			"schtasks.exe",
-			"/End",
-			"/TN",
-			"DSH Update Status Web"
-		],
-		uninstallCommand: [
-			"schtasks.exe",
-			"/Delete",
-			"/TN",
-			"DSH Update Status Web",
-			"/F"
-		]
-	};
+			"show",
+			SYSTEMD_UNIT,
+			"-p",
+			"MainPID",
+			"--value"
+		]);
+		const pid = parseSystemdMainPid(result.stdout);
+		return pid === void 0 ? { running: false } : {
+			running: true,
+			pid
+		};
+	}
+	const result = run("powershell.exe", [
+		"-NoProfile",
+		"-NonInteractive",
+		"-Command",
+		`(Get-ScheduledTask -TaskName '${WINDOWS_TASK_NAME}').State`
+	]);
+	return { running: parseWindowsTaskRunning(result.stdout) };
+}
+function defaultSleep(ms) {
+	return new Promise((resolve) => {
+		setTimeout(resolve, ms);
+	});
+}
+async function verifyActivatedService(spec, options) {
+	const attempts = options.attempts ?? 4;
+	const intervalMs = options.intervalMs ?? 5e3;
+	const sleep = options.sleep ?? defaultSleep;
+	const uid = options.uid ?? 0;
+	const recentRestarts = options.recentRestarts ?? (() => countRecentRestarts(serviceLogDir(), bootStampFile(), Date.now(), 18e4));
+	for (let attempt = 0; attempt < attempts; attempt += 1) {
+		const restarts = recentRestarts();
+		if (restarts >= 4) return {
+			kind: "crash-loop",
+			recentRestarts: restarts,
+			windowMs: RESTART_STORM_WINDOW_MS
+		};
+		if ((await observeServiceState(spec, options.run, uid)).running) {
+			if (attempt === attempts - 1) return { kind: "settled" };
+			await sleep(intervalMs);
+			continue;
+		}
+		if (attempt === attempts - 1) return { kind: "not-running" };
+		await sleep(intervalMs);
+	}
+	return { kind: "not-running" };
 }
 //#endregion
 //#region src/service/cli.ts
@@ -384,6 +107,10 @@ Options:
   --log-dir <path>       Absolute log directory (default: $DSH_HOME/logs)
 
 Workflow: plan --dry-run → install → stop the terminal-started DSH yourself → activate.
+
+activate refuses an occupied port, never kills a process, and then verifies that
+the service it started actually took over; a service that begins crash-looping
+makes activate fail instead of reporting success.
 `;
 }
 function assertSafeText(value, description) {
@@ -435,7 +162,14 @@ function atomicWrite(path, content) {
 	});
 	renameSync(temporary, path);
 }
-function ensureManagedTarget(path, expected) {
+/**
+* Replace an artifact only when we can prove we wrote it: either it already holds
+* exactly what we are about to write, or our own receipt names that path. The
+* receipt is what makes an upgrade possible at all — an improved definition
+* differs from the stored one by exactly the fix being installed, so
+* byte-equality with the previous rendering can never authorise it.
+*/
+function ensureReplaceable(path, expected, managed) {
 	if (!existsSync(path)) return;
 	let current;
 	try {
@@ -443,7 +177,18 @@ function ensureManagedTarget(path, expected) {
 	} catch {
 		throw new Error(`refusing to replace unreadable existing file: ${path}`);
 	}
-	if (current !== expected) throw new Error(`refusing to overwrite an existing unmanaged service artifact: ${path}`);
+	if (current === expected || managed) return;
+	throw new Error(`refusing to overwrite an existing unmanaged service artifact: ${path}`);
+}
+function receiptOwnsPath(previous, path) {
+	if (previous === void 0) return false;
+	return previous.paths.definitionFile === path || previous.paths.stateFile === path || previous.paths.wrapperFile === path;
+}
+function receiptTextOf(receipt) {
+	return JSON.stringify(receipt, null, 2) + "\n";
+}
+function readReceiptIfPresent(path) {
+	return existsSync(path) ? readReceipt(path) : void 0;
 }
 function readReceipt(path) {
 	try {
@@ -483,7 +228,8 @@ function serialisePlan(plan) {
 			start: plan.startCommand,
 			status: plan.statusCommand,
 			stop: plan.stopCommand,
-			uninstall: plan.uninstallCommand
+			uninstall: plan.uninstallCommand,
+			recover: plan.recoverCommand
 		}
 	}, null, 2) + "\n";
 }
@@ -577,16 +323,16 @@ async function main(argv = process.argv.slice(2), env = environment(), run = run
 		}
 		if (action === "install") {
 			(hooks.preflight ?? preflight)(spec);
-			ensureManagedTarget(plan.paths.definitionFile, plan.definition);
-			if (plan.wrapper !== void 0 && plan.paths.wrapperFile !== void 0) ensureManagedTarget(plan.paths.wrapperFile, plan.wrapper);
-			const receipt = {
+			const previous = readReceiptIfPresent(plan.paths.stateFile);
+			ensureReplaceable(plan.paths.definitionFile, plan.definition, receiptOwnsPath(previous, plan.paths.definitionFile));
+			if (plan.wrapper !== void 0 && plan.paths.wrapperFile !== void 0) ensureReplaceable(plan.paths.wrapperFile, plan.wrapper, receiptOwnsPath(previous, plan.paths.wrapperFile));
+			const receiptText = receiptTextOf({
 				version: RECEIPT_VERSION,
 				managedBy: "dsh-update-status",
 				spec,
 				paths: plan.paths
-			};
-			const receiptText = JSON.stringify(receipt, null, 2) + "\n";
-			ensureManagedTarget(plan.paths.stateFile, receiptText);
+			});
+			ensureReplaceable(plan.paths.stateFile, receiptText, receiptOwnsPath(previous, plan.paths.stateFile));
 			mkdirSync(spec.logDir, {
 				recursive: true,
 				mode: 448
@@ -601,7 +347,13 @@ async function main(argv = process.argv.slice(2), env = environment(), run = run
 		if (action === "activate") {
 			if (!await portIsFree(receipt.spec.host, receipt.spec.port)) throw new Error(`port ${receipt.spec.host}:${String(receipt.spec.port)} is in use; stop the existing DSH yourself before activate. Nothing was killed.`);
 			for (const command of commandsForActivate(plan, env.uid ?? 0)) invoke(command, run);
-			process.stdout.write("User service activated. Wait for DSH to become ready, then open the existing Web URL.\n");
+			const verification = await (hooks.verify ?? ((installed) => verifyActivatedService(installed, {
+				run,
+				uid: env.uid ?? 0
+			})))(receipt.spec);
+			if (verification.kind === "crash-loop") throw new Error(`the activated service is restarting repeatedly (${String(verification.recentRestarts)} starts within ${String(Math.round(verification.windowMs / 1e3))}s); another process probably holds ${receipt.spec.host}:${String(receipt.spec.port)}. Nothing was killed. Stop that instance, fix the cause, then run activate again.`);
+			if (verification.kind === "not-running") throw new Error(`the activated service reported no running process; check the native status and the logs in ${receipt.spec.logDir}. Nothing was killed.`);
+			process.stdout.write("User service activated and verified to be running. Wait for DSH to become ready, then open the existing Web URL.\n");
 			return 0;
 		}
 		if (action === "status") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-update-status",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "DeepSeek Harness Web plugin for version status, copy-only upgrade guidance, and safe restart when an explicit user-level supervisor is installed.",
   "type": "module",
   "main": "lib/index.js",
@@ -17,11 +17,7 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "lib/index.js",
-    "lib/index.d.ts",
-    "lib/client.js",
-    "lib/client.js.map",
-    "lib/service-cli.js",
+    "lib",
     "bin/dsh-update-status-service.mjs",
     "cordis.patch.yml",
     "README.md",