@camstack/server 1.1.61 → 1.1.63

package/dist/server-root/index.js

@@ -98,6 +98,7 @@ var require_dist = __commonJS({
       planBoot: /* @__PURE__ */ __name(() => planBoot, "planBoot"),
       readDevUploadManifest: /* @__PURE__ */ __name(() => readDevUploadManifest, "readDevUploadManifest"),
       readRestartIntentMarker: /* @__PURE__ */ __name(() => readRestartIntentMarker, "readRestartIntentMarker"),
+      readSeedVersion: /* @__PURE__ */ __name(() => readSeedVersion, "readSeedVersion"),
       readServerRootState: /* @__PURE__ */ __name(() => readServerRootState, "readServerRootState"),
       registerActiveRootResolver: /* @__PURE__ */ __name(() => registerActiveRootResolver, "registerActiveRootResolver"),
       restartIntentMarkerPath: /* @__PURE__ */ __name(() => restartIntentMarkerPath, "restartIntentMarkerPath"),
@@ -351,7 +352,39 @@ var require_dist = __commonJS({
       return null;
     }
     __name(validateVersionDir, "validateVersionDir");
-    function planBoot(state, isValidVersion, now) {
+    function parse(version) {
+      const dashIdx = version.indexOf("-");
+      const base = dashIdx === -1 ? version : version.slice(0, dashIdx);
+      const prerelease = dashIdx === -1 ? null : version.slice(dashIdx + 1);
+      const nums = base.split(".").map((seg) => {
+        const n = Number.parseInt(seg, 10);
+        return Number.isNaN(n) ? 0 : n;
+      });
+      return {
+        nums,
+        prerelease
+      };
+    }
+    __name(parse, "parse");
+    function compareSemver(a, b) {
+      const pa = parse(a);
+      const pb = parse(b);
+      const len = Math.max(pa.nums.length, pb.nums.length);
+      for (let i = 0; i < len; i++) {
+        const na = pa.nums[i] ?? 0;
+        const nb = pb.nums[i] ?? 0;
+        if (na < nb) return -1;
+        if (na > nb) return 1;
+      }
+      if (pa.prerelease === null && pb.prerelease === null) return 0;
+      if (pa.prerelease === null) return 1;
+      if (pb.prerelease === null) return -1;
+      if (pa.prerelease < pb.prerelease) return -1;
+      if (pa.prerelease > pb.prerelease) return 1;
+      return 0;
+    }
+    __name(compareSemver, "compareSemver");
+    function planBoot(state, isValidVersion, now, seedVersion = null) {
       if (state === null) {
         return {
           kind: "baked",
@@ -404,6 +437,19 @@ var require_dist = __commonJS({
       }
       if (next.currentVersion !== null) {
         if (isValidVersion(next.currentVersion)) {
+          if (!changed && seedVersion !== null && compareSemver(seedVersion, next.currentVersion) > 0) {
+            return {
+              kind: "baked",
+              reason: `baked seed ${seedVersion} is newer than active data-root ${next.currentVersion} \u2014 adopting the image seed`,
+              stateToWrite: {
+                ...next,
+                currentVersion: null,
+                previousVersion: null,
+                pendingBoot: null,
+                rolledBack: null
+              }
+            };
+          }
           return {
             kind: "data-root",
             version: next.currentVersion,
@@ -453,38 +499,6 @@ var require_dist = __commonJS({
       };
     }
     __name(planBoot, "planBoot");
-    function parse(version) {
-      const dashIdx = version.indexOf("-");
-      const base = dashIdx === -1 ? version : version.slice(0, dashIdx);
-      const prerelease = dashIdx === -1 ? null : version.slice(dashIdx + 1);
-      const nums = base.split(".").map((seg) => {
-        const n = Number.parseInt(seg, 10);
-        return Number.isNaN(n) ? 0 : n;
-      });
-      return {
-        nums,
-        prerelease
-      };
-    }
-    __name(parse, "parse");
-    function compareSemver(a, b) {
-      const pa = parse(a);
-      const pb = parse(b);
-      const len = Math.max(pa.nums.length, pb.nums.length);
-      for (let i = 0; i < len; i++) {
-        const na = pa.nums[i] ?? 0;
-        const nb = pb.nums[i] ?? 0;
-        if (na < nb) return -1;
-        if (na > nb) return 1;
-      }
-      if (pa.prerelease === null && pb.prerelease === null) return 0;
-      if (pa.prerelease === null) return 1;
-      if (pb.prerelease === null) return -1;
-      if (pa.prerelease < pb.prerelease) return -1;
-      if (pa.prerelease > pb.prerelease) return 1;
-      return 0;
-    }
-    __name(compareSemver, "compareSemver");
     var fs3 = __toESM2(require("fs"));
     var path3 = __toESM2(require("path"));
     function detectWorkspaceRoot(fromDir) {
@@ -504,6 +518,7 @@ var require_dist = __commonJS({
       }
     }
     __name(detectWorkspaceRoot, "detectWorkspaceRoot");
+    var fs4 = __toESM2(require("fs"));
     var path4 = __toESM2(require("path"));
     var import_node_url = require("url");
     var HOST_EXTERNAL_SPECIFIERS = [
@@ -546,6 +561,20 @@ var require_dist = __commonJS({
       registerHooks(hooks);
     }
     __name(registerActiveRootResolver, "registerActiveRootResolver");
+    function readSeedVersion(seedEntry) {
+      try {
+        const pkgJsonPath = path4.join(path4.dirname(seedEntry), "..", "package.json");
+        const raw = JSON.parse(fs4.readFileSync(pkgJsonPath, "utf-8"));
+        if (typeof raw === "object" && raw !== null) {
+          const version = raw["version"];
+          if (typeof version === "string") return version;
+        }
+        return null;
+      } catch {
+        return null;
+      }
+    }
+    __name(readSeedVersion, "readSeedVersion");
     function runNodeStarter(options) {
       const env = options.env ?? process.env;
       const now = options.now ?? Date.now;
@@ -572,7 +601,8 @@ var require_dist = __commonJS({
         if (reason !== null) console.warn(`[starter] version ${version} invalid: ${reason}`);
         return reason === null;
       }, "isValidVersion");
-      const plan = planBoot(state, isValidVersion, now);
+      const seedVersion = readSeedVersion(options.seedEntry);
+      const plan = planBoot(state, isValidVersion, now, seedVersion);
       if (plan.stateToWrite !== null) {
         try {
           writeServerRootState(rootDir, plan.stateToWrite);
@@ -604,7 +634,7 @@ var require_dist = __commonJS({
     }
     __name(runNodeStarter, "runNodeStarter");
     var import_node_child_process = require("child_process");
-    var fs4 = __toESM2(require("fs"));
+    var fs5 = __toESM2(require("fs"));
     var path5 = __toESM2(require("path"));
     var import_node_util = require("util");
     var execFileAsync = (0, import_node_util.promisify)(import_node_child_process.execFile);
@@ -622,7 +652,7 @@ var require_dist = __commonJS({
     var RESTART_REASON_PREFIX = "server-update";
     function readPackageVersion(pkgJsonPath) {
       try {
-        const raw = JSON.parse(fs4.readFileSync(pkgJsonPath, "utf-8"));
+        const raw = JSON.parse(fs5.readFileSync(pkgJsonPath, "utf-8"));
         if (typeof raw === "object" && raw !== null) {
           const version = raw["version"];
           if (typeof version === "string") return version;
@@ -712,7 +742,7 @@ var require_dist = __commonJS({
         };
         return {
           state: emptyServerRootState(),
-          corrupt: fs4.existsSync(stateFilePath(rootDir))
+          corrupt: fs5.existsSync(stateFilePath(rootDir))
         };
       }
       updateState(state) {
@@ -865,7 +895,7 @@ var require_dist = __commonJS({
         }
         if (isDevChannelVersion(target)) {
           const uploadsDir = devUploadVersionDir(this.rootDir(), target);
-          if (!fs4.existsSync(uploadsDir)) {
+          if (!fs5.existsSync(uploadsDir)) {
             return {
               accepted: false,
               targetVersion: target,
@@ -926,11 +956,11 @@ var require_dist = __commonJS({
       async stageAndActivate(target) {
         const rootDir = this.rootDir();
         const vDir = versionsDir(rootDir);
-        fs4.mkdirSync(vDir, {
+        fs5.mkdirSync(vDir, {
           recursive: true
         });
         const stagingDir = path5.join(vDir, `.staging-${target}-${process.pid}-${this.now()}`);
-        fs4.mkdirSync(stagingDir, {
+        fs5.mkdirSync(stagingDir, {
           recursive: true
         });
         try {
@@ -943,8 +973,8 @@ var require_dist = __commonJS({
             "--no-fund",
             "--loglevel=error"
           ];
-          if (fs4.existsSync(devDir)) {
-            fs4.writeFileSync(path5.join(stagingDir, "package.json"), JSON.stringify(this.buildDevUploadsPackageJson(devDir, target), null, 2), "utf-8");
+          if (fs5.existsSync(devDir)) {
+            fs5.writeFileSync(path5.join(stagingDir, "package.json"), JSON.stringify(this.buildDevUploadsPackageJson(devDir, target), null, 2), "utf-8");
             await this.execNpm([
               ...installArgs,
               ...buildNpmRegistryArgs(registry)
@@ -953,7 +983,7 @@ var require_dist = __commonJS({
               timeoutMs: NPM_INSTALL_TIMEOUT_MS
             });
           } else {
-            fs4.writeFileSync(path5.join(stagingDir, "package.json"), JSON.stringify({
+            fs5.writeFileSync(path5.join(stagingDir, "package.json"), JSON.stringify({
               name: "camstack-node-root",
               private: true
             }, null, 2), "utf-8");
@@ -967,7 +997,7 @@ var require_dist = __commonJS({
             });
           }
           const entry = rootEntryPath2(stagingDir, this.spec);
-          if (!fs4.existsSync(entry)) {
+          if (!fs5.existsSync(entry)) {
             throw new Error(`staged closure is missing the root entry (${entry})`);
           }
           const stagedVersion = readPackageVersion(path5.join(rootPackageDir2(stagingDir, this.spec), "package.json"));
@@ -975,17 +1005,17 @@ var require_dist = __commonJS({
             throw new Error(`staged closure version mismatch: expected ${target}, got ${stagedVersion ?? "unknown"}`);
           }
           const dest = versionDir(rootDir, target);
-          if (fs4.existsSync(dest)) {
+          if (fs5.existsSync(dest)) {
             const aside = `${dest}.evicted-${this.now()}`;
-            await fs4.promises.rename(dest, aside);
-            await fs4.promises.rm(aside, {
+            await fs5.promises.rename(dest, aside);
+            await fs5.promises.rm(aside, {
               recursive: true,
               force: true
             }).catch(() => void 0);
           }
-          await fs4.promises.rename(stagingDir, dest);
+          await fs5.promises.rename(stagingDir, dest);
         } catch (err) {
-          await fs4.promises.rm(stagingDir, {
+          await fs5.promises.rm(stagingDir, {
             recursive: true,
             force: true
           }).catch(() => void 0);
@@ -1015,7 +1045,7 @@ var require_dist = __commonJS({
         }
         const fileRef = /* @__PURE__ */ __name((filename) => {
           const abs = path5.join(devDir, filename);
-          if (!fs4.existsSync(abs)) {
+          if (!fs5.existsSync(abs)) {
             throw new Error(`dev-uploads tarball listed in the manifest is missing: ${abs}`);
           }
           return `file:${abs}`;
@@ -1194,7 +1224,7 @@ var require_dist = __commonJS({
         const vDir = versionsDir(this.rootDir());
         let entries;
         try {
-          entries = fs4.readdirSync(vDir);
+          entries = fs5.readdirSync(vDir);
         } catch {
           return;
         }
@@ -1203,14 +1233,14 @@ var require_dist = __commonJS({
           const full = path5.join(vDir, entry);
           if (entry.startsWith(".")) {
             try {
-              const ageMs = this.now() - fs4.statSync(full).mtimeMs;
+              const ageMs = this.now() - fs5.statSync(full).mtimeMs;
               if (ageMs < _RootUpdateService.STALE_TRANSIENT_MS) continue;
             } catch {
               continue;
             }
           }
           try {
-            fs4.rmSync(full, {
+            fs5.rmSync(full, {
               recursive: true,
               force: true
             });
@@ -1241,15 +1271,15 @@ var require_dist = __commonJS({
         const dir = devUploadsDir(this.rootDir());
         let entries;
         try {
-          entries = fs4.readdirSync(dir);
+          entries = fs5.readdirSync(dir);
         } catch {
           return;
         }
         const graveyard = path5.join(dir, ".sweeping");
         try {
-          for (const residue of fs4.readdirSync(graveyard)) {
+          for (const residue of fs5.readdirSync(graveyard)) {
             try {
-              fs4.rmSync(path5.join(graveyard, residue), {
+              fs5.rmSync(path5.join(graveyard, residue), {
                 recursive: true,
                 force: true
               });
@@ -1264,13 +1294,13 @@ var require_dist = __commonJS({
         ].sort((a, b) => (devChannelEpoch(b) ?? -1) - (devChannelEpoch(a) ?? -1));
         const doomed = byNewestFirst.slice(keepCount);
         if (doomed.length === 0) return;
-        fs4.mkdirSync(graveyard, {
+        fs5.mkdirSync(graveyard, {
           recursive: true
         });
         for (const entry of doomed) {
           const aside = path5.join(graveyard, `${entry}-${this.now()}`);
           try {
-            fs4.renameSync(path5.join(dir, entry), aside);
+            fs5.renameSync(path5.join(dir, entry), aside);
           } catch (err) {
             this.logger.warn("failed to move dev-uploads entry aside for sweep", {
               meta: {
@@ -1281,7 +1311,7 @@ var require_dist = __commonJS({
             continue;
           }
           try {
-            fs4.rmSync(aside, {
+            fs5.rmSync(aside, {
               recursive: true,
               force: true
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.1.61",
+  "version": "1.1.63",
   "private": false,
   "files": [
     "dist",
@@ -23,19 +23,19 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.1.50",
-    "@camstack/addon-advanced-notifier": "1.1.23",
-    "@camstack/addon-auth": "1.1.8",
-    "@camstack/addon-decoder-nodeav": "1.1.11",
-    "@camstack/addon-notifiers": "1.1.23",
-    "@camstack/addon-pipeline": "1.1.55",
-    "@camstack/addon-pipeline-orchestrator": "1.1.45",
-    "@camstack/addon-post-analysis": "1.1.27",
+    "@camstack/addon-admin-ui": "1.1.52",
+    "@camstack/addon-advanced-notifier": "1.1.24",
+    "@camstack/addon-auth": "1.1.9",
+    "@camstack/addon-decoder-nodeav": "1.1.12",
+    "@camstack/addon-notifiers": "1.1.24",
+    "@camstack/addon-pipeline": "1.1.57",
+    "@camstack/addon-pipeline-orchestrator": "1.1.46",
+    "@camstack/addon-post-analysis": "1.1.29",
     "@camstack/sdk": "1.1.24",
     "@camstack/shm-ring": "1.0.23",
-    "@camstack/system": "1.1.48",
-    "@camstack/types": "1.1.43",
-    "@camstack/ui-library": "1.1.35",
+    "@camstack/system": "1.1.50",
+    "@camstack/types": "1.1.45",
+    "@camstack/ui-library": "1.1.36",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",
     "@fastify/multipart": "^10.0.0",