dsh-unlag 1.9.26 → 1.9.28

package/client.js

@@ -15,8 +15,8 @@ window.__ModuleLoader__.load({
      * repeating one generic sentence.
      */
     const REASONS = zh
-      ? { list: '读不到启动信息', row: '启动信息不完整', src: '启动脚本没有地址', graph: '已装插件清单读不到', plugin: '有插件已不在运行', script: '启动脚本读不到', empty: '启动脚本是空的', covers: '启动脚本缺插件', parse: '启动脚本内容不完整', verify: '插件后端没有应答' }
-      : { list: 'startup info is unavailable', 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', verify: 'the plugin is not answering' };
+      ? { list: '读不到启动信息', slow: '启动信息读得太慢', row: '启动信息不完整', src: '启动脚本没有地址', graph: '已装插件清单读不到', plugin: '有插件已不在运行', script: '启动脚本读不到', empty: '启动脚本是空的', covers: '启动脚本缺插件', parse: '启动脚本内容不完整', verify: '插件后端没有应答' }
+      : { 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', verify: 'the plugin is not answering' };
 
     /** The last reason a readiness check refused for, or null after a check that passed. */
     let holdReason = null;
@@ -245,7 +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
+      slow: 'slow', // ui-copy-ignore
       dependencies: 'covers',
       list: 'list', // ui-copy-ignore
     };
@@ -749,6 +749,7 @@ window.__ModuleLoader__.load({
       prepareInterface,
       startupLooksServable,
       startupHoldReason: () => holdReason,
+      noticeFor,
       frozenStartupLooksServable,
       desktopStartupPayload,
       desktopShellPresent,

package/index.js

@@ -31,6 +31,12 @@ export const inject = ['webServer']
 
 /** A transaction that has not finished in this long is stuck; the press reports it instead of hanging. */
 const RELOAD_TIMEOUT_MS = 20_000
+/**
+ * How long a press waits for an answer before it is told the update is still applying. The page
+ * gives up on its own request sooner than the update may take, and a press that ends in "did not
+ * finish" while the plugin set is still being replaced is a lie the person cannot check.
+ */
+const RELOAD_ANSWER_MS = 10_000
 
 
 const LOG_PATH = join(homedir(), '.dsh', 'unlag-reload.log')
@@ -1667,8 +1673,18 @@ function serveButton(ctx, controller, config) {
           if (method !== 'POST') return sendJson(res, 405, { status: 'method' })
           if (buttonAllowed(req) === false) return sendJson(res, 403, { status: 'forbidden' })
           if (!settings.reloadPlugins) return sendJson(res, 200, { status: 'off' })
-          const outcome = await controller.reloadNow()
-          sendJson(res, 200, outcome)
+          const limit = Number(process.env.DSH_UNLAG_ANSWER_MS ?? '') || RELOAD_ANSWER_MS
+          let timer = null
+          const stillApplying = new Promise((resolve) => {
+            timer = setTimeout(() => resolve({ status: 'applying', warnings: [], pending: [], restartReason: null, failedEntries: [] }), limit)
+          })
+          try {
+            const outcome = await Promise.race([controller.reloadNow(), stillApplying])
+            if (outcome?.status === 'applying') log('the update outlasted the answer the page waits for: the press is told it is still applying')
+            sendJson(res, 200, outcome)
+          } finally {
+            if (timer !== null) clearTimeout(timer)
+          }
         } catch (error) {
           log(`cannot apply a plugin reload: ${error?.message ?? error}`)
           sendJson(res, 500, { status: 'failed', detail: String(error?.message ?? error) })

package/package.json

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