dsh-unlag 1.9.113 → 1.9.115

package/client.js

@@ -15,8 +15,8 @@ window.__ModuleLoader__.load({
      * repeating one generic sentence.
      */
     const REASONS = zh
-      ? { list: '读不到启动信息', slow: '启动信息读得太慢', row: '启动信息不完整', src: '启动脚本没有地址', graph: '已装插件清单读不到', plugin: '有插件已不在运行', script: '启动脚本读不到', empty: '启动脚本是空的', covers: '启动脚本缺插件', parse: '启动脚本内容不完整', size: '启动脚本太大', verify: '插件后端没有应答', screen: '页面状态读不到' }
-      : { list: 'startup info is unavailable', slow: 'the startup list answered too slowly', row: 'startup info is incomplete', src: 'a startup script has no address', graph: 'the plugin list cannot be read', plugin: 'a plugin is no longer running', script: 'a startup script cannot be read', empty: 'a startup script is empty', covers: 'a startup script misses a plugin', parse: 'a startup script is incomplete', size: 'a startup script is too large', verify: 'the plugin is not answering', screen: 'the page state cannot be read' };
+      ? { list: '读不到启动信息', slow: '启动信息读得太慢', row: '启动信息不完整', src: '启动脚本没有地址', graph: '已装插件清单读不到', plugin: '有插件已不在运行', script: '启动脚本读不到', empty: '启动脚本是空的', covers: '启动脚本缺插件', parse: '启动脚本内容不完整', size: '启动脚本太大', verify: '插件后端没有应答', screen: '页面状态读不到', busy: '另一次刷新还在进行', dependencies: '插件依赖还没有运行', missing: '启动清单里有插件已经不见了', network: '读取插件时出错', register: '插件没有登记自己' }
+      : { list: 'startup info is unavailable', slow: 'the startup list answered too slowly', row: 'startup info is incomplete', src: 'a startup script has no address', graph: 'the plugin list cannot be read', plugin: 'a plugin is no longer running', script: 'a startup script cannot be read', empty: 'a startup script is empty', covers: 'a startup script misses a plugin', parse: 'a startup script is incomplete', size: 'a startup script is too large', verify: 'the plugin is not answering', screen: 'the page state cannot be read', busy: 'another rebuild is already running', dependencies: 'a plugin dependency is not running', missing: 'a plugin in the startup list is gone', network: 'the plugins could not be read', register: 'a plugin did not register itself' };
 
     /** The last reason a readiness check refused for, or null after a check that passed. */
     let holdReason = null;

package/index.js

@@ -1710,11 +1710,14 @@ export async function verifyStartupRows(graph, fetchBody, rows, budgetMs = MAX_V
     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)
-    } catch (error) {
-      return { status: 'blocked', reason: 'network', detail: `${item.url}: ${String(error?.message ?? error)}` }
+    const read = await withDeadline(() => fetchBody(item.url), budgetMs - (Date.now() - began))
+    if (read.timedOut === true) {
+      return { status: 'blocked', reason: 'slow', detail: `${item.url} did not answer within the time this check waits` }
+    }
+    if ('error' in read) {
+      return { status: 'blocked', reason: 'network', detail: `${item.url}: ${String(read.error?.message ?? read.error)}` }
     }
+    response = read.value
     // Reading the answer is the same kind of step as fetching it: a response whose status or body
     // cannot be read is one this check cannot approve, and saying which script failed beats
     // abandoning the whole list without a name in the reason.
@@ -1822,6 +1825,27 @@ export async function verifyStartup(clientModules, rows) {
   return verifyStartupRows(graph, (url) => readStartupScript(clientModules, url), rows)
 }
 
+/** The sentinel a read that ran past its time resolves to: a value, never an error. */
+const LATE = Symbol('late')
+
+/**
+ * One read the check will not wait past. The budget is counted between rows already; a single
+ * address that never answers would otherwise hold the press past the moment the page stops waiting
+ * for it, and the page would be told the check timed out with nothing naming what hung. Racing the
+ * read keeps the reason the check's own, and the read itself is left to finish with its bytes
+ * dropped, so nothing is left half-read.
+ */
+async function withDeadline(work, ms) {
+  let timer = null
+  const late = new Promise((resolve) => {
+    timer = setTimeout(() => resolve(LATE), Math.max(0, ms))
+  })
+  const settled = Promise.resolve().then(work).then((value) => ({ value }), (error) => ({ error }))
+  const answer = await Promise.race([settled, late])
+  if (timer !== null) clearTimeout(timer)
+  return answer === LATE ? { timedOut: true } : answer
+}
+
 /** What one press is told when the update it waits for did not answer in time. */
 const STILL_APPLYING = Object.freeze({ status: 'applying', warnings: [], pending: [], restartReason: null, failedEntries: [] });
 

package/package.json

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