pinokiod 8.0.72 → 8.0.73

package/kernel/vault/automatic_scans.js

@@ -57,6 +57,7 @@ class AutomaticScans {
     this.lifecycleWork = new Set()
     this.stopSettleMs = STOP_SETTLE_MS
     this.drainQueued = false
+    this.drainRequested = false
     this.waitingFor = null
     this.listeners = new Set()
     this.appTransitions = new Map()
@@ -266,9 +267,13 @@ class AutomaticScans {
   }
 
   async candidateThreshold() {
-    const scan = this.vault.registry
-      ? await this.vault.registry.scanFor()
+    const cached = this.vault.lastScanCache &&
+      typeof this.vault.lastScanCache.get === "function"
+      ? this.vault.lastScanCache.get("")
       : null
+    const scan = cached || (this.vault.registry
+      ? await this.vault.registry.scanFor()
+      : null)
     const threshold = scan ? Number(scan.candidate_min_bytes) : NaN
     return Number.isFinite(threshold) && threshold >= 0
       ? threshold
@@ -805,24 +810,38 @@ class AutomaticScans {
   }
 
   schedule() {
-    if (this.disposed || this.drainQueued) return
+    if (this.disposed) return
+    if (this.drainQueued) {
+      this.drainRequested = true
+      return
+    }
     this.drainQueued = true
     queueMicrotask(() => {
-      this.drainQueued = false
-      const pending = this.drain()
+      const pending = (async () => {
+        do {
+          this.drainRequested = false
+          await this.drain()
+        } while (!this.disposed && this.drainRequested)
+      })()
       this.lifecycleWork.add(pending)
       pending.then(
-        () => this.lifecycleWork.delete(pending),
-        () => this.lifecycleWork.delete(pending)
+        () => {
+          this.lifecycleWork.delete(pending)
+          this.drainQueued = false
+          if (this.drainRequested) this.schedule()
+        },
+        (error) => {
+          this.lifecycleWork.delete(pending)
+          this.drainQueued = false
+          this.log("error", {
+            stage: "queue",
+            message: error && error.message ? error.message : String(error)
+          })
+          console.warn("Automatic Disk Saver check failed:",
+            error && error.message ? error.message : error)
+          if (this.drainRequested) this.schedule()
+        }
       )
-      pending.catch((error) => {
-        this.log("error", {
-          stage: "queue",
-          message: error && error.message ? error.message : String(error)
-        })
-        console.warn("Automatic Disk Saver check failed:",
-          error && error.message ? error.message : error)
-      })
     })
   }
 
@@ -972,7 +991,6 @@ class AutomaticScans {
     const paths = [...new Set(active.paths || [])].filter((filePath) =>
       typeof filePath === "string" && inside(root, filePath))
     const verifiedHashes = new Map()
-    await this.vault.registry.beginAutomaticPrecheck(app)
     this.log("check-started", {
       app,
       root,
@@ -980,6 +998,7 @@ class AutomaticScans {
       changed_paths: paths.length,
       policy: "metadata-prefilter-sha256"
     })
+    await this.vault.registry.beginAutomaticPrecheck(app)
     try {
       this.checkpoint(active)
       const metadataOptions = {
@@ -1164,7 +1183,19 @@ class AutomaticScans {
       item.state === "checking")
     if (!entry) return
     await this.refreshGlobalScanReady()
-    if (this.disposed || !this.globalScanReady) return
+    if (this.disposed) return
+    if (!this.globalScanReady) {
+      if (this.entries.get(entry.app) === entry) {
+        this.restorePrevious(entry.app)
+        this.discardChangedPaths(entry.app)
+        this.log("check-skipped", {
+          app: entry.app,
+          reason: "global-scan-required"
+        })
+      }
+      this.schedule()
+      return
+    }
     if (this.manualDepth > 0 || this.currentBusyPromise() ||
         this.vault.fileActionProgress) {
       this.waitForBusyWork()

package/package.json

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

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

@@ -405,6 +405,71 @@ describe("automatic app checks", () => {
     assert.equal(checksStarted, 0)
   })
 
+  test("scheduler coalesces wakeups while dispatch is in progress", async () => {
+    let releaseReadiness
+    let readinessCalls = 0
+    let dispatches = 0
+    const automatic = makeAutomatic({
+      enabled: true,
+      registry: {},
+      runExclusive: () => {
+        dispatches += 1
+        return new Promise(() => {})
+      }
+    })
+    automatic.entries.set("demo", {
+      app: "demo",
+      state: "checking",
+      paths: []
+    })
+    automatic.globalScanReady = true
+    automatic.refreshGlobalScanReady = async () => {
+      readinessCalls += 1
+      if (readinessCalls === 1) {
+        await new Promise((resolve) => { releaseReadiness = resolve })
+      }
+      automatic.globalScanReady = true
+    }
+    automatic.appRootIsAvailable = async () => true
+    automatic.appIsRunning = () => false
+
+    automatic.schedule()
+    await waitFor(() => typeof releaseReadiness === "function",
+      "scheduler readiness pause")
+    automatic.schedule()
+    releaseReadiness()
+    await waitFor(() => dispatches > 0, "automatic dispatch")
+    await new Promise((resolve) => setImmediate(resolve))
+
+    assert.equal(dispatches, 1)
+    assert.equal(readinessCalls, 1)
+  })
+
+  test("queued checks are cleared if global readiness disappears", async () => {
+    const automatic = makeAutomatic({
+      enabled: true,
+      registry: {}
+    })
+    automatic.entries.set("demo", {
+      app: "demo",
+      state: "checking",
+      paths: ["/pinokio/api/demo/model.bin"]
+    })
+    automatic.changedPaths.set("demo", new Set([
+      "/pinokio/api/demo/model.bin"
+    ]))
+    automatic.refreshGlobalScanReady = async () => {
+      automatic.globalScanReady = false
+    }
+    automatic.log = () => {}
+
+    automatic.schedule()
+    await waitFor(() => !automatic.drainQueued, "automatic queue cleanup")
+
+    assert.equal(automatic.entries.has("demo"), false)
+    assert.equal(automatic.changedPaths.has("demo"), false)
+  })
+
   test("Linux starts no watcher and ignores automatic lifecycle work", async () => {
     const home = await makeHome()
     const appRoot = path.join(home, "api", "linux-app")