pinokiod 8.0.60 → 8.0.61

package/kernel/vault/automatic_scans.js

@@ -10,7 +10,7 @@ const {
 } = require("./operation_errors")
 
 const COMPLETE_PHASES = new Set(["complete", "completed_with_exclusions"])
-const STOP_SETTLE_MS = 3000
+const STOP_SETTLE_MS = 1000
 const PROGRESS_INTERVAL_MS = 5000
 const isMissing = (error) => !!(error &&
   (error.code === "ENOENT" || error.code === "ENOTDIR"))

package/package.json

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

package/server/public/vault.js

@@ -105,7 +105,7 @@ const COPY = {
   never: "Never",
   scan: "Scan",
   scan_app: "Scan this app",
-  scan_all_locations: "Scan all locations",
+  setup_disk_saver: "Set up Disk Saver",
   setup_title: "Run an initial scan to enable app scans",
   setup_description: "This creates the file index used to compare apps and enables automatic checks.",
   scan_again: "Scan again",
@@ -537,12 +537,7 @@ const post = async (payload) => {
   return result
 }
 const openGlobalWorkspace = () => {
-  if (window.parent === window) {
-    window.location.assign("/vault")
-    return
-  }
-  window.parent.postMessage(
-    { e: "vault-open-global" }, window.location.origin)
+  window.parent.location.assign("/vault")
 }
 let automaticModeEventSource = null
 const applyAutomaticScanSnapshot = (snapshot) => {
@@ -2229,9 +2224,9 @@ const renderSetupOverview = () => {
   restoreAutomaticModeMenu(modeMenuOpen)
 
   const scanButton = el("btn-scan")
-  scanButton.innerHTML = `<i class="fa-solid fa-rotate"></i>${esc(COPY.scan_all_locations)}`
+  scanButton.innerHTML = `<i class="fa-solid fa-arrow-right" aria-hidden="true"></i>${esc(COPY.setup_disk_saver)}`
   scanButton.classList.add("primary")
-  scanButton.disabled = state.scanCancelRequested
+  scanButton.disabled = false
   const candidateSizeSelect = el("vault-candidate-size")
   if (candidateSizeSelect) candidateSizeSelect.hidden = true
   const scanState = el("vault-scan-state")
@@ -3643,25 +3638,7 @@ document.addEventListener("click", async (event) => {
       return
     }
     if (appSetupRequired()) {
-      target.disabled = true
-      state.feedback = null
-      renderFeedback()
-      try {
-        const result = await post({
-          action: "scan",
-          scope_id: null,
-          candidate_size: candidateSize()
-        })
-        if (result.error) throw new Error(result.error)
-        openGlobalWorkspace()
-      } catch (error) {
-        target.disabled = false
-        state.feedback = {
-          error: true,
-          message: error && error.message ? error.message : String(error)
-        }
-        renderFeedback()
-      }
+      openGlobalWorkspace()
       return
     }
     state.scanRequested = true

package/server/views/app.ejs

@@ -12907,13 +12907,6 @@ const rerenderMenuSection = (container, html) => {
     await renderSelection({ target: diskSaverTab, force: true })
     openVaultAutomaticSettings()
   })
-  window.addEventListener("message", (event) => {
-    const frame = document.querySelector("iframe[name='app-vault']")
-    if (!frame || event.source !== frame.contentWindow ||
-        event.origin !== window.location.origin ||
-        !event.data || event.data.e !== "vault-open-global") return
-    window.location.assign("/vault")
-  })
   if (window.parent !== window) {
     window.parent.postMessage(
       { e: "vault-auto-settings-ready" }, window.location.origin)

package/test/vault-automatic-scans.test.js

@@ -102,6 +102,10 @@ describe("automatic app checks", () => {
     assert.deepEqual(automatic.snapshot().rows, [])
   })
 
+  test("automatic checks wait one second after an app stops", () => {
+    assert.equal(AutomaticScans.STOP_SETTLE_MS, 1000)
+  })
+
   test("disabled Vault ignores app-stop events", async () => {
     const home = await makeHome()
     const appRoot = path.join(home, "api", "disabled-app")

package/test/vault-ui.test.js

@@ -3,7 +3,7 @@ const assert = require("node:assert/strict")
 const fs = require("node:fs")
 const path = require("node:path")
 const ejs = require("ejs")
-const { JSDOM, VirtualConsole } = require("jsdom")
+const { JSDOM } = require("jsdom")
 
 const root = path.resolve(__dirname, "..")
 const publicRoot = path.join(root, "server", "public")
@@ -153,24 +153,17 @@ const makePage = async (status, options = {}) => {
   const workspace = ejs.render(await source(workspacePath), {
     appMode
   })
-  const navigationErrors = []
-  const virtualConsole = options.captureNavigation
-    ? new VirtualConsole().on("jsdomError", (error) => {
-        navigationErrors.push(error)
-      })
-    : undefined
   const dom = new JSDOM(
     `<body data-platform="${process.platform}" data-agent="electron" data-vault-mode="${appMode ? "app" : "global"}" data-vault-scope="${scopeId}" data-vault-app="${appMode ? "app" : ""}" data-vault-home="${homePath}">${workspace}</body>`,
     {
       runScripts: "outside-only",
-      virtualConsole,
       url: appMode
         ? "http://localhost/vault/app/app"
         : "http://localhost/vault"
     }
   )
   const requests = []
-  const parentMessages = []
+  const parentNavigations = []
   const selectedSources = new Set(options.folderDiscoverySelected || [])
   const recommendedSources = new Set()
   const confirmations = []
@@ -262,8 +255,10 @@ const makePage = async (status, options = {}) => {
     Object.defineProperty(dom.window, "parent", {
       configurable: true,
       value: {
-        postMessage(message, targetOrigin) {
-          parentMessages.push({ message, targetOrigin })
+        location: {
+          assign(target) {
+            parentNavigations.push(target)
+          }
         }
       }
     })
@@ -418,8 +413,7 @@ const makePage = async (status, options = {}) => {
   return {
     dom,
     requests,
-    parentMessages,
-    navigationErrors,
+    parentNavigations,
     confirmations,
     pickerRequests,
     choosePickedPath,
@@ -466,7 +460,8 @@ describe("Save Space interface", () => {
     assert.doesNotMatch(combined, /Previous completed results were kept\./)
     assert.match(combined, /Scan completed with exclusions/)
     assert.match(combined, /Provisional until the scan completes/)
-    assert.match(combined, /Scan all locations/)
+    assert.match(combined, /Set up Disk Saver/)
+    assert.doesNotMatch(combined, /Scan all locations/)
     assert.match(combined, /data-find-home-folder/)
     assert.match(combined, /data-find-other-folder/)
     assert.doesNotMatch(combined,
@@ -2226,7 +2221,7 @@ describe("Save Space interface", () => {
     dom.window.close()
   })
 
-  test("an app without a global baseline shows setup and starts a global scan", async () => {
+  test("an app without a global baseline shows setup and opens global Disk Saver", async () => {
     const status = fixture([], {
       global_scan_ready: false,
       last_scan: null,
@@ -2234,12 +2229,11 @@ describe("Save Space interface", () => {
       saved_by_sharing: 0,
       pending_bytes: 0
     })
-    const { dom, requests, parentMessages } = await makePage(status, {
+    const { dom, requests, parentNavigations } = await makePage(status, {
       appMode: true,
       embeddedApp: true,
       scopeId: "app:app",
       actionResults: {
-        scan: { started: true },
         automatic_set_mode: { app: "app", mode: "manual" }
       }
     })
@@ -2250,7 +2244,7 @@ describe("Save Space interface", () => {
       /Run an initial scan to enable app scans/)
     assert.match(document.querySelector(".vault-setup-copy").textContent,
       /creates the file index used to compare apps/)
-    assert.match(scanButton.textContent, /Scan all locations/)
+    assert.match(scanButton.textContent, /Set up Disk Saver/)
     assert.equal(scanButton.classList.contains("primary"), true)
     assert.equal(document.getElementById("vault-candidate-size").hidden, true)
     assert.equal(document.getElementById("vault-explorer").style.display,
@@ -2271,45 +2265,8 @@ describe("Save Space interface", () => {
       "none")
 
     scanButton.click()
-    await waitFor(() => requests.some((request) =>
-      request.action === "scan"))
-    assert.deepEqual(requests.find((request) => request.action === "scan"), {
-      action: "scan",
-      scope_id: null,
-      candidate_size: 100 * (process.platform === "win32" ? 1024 : 1000) ** 2
-    })
-    await waitFor(() => parentMessages.length === 1)
-    assert.equal(parentMessages[0].message.e, "vault-open-global")
-    assert.equal(parentMessages[0].targetOrigin, "http://localhost")
-
-    dom.window.close()
-  })
-
-  test("app setup navigates to global Disk Saver when standalone", async () => {
-    const status = fixture([], {
-      global_scan_ready: false,
-      last_scan: null
-    })
-    const { dom, requests, navigationErrors } = await makePage(status, {
-      appMode: true,
-      captureNavigation: true,
-      scopeId: "app:app",
-      actionResults: { scan: { started: true } }
-    })
-
-    dom.window.document.getElementById("btn-scan").click()
-    await waitFor(() => requests.some((request) =>
-      request.action === "scan"))
-    await waitFor(() => navigationErrors.length > 0)
-
-    assert.deepEqual(requests.find((request) => request.action === "scan"), {
-      action: "scan",
-      scope_id: null,
-      candidate_size: 100 *
-        (process.platform === "win32" ? 1024 : 1000) ** 2
-    })
-    assert.match(navigationErrors[0].message,
-      /Not implemented: navigation/)
+    assert.deepEqual(parentNavigations, ["/vault"])
+    assert.equal(requests.some((request) => request.action === "scan"), false)
 
     dom.window.close()
   })