dsh-unlag 1.9.32 → 1.9.34

package/README.md

@@ -43,6 +43,7 @@ dsh plugin install dsh-unlag
 - 界面重建会重新进入同一个地址：屏幕上正在显示的内容重新载入一次，会话记录还在。
 - 排队消息、输入草稿、附件：重建前先提交焦点里的内容；有人没存完就拦下，不硬刷。
 - 有未保存改动、开着弹窗、或下个页面要用的模块读不全：拦下并提示，提示里写明卡在哪一项，宁可不刷。
+- 原来就起不来的插件不挡这一下：换代码照做，日志里点名哪个插件本来就没在跑。
 - 旧页面记着的启动清单分组变了（装过／卸过插件）：按插件逐个补齐再交给新页面，不会因为清单 404 把 App 带走。
 - 从不自己重启或退出 App。
 

package/client.js

@@ -6,8 +6,8 @@ window.__ModuleLoader__.load({
 
     const zh = /^zh/i.test(navigator.language || '');
     const COPY = zh
-      ? { label: '解除卡顿', hint: '卡顿时用：换掉插件代码并重建界面；运行中的任务、排队的消息保留', blocked: '暂时无法重建界面，稍后再试', unsaved: '有未保存的改动，先保存再重试', dialog: '先关闭打开的窗口再重载', queued: '更新已排队，稍后再按一次', applying: '还在应用这次更新，稍后再按一次', off: '两个开关都关着，先在设置里打开一个', replaced: '插件代码已更新，页面保持不动', done: '插件代码已是最新', restart: '这次改动要重新打开应用才会生效', failed: '插件更新没完成，稍后再按一次' } // ui-copy-ignore
-      : { label: 'Unlag', hint: 'For a sluggish interface: replaces plugin code and rebuilds the page; running turns and queued messages are kept', blocked: 'Cannot rebuild the page right now; try again', unsaved: 'Unsaved changes; save them, then retry', dialog: 'Close the open window first', queued: 'Update queued; press again shortly', applying: 'Still applying this update; press again shortly', off: 'Both switches are off; turn one on in settings', replaced: 'Plugin code updated; the page stayed as it is', done: 'Plugin code is already up to date', restart: 'This change needs the app reopened before it can apply', failed: 'The plugin update did not finish; press again later' };
+      ? { label: '解除卡顿', hint: '卡顿时用：换掉插件代码并重建界面；运行中的任务、排队的消息保留', blocked: '暂时无法重建界面，稍后再试', unsaved: '有未保存的改动，先保存再重试', dialog: '先关闭打开的窗口再重载', queued: '更新已排队，稍后再按一次', applying: '还在应用这次更新，稍后再按一次', off: '两个开关都关着，先在设置里打开一个', replaced: '插件代码已更新，页面保持不动', stayedReplaced: '插件代码已更新，页面没有重建；稍后再按一次', stayed: '页面没有重建；稍后再按一次', done: '插件代码已是最新', restart: '这次改动要重新打开应用才会生效', failed: '插件更新没完成，稍后再按一次' } // ui-copy-ignore
+      : { label: 'Unlag', hint: 'For a sluggish interface: replaces plugin code and rebuilds the page; running turns and queued messages are kept', blocked: 'Cannot rebuild the page right now; try again', unsaved: 'Unsaved changes; save them, then retry', dialog: 'Close the open window first', queued: 'Update queued; press again shortly', applying: 'Still applying this update; press again shortly', off: 'Both switches are off; turn one on in settings', replaced: 'Plugin code updated; the page stayed as it is', stayedReplaced: 'Plugin code updated; the page did not rebuild; press again shortly', stayed: 'The page did not rebuild; press again shortly', done: 'Plugin code is already up to date', restart: 'This change needs the app reopened before it can apply', failed: 'The plugin update did not finish; press again later' };
 
     /**
      * Why the interface was left as it is, in words a person can act on. The checks below record
@@ -173,9 +173,9 @@ window.__ModuleLoader__.load({
     function reloadVerdict(data) {
       if (data === null || typeof data !== 'object') return 'failed';
       const status = typeof data.status === 'string' ? data.status : 'failed';
-      // A plugin that did not start makes the set unusable for a rebuild, whatever the status says.
-      if (Array.isArray(data.failedEntries) && data.failedEntries.length > 0) return 'failed';
       // `pending` is not a queued update: the changed modules need a restart to load at all.
+      // Entries that were already not running before the press are not its result: the app rejects
+      // a reload that newly breaks one, so the press stands whatever that leftover list says.
       if (Array.isArray(data.pending) && data.pending.length > 0) return 'restart';
       if (typeof data.restartReason === 'string' && data.restartReason !== '') return 'failed';
       return status;
@@ -642,6 +642,8 @@ window.__ModuleLoader__.load({
         setPending(true);
         setNotice(null);
         let navigated = false;
+        // Read by the fallback below, which runs after the try block's own scope is gone.
+        let replaced = false;
         const stop = (key, applied = false) => {
           setPending(false);
           setNotice(noticeFor(key, applied));
@@ -650,7 +652,6 @@ window.__ModuleLoader__.load({
           const settings = await readSettings();
           const replace = settings === null ? false : settings.plugins;
           const rebuild = settings === null ? true : settings.page;
-          let replaced = false;
           // Nothing is switched on: the press says so instead of looking broken.
           if (!replace && !rebuild) {
             report('off');
@@ -726,7 +727,9 @@ window.__ModuleLoader__.load({
               // happened and take the press back, so the button is never left unresponsive.
               report('held', 'navigation');
               setPending(false);
-              setNotice(noticeFor('replaced'));
+              // Only a press that really replaced the plugins may say so: a page-only press that
+              // held the navigation changed no code.
+              setNotice(replaced ? COPY.stayedReplaced : COPY.stayed);
             }, 6000); // ui-copy-ignore
           }
         }

package/index.js

@@ -401,17 +401,19 @@ function pluginReloader(ctx, config) {
      * out of harmless prose. The warning itself is the app saying an entry is not serving the page, so
      * every warning counts and the sentence is passed on as it reads.
      */
-    const failedEntries = warnings.map((warning) => (typeof warning === 'string' ? warning : String(warning?.message ?? warning)))
-    log(
-      `plugins reloaded (warnings=${warnings.length} pending=${pending.length}${restartReason === null ? '' : ` restart=${restartReason}`})`,
-    )
     /**
-     * The count alone cannot say which plugin is not serving now, and that is what a person sees
-     * afterwards. The app's own sentence is passed on, cut short so one entry cannot fill the log.
+     * These are the entries that were already not running before this press: the app rejects a
+     * reload that newly breaks an entry, so nothing in this list is a result of the press. They are
+     * written down because a person sees them afterwards, and they must not stop the page from
+     * coming up on the set that is running now.
      */
-    for (const entry of failedEntries.slice(0, 5)) log(`a plugin did not come back: ${entry.slice(0, 200)}`)
-    if (failedEntries.length > 5) log(`and ${failedEntries.length - 5} more did not come back`)
-    return { status: 'done', warnings, pending, restartReason, failedEntries }
+    const inactiveEntries = warnings.map((warning) => (typeof warning === 'string' ? warning : String(warning?.message ?? warning)))
+    log(
+      `plugins reloaded (inactive before this press=${inactiveEntries.length} pending=${pending.length}${restartReason === null ? '' : ` restart=${restartReason}`})`,
+    )
+    for (const entry of inactiveEntries.slice(0, 5)) log(`a plugin was already not running and still is not: ${entry.slice(0, 200)}`)
+    if (inactiveEntries.length > 5) log(`and ${inactiveEntries.length - 5} more were already not running`)
+    return { status: 'done', warnings, pending, restartReason, inactiveEntries, failedEntries: [] }
   }
 
   const flush = async () => {
@@ -584,15 +586,6 @@ function pluginReloader(ctx, config) {
           failedEntries: outcome.failedEntries,
         }
       }
-      if (outcome.failedEntries.length > 0) {
-        return {
-          status: 'failed', // ui-copy-ignore
-          warnings: outcome.warnings, // ui-copy-ignore
-          pending: [], // ui-copy-ignore
-          restartReason: null,
-          failedEntries: outcome.failedEntries,
-        }
-      }
       return outcome
     } catch (error) {
       if (error?.stillRunning === true) {

package/package.json

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