@camstack/server 1.2.714 → 1.2.716

package/dist/launcher.js

@@ -63,6 +63,7 @@ const closure_node_modules_js_1 = require("./closure-node-modules.js");
 const framework_nodepath_js_1 = require("./framework-nodepath.js");
 const package_inventory_js_1 = require("./package-inventory.js");
 const pending_restore_js_1 = require("./pending-restore.js");
+const pre_migration_restore_js_1 = require("./pre-migration-restore.js");
 /** Resolve the data directory from env or default */
 const DATA_DIR = process.env['CAMSTACK_DATA'] ?? 'camstack-data';
 /** Narrow `CAMSTACK_INSTALL_SOURCE` env into the typed union. */
@@ -246,6 +247,8 @@ async function launch() {
     // installer + symlink step pick up — otherwise we'd install a stale
     // set and overwrite it a step later.
     await (0, pending_restore_js_1.applyPendingRestore)(dataDir, (line) => console.log(line));
+    // A pre-migration snapshot the operator chose to go back to (D987).
+    (0, pre_migration_restore_js_1.applyPendingPreMigrationRestore)(dataDir, (line) => console.log(line));
     // @camstack/system is imported DYNAMICALLY here — AFTER the active framework
     // dir + NODE_PATH are resolved above — so the correct framework copy is what
     // gets loaded. Never import it at module top.

package/dist/pre-migration-restore.js

@@ -0,0 +1,136 @@
+"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.PRE_MIGRATION_RESTORE_MARKER = void 0;
+exports.applyPendingPreMigrationRestore = applyPendingPreMigrationRestore;
+/**
+ * The boot-time restore of a PRE-MIGRATION snapshot (D987). The sqlite-settings
+ * owner writes `.pending-restore.json`'s sibling marker; the launcher promotes
+ * the snapshot over the database before any runner starts, so nothing holds the
+ * file open (D679). It is its own marker, not a field of the system-restore one:
+ * that one is owned by the backup service and carries an archive.
+ *
+ * Marker: `{ requests: [{ livePath, snapshotPath }] }`, both relative to the
+ * data dir. The snapshot is COPIED (temp file + rename) and kept, so the same
+ * restore can be asked for again. The launcher has no `@camstack/*` imports.
+ */
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+const sqlite_restore_js_1 = require("./sqlite-restore.js");
+exports.PRE_MIGRATION_RESTORE_MARKER = '.pending-migration-restore.json';
+function isRequest(value) {
+    return (typeof value === 'object' &&
+        value !== null &&
+        'livePath' in value &&
+        typeof value.livePath === 'string' &&
+        'snapshotPath' in value &&
+        typeof value.snapshotPath === 'string');
+}
+function requestsOf(raw) {
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== 'object' || parsed === null)
+        return null;
+    if (!('requests' in parsed) || !Array.isArray(parsed.requests))
+        return null;
+    const requests = parsed.requests;
+    return requests.every(isRequest) ? requests.filter(isRequest) : null;
+}
+function inside(dataDir, relative) {
+    const root = path.resolve(dataDir);
+    const full = path.resolve(root, relative);
+    return full === root || full.startsWith(root + path.sep) ? full : null;
+}
+function fsyncDirectory(dir) {
+    const fd = fs.openSync(dir, 'r');
+    try {
+        fs.fsyncSync(fd);
+    }
+    finally {
+        fs.closeSync(fd);
+    }
+}
+/** Apply the marker if present. Never throws: a launcher that threw would fail every boot. */
+function applyPendingPreMigrationRestore(dataDir, log) {
+    const markerPath = path.join(dataDir, exports.PRE_MIGRATION_RESTORE_MARKER);
+    if (!fs.existsSync(markerPath))
+        return;
+    let requests;
+    try {
+        requests = requestsOf(fs.readFileSync(markerPath, 'utf-8'));
+    }
+    catch (err) {
+        log(`[launcher] Pre-migration restore marker malformed — leaving in place: ${String(err)}`);
+        return;
+    }
+    if (requests === null) {
+        log('[launcher] Pre-migration restore marker malformed — leaving in place');
+        return;
+    }
+    let allDone = true;
+    for (const request of requests) {
+        const live = inside(dataDir, request.livePath);
+        const snapshot = inside(dataDir, request.snapshotPath);
+        if (live === null || snapshot === null) {
+            log(`[launcher] Pre-migration restore: ${request.livePath} is outside the data dir — refused`);
+            allDone = false;
+            continue;
+        }
+        if (!fs.existsSync(snapshot)) {
+            log(`[launcher] Pre-migration restore: snapshot ${request.snapshotPath} is missing`);
+            allDone = false;
+            continue;
+        }
+        try {
+            for (const suffix of sqlite_restore_js_1.SQLITE_SIDECAR_SUFFIXES)
+                fs.rmSync(live + suffix, { force: true });
+            const temp = `${live}.restore-tmp`;
+            fs.copyFileSync(snapshot, temp);
+            fs.renameSync(temp, live);
+            try {
+                fsyncDirectory(path.dirname(live));
+            }
+            catch (err) {
+                log(`[launcher] WARNING Pre-migration restore: could not fsync (${String(err)}) — continuing`);
+            }
+            log(`[launcher] Pre-migration restore: ${request.snapshotPath} → ${request.livePath}`);
+        }
+        catch (err) {
+            log(`[launcher] Pre-migration restore of ${request.livePath} failed: ${String(err)}`);
+            allDone = false;
+        }
+    }
+    if (allDone)
+        fs.rmSync(markerPath, { force: true });
+}

package/dist/sqlite-restore.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SQLITE_SNAPSHOT_SUFFIX = void 0;
+exports.SQLITE_SIDECAR_SUFFIXES = exports.SQLITE_SNAPSHOT_SUFFIX = void 0;
 exports.planSqliteRestore = planSqliteRestore;
 exports.applySqliteRestore = applySqliteRestore;
 exports.missingPromisedSnapshots = missingPromisedSnapshots;
@@ -68,7 +68,8 @@ const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 /** Mirrors `DATABASE_SNAPSHOT_SUFFIX` in `@camstack/types` (spec-pinned). */
 exports.SQLITE_SNAPSHOT_SUFFIX = '.backup-snapshot';
-const SIDECARS = ['-wal', '-shm', '-journal'];
+exports.SQLITE_SIDECAR_SUFFIXES = ['-wal', '-shm', '-journal'];
+const SIDECARS = exports.SQLITE_SIDECAR_SUFFIXES;
 const DATABASE_SUFFIXES = ['.db', '.sqlite', '.sqlite3'];
 /** Decide, from the paths an extraction wrote, what the target needs. */
 function planSqliteRestore(extracted) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.2.714",
+  "version": "1.2.716",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -50,8 +50,8 @@
     ]
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.2.537",
-    "@camstack/addon-agent-ui": "1.2.305",
+    "@camstack/addon-admin-ui": "1.2.539",
+    "@camstack/addon-agent-ui": "1.2.306",
     "@camstack/addon-auth": "1.2.174",
     "@camstack/addon-benchmark": "1.2.304",
     "@camstack/addon-decoder-nodeav": "1.2.144",
@@ -61,9 +61,9 @@
     "@camstack/addon-post-analysis": "1.2.656",
     "@camstack/develop": "0.1.41",
     "@camstack/sdk": "1.2.154",
-    "@camstack/system": "1.2.533",
-    "@camstack/types": "1.2.458",
-    "@camstack/ui-library": "1.2.363",
+    "@camstack/system": "1.2.535",
+    "@camstack/types": "1.2.460",
+    "@camstack/ui-library": "1.2.364",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",
     "@fastify/cors": "^11.2.0",