pinokiod 8.0.67 → 8.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "8.0.67",
+  "version": "8.0.68",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/public/app-vault-mode.js

@@ -186,12 +186,21 @@
         !event.data || typeof event.data !== "object") return
     if (event.data.e === "vault-automatic-scan-state" &&
         window.parent !== window && event.source === window.parent) {
+      const firstParentState = parentStateVersion === 0
       parentStateVersion += 1
       if (fallbackTimer !== null) {
         window.clearTimeout(fallbackTimer)
         fallbackTimer = null
       }
-      applySnapshot(event.data.snapshot)
+      const snapshot = normalizeSnapshot(event.data.snapshot)
+      const result = snapshot.rows.find((item) => item.app === app)
+      const currentSignature = status.dataset.resultSignature || ""
+      const parentSignature = result ? result.signature : ""
+      if (firstParentState && currentSignature && currentSignature !== parentSignature) {
+        loadState()
+        return
+      }
+      applySnapshot(snapshot)
       relaySnapshot()
       return
     }

package/test/vault-automatic-scan-ui.test.js

@@ -576,3 +576,61 @@ test("a late parent state is not overwritten by the app badge fallback", async (
   dom.window.close()
   parent.window.close()
 })
+
+test("a stale parent replay cannot clear a server-rendered result", async () => {
+  const script = await fs.promises.readFile(
+    path.join(root, "server", "public", "app-vault-mode.js"), "utf8")
+  const signature = "d".repeat(64)
+  const parent = new JSDOM("", { url: "http://localhost/" })
+  const dom = new JSDOM(`<a id="save-space-tab">
+    <span data-app-vault-result-badge></span>
+    <span data-app-vault-mode data-app="ComfyUI" data-mode="automatic"
+      data-ready="true" data-result-signature="${signature}">
+      <span data-app-vault-mode-label>Auto</span>
+    </span>
+  </a>`, {
+    runScripts: "outside-only",
+    url: "http://localhost/v/ComfyUI"
+  })
+  Object.defineProperty(dom.window, "parent", {
+    configurable: true,
+    value: parent.window
+  })
+  parent.window.postMessage = () => {}
+  const requests = []
+  dom.window.fetch = async (url) => {
+    requests.push(url)
+    return {
+      ok: true,
+      json: async () => ({
+        global_scan_ready: true,
+        rows: [{ app: "ComfyUI", state: "result", signature }],
+        settings: [{ app: "ComfyUI", mode: "automatic" }]
+      })
+    }
+  }
+
+  dom.window.eval(script)
+  dom.window.dispatchEvent(new dom.window.MessageEvent("message", {
+    source: parent.window,
+    origin: "http://localhost",
+    data: {
+      e: "vault-automatic-scan-state",
+      snapshot: {
+        global_scan_ready: true,
+        rows: [],
+        settings: []
+      }
+    }
+  }))
+
+  await waitFor(() => requests.length === 1)
+  assert.deepEqual(requests, ["/info/vault/automatic-scans"])
+  assert.equal(dom.window.document.querySelector(
+    "[data-app-vault-result-badge]").hidden, false)
+  assert.equal(dom.window.document.querySelector(
+    "[data-app-vault-mode]").dataset.resultSignature, signature)
+
+  dom.window.close()
+  parent.window.close()
+})