@zixt/host 0.0.82 → 0.0.83

package/dist/index.js

@@ -31,7 +31,7 @@ import { homedir as homedir3 } from "node:os";
 // package.json
 var package_default = {
   name: "@zixt/host",
-  version: "0.0.82",
+  version: "0.0.83",
   type: "module",
   exports: {
     ".": "./src/client.ts",
@@ -25446,6 +25446,9 @@ var DO_NOT_RESTART_EXIT_CODE = 64;
 var RESTART_BACKOFF_MS = 2e3;
 var MAX_RESTART_BACKOFF_MS = 6e4;
 var CRASH_STREAK_RESET_MS = 6e4;
+function streakBackoffMs(streak) {
+  return Math.min(MAX_RESTART_BACKOFF_MS, RESTART_BACKOFF_MS * 2 ** Math.min(streak - 1, 10));
+}
 var RELEASE_PROBATION_MS = 5 * 6e4;
 var FAST_UPDATE_EXIT_MS = 1e4;
 var STOP_GRACE_MS = 3e4;
@@ -25496,6 +25499,23 @@ function versionsRoot() {
 function npmCommand(platform = process.platform) {
   return platform === "win32" ? "npm.cmd" : "npm";
 }
+async function resolveInstallerCommand(options = {}) {
+  const platform = options.platform ?? process.platform;
+  const command = npmCommand(platform);
+  if (platform !== "win32") return command;
+  const execPath = options.execPath ?? process.execPath;
+  const resolution = {
+    platform,
+    ...options.searchPath !== void 0 ? { searchPath: options.searchPath } : {}
+  };
+  return (
+    // npm ships beside the `node` running this process, and that copy is the
+    // one matching it. A per-user Scheduled Task may carry no npm on PATH.
+    await resolveTrustedCliCommand(join8(dirname4(execPath), command), resolution) ?? await resolveTrustedCliCommand(command, resolution) ?? // Nothing resolved: keep the previous behaviour, so a Machine without npm
+    // fails one install rather than changing how failure is handled.
+    command
+  );
+}
 function windowsInstallerCommandLine(command, args) {
   return [command, ...args].map(quoteForCmd).join(" ");
 }
@@ -25788,12 +25808,12 @@ var InstallerContainmentError = class extends Error {
 async function installRelease(version2, options = {}) {
   if (!VERSION_DIR.test(version2)) return null;
   const platform = options.platform ?? process.platform;
-  const installerCommand = options.installerCommand ?? npmCommand(platform);
   const root = options.root ?? versionsRoot();
   const prefix = join8(root, version2);
   const entry = installedReleaseEntry(version2, root);
   if (await validReleaseAtPrefix(prefix, version2)) return entry;
   if (options.signal?.aborted) return null;
+  const installerCommand = options.installerCommand ?? await resolveInstallerCommand({ platform });
   await mkdir5(root, { recursive: true, mode: 448 });
   const staging = join8(root, `.install-${version2}-${process.pid}-${crypto.randomUUID()}`);
   const quarantine = join8(root, `.invalid-${version2}-${process.pid}-${crypto.randomUUID()}`);
@@ -26602,6 +26622,7 @@ async function superviseHost(options = {}) {
     announceShutdown = resolve18;
   });
   const attempted = /* @__PURE__ */ new Set();
+  let unsatisfiableUpdates = 0;
   const waitOrShutdown = async (ms) => {
     if (shuttingDown2) return false;
     if (!customDelay) {
@@ -26622,11 +26643,7 @@ async function superviseHost(options = {}) {
   const waitAfterCrash = async (runtimeMs) => {
     if (runtimeMs >= CRASH_STREAK_RESET_MS) consecutiveCrashes = 0;
     consecutiveCrashes++;
-    const backoff = Math.min(
-      MAX_RESTART_BACKOFF_MS,
-      RESTART_BACKOFF_MS * 2 ** Math.min(consecutiveCrashes - 1, 10)
-    );
-    return waitOrShutdown(backoff);
+    return waitOrShutdown(streakBackoffMs(consecutiveCrashes));
   };
   const cleanupExitedWorker = async (exitedChild, childExited, workerBoundary, containment) => {
     for (let attempt = 1; attempt <= CLEANUP_ATTEMPTS2; attempt++) {
@@ -26989,10 +27006,15 @@ async function superviseHost(options = {}) {
       consecutiveCrashes = 0;
       if (orderlyValidatedBoundary) rollbackCandidate = null;
       const target = await published();
+      let updateLanded = false;
       if (target === null) {
         log2(
           "Zixt Host: a newer release was reported but the registry is unreachable; staying on the current version"
         );
+      } else if (target === command.version) {
+        log2(
+          `Zixt Host: this Machine already runs the newest published release (${target}), so an update cannot satisfy the cloud; waiting for a newer one`
+        );
       } else if (attempted.has(target)) {
         log2(`Zixt Host: already running ${target}; ignoring a repeated update request`);
       } else {
@@ -27066,6 +27088,7 @@ async function superviseHost(options = {}) {
               }
               rollbackCandidate = { failedVersion: target, command: fallback };
               command = { entry, version: target };
+              updateLanded = true;
               if (reloadAfterActivation) return SUPERVISOR_RELOAD_EXIT_CODE;
               if (releaseStore) {
                 const probation = durableState("probation", target, fallback.version);
@@ -27093,7 +27116,10 @@ async function superviseHost(options = {}) {
           log2(`Zixt Host: could not install ${target}; staying on the current version`);
         }
       }
-      if (now() - startedAt < FAST_UPDATE_EXIT_MS && !await waitOrShutdown(RESTART_BACKOFF_MS)) {
+      unsatisfiableUpdates = updateLanded ? 0 : unsatisfiableUpdates + 1;
+      if (unsatisfiableUpdates > 0) {
+        if (!await waitOrShutdown(streakBackoffMs(unsatisfiableUpdates))) return 0;
+      } else if (now() - startedAt < FAST_UPDATE_EXIT_MS && !await waitOrShutdown(RESTART_BACKOFF_MS)) {
         return 0;
       }
       if (shuttingDown2) return 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zixt/host",
-  "version": "0.0.82",
+  "version": "0.0.83",
   "type": "module",
   "exports": {
     ".": "./src/client.ts",