dsh-unlag 1.9.23 → 1.9.25

package/index.js

@@ -85,6 +85,13 @@ const DEFAULT_ROOTS = [join(homedir(), '.dsh', 'plugins')]
 const MAX_DEFERRALS = 40
 const MAX_STARTUP_ROWS = 64
 const MAX_STARTUP_ROW_CHARS = 4096
+
+/**
+ * The most plugin ids one bundle address may name. A real startup list is far below this; a made-up
+ * address far above it would otherwise have the plugin read one body per id, and answering a request
+ * is work the request itself must not be able to grow without bound.
+ */
+const MAX_BUNDLE_IDS = 128
 const MIN_INTERVAL_MS = 1500
 /** The route the app publishes client bundles under; the same key the module table registers. */
 const BUNDLE_ROUTE = '/plugins'
@@ -848,8 +855,10 @@ function bundleRequest(rawUrl) {
     id = id.endsWith('/client.js') ? id.slice(0, -'/client.js'.length) : id
     if (id !== '') ids.push(id)
   }
-  if (ids.length === 0) return null
-  return { ids, sourceMap, rev: revAt < 0 ? '' : rest.slice(revAt + '&rev='.length) }
+  if (ids.length === 0 || ids.length > MAX_BUNDLE_IDS) return null
+  // The same plugin twice in one address is one plugin: read its body once.
+  const unique = [...new Set(ids)]
+  return { ids: unique, sourceMap, rev: revAt < 0 ? '' : rest.slice(revAt + '&rev='.length) }
 }
 
 /**
@@ -884,14 +893,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 })
 }
 
 /**

package/package.json

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