@camstack/server 1.2.353 → 1.2.354

package/dist/server-root/index.js

@@ -83,9 +83,13 @@ var require_dist = __commonJS({
       PENDING_ROOT_SWAP_FILE: /* @__PURE__ */ __name(() => PENDING_ROOT_SWAP_FILE, "PENDING_ROOT_SWAP_FILE"),
       REQUIRED_NATIVE_PACKAGES: /* @__PURE__ */ __name(() => REQUIRED_NATIVE_PACKAGES, "REQUIRED_NATIVE_PACKAGES"),
       RESTART_INTENT_FILE: /* @__PURE__ */ __name(() => RESTART_INTENT_FILE, "RESTART_INTENT_FILE"),
+      ROLLBACK_UNSUPPORTED_REASON: /* @__PURE__ */ __name(() => ROLLBACK_UNSUPPORTED_REASON, "ROLLBACK_UNSUPPORTED_REASON"),
       RootUpdateService: /* @__PURE__ */ __name(() => RootUpdateService, "RootUpdateService"),
       SERVER_ROOT_DIRNAME: /* @__PURE__ */ __name(() => SERVER_ROOT_DIRNAME, "SERVER_ROOT_DIRNAME"),
       SERVER_ROOT_STATE_FILE: /* @__PURE__ */ __name(() => SERVER_ROOT_STATE_FILE, "SERVER_ROOT_STATE_FILE"),
+      STAGING_ATTEMPTS: /* @__PURE__ */ __name(() => STAGING_ATTEMPTS, "STAGING_ATTEMPTS"),
+      STAGING_FAILED_REASON: /* @__PURE__ */ __name(() => STAGING_FAILED_REASON, "STAGING_FAILED_REASON"),
+      STAGING_RETRY_DELAYS_MS: /* @__PURE__ */ __name(() => STAGING_RETRY_DELAYS_MS, "STAGING_RETRY_DELAYS_MS"),
       applyPendingRootSwap: /* @__PURE__ */ __name(() => applyPendingRootSwap, "applyPendingRootSwap"),
       assessImageContract: /* @__PURE__ */ __name(() => assessImageContract, "assessImageContract"),
       clearPendingRootSwap: /* @__PURE__ */ __name(() => clearPendingRootSwap, "clearPendingRootSwap"),
@@ -105,6 +109,7 @@ var require_dist = __commonJS({
       isDevChannelVersion: /* @__PURE__ */ __name(() => isDevChannelVersion, "isDevChannelVersion"),
       isHostExternal: /* @__PURE__ */ __name(() => isHostExternal, "isHostExternal"),
       isServerRootState: /* @__PURE__ */ __name(() => isServerRootState, "isServerRootState"),
+      isTransientNpmNetworkError: /* @__PURE__ */ __name(() => isTransientNpmNetworkError, "isTransientNpmNetworkError"),
       migrateToSingleCopy: /* @__PURE__ */ __name(() => migrateToSingleCopy, "migrateToSingleCopy"),
       minNodeMajorOf: /* @__PURE__ */ __name(() => minNodeMajorOf, "minNodeMajorOf"),
       pendingRootSwapPath: /* @__PURE__ */ __name(() => pendingRootSwapPath, "pendingRootSwapPath"),
@@ -1071,6 +1076,18 @@ var require_dist = __commonJS({
     __name(buildNpmRegistryArgs, "buildNpmRegistryArgs");
     var NPM_VIEW_TIMEOUT_MS = 2e4;
     var NPM_INSTALL_TIMEOUT_MS = 15 * 6e4;
+    var STAGING_ATTEMPTS = 3;
+    var STAGING_RETRY_DELAYS_MS = [
+      5e3,
+      15e3
+    ];
+    var TRANSIENT_NPM_ERROR_RE = /npm error code (?:ECONNRESET|ETIMEDOUT|EAI_AGAIN|ENOTFOUND|ECONNREFUSED|EPIPE|E50[234]|E429)\b|npm error network/i;
+    function isTransientNpmNetworkError(message) {
+      return TRANSIENT_NPM_ERROR_RE.test(message);
+    }
+    __name(isTransientNpmNetworkError, "isTransientNpmNetworkError");
+    var STAGING_FAILED_REASON = "staging-failed";
+    var ROLLBACK_UNSUPPORTED_REASON = "rollback-unsupported";
     var CLOSURE_ALLOW_SCRIPTS = {
       "@camstack/server": true,
       "better-sqlite3": true,
@@ -1131,8 +1148,20 @@ var require_dist = __commonJS({
       env;
       readWrapperProbesFn;
       now;
+      sleep;
       runningPackageJsonPath;
       workspaceProbeDir;
+      /**
+      * The version THIS PROCESS loaded — read once, here, from the package.json
+      * of the copy the code came from, and never again. The file is the only
+      * place the fact exists in a form the process can read, and the moment of
+      * construction is the only moment it is guaranteed to describe what is in
+      * memory: the starter swaps `current/` BEFORE loading the entry, and nothing
+      * else may move it, so a later read that disagrees is a disk that changed
+      * under a live process — reported through `installedVersion`, never folded
+      * into this number.
+      */
+      loadedVersion;
       checkCache = null;
       inFlight = "idle";
       constructor(options) {
@@ -1160,8 +1189,22 @@ var require_dist = __commonJS({
         this.env = options.env ?? process.env;
         this.readWrapperProbesFn = options.readWrapperProbes ?? readWrapperProbes;
         this.now = options.now ?? Date.now;
+        this.sleep = options.sleep ?? ((ms) => new Promise((resolve3) => {
+          setTimeout(resolve3, ms);
+        }));
         this.runningPackageJsonPath = options.runningPackageJsonPath;
         this.workspaceProbeDir = options.workspaceProbeDir;
+        this.loadedVersion = readPackageVersion(this.runningPackageJsonPath);
+        const bootedVersion = this.env[this.envNames.activeVersion];
+        if (bootedVersion !== void 0 && this.loadedVersion !== null && bootedVersion !== this.loadedVersion) {
+          this.logger.warn("running root package disagrees with the version the starter booted", {
+            tags: this.logTags,
+            meta: {
+              loadedVersion: this.loadedVersion,
+              bootedVersion
+            }
+          });
+        }
       }
       // ── Status ────────────────────────────────────────────────────────────
       resolveBootMode() {
@@ -1169,8 +1212,36 @@ var require_dist = __commonJS({
         if (raw === "workspace" || raw === "baked" || raw === "data-root") return raw;
         return detectWorkspaceRoot(this.workspaceProbeDir) !== null ? "workspace" : "baked";
       }
+      /** What THIS process loaded — see {@link loadedVersion}. Never a disk read. */
       runningVersion() {
-        return readPackageVersion(this.runningPackageJsonPath);
+        return this.loadedVersion;
+      }
+      /**
+      * What is in the data-root `current/` copy RIGHT NOW — the version the next
+      * boot would load if nothing is staged. Only answered on a `data-root` boot:
+      * on a workspace boot there is no such copy, and on a `baked` boot the
+      * starter already judged `current/` unloadable (or absent), so a version
+      * read from it would claim "runs after restart" about code that will not.
+      */
+      installedVersion() {
+        if (this.resolveBootMode() !== "data-root") return null;
+        return readPackageVersion(path6.join(rootPackageDir2(currentDir(this.rootDir()), this.spec), "package.json"));
+      }
+      /**
+      * The three facts a restart question needs, read together so no surface can
+      * quote one without the others: what is staged, what is on disk, and whether
+      * the code that would run after a restart differs from the code running now.
+      */
+      restartFacts() {
+        const pendingVersion = readPendingRootSwap(this.rootDir())?.version ?? null;
+        const installedVersion = this.installedVersion();
+        const running = this.runningVersion();
+        const restartRequired = pendingVersion !== null || installedVersion !== null && running !== null && installedVersion !== running;
+        return {
+          pendingVersion,
+          installedVersion,
+          restartRequired
+        };
       }
       /** The running root package's identity — feeds registerNode / topology rows. */
       getRunningRootPackage() {
@@ -1207,16 +1278,26 @@ var require_dist = __commonJS({
         if (readPendingRootSwap(this.rootDir()) !== null) return "pending-restart";
         return "idle";
       }
+      /**
+      * `latest` is an update this node can still TAKE: newer than what runs, and
+      * not the version already staged here — that one is a restart away, and
+      * re-applying it is refused (`already-staged`).
+      */
+      isUpdateAvailable(latestVersion, runningVersion, pendingVersion) {
+        return latestVersion !== null && runningVersion !== null && latestVersion !== pendingVersion && compareSemver(latestVersion, runningVersion) > 0;
+      }
       async getServerPackageStatus() {
         const runningVersion = this.runningVersion();
         const latestVersion = this.checkCache?.latestVersion ?? null;
-        const pending = readPendingRootSwap(this.rootDir());
-        const updateAvailable = latestVersion !== null && runningVersion !== null && compareSemver(latestVersion, runningVersion) > 0;
+        const { pendingVersion, installedVersion, restartRequired } = this.restartFacts();
+        const updateAvailable = this.isUpdateAvailable(latestVersion, runningVersion, pendingVersion);
         return {
           packageName: this.spec.packageName,
           runningVersion,
           nodeRuntimeVersion: process.versions.node,
           activeVersion: this.env[this.envNames.activeVersion] ?? runningVersion,
+          installedVersion,
+          restartRequired,
           // Single-copy model: no N-1 retention, no rollback record.
           previousVersion: null,
           seedVersion: this.seedVersion(),
@@ -1224,7 +1305,7 @@ var require_dist = __commonJS({
           updateAvailable,
           bootMode: this.resolveBootMode(),
           updateState: this.updateState(),
-          pendingVersion: pending?.version ?? null,
+          pendingVersion,
           rolledBack: null,
           stateFileCorrupt: false,
           lastCheckedAtMs: this.checkCache?.checkedAtMs ?? null,
@@ -1246,6 +1327,7 @@ var require_dist = __commonJS({
       // ── Check ─────────────────────────────────────────────────────────────
       async checkServerUpdate() {
         const runningVersion = this.runningVersion();
+        const { pendingVersion, restartRequired } = this.restartFacts();
         if (this.inFlight !== "idle") {
           return {
             packageName: this.spec.packageName,
@@ -1253,7 +1335,9 @@ var require_dist = __commonJS({
             latestVersion: this.checkCache?.latestVersion ?? null,
             updateAvailable: false,
             checkedAtMs: this.checkCache?.checkedAtMs ?? this.now(),
-            error: `busy: ${this.inFlight}`
+            error: `busy: ${this.inFlight}`,
+            pendingVersion,
+            restartRequired
           };
         }
         this.inFlight = "checking";
@@ -1288,14 +1372,16 @@ var require_dist = __commonJS({
               }
             });
           }
-          const updateAvailable = latestVersion !== null && runningVersion !== null && compareSemver(latestVersion, runningVersion) > 0;
+          const updateAvailable = this.isUpdateAvailable(latestVersion, runningVersion, pendingVersion);
           return {
             packageName: this.spec.packageName,
             runningVersion,
             latestVersion,
             updateAvailable,
             checkedAtMs: this.checkCache.checkedAtMs,
-            error: null
+            error: null,
+            pendingVersion,
+            restartRequired
           };
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
@@ -1315,7 +1401,9 @@ var require_dist = __commonJS({
             latestVersion: this.checkCache.latestVersion,
             updateAvailable: false,
             checkedAtMs: this.checkCache.checkedAtMs,
-            error: message
+            error: message,
+            pendingVersion,
+            restartRequired
           };
         } finally {
           this.inFlight = "idle";
@@ -1345,7 +1433,12 @@ var require_dist = __commonJS({
           accepted: false,
           targetVersion,
           restarting: false,
-          message
+          message,
+          // "Already running" is not a gate saying no — it is the work already
+          // done. Every other reason is a refusal the caller may need to clear.
+          outcome: reason === "already-running" ? "already-current" : "refused",
+          reason,
+          error: null
         };
       }
       async applyServerUpdate(input) {
@@ -1388,21 +1481,17 @@ var require_dist = __commonJS({
         this.inFlight = "staging";
         let stagingPath;
         try {
-          stagingPath = await this.stageClosure(target);
+          stagingPath = await this.stageClosureWithRetry(target);
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
-          this.logger.error("root package update staging failed", {
-            tags: this.logTags,
-            meta: {
-              targetVersion: target,
-              error: message
-            }
-          });
           return {
             accepted: false,
             targetVersion: target,
             restarting: false,
-            message: `Staging failed: ${message}`
+            message: `Staging failed: ${message}`,
+            outcome: "failed",
+            reason: STAGING_FAILED_REASON,
+            error: message
           };
         } finally {
           this.inFlight = "idle";
@@ -1431,10 +1520,59 @@ var require_dist = __commonJS({
           accepted: true,
           targetVersion: target,
           restarting: true,
-          message: `Staged ${this.spec.packageName}@${target} \u2014 restarting to apply (single automatic reboot).`
+          message: `Staged ${this.spec.packageName}@${target} \u2014 restarting to apply (single automatic reboot). Until that restart completes the node still runs ${runningVersion ?? "the previous version"}.`,
+          outcome: "staged",
+          reason: null,
+          error: null
         };
       }
       /**
+      * {@link stageClosure}, attempted up to {@link STAGING_ATTEMPTS} times when
+      * the failure is a transient registry network error and ONLY then. Every
+      * attempt is logged with its ordinal; the final failure is logged at ERROR
+      * with the attempt count, so a log that shows one line shows the whole
+      * story. Throws the last error when every attempt failed.
+      */
+      async stageClosureWithRetry(target) {
+        let lastError = new Error("staging never ran");
+        for (let attempt = 1; attempt <= STAGING_ATTEMPTS; attempt += 1) {
+          try {
+            return await this.stageClosure(target);
+          } catch (err) {
+            lastError = err;
+            const message = err instanceof Error ? err.message : String(err);
+            const transient = isTransientNpmNetworkError(message);
+            const delayMs = STAGING_RETRY_DELAYS_MS[attempt - 1];
+            const willRetry = transient && attempt < STAGING_ATTEMPTS && delayMs !== void 0;
+            if (!willRetry) {
+              this.logger.error("root package update staging failed", {
+                tags: this.logTags,
+                meta: {
+                  targetVersion: target,
+                  attempt,
+                  attempts: STAGING_ATTEMPTS,
+                  transient,
+                  error: message
+                }
+              });
+              break;
+            }
+            this.logger.warn("root package update staging failed \u2014 transient network error, retrying", {
+              tags: this.logTags,
+              meta: {
+                targetVersion: target,
+                attempt,
+                attempts: STAGING_ATTEMPTS,
+                delayMs,
+                error: message
+              }
+            });
+            await this.sleep(delayMs);
+          }
+        }
+        throw lastError;
+      }
+      /**
       * npm-install the target closure into a SAME-FS `.staging-*` dir, then
       * validate it (entry + version + native prebuilds). Returns the staging dir
       * path for the pending-root-swap marker; the STARTER swaps it into `current`
@@ -1583,7 +1721,10 @@ var require_dist = __commonJS({
           accepted: false,
           targetVersion: null,
           restarting: false,
-          message: "Rollback is not supported in the single-copy model (no retained previous version). Recover by re-applying a known-good version via applyServerUpdate, or reinstall the image seed."
+          message: "Rollback is not supported in the single-copy model (no retained previous version). Recover by re-applying a known-good version via applyServerUpdate, or reinstall the image seed.",
+          outcome: "refused",
+          reason: ROLLBACK_UNSUPPORTED_REASON,
+          error: null
         };
       }
       // ── Plain restart ─────────────────────────────────────────────────────
@@ -1608,7 +1749,10 @@ var require_dist = __commonJS({
           accepted: false,
           targetVersion,
           restarting: false,
-          message
+          message,
+          outcome: "refused",
+          reason,
+          error: null
         };
       }
       restartNode() {
@@ -1630,7 +1774,10 @@ var require_dist = __commonJS({
           accepted: true,
           targetVersion: runningVersion,
           restarting: true,
-          message: "Restarting the node \u2014 the supervisor relaunches it on the same version."
+          message: "Restarting the node \u2014 the supervisor relaunches it on the same version.",
+          outcome: "restart-scheduled",
+          reason: null,
+          error: null
         };
       }
       // ── Boot health confirmation ──────────────────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.2.353",
+  "version": "1.2.354",
   "private": false,
   "files": [
     "dist",
@@ -35,17 +35,17 @@
     ]
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.2.242",
+    "@camstack/addon-admin-ui": "1.2.243",
     "@camstack/addon-agent-ui": "1.2.131",
     "@camstack/addon-auth": "1.2.123",
     "@camstack/addon-decoder-nodeav": "1.2.115",
     "@camstack/addon-notifiers": "1.2.119",
-    "@camstack/addon-pipeline": "1.2.271",
-    "@camstack/addon-pipeline-orchestrator": "1.2.230",
-    "@camstack/addon-post-analysis": "1.2.270",
+    "@camstack/addon-pipeline": "1.2.272",
+    "@camstack/addon-pipeline-orchestrator": "1.2.231",
+    "@camstack/addon-post-analysis": "1.2.271",
     "@camstack/sdk": "1.2.118",
-    "@camstack/system": "1.2.274",
-    "@camstack/types": "1.2.232",
+    "@camstack/system": "1.2.275",
+    "@camstack/types": "1.2.233",
     "@camstack/ui-library": "1.2.189",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",