dsh-unlag 1.9.14 → 1.9.16

package/README.md

@@ -68,7 +68,8 @@ dsh plugin install dsh-unlag
 ## 排错
 
 - 日志：`~/.dsh/unlag-reload.log`，换代码／跳过／被拦各一行，含原因。
-- 状态：`GET /dsh-unlag/state` → `{"plugins":true,"page":true,"shim":{...}}`。
+- 状态：`GET /dsh-unlag/state` → `{"version":"1.9.14","code":"<index.js 写入时间>","plugins":true,"page":true,"shim":{...}}`。`code` 用来分清「版本号没刷」和「旧代码真的还在跑」。
+- 重建后的日志带起页面代次：`interface rebuilt; the page runs the plugins as served now (page <rev>)`，据此判断新文档加载的是新脚本还是旧脚本。
 
 ## 测试
 

package/index.js

@@ -83,6 +83,8 @@ const TEST_PATH = /(^|\/)(test|tests|__tests__|__mocks__)(\/|$)|[.-](test|spec)\
 const DEFAULT_ROOTS = [join(homedir(), '.dsh', 'plugins')]
 /** A turn that never goes idle must not turn this into an endless poll. */
 const MAX_DEFERRALS = 40
+const MAX_STARTUP_ROWS = 64
+const MAX_STARTUP_ROW_CHARS = 4096
 const MIN_INTERVAL_MS = 1500
 /** The route the app publishes client bundles under; the same key the module table registers. */
 const BUNDLE_ROUTE = '/plugins'
@@ -1131,6 +1133,7 @@ function serveBundlesAtCurrentRevision(ctx) {
     const ask = async (url) => {
       let held = null
       let body
+      let failed = false
       if (url !== originalUrl) {
         try {
           req.url = url
@@ -1159,6 +1162,7 @@ function serveBundlesAtCurrentRevision(ctx) {
       try {
         await Promise.resolve(original(req, res))
       } catch (error) {
+        failed = true
         log(`cannot answer a bundle request: ${error?.message ?? error}`)
       } finally {
         try {
@@ -1168,12 +1172,26 @@ function serveBundlesAtCurrentRevision(ctx) {
           /* the response object owns its own shape */
         }
       }
-      return { held, body }
+      return { held, body, failed }
     }
     // The table's own answer first: it still holds the generation this page booted from.
     let outcome = await ask(originalUrl)
     if (outcome.held !== null && retargeted !== null) outcome = await ask(retargeted)
-    if (outcome.held === null) return undefined
+    if (outcome.held === null) {
+      /**
+       * The table started writing and then failed. A body that already sent its status cannot take
+       * another one, and a socket left open is a document that waits for a script forever; ending it
+       * lets the page see the failure and carry on.
+       */
+      if (outcome.failed === true) {
+        try {
+          if (res.headersSent === true && res.writableEnded !== true && res.destroyed !== true) realEnd.call(res)
+        } catch {
+          /* the response is gone; nothing left to answer */
+        }
+      }
+      return undefined
+    }
     // The shim resolves the set from the address the page asked for, not the retried one.
     try {
       req.url = originalUrl
@@ -1323,9 +1341,14 @@ export async function verifyStartupRows(graph, fetchBody, rows) {
       .filter((row) => typeof row?.id === 'string' && row.id !== '')
       .map((row) => [row.id, row]),
   )
+  // A startup list is a handful of addresses. Anything past that bound is not a list this app could
+  // boot from, and reading it would turn one request into unbounded work on the process that owns
+  // every running turn.
+  const offered = Array.isArray(rows) ? rows.slice(0, MAX_STARTUP_ROWS) : []
   const wanted = []
-  for (const row of Array.isArray(rows) ? rows : []) {
+  for (const row of offered) {
     if (typeof row !== 'string' || row === '') continue
+    if (row.length > MAX_STARTUP_ROW_CHARS) continue
     const path = row.includes('://') ? row.replace(/^[a-z]+:\/\/[^/]+/iu, '') : row
     const url = path.startsWith('/') ? path : `/${path.replace(/^\.?\//u, '')}`
     const request = bundleRequest(url)

package/package.json

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