Skip to content

Commit b5ffa67

Browse files
committed
fix(desktop): retain startup flush for incomplete prepared caches
1 parent f46b0ec commit b5ffa67

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

‎scripts/lib/server-compile-cache.test.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,17 @@ it("seeds relocated cache entries without allowing writes into shipped resources
3131
expect(NodeFS.readFileSync(NodePath.join(prepared, "12345678"), "utf8")).toBe("prepared bytes");
3232
expect(seedPreparedCache(prepared, active, "matching")).toBe(true);
3333
expect(NodeFS.readFileSync(NodePath.join(active, key), "utf8")).toBe("runtime replacement");
34+
const missing = { module: "app.asar/apps/server/dist/missing.mjs", file: "87654321" };
35+
for (const entries of [
36+
[...manifest.entries, missing],
37+
[missing, ...manifest.entries],
38+
]) {
39+
NodeFS.writeFileSync(
40+
NodePath.join(prepared, "manifest.json"),
41+
JSON.stringify({ ...manifest, entries }),
42+
);
43+
expect(seedPreparedCache(prepared, active, "matching")).toBe(false);
44+
}
3445
NodeFS.writeFileSync(NodePath.join(prepared, "manifest.json"), "corrupt");
3546
expect(seedPreparedCache(prepared, active, "matching")).toBe(false);
3647
expect(seedPreparedCache(NodePath.join(root, "missing"), active, "matching")).toBe(false);

‎scripts/lib/server-compile-cache.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export function seedPreparedCache(prepared: string, active: string, runtime: str
4040
manifest.entries.length === 0
4141
)
4242
return false;
43-
let seeded = false;
4443
for (const entry of manifest.entries) {
4544
if (
4645
typeof entry?.module !== "string" ||
@@ -58,12 +57,10 @@ export function seedPreparedCache(prepared: string, active: string, runtime: str
5857
// Node replaces cache files atomically. A directory link would instead allow writes into signed resources.
5958
if (process.platform === "win32") NodeFS.linkSync(source, destination);
6059
else NodeFS.symlinkSync(source, destination);
61-
seeded = true;
62-
} catch {
63-
seeded ||= NodeFS.existsSync(destination);
64-
}
60+
} catch {}
61+
if (!NodeFS.existsSync(destination)) return false;
6562
}
66-
return seeded;
63+
return true;
6764
} catch {
6865
return false;
6966
}

0 commit comments

Comments
 (0)