dsh-unlag 1.9.25 → 1.9.27

package/client.js

@@ -245,6 +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
       dependencies: 'covers',
       list: 'list', // ui-copy-ignore
     };

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')
@@ -92,6 +98,12 @@ const MAX_STARTUP_ROW_CHARS = 4096
  * is work the request itself must not be able to grow without bound.
  */
 const MAX_BUNDLE_IDS = 128
+/**
+ * How long one startup check may spend reading the list. Each address is bounded on its own, but a
+ * list of them is not: dozens of slow addresses would otherwise hold a press past the moment the
+ * page gives up waiting, and the person would see a button that did nothing.
+ */
+const MAX_VERIFY_MS = 9000
 const MIN_INTERVAL_MS = 1500
 /** The route the app publishes client bundles under; the same key the module table registers. */
 const BUNDLE_ROUTE = '/plugins'
@@ -1417,7 +1429,7 @@ function parseAsScript(body, name) {
  * @param fetchBody reads one script address and answers a response-like, or null when it cannot.
  * @param rows the startup script addresses, as the next document would request them.
  */
-export async function verifyStartupRows(graph, fetchBody, rows) {
+export async function verifyStartupRows(graph, fetchBody, rows, budgetMs = MAX_VERIFY_MS) {
   const entries = new Map(
     (Array.isArray(graph?.entries) ? graph.entries : [])
       .filter((row) => typeof row?.id === 'string' && row.id !== '')
@@ -1447,7 +1459,11 @@ export async function verifyStartupRows(graph, fetchBody, rows) {
   const leftOut = new Set()
   const listed = new Set()
   const bodies = []
+  const began = Date.now()
   for (const item of wanted) {
+    if (Date.now() - began > budgetMs) {
+      return { status: 'blocked', reason: 'slow', detail: 'the startup list took longer than this check waits' }
+    }
     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
@@ -1595,6 +1611,9 @@ function serveButton(ctx, controller, config) {
           } catch (error) {
             verdict = { status: 'blocked', reason: 'list', detail: String(error?.message ?? error) }
           }
+          if (verdict?.status !== 'ok') {
+            log(`a startup check refused the page: ${String(verdict?.reason ?? 'list')} (${String(verdict?.detail ?? 'no detail')})`)
+          }
           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`)
           }
@@ -1654,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.25",
+  "version": "1.9.27",
   "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",