foss-design 0.9.7 → 0.9.8

package/dist/cli.js

@@ -3033,8 +3033,16 @@ import fs20 from "fs";
 import os3 from "os";
 
 // src/server/snapshots.ts
+import { createHash as createHash5 } from "crypto";
 import fs17 from "fs";
 import path17 from "path";
+function sourceHash(file) {
+  try {
+    return createHash5("sha1").update(fs17.readFileSync(file)).digest("hex").slice(0, 16);
+  } catch {
+    return null;
+  }
+}
 var SAFE = /^@?[a-z0-9][a-z0-9_-]*$/i;
 function isSafeSegment(value) {
   return SAFE.test(value);
@@ -3050,6 +3058,12 @@ var SnapshotStore = class {
   metaFile(canvas) {
     return path17.join(this.dir, canvas, "meta.json");
   }
+  /** Written aside and renamed: a run stopped mid-write leaves the old file, not half of one. */
+  writeMeta(canvas, data) {
+    const temp = `${this.metaFile(canvas)}.${process.pid}.tmp`;
+    fs17.writeFileSync(temp, JSON.stringify(data));
+    fs17.renameSync(temp, this.metaFile(canvas));
+  }
   load(canvas) {
     const cached = this.meta.get(canvas);
     if (cached) return cached;
@@ -3084,7 +3098,21 @@ var SnapshotStore = class {
     if (!isSafeSegment(canvas) || !isSafeSegment(id2)) return null;
     return this.load(canvas)[id2]?.[theme2] ?? null;
   }
-  save(canvas, id2, theme2, png, height) {
+  /** The source hash recorded with the snapshot; undefined for snapshots taken before hashes were kept. */
+  source(canvas, id2, theme2) {
+    if (!isSafeSegment(canvas) || !isSafeSegment(id2)) return void 0;
+    return this.load(canvas)[id2]?.sources?.[theme2];
+  }
+  /** Record `hash` for a snapshot taken before hashes were kept: from now on it counts as that content's. */
+  adopt(canvas, id2, theme2, hash) {
+    if (!isSafeSegment(canvas) || !isSafeSegment(id2)) return;
+    const data = this.load(canvas);
+    const entry = data[id2];
+    if (!entry?.[theme2]) return;
+    entry.sources = { ...entry.sources, [theme2]: hash };
+    this.writeMeta(canvas, data);
+  }
+  save(canvas, id2, theme2, png, height, source) {
     if (!isSafeSegment(canvas) || !isSafeSegment(id2)) throw new Error("bad snapshot key");
     const dir = path17.join(this.dir, canvas);
     fs17.mkdirSync(dir, { recursive: true });
@@ -3093,10 +3121,12 @@ var SnapshotStore = class {
     fs17.renameSync(`${file}.${process.pid}.tmp`, file);
     const data = this.load(canvas);
     const version = Date.now();
-    data[id2] = { ...data[id2], [theme2]: version, ...height ? { height } : {} };
-    const temp = `${this.metaFile(canvas)}.${process.pid}.tmp`;
-    fs17.writeFileSync(temp, JSON.stringify(data));
-    fs17.renameSync(temp, this.metaFile(canvas));
+    const previous = data[id2];
+    const sources = { ...previous?.sources };
+    if (source) sources[theme2] = source;
+    else delete sources[theme2];
+    data[id2] = { ...previous, [theme2]: version, ...height ? { height } : {}, sources };
+    this.writeMeta(canvas, data);
     return { url: this.url(canvas, id2, theme2, version) };
   }
   /** Absolute path of `<id>.<theme>.png`, or of its thumbnail for `<id>.<theme>.thumb.png` (made on first use); null when missing. */
@@ -3353,13 +3383,18 @@ function staleSnapshots(paths, canvasIds, filter = {}) {
       if (filter.screens && !filter.screens.has(job.id)) continue;
       const file = files.get(job.id);
       if (!file || !fs20.existsSync(file)) continue;
-      const changed = fs20.statSync(file).mtimeMs;
+      const hash = sourceHash(file);
       const pinned = inDark.get(job.id) === job.theme;
       const themes = pinned ? [job.theme] : THEMES2;
-      const screen = { id: job.id };
       for (const theme2 of themes) {
-        const taken = store.version(id2, screen.id, theme2);
-        if (!taken || taken < changed) stale.push({ canvas: id2, screen: screen.id, theme: theme2 });
+        if (!store.version(id2, job.id, theme2)) {
+          stale.push({ canvas: id2, screen: job.id, theme: theme2, source: hash });
+          continue;
+        }
+        const recorded = store.source(id2, job.id, theme2);
+        if (recorded === void 0) {
+          if (hash) store.adopt(id2, job.id, theme2, hash);
+        } else if (recorded !== hash) stale.push({ canvas: id2, screen: job.id, theme: theme2, source: hash });
       }
     }
   }
@@ -3391,7 +3426,7 @@ async function takeSnapshots(paths, targets, preview, progress2) {
   const line = () => `Snapshots ${done}/${targets.length} (both themes, as the viewer and the cloud show them)`;
   progress2.update(line());
   try {
-    await mapLimit([...targets], TABS, async ({ canvas, screen, theme: theme2 }) => {
+    await mapLimit([...targets], TABS, async ({ canvas, screen, theme: theme2, source }) => {
       const job = canvasFrames(docOf(canvas), url, theme2, { id: screen })[0];
       if (job) {
         const page = await browser.newPage({
@@ -3404,7 +3439,7 @@ async function takeSnapshots(paths, targets, preview, progress2) {
           if (report.ready) {
             const png = await page.screenshot({ fullPage: job.fullPage });
             const height = job.fullPage ? await page.evaluate(() => document.documentElement.scrollHeight) : void 0;
-            store.save(canvas, screen, theme2, png, height);
+            store.save(canvas, screen, theme2, png, height, source);
           } else failed.push(`${canvas}/${screen} (${theme2})`);
         } catch {
           failed.push(`${canvas}/${screen} (${theme2})`);
@@ -4236,7 +4271,8 @@ async function handleApi(ctx, req, res, url) {
     try {
       const body = await readBody(req);
       if (body.subarray(0, 8).toString("hex") !== "89504e470d0a1a0a") throw new Error("not a PNG");
-      const { url: snapshotUrl } = snapshots.save(canvas, id2, theme2, body, height);
+      const file = project.source(canvas, id2)?.file;
+      const { url: snapshotUrl } = snapshots.save(canvas, id2, theme2, body, height, file ? sourceHash(file) : null);
       project.invalidateCanvas(canvas);
       events.send({ type: "snapshot", canvas, id: id2, theme: theme2, url: snapshotUrl, height });
       sendJson(res, 200, { url: snapshotUrl });