dsh-unlag 1.9.112 → 1.9.114

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

@@ -116,6 +116,8 @@ const MAX_TOTAL_SCRIPT_BYTES = 128 * 1024 * 1024
  * app could boot from, and it is answered as such instead of being read.
  */
 const MAX_LIST_BODY_BYTES = 1024 * 1024
+/** Checks that may read the plugin table at the same time. Each one holds a script at a time. */
+const MAX_CONCURRENT_CHECKS = 3
 /** The body reader's answer for a request past its bound: not JSON, and not an empty list either. */
 const TOO_LARGE = Symbol('too-large')
 
@@ -1872,6 +1874,8 @@ function serveButton(ctx, controller, config) {
     return null
   }
   const settings = settingsOf(config)
+  /** One counter for the whole route set: the check is the only body that reads scripts. */
+  let checking = 0
   const handlers = [
     [
       `${BASE_PATH}/state`,
@@ -1916,6 +1920,18 @@ function serveButton(ctx, controller, config) {
           const method = String(req?.method ?? 'GET').toUpperCase()
           if (method !== 'POST') return sendJson(res, 405, { status: 'method' })
           if (buttonAllowed(req) === false) return sendJson(res, 403, { status: 'forbidden' })
+          /**
+           * Each check holds the bytes of one script while it reads them, so a page that asks in a
+           * loop, or several windows asking at once, must not stack those reads without a ceiling: the
+           * app is the process that would run out of memory. Past three the check is refused in its
+           * own words rather than served slowly or not at all.
+           */
+          if (checking >= MAX_CONCURRENT_CHECKS) {
+            log(`a startup check was refused: ${String(checking)} checks are already reading the plugin table`)
+            return sendJson(res, 200, { status: 'blocked', reason: 'busy', detail: 'another startup check is still running' })
+          }
+          checking += 1
+          try {
           const clientModules = ctx.get('clientModules')
           if (typeof clientModules?.fetchBundle !== 'function' || typeof clientModules?.graph !== 'function') {
             return sendJson(res, 200, { status: 'blocked', reason: 'list', detail: 'the plugin table is not running' })
@@ -1943,6 +1959,9 @@ function serveButton(ctx, controller, config) {
             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)
+          } finally {
+            checking -= 1
+          }
         } catch (error) {
           log(`cannot answer ${BASE_PATH}/verify: ${error?.message ?? error}`)
           sendJson(res, 500, { status: 'error' })

package/package.json

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