dsh-unlag 1.9.24 → 1.9.26

package/client.js

@@ -245,6 +245,7 @@ window.__ModuleLoader__.load({
       network: 'script', // ui-copy-ignore
       parse: 'parse', // ui-copy-ignore
       register: 'plugin', // ui-copy-ignore
+      slow: 'script', // ui-copy-ignore
       dependencies: 'covers',
       list: 'list', // ui-copy-ignore
     };

package/index.js

@@ -92,6 +92,12 @@ const MAX_STARTUP_ROW_CHARS = 4096
  * is work the request itself must not be able to grow without bound.
  */
 const MAX_BUNDLE_IDS = 128
+/**
+ * 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
+ * page gives up waiting, and the person would see a button that did nothing.
+ */
+const MAX_VERIFY_MS = 9000
 const MIN_INTERVAL_MS = 1500
 /** The route the app publishes client bundles under; the same key the module table registers. */
 const BUNDLE_ROUTE = '/plugins'
@@ -893,14 +899,34 @@ function currentBundleUrls(graph, request) {
  */
 async function fetchBundleAt(clientModules, url, method) {
   const address = `http://unlag.invalid${url}`
-  if (typeof Request === 'function') {
-    try {
-      return await clientModules.fetchBundle(new Request(address, { method, headers: {} }))
-    } catch (error) {
-      if (error?.name !== 'TypeError') throw error
+  /**
+   * A table that accepts the question and then never answers would hold the request that asked it:
+   * the document waits on this script and the page stops. The wait is bounded, and a table that
+   * misses it is answered the same way as one that fails.
+   */
+  const limit = Number(process.env.DSH_UNLAG_FETCH_TIMEOUT_MS ?? '') > 0 ? Number(process.env.DSH_UNLAG_FETCH_TIMEOUT_MS) : 8000
+  let timer = null
+  const late = new Promise((_, reject) => {
+    timer = setTimeout(() => reject(new Error('the module table did not answer in time')), limit)
+  })
+  const asked = (async () => {
+    if (typeof Request === 'function') {
+      try {
+        return await clientModules.fetchBundle(new Request(address, { method, headers: {} }))
+      } catch (error) {
+        if (error?.name !== 'TypeError') throw error
+      }
     }
+    return clientModules.fetchBundle({ method, url: address })
+  })()
+  // Whichever side loses the race must still be observed, or its rejection ends the process.
+  asked.catch(() => {})
+  late.catch(() => {})
+  try {
+    return await Promise.race([asked, late])
+  } finally {
+    if (timer !== null) clearTimeout(timer)
   }
-  return clientModules.fetchBundle({ method, url: address })
 }
 
 /**
@@ -1397,7 +1423,7 @@ function parseAsScript(body, name) {
  * @param fetchBody reads one script address and answers a response-like, or null when it cannot.
  * @param rows the startup script addresses, as the next document would request them.
  */
-export async function verifyStartupRows(graph, fetchBody, rows) {
+export async function verifyStartupRows(graph, fetchBody, rows, budgetMs = MAX_VERIFY_MS) {
   const entries = new Map(
     (Array.isArray(graph?.entries) ? graph.entries : [])
       .filter((row) => typeof row?.id === 'string' && row.id !== '')
@@ -1427,7 +1453,11 @@ export async function verifyStartupRows(graph, fetchBody, rows) {
   const leftOut = new Set()
   const listed = new Set()
   const bodies = []
+  const began = Date.now()
   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' }
+    }
     for (const id of item.ids) if (served.has(id)) listed.add(id)
     for (const id of item.ids) if (!served.has(id)) leftOut.add(id)
     let response = null
@@ -1575,6 +1605,9 @@ function serveButton(ctx, controller, config) {
           } catch (error) {
             verdict = { status: 'blocked', reason: 'list', detail: String(error?.message ?? error) }
           }
+          if (verdict?.status !== 'ok') {
+            log(`a startup check refused the page: ${String(verdict?.reason ?? 'list')} (${String(verdict?.detail ?? 'no detail')})`)
+          }
           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.24",
+  "version": "1.9.26",
   "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",