dsh-unlag 1.9.37 → 1.9.39

package/index.js

@@ -106,6 +106,18 @@ const MAX_TOTAL_SCRIPT_BYTES = 32 * 1024 * 1024
  * is work the request itself must not be able to grow without bound.
  */
 const MAX_BUNDLE_IDS = 128
+/**
+ * How long one stale-bundle answer may spend before it gives the request back to the app's own
+ * route. Each row is bounded on its own, but a request can name many rows and the route answers
+ * whatever a socket asks: without a whole-request bound one made-up address holds a connection for
+ * as long as its rows add up.
+ */
+const MAX_ANSWER_MS = 15_000
+/** The same bound for a test that must reach it quickly. */
+function answerBudgetMs() {
+  const set = Number(process.env.DSH_UNLAG_STALE_MS ?? '')
+  return set > 0 ? set : MAX_ANSWER_MS
+}
 /**
  * How long one startup check may spend reading the list. Each address is bounded on its own, but a
  * list of them is not: dozens of slow addresses would otherwise hold a press past the moment the
@@ -180,6 +192,16 @@ function settingsOf(config) {
   }
 }
 
+/**
+ * One log line, whatever the message. An address, a plugin id or an error can carry a line break,
+ * and a forged line in a file that is read as evidence is worse than a missing one; a message can
+ * also be arbitrarily long, and the log is one line per event.
+ */
+export function oneLine(value, limit = 2000) {
+  const text = String(value ?? '').replace(/[\r\n\u2028\u2029]+/gu, ' ')
+  return text.length > limit ? `${text.slice(0, limit)}\u2026` : text
+}
+
 function log(line) {
   try {
     const target = logTarget()
@@ -193,7 +215,7 @@ function log(line) {
         /* a missing or unreadable log is created by the append below */
       }
     }
-    appendFileSync(target, `${new Date().toISOString()} ${line}\n`)
+    appendFileSync(target, `${new Date().toISOString()} ${oneLine(line)}\n`)
   } catch {}
 }
 
@@ -974,10 +996,11 @@ async function currentEntryBody(clientModules, graph, id) {
  * answering with them in the requested order registers exactly the plugins the document expects,
  * so a boot that would otherwise 404 and end the app comes up instead.
  */
-async function regroupedBundleAnswer(clientModules, graph, request) {
+async function regroupedBundleAnswer(clientModules, graph, request, deadline = Date.now() + answerBudgetMs()) {
   if (request.sourceMap) return null
   const parts = []
   for (const id of request.ids) {
+    if (Date.now() > deadline) return null
     const body = await currentEntryBody(clientModules, graph, id)
     if (body === null) return null
     parts.push(body)
@@ -1005,7 +1028,7 @@ async function regroupedBundleAnswer(clientModules, graph, request) {
  * booting from an old startup list that meets one ends the whole app: a boot that comes up without
  * a plugin it no longer has beats that.
  */
-async function survivingBundleAnswer(clientModules, graph, request) {
+async function survivingBundleAnswer(clientModules, graph, request, deadline = Date.now() + answerBudgetMs()) {
   if (request.sourceMap) return null
   const entries = Array.isArray(graph?.entries) ? graph.entries : []
   const served = new Set(entries.filter((row) => typeof row?.id === 'string').map((row) => row.id))
@@ -1013,6 +1036,7 @@ async function survivingBundleAnswer(clientModules, graph, request) {
   if (gone.length === 0) return null
   const parts = []
   for (const id of request.ids) {
+    if (Date.now() > deadline) return null
     if (served.has(id)) {
       const body = await currentEntryBody(clientModules, graph, id)
       if (body === null) return null
@@ -1031,7 +1055,7 @@ async function survivingBundleAnswer(clientModules, graph, request) {
  * that really contains every plugin it claims is handed back; anything unsure answers null, so the
  * route then behaves exactly as before and an unknown id still ends as a plain 404.
  */
-async function currentBundleAnswer(clientModules, method, url) {
+async function currentBundleAnswer(clientModules, method, url, deadline = Date.now() + answerBudgetMs()) {
   const request = bundleRequest(url)
   if (request === null) return null
   const graph = clientModules.graph()
@@ -1057,7 +1081,7 @@ async function currentBundleAnswer(clientModules, method, url) {
       }
     }
   }
-  return (await regroupedBundleAnswer(clientModules, graph, request)) ?? survivingBundleAnswer(clientModules, graph, request)
+  return (await regroupedBundleAnswer(clientModules, graph, request, deadline)) ?? survivingBundleAnswer(clientModules, graph, request, deadline)
 }
 
 /** Answer one stale request over the plain request/response route an app registers. */
@@ -1355,7 +1379,10 @@ function releaseBundleShim(shim) {
     }
     // The mark belongs to this wrapper only; a mark left by a newer one stays on the route.
     if (shim.route[SHIM_MARK] === shim.wrapped) delete shim.route[SHIM_MARK]
-  } catch {}
+  } catch (error) {
+    // A route left wrapped here would answer pages from a context that is going away.
+    log(`cannot unwrap the bundle route: ${oneLine(error?.message ?? error)}`)
+  }
 }
 
 /**
@@ -1558,7 +1585,10 @@ export async function readStartupScript(clientModules, url) {
   try {
     const answer = await currentBundleAnswer(clientModules, 'GET', url)
     if (answer !== null) return { status: 200, arrayBuffer: async () => answer.body }
-  } catch {}
+  } 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`)
+  }
   return fetchBundleAt(clientModules, url, 'GET')
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-unlag",
-  "version": "1.9.37",
+  "version": "1.9.39",
   "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",