castle-web-cli 0.4.99 → 0.4.100

package/dist/imports.js

@@ -1,5 +1,4 @@
 import * as fs from 'fs';
-import * as os from 'os';
 import * as path from 'path';
 import { nanoid } from 'nanoid';
 import * as api from './api.js';
@@ -248,20 +247,32 @@ export async function restoreMissingImports(deckDir) {
     }
     return restored;
 }
-// Download an archive and unpack it at `destDir`, via a temp dir so a failure
-// partway leaves nothing behind.
+// Download an archive and unpack it at `destDir`, replacing whatever is there.
+//
+// Staged NEXT TO destDir rather than in the OS temp dir. In a sandbox `/tmp` and
+// the workspace are separate filesystems, and renaming across them fails with
+// EXDEV -- which, when the old copy had already been cleared to make room, left
+// the deck with no kit at all. Staging inside `imports/` keeps the move on one
+// filesystem, and nothing existing is touched until the new copy is unpacked and
+// whole: a failed download or a bad archive now leaves the deck exactly as it
+// was.
 async function fetchDeckSourceInto(archiveUrl, destDir) {
-    const res = await fetch(archiveUrl, { signal: AbortSignal.timeout(60000) });
-    if (!res.ok)
-        throw new Error(`Archive fetch failed: HTTP ${res.status}`);
-    const buf = Buffer.from(await res.arrayBuffer());
-    const tmpFile = path.join(os.tmpdir(), `castle-import-${nanoid(8)}.tar.gz`);
-    const tmpDir = path.join(os.tmpdir(), `castle-import-${nanoid(8)}`);
-    fs.writeFileSync(tmpFile, buf);
+    const importsDir = path.dirname(destDir);
+    fs.mkdirSync(importsDir, { recursive: true });
+    const tmpFile = path.join(importsDir, `.castle-import-${nanoid(8)}.tar.gz`);
+    const tmpDir = path.join(importsDir, `.castle-import-${nanoid(8)}`);
     fs.mkdirSync(tmpDir, { recursive: true });
     try {
+        const res = await fetch(archiveUrl, { signal: AbortSignal.timeout(60000) });
+        if (!res.ok)
+            throw new Error(`Archive fetch failed: HTTP ${res.status}`);
+        fs.writeFileSync(tmpFile, Buffer.from(await res.arrayBuffer()));
         await runTar(['-xzf', tmpFile, '-C', tmpDir]);
-        fs.mkdirSync(path.dirname(destDir), { recursive: true });
+        // The new copy is whole; only now is it safe to drop the old one.
+        if (fs.existsSync(destDir)) {
+            unlockImportTree(destDir);
+            fs.rmSync(destDir, { recursive: true, force: true });
+        }
         fs.renameSync(tmpDir, destDir);
     }
     finally {
@@ -347,11 +358,11 @@ function backupImport(deckDir, alias) {
 async function placeImport(deckDir, alias, deckId, source, via) {
     const destDir = path.join(deckDir, IMPORTS_DIR, alias);
     const replaced = fs.existsSync(destDir);
-    if (replaced) {
+    // Back up first, but leave the old copy in place: fetchDeckSourceInto only
+    // clears it once the replacement is unpacked, so a failed update is a no-op
+    // rather than a deck with its kit missing.
+    if (replaced)
         backupImport(deckDir, alias);
-        unlockImportTree(destDir);
-        fs.rmSync(destDir, { recursive: true, force: true });
-    }
     await fetchDeckSourceInto(source.archiveUrl, destDir);
     lockImportTree(destDir);
     clearStatusCache(deckDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "castle-web-cli",
-  "version": "0.4.99",
+  "version": "0.4.100",
   "type": "module",
   "bin": {
     "castle-web": "./dist/index.js"