@camstack/server 1.1.38 → 1.1.39

package/dist/core/addon/framework-live-sync.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveHubClosurePackageDir = resolveHubClosurePackageDir;
 exports.resolveOverlayPackageDir = resolveOverlayPackageDir;
 exports.computeDistBuildId = computeDistBuildId;
+exports.swapDist = swapDist;
 exports.syncFrameworkDist = syncFrameworkDist;
 /**
  * Framework live-sync — make a `camstack deploy` of a framework package
@@ -202,17 +203,27 @@ function computeDistBuildId(distDir) {
 // ---------------------------------------------------------------------------
 // Atomic dist swap (rename-aside)
 // ---------------------------------------------------------------------------
+function isCrossDeviceError(err) {
+    return err instanceof Error && err.code === 'EXDEV';
+}
 /**
- * Replace `<targetPkgDir>/dist` with a copy of `sourceDistDir`, atomically.
+ * Replace `<targetPkgDir>/dist` with a copy of `sourceDistDir`.
+ *
+ * 1. COPY `sourceDistDir` → a staging dir INSIDE the target dir. The live
+ *    `dist/` is untouched, so a mid-copy failure cannot corrupt it.
+ * 2. Evict the current `dist/` aside (rename), then rename the staging dir into
+ *    place. Both renames are metadata ops WITHIN the target fs (atomic). If the
+ *    final swap fails, the previous `dist/` is restored.
  *
- * 1. Cross-device COPY `sourceDistDir` → a staging dir INSIDE the target's
- *    filesystem. The live `dist/` is untouched, so a mid-copy failure cannot
- *    corrupt it.
- * 2. Rename the current `dist/` aside, then rename the staging dir into place.
- *    Both renames are metadata ops WITHIN the target fs (atomic). If the final
- *    swap fails, the previous `dist/` is restored so the target is never left
- *    without one.
- * 3. Best-effort delete of the evicted copy.
+ * OVERLAYFS FALLBACK: the hub-closure target (`/opt/.../@camstack/system`) lives
+ * on the container's overlay rootfs. A `dist/` materialized from a LOWER image
+ * layer cannot be `rename()`d (overlayfs returns `EXDEV: cross-device link`),
+ * so the atomic aside/swap is impossible there. On EXDEV we fall back to a
+ * copy-aside restore point + in-place replace. This opens a brief non-atomic
+ * window, but it is safe here: the running process already holds the old
+ * modules in memory (nothing reads `dist/` until the scheduled restart), and
+ * the copy-aside is kept until the replace completes so a failure is
+ * recoverable.
  */
 async function swapDist(sourceDistDir, targetPkgDir) {
     const targetDist = path.join(targetPkgDir, 'dist');
@@ -227,24 +238,63 @@ async function swapDist(sourceDistDir, targetPkgDir) {
         await fs.promises.rm(incoming, { recursive: true, force: true }).catch(() => undefined);
         throw err;
     }
-    // Step 2 — atomic swap within the target fs.
     const hadDist = fs.existsSync(targetDist);
+    // How the previous dist was preserved: 'rename' (moved aside, same fs),
+    // 'copy' (overlayfs EXDEV — copied aside then removed in place), or 'none'.
+    let asideKind = 'none';
+    const restorePreviousDist = async () => {
+        if (asideKind === 'none' || fs.existsSync(targetDist))
+            return;
+        if (asideKind === 'rename') {
+            await fs.promises.rename(aside, targetDist).catch(() => undefined);
+        }
+        else {
+            await fs.promises
+                .cp(aside, targetDist, { recursive: true, force: true })
+                .catch(() => undefined);
+        }
+    };
+    // Step 2 — evict the current dist. Prefer the atomic rename; fall back to
+    // copy-aside + in-place remove on overlayfs EXDEV.
     if (hadDist) {
-        await fs.promises.rename(targetDist, aside);
+        try {
+            await fs.promises.rename(targetDist, aside);
+            asideKind = 'rename';
+        }
+        catch (err) {
+            if (!isCrossDeviceError(err)) {
+                await fs.promises.rm(incoming, { recursive: true, force: true }).catch(() => undefined);
+                throw err;
+            }
+            await fs.promises.cp(targetDist, aside, { recursive: true, force: true });
+            await fs.promises.rm(targetDist, { recursive: true, force: true });
+            asideKind = 'copy';
+        }
     }
+    // Step 3 — move the incoming dist into place; fall back to copy on EXDEV.
     try {
         await fs.promises.rename(incoming, targetDist);
     }
-    catch (swapErr) {
-        // Restore the previous dist so the target is never left without one.
-        if (hadDist) {
-            await fs.promises.rename(aside, targetDist).catch(() => undefined);
+    catch (err) {
+        if (isCrossDeviceError(err)) {
+            try {
+                await fs.promises.cp(incoming, targetDist, { recursive: true, force: true });
+                await fs.promises.rm(incoming, { recursive: true, force: true }).catch(() => undefined);
+            }
+            catch (copyErr) {
+                await restorePreviousDist();
+                await fs.promises.rm(incoming, { recursive: true, force: true }).catch(() => undefined);
+                throw copyErr;
+            }
+        }
+        else {
+            await restorePreviousDist();
+            await fs.promises.rm(incoming, { recursive: true, force: true }).catch(() => undefined);
+            throw err;
         }
-        await fs.promises.rm(incoming, { recursive: true, force: true }).catch(() => undefined);
-        throw swapErr;
     }
-    // Step 3 — best-effort cleanup of the evicted copy.
-    if (hadDist) {
+    // Step 4 — best-effort cleanup of the evicted copy.
+    if (asideKind !== 'none') {
         await fs.promises.rm(aside, { recursive: true, force: true }).catch(() => undefined);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.1.38",
+  "version": "1.1.39",
   "private": false,
   "files": [
     "dist",