dsh-unlag 1.9.78 → 1.9.80

package/client.js

@@ -72,6 +72,14 @@ window.__ModuleLoader__.load({
       }
     }
 
+    function stampClear() {
+      try {
+        window.sessionStorage.removeItem(STAMP_KEY);
+      } catch {
+        // Pacing is the only thing this stamp feeds: a store that refuses the clear costs nothing.
+      }
+    }
+
     function stampWrite() {
       try {
         window.sessionStorage.setItem(STAMP_KEY, String(Date.now()));
@@ -860,7 +868,6 @@ window.__ModuleLoader__.load({
             report('replaced');
             return stop(replaced ? 'replaced' : 'done');
           }
-          stampWrite();
           const reason = await prepareInterface();
           if (reason !== null) {
             // The log keeps the exact check that refused, so a held press can be explained later.
@@ -868,6 +875,9 @@ window.__ModuleLoader__.load({
             report('held', replaced ? `applied:${gate}` : gate);
             return stop(reason, replaced);
           }
+          // Written only now, when the document really is about to go: a press that was held changed
+          // nothing, so the next press must not be turned away as if this one had been answered.
+          stampWrite();
           report('rebuild');
           navigated = true;
           reloadFreshPage();
@@ -885,6 +895,9 @@ window.__ModuleLoader__.load({
               // Still here after asking for a rebuild: the page held the navigation. Say what
               // happened and take the press back, so the button is never left unresponsive.
               report('held', 'navigation');
+              // The document stayed, so no press was answered: clear the pacing stamp this press
+              // wrote, or the next press inside three seconds would be told it is already applying.
+              stampClear();
               setPending(false);
               // Only a press that really replaced the plugins may say so: a page-only press that
               // held the navigation changed no code.

package/index.js

@@ -1144,7 +1144,13 @@ async function currentBundleAnswer(clientModules, method, url, deadline = Date.n
       }
     }
   }
-  return (await regroupedBundleAnswer(clientModules, graph, request, deadline)) ?? survivingBundleAnswer(clientModules, graph, request, deadline)
+  const regrouped = await regroupedBundleAnswer(clientModules, graph, request, deadline)
+  if (regrouped !== null) return regrouped
+  // What is left is the last resort: the set itself is gone and the body is a stand-in that
+  // registers nothing. The check passes, and the answer says so, because a page booting that row
+  // comes up without the plugin rather than failing.
+  const surviving = await survivingBundleAnswer(clientModules, graph, request, deadline)
+  return surviving === null ? null : { ...surviving, standIn: true }
 }
 
 /** Answer one stale request over the plain request/response route an app registers. */
@@ -1663,6 +1669,7 @@ export async function verifyStartupRows(graph, fetchBody, rows, budgetMs = MAX_V
   const bodies = []
   const began = Date.now()
   let totalBytes = 0
+  let standInRows = 0
   for (const item of wanted) {
     if (Date.now() - began > budgetMs) {
       return { status: 'blocked', reason: 'slow', detail: 'the startup list took longer than this check waits' }
@@ -1688,6 +1695,9 @@ export async function verifyStartupRows(graph, fetchBody, rows, budgetMs = MAX_V
     if (!readable || response === null || response === undefined || status !== 200) {
       return { status: 'blocked', reason: 'missing', detail: `${item.url} answers ${readable ? String(status ?? 'nothing') : 'nothing readable'}` }
     }
+    try {
+      if (response?.standIn === true) standInRows += 1
+    } catch {}
     let bytes = null
     try {
       bytes = Buffer.from(await response.arrayBuffer())
@@ -1742,6 +1752,7 @@ export async function verifyStartupRows(graph, fetchBody, rows, budgetMs = MAX_V
     revision: typeof graph?.rev === 'string' ? graph.rev : null,
     scripts: bodies.map((body) => ({ url: body.url, digest: body.digest, ids: body.ids })),
     ...(leftOut.size > 0 ? { leftOut: [...leftOut] } : {}),
+    ...(standInRows > 0 ? { standInRows } : {}),
   }
 }
 
@@ -1757,7 +1768,9 @@ export async function verifyStartupRows(graph, fetchBody, rows, budgetMs = MAX_V
 export async function readStartupScript(clientModules, url) {
   try {
     const answer = await currentBundleAnswer(clientModules, 'GET', url)
-    if (answer !== null) return { status: 200, arrayBuffer: async () => answer.body }
+    // `standIn` rides along: these bytes stand in for a plugin the set no longer has, and the check
+    // says so when it passes, so the log can tell that from a body the app really serves.
+    if (answer !== null) return { status: 200, standIn: answer.standIn === true, arrayBuffer: async () => answer.body }
   } catch (error) {
     // The fallback is still the right answer; the failure itself must not vanish.
     log(`cannot answer ${oneLine(url)} at the revision the app serves now: ${oneLine(error?.message ?? error)}; asking the app's own route`)
@@ -1892,6 +1905,9 @@ function serveButton(ctx, controller, config) {
           if (verdict?.status !== 'ok') {
             log(`a startup check refused the page: ${String(verdict?.reason ?? 'list')} (${String(verdict?.detail ?? 'no detail')})`)
           }
+          if (typeof verdict?.standInRows === 'number' && verdict.standInRows > 0) {
+            log(`a startup check passed with ${String(verdict.standInRows)} row(s) answered by a stand-in script`)
+          }
           if (Array.isArray(verdict?.leftOut) && verdict.leftOut.length > 0) {
             log(`a startup row names a plugin this app no longer serves: ${verdict.leftOut.join(', ')}; the page comes up without it`)
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-unlag",
-  "version": "1.9.78",
+  "version": "1.9.80",
   "type": "module",
   "description": "A press applies plugin edits right away and brings a laggy interface back; automatic reloading stays off unless you turn it on, so the press is the only trigger, and nothing restarts.",
   "license": "MIT",