dsh-panel-control 0.3.16 → 0.4.0

package/README.md

@@ -109,6 +109,14 @@ python -m http.server 8787 --bind 127.0.0.1   # 在仓库根目录
 - 文案改成「刷新后仍然缺：重启 DSH 才会应用新的插件清单」——这才是真正有效的动作。
 - 缺口修复后自动清除记忆，下次真出现新缺口还会提示。
 
+## 0.4.0：不再有任何"等一会儿"的机制
+
+前面几版为了对付"启动后入口不见了"，加过看门狗、自愈改写、延时判断。这些都是**事后补偿**，代价是行为不可预测（改写自己的脚本会让加载器热替换，顺手把邻居插件的重复注册打挂）。0.4.0 把它们全部删掉了：
+
+- 没有定时器、没有自查重试、不会改写任何文件。Host 半只做三件事：装路由、读一次插件图并记一行结论、做一次"我这个包的脚本取得到吗"的自检（都是**启动瞬间**完成的同步调用）。
+- Client 半和别的插件一样：`dsh.client.immediately = true`，页面启动时随清单一起加载，立刻把入口挂到侧栏。
+- 安装方式也建议和别的插件一致：用 **npm 安装**（`npm i dsh-panel-control`），而不是 `link:` 本地目录。`link:` 指向的是一个我随时在改的开发目录，任何一次编辑都会让页面手里的版本号作废；装成包之后文件是静止的，不存在这个窗口。
+
 ## 为什么重启后偶尔看不到入口（0.3.16）
 
 DSH 给每个插件的脚本算一个**版本号**，来源是文件的 `mtime / ctime / 大小`，注册表只认它自己在组装那一刻读到的那个版本。页面拿到的是**启动时那份清单**，只要 `client.js` 在清单发出去之后被重写过（编辑器保存、`git` 换行归一化、或者早先那个"自愈"改写），页面手里的版本号就成了作废的号，请求回 404，而页面**不会报错**——入口就这么没了。

package/client.js

@@ -340,11 +340,6 @@ function build(require) {
       return;
     }
     const missing = hostIds.filter((id) => !boot.ids.has(id));
-    // The Host can hand this very plugin to a page whose list predates it (see
-    // `recovery nudge` in the Host half). In that case the page is still missing
-    // an entry, but it is this one and it is already on screen: nagging the user
-    // to reload for it would be noise. Every other gap still counts.
-    const selfOnly = missing.length === 1 && missing[0] === PACKAGE && value.recovered === true;
     // Only a real gap is worth a banner. A revision that merely differs proves
     // nothing: the Host rebuilds that graph whenever any plugin file changes, so
     // comparing revisions nagged people whose page was missing nothing at all.
@@ -353,7 +348,7 @@ function build(require) {
     // Already said on an earlier load and a reload did not help: keep quiet, the
     // diagnostics still list it.
     const repeated = gap.length > 0 && readNagged() === gap;
-    const stale = !selfOnly && missing.length > 0 && !repeated;
+    const stale = missing.length > 0 && !repeated;
     if (stale) rememberNagged(gap);
     else if (!missing.length) rememberNagged('');
     if (!stale) forgetReloadMark();

package/index.js

@@ -45,31 +45,6 @@ const CLIENT_LOG = path.join(STATE_DIR, 'client.log');
 const MAX_PREFS_BYTES = 256 * 1024;
 const LOG_KEEP_BYTES = 256 * 1024;
 
-/** The Client half this Host half ships with, used by the recovery nudge below. */
-const CLIENT_FILE = fileURLToPath(new URL('./client.js', import.meta.url));
-
-/** Set `DPC_NUDGE=off` to keep the Host strictly read-only about its own files. */
-/**
- * The nudge is opt-in, and that default is deliberate.
- *
- * Rewriting `client.js` makes the loader hot-swap this module into the live
- * page. That re-evaluation runs the whole slot reconcile again, and a plugin
- * whose registration is not idempotent then throws on its second
- * `register({ id: 'workspace-control' })` and loses its sidebar entry: healing
- * this plugin broke a neighbour's. A page reload fixes the frozen list without
- * touching anyone else, so the safe path is the banner, and the nudge stays
- * behind DPC_NUDGE=on for people who need it and accept the risk.
- */
-const NUDGE_ENABLED = ['on', '1', 'true', 'yes'].includes(
-  String(process.env.DPC_NUDGE || '').trim().toLowerCase(),
-);
-
-/** Set once the nudge below actually rewrote the Client file in this process. */
-let recoveredAt = 0;
-
-/** `String.fromCharCode(10)`: a literal newline in source is easy to mangle. */
-const NL = String.fromCharCode(10);
-
 /** Identifies one Host process, so a log spanning several launches shows which
  * apply/mount lines belong together. */
 const BOOT = Math.random().toString(36).slice(2, 8);
@@ -513,10 +488,6 @@ function inventorySnapshot(scope) {
       rev: graph.rev,
       release: typeof graph.release === 'string' ? graph.release : null,
       ids: entries.map((entry) => String(entry && entry.id)).filter(Boolean),
-      // True when this process had to hand itself to the page: the page's list is
-      // still stale, but the entry it lacks is this very plugin, so there is
-      // nothing left for the user to do.
-      recovered: recoveredAt > 0,
     },
   };
 }
@@ -577,6 +548,9 @@ let serveLoggedAt = 0;
  */
 const servedBytes = new Map();
 const SERVED_BYTES_KEPT = 5;
+/** Requests to log per Host process: enough to see a boot, not a chatty stream. */
+let bundleAsked = 0;
+const BUNDLE_ASK_LIMIT = 8;
 
 function revisionOf(url) {
   const match = /[?&]rev=([A-Za-z0-9._-]+)/.exec(String(url || ''));
@@ -591,6 +565,10 @@ function serveCurrentRevision(scope) {
   servePatched = modules;
   modules.bundleResource = async function bundleResourceWithFallback(method, url) {
     const answer = await original(method, url);
+    if (String(url || '').includes(PACKAGE) && bundleAsked < BUNDLE_ASK_LIMIT) {
+      bundleAsked += 1;
+      logHost(`bundle: asked rev ${String(revisionOf(url))} -> ${answer && answer.status}`);
+    }
     if (answer && answer.status === 200 && method === 'GET' && String(url || '').includes(PACKAGE)) {
       const rev = revisionOf(url);
       if (rev && typeof answer.body === 'string') {
@@ -676,91 +654,6 @@ async function probeOwnBundle(scope) {
   }
 }
 
-/**
- * Say it out loud when the page never came back.
- *
- * The Host is up (this half ran) and yet the Client half reports nothing: the
- * window was built from a plugin list that no longer matches the code on disk,
- * so its script request went nowhere and the page silently omits the entry. The
- * user sees a plugin that "does not start", so write the diagnosis where it can
- * be found -- once per launch.
- *
- * This runs in a timer, outside every request and outside Cordis' own error
- * handling: anything thrown here kills the whole Host process. Every branch is
- * therefore contained, and the caller adds one more net.
- */
-let watchdogSpoken = false;
-
-async function watchFirstClientBoot(startedAt) {
-  try {
-    // Several applies can share one process (hot swap); only the first one speaks.
-    if (watchdogSpoken) return;
-    watchdogSpoken = true;
-    let text = '';
-    try {
-      text = await fs.readFile(CLIENT_LOG, 'utf8');
-    } catch (error) {
-      if (!error || error.code !== 'ENOENT') throw error;
-    }
-    const since = startedAt - 4_000;
-    let newest = 0;
-    let reported = false;
-    for (const line of text.split(String.fromCharCode(10))) {
-      if (!line.includes('"kind":"boot"')) continue;
-      const stamp = Date.parse(line.slice(0, line.indexOf(' ')));
-      if (!Number.isFinite(stamp)) continue;
-      if (stamp > newest) newest = stamp;
-      if (stamp >= since) reported = true;
-    }
-    if (reported) return;
-    // A page that reported shortly before this apply is an already-running page:
-    // it did load this plugin, and a Host hot swap (which happens on every edit
-    // while developing) must not be reported as "the window never got the code".
-    if (newest >= startedAt - 120_000) return;
-    logHost(
-      'client half did not report within 30s: the window is running a plugin list from before this code ' +
-        '(a rebuilt interface can take this long to finish loading; press the refresh button if the entry is missing)',
-    );
-    // The page will not ask for a script that is not in its frozen list, but it
-    // does watch this package's files: one byte-level change to the Client entry
-    // makes the loader hand the module to the live page. Flip the trailing
-    // newline, so the file stays byte-stable instead of growing on every launch.
-    if (!NUDGE_ENABLED) {
-      logHost('recovery nudge stayed off (opt in with DPC_NUDGE=on); a page reload is the safe fix');
-      return;
-    }
-    try {
-      // The page may have reported while this timer was waiting: never rewrite a
-      // file the running page just loaded, because the resulting hot swap is
-      // what re-runs everybody's registration.
-      const late = await fs.readFile(CLIENT_LOG, 'utf8').catch(() => '');
-      const quiet = late
-        .split(String.fromCharCode(10))
-        .some((line) => {
-          if (!line.includes('"kind":"boot"')) return false;
-          const stamp = Date.parse(line.slice(0, line.indexOf(' ')));
-          return Number.isFinite(stamp) && stamp >= since;
-        });
-      if (quiet) {
-        logHost('recovery nudge skipped: the page reported while the watchdog was waiting');
-        return;
-      }
-      const source = await fs.readFile(CLIENT_FILE, 'utf8');
-      const next = source.endsWith(NL + NL) ? source.slice(0, -1) : source + NL;
-      await fs.writeFile(CLIENT_FILE, next, 'utf8');
-      recoveredAt = Date.now();
-      logHost(
-        `recovery nudge: rewrote ${path.basename(CLIENT_FILE)} (${next.length - source.length} byte) so the ` +
-          'loader hands this plugin to the running page; the sidebar entry should appear within a second',
-      );
-    } catch (error) {
-      logHost(`recovery nudge failed: ${describeError(error)}`);
-    }
-  } catch (error) {
-    logHost(`client boot watchdog failed: ${describeError(error)}`);
-  }
-}
-
 /** Register the route; returns null while `connection` is not available yet so
  * that the caller can retry on a later tick. */
 function mount(scope) {
@@ -798,15 +691,6 @@ export function apply(ctx) {
       logHost(`route mounted at ${ROUTE_PATH} (attempt ${attempts})`);
       logInventoryOnApply(scope);
       serveCurrentRevision(scope);
-      const startedAt = Date.now();
-      // A timer callback that throws is fatal for the Host: contain it here and
-      // again inside the async body.
-      const watchdog = setTimeout(() => {
-        void watchFirstClientBoot(startedAt).catch((error) =>
-          logHost(`client boot watchdog failed: ${describeError(error)}`),
-        );
-      }, 30_000);
-      if (typeof watchdog.unref === 'function') watchdog.unref();
       return;
     }
     if (!disposed) retry = setTimeout(() => attach(scope), 1000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-panel-control",
-  "version": "0.3.16",
+  "version": "0.4.0",
   "type": "module",
   "description": "Manage the global panel navigation at the top of the DSH sidebar: reorder, hide and group every entry, with the layout persisted per installation.",
   "keywords": [