dsh-unlag 1.9.33 → 1.9.35

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
@@ -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

@@ -371,6 +371,8 @@ function pluginReloader(ctx, config) {
       request.then(settle, settle)
       return request
     }
+    /** Whether the bundle route was wrapped when this update started, so a re-wrap is written down. */
+    const shimWrappedBefore = bundleShimStatus(ctx).wrapped
     let result = null
     for (let attempt = 0; ; attempt += 1) {
       try {
@@ -391,6 +393,19 @@ function pluginReloader(ctx, config) {
         throw error
       }
     }
+    /**
+     * A recomposition can leave the bundle route owned by a fresh handler. A page started from the
+     * launch-time list is then answered by the app's own 404 for a stale set, and the desktop shell
+     * treats such an entry as fatal — it exits and takes every running turn with it. Wrapping again
+     * here means the time between an update and the next press is never left unwrapped.
+     */
+    try {
+      ensureBundleShim(ctx)
+      if (bundleShimStatus(ctx).wrapped !== true) log('the bundle route is not wrapped after the update; a page started now may not boot')
+      else if (shimWrappedBefore !== true) log('the bundle route was wrapped again after the update')
+    } catch (error) {
+      log(`cannot wrap the bundle route after the update: ${error?.message ?? error}`)
+    }
     const warnings = Array.isArray(result?.warnings) ? result.warnings : []
     const pending = Array.isArray(result?.pending) ? result.pending : []
     const restartReason = typeof result?.restartReason === 'string' ? result.restartReason : null

package/package.json

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