pinokiod 8.0.67 → 8.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "8.0.67",
+  "version": "8.0.69",
   "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/server/views/app.ejs

@@ -4115,13 +4115,10 @@ body.dark .disk-usage {
   inset: 0;
   z-index: 0;
   border-radius: inherit;
-  background: rgba(180, 83, 9, 0.16);
+  background: var(--pinokio-sidebar-notice-flash-bg);
   opacity: 0;
   pointer-events: none;
 }
-body.dark .appcanvas.vertical > aside .menu-actions #save-space-tab::before {
-  background: rgba(224, 165, 75, 0.18);
-}
 .appcanvas.vertical > aside .menu-actions #save-space-tab > .tab {
   position: relative;
   z-index: 1;
@@ -4132,10 +4129,10 @@ body.dark .appcanvas.vertical > aside .menu-actions #save-space-tab::before {
   justify-content: center;
   flex: 0 0 auto;
   padding: 1px 5px;
-  border: 1px solid rgba(180, 83, 9, 0.28);
+  border: 1px solid rgba(255,255,255,0.28);
   border-radius: 4px;
-  color: #92400e;
-  background: rgba(180, 83, 9, 0.1);
+  color: #fff;
+  background: #b91c1c;
   font-size: 10px;
   font-weight: 600;
   line-height: 1.2;
@@ -4146,9 +4143,9 @@ body.dark .appcanvas.vertical > aside .menu-actions #save-space-tab::before {
   display: none;
 }
 body.dark .app-vault-result-badge {
-  border-color: rgba(224, 165, 75, 0.34);
-  color: #e8b45f;
-  background: rgba(224, 165, 75, 0.12);
+  border-color: rgba(255,255,255,0.22);
+  color: #fff;
+  background: #dc2626;
 }
 #save-space-tab.app-vault-result-attention::before {
   animation: app-vault-result-attention 800ms cubic-bezier(0.22, 1, 0.36, 1);
@@ -8573,7 +8570,7 @@ body.dark .pinokio-custom-terminal-header {
             <i class="fa-solid fa-hard-drive menu-action-leading-icon"></i>
             <div class='display'>Disk Saver</div>
             <% if (vaultAutomaticSupported) { %>
-              <span class="app-vault-result-badge" data-app-vault-result-badge title="Possible duplicate files found" aria-hidden="true" <%=vaultAutomaticResultSignature ? '' : 'hidden'%>>Review</span>
+              <span class="app-vault-result-badge" data-app-vault-result-badge title="New possible duplicate matches found" aria-hidden="true" <%=vaultAutomaticResultSignature ? '' : 'hidden'%>>New</span>
             <% } %>
             <div class='flexible'></div>
             <% if (vaultAutomaticSupported) { %>

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

@@ -435,9 +435,13 @@ test("the app sidebar mirrors the shared layout state without another event stre
   assert.match(template, /data-app-vault-mode/)
   assert.match(template, /data-app-vault-result-badge/)
   assert.match(template,
-    /class="app-vault-result-badge"[\s\S]{0,200}>Review<\/span>/)
+    /class="app-vault-result-badge"[\s\S]{0,200}>New<\/span>/)
   assert.match(template,
-    /\.app-vault-result-badge\s*\{[^}]*display:\s*inline-flex;[^}]*padding:\s*1px 5px;[^}]*font-size:\s*10px;[^}]*font-weight:\s*600;/s)
+    /\.app-vault-result-badge\s*\{[^}]*color:\s*#fff;[^}]*background:\s*#b91c1c;/s)
+  assert.match(template,
+    /body\.dark \.app-vault-result-badge\s*\{[^}]*background:\s*#dc2626;/s)
+  assert.match(template,
+    /#save-space-tab::before\s*\{[^}]*background:\s*var\(--pinokio-sidebar-notice-flash-bg\);/s)
   assert.doesNotMatch(template,
     /\.app-vault-result-badge\s*\{[^}]*border-radius:\s*50%/s)
   assert.match(template, /app-vault-mode\.js/)
@@ -576,3 +580,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()
+})