dsh-unlag 1.9.22 → 1.9.24

package/README.md

@@ -65,6 +65,8 @@ dsh plugin install dsh-unlag
 
 官方的插件资源路由对未知修订返回 404。本插件对旧页面记着的旧修订返回当前内容：桌面版在窗口启动时固定了启动清单，页面按旧修订请求脚本是常态，返回 404 会让新页面起不来、App 直接退出。这是本插件的兼容措施，不是官方行为；不需要时可以整个关掉（设置里两行都关）。
 
+同一原因下的第二种情况：启动清单里记着的插件在配置里已经被关掉或删掉了，官方路由对那一行只会 404。本插件改为返回一段空脚本占位，页面起来时不再加载这个插件，App 照常起来；日志会写明哪个插件被留下，`/dsh-unlag/verify` 的结论里也带 `leftOut` 字段。
+
 ## 排错
 
 - 日志：`~/.dsh/unlag-reload.log`，换代码／跳过／被拦各一行，含原因。

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) }
 }
 
 /**
@@ -940,6 +949,35 @@ async function regroupedBundleAnswer(clientModules, graph, request) {
   return { body, contentType: 'text/javascript; charset=utf-8', ids: request.ids }
 }
 
+/**
+ * A stale request can name a plugin the profile no longer has at all: it was turned off or removed
+ * after the document that asks was made. Every plugin in the request is still served on its own, so
+ * the ones that remain are answered and the ones that are gone take a comment's place, which a
+ * script can hold without registering anything. The app's own answer here is 404, and a document
+ * 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) {
+  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))
+  const gone = request.ids.filter((id) => !served.has(id))
+  if (gone.length === 0) return null
+  const parts = []
+  for (const id of request.ids) {
+    if (served.has(id)) {
+      const body = await currentEntryBody(clientModules, graph, id)
+      if (body === null) return null
+      parts.push(body)
+      continue
+    }
+    parts.push(Buffer.from(`/* ${id.replace(/[^a-z0-9@/._-]/giu, '')} is not part of the plugin set served now */`))
+  }
+  if (parts.length === 0) return null
+  const body = Buffer.concat(parts.flatMap((part, index) => (index === parts.length - 1 ? [part] : [part, Buffer.from('\n;\n')])))
+  return { body, contentType: 'text/javascript; charset=utf-8', ids: request.ids, gone }
+}
+
 /**
  * The plugin set one stale request names, answered at the revision the app serves now. Only a body
  * that really contains every plugin it claims is handed back; anything unsure answers null, so the
@@ -971,7 +1009,7 @@ async function currentBundleAnswer(clientModules, method, url) {
       }
     }
   }
-  return regroupedBundleAnswer(clientModules, graph, request)
+  return (await regroupedBundleAnswer(clientModules, graph, request)) ?? survivingBundleAnswer(clientModules, graph, request)
 }
 
 /** Answer one stale request over the plain request/response route an app registers. */
@@ -988,7 +1026,16 @@ async function serveCurrentBundle(clientModules, req, res) {
       'content-length': String(answer.body.length),
     })
     res.end(method === 'HEAD' ? undefined : answer.body)
-    log(`served ${answer.ids.join(', ')} at the current revision: a page asked for an older one`)
+    if (Array.isArray(answer.gone) && answer.gone.length > 0) {
+      const kept = answer.ids.filter((id) => !answer.gone.includes(id))
+      log(
+        kept.length === 0
+          ? `answered an older set with an empty script in place of ${answer.gone.join(', ')}: the app would have ended on the table's 404`
+          : `served ${kept.join(', ')} at the current revision and left out ${answer.gone.join(', ')}: a page asked for an older set`,
+      )
+    } else {
+      log(`served ${answer.ids.join(', ')} at the current revision: a page asked for an older one`)
+    }
     return true
   } catch (error) {
     log(`cannot serve a bundle from an older revision: ${error?.message ?? error}`)
@@ -1037,7 +1084,16 @@ async function serveCurrentBundleResource(clientModules, request) {
     if (method !== 'GET' && method !== 'HEAD') return null
     const answer = await currentBundleAnswer(clientModules, method, request?.url)
     if (answer === null) return null
-    log(`served ${answer.ids.join(', ')} at the current revision: a page asked for an older one`)
+    if (Array.isArray(answer.gone) && answer.gone.length > 0) {
+      const kept = answer.ids.filter((id) => !answer.gone.includes(id))
+      log(
+        kept.length === 0
+          ? `answered an older set with an empty script in place of ${answer.gone.join(', ')}: the app would have ended on the table's 404`
+          : `served ${kept.join(', ')} at the current revision and left out ${answer.gone.join(', ')}: a page asked for an older set`,
+      )
+    } else {
+      log(`served ${answer.ids.join(', ')} at the current revision: a page asked for an older one`)
+    }
     return new Response(method === 'HEAD' ? null : answer.body, {
       status: 200,
       headers: {
@@ -1361,10 +1417,19 @@ export async function verifyStartupRows(graph, fetchBody, rows) {
     wanted.push({ url, ids: request === null ? [] : request.ids })
   }
   if (wanted.length === 0) return { status: 'blocked', reason: 'list', detail: 'the startup list names no script' }
+  /**
+   * A row can name a plugin the profile no longer has: the document that made it was composed
+   * before that plugin was turned off. The route answers such a row with a stand-in that registers
+   * nothing, so the boot comes up without the plugin; the check reads the same way and does not
+   * demand a registration the set cannot give.
+   */
+  const served = new Set(entries.keys())
+  const leftOut = new Set()
   const listed = new Set()
   const bodies = []
   for (const item of wanted) {
-    for (const id of item.ids) listed.add(id)
+    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
     try {
       response = await fetchBody(item.url)
@@ -1380,8 +1445,9 @@ export async function verifyStartupRows(graph, fetchBody, rows) {
     const complaint = parseAsScript(text, item.url)
     if (complaint !== null) return { status: 'blocked', reason: 'parse', detail: `${item.url}: ${complaint}` }
     const registered = registeredIds(text)
-    const missing = item.ids.filter((id) => !registered.has(id))
-    if (item.ids.length > 0 && missing.length > 0) {
+    const required = item.ids.filter((id) => served.has(id))
+    const missing = required.filter((id) => !registered.has(id))
+    if (required.length > 0 && missing.length > 0) {
       return { status: 'blocked', reason: 'register', detail: `${item.url} does not register ${missing.join(', ')}` }
     }
     bodies.push({
@@ -1418,6 +1484,7 @@ export async function verifyStartupRows(graph, fetchBody, rows) {
     reason: 'ok', // ui-copy-ignore
     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] } : {}),
   }
 }
 
@@ -1508,6 +1575,9 @@ function serveButton(ctx, controller, config) {
           } catch (error) {
             verdict = { status: 'blocked', reason: 'list', detail: String(error?.message ?? error) }
           }
+          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`)
+          }
           sendJson(res, 200, verdict)
         } catch (error) {
           log(`cannot answer ${BASE_PATH}/verify: ${error?.message ?? error}`)

package/package.json

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