dsh-mizar 0.8.6 → 0.8.7

package/README.md

@@ -135,6 +135,10 @@ DSH 自己的 Web 接口暴露出去（那是 DSH 的安全边界，插件不碰
   漂到 19391、19392，手机配对里保存的直连地址就永远失效了。现在一个进程只保留**一个**挂载：
   新挂载要等旧挂载完全释放监听之后才绑端口；网络变化导致监听地址改变时，隧道也会立刻用新
   地址重拨，并把监听端口的变化同步给隧道（否则隧道健康、手机请求却全部 502）。
+- **0.8.7 修了 0.8.6 单实例的漏洞。** 0.8.6 的注册表是模块级的，而 DSH 会在同一进程里多次
+  加载插件模块，每份副本各有一张空注册表——实测一个进程因此挂了 8 个监听（19390–19397）。
+  0.8.7 把注册表放到 `globalThis`（`Symbol.for('dsh-mizar.mount-registry')`），所有模块副本
+  共用同一个槽位，一个进程只剩一个监听。
 
 日志里对应 `relay: the tunnel has been silent for …s — redialling it`、
 `relay: the network changed — redialling the tunnel` 和 `relay: the listener moved to port …`。

package/lib/index.js

@@ -27,7 +27,7 @@ import { awaitRequestedPlan, bindKey, isRequested, needsRebind } from './net/wat
 import { PROTOCOL_VERSION } from './protocol/frames.js';
 import { MizarListener } from './server/listener.js';
 import { RelayClient, phoneBaseURL } from './relay/client.js';
-import { MountRegistry } from './mount.js';
+import { sharedMountRegistry } from './mount.js';
 import { loadOrCreateTunnelSecret } from './relay/identity.js';
 import { runSpike } from './spike.js';
 /** Cordis plugin name. */
@@ -55,7 +55,7 @@ const systemLocale = (() => {
  * code in place and every symptom unchanged. One line at boot turns that from a
  * guess into a fact.
  */
-const MIZAR_VERSION = '0.8.6';
+const MIZAR_VERSION = '0.8.7';
 /**
  * Services this plugin must observe before it activates.
  *
@@ -491,7 +491,7 @@ async function startListener(ctx, config, signal) {
  * finished shutting down, so the port is free and the address a phone saved is
  * still the address the computer listens on.
  */
-const mounts = new MountRegistry();
+const mounts = sharedMountRegistry();
 /**
  * Mount the Mizar host half.
  * @param ctx - the plugin context.

package/lib/mount.d.ts

@@ -1,3 +1,21 @@
+/**
+ * The one registry every copy of this plugin in a process shares.
+ *
+ * Module-level state is not enough: the plugin can be loaded more than once in
+ * one process, and each load gets its own copy of this module -- which is how a
+ * single DSH process ended up with eight Mizar listeners (19390 through 19397)
+ * after 0.8.6 shipped a module-level registry. Each copy saw an empty slot and
+ * bound its own port, so the port a phone had saved was always one generation
+ * behind.
+ *
+ * `globalThis` is shared by every copy in the process, and `Symbol.for` gives
+ * the key a stable identity across them. The registry therefore outlives a
+ * module copy exactly as long as the process does, which is the lifetime that
+ * matters for a listening port.
+ *
+ * @returns the process-wide registry.
+ */
+export declare function sharedMountRegistry(): MountRegistry;
 /** Something that can be shut down once, asynchronously. */
 export interface Mounted {
     /** Release the listener, the tunnel and anything else this mount owns. */

package/lib/mount.js

@@ -21,6 +21,33 @@
 //
 //  Pure, so the ordering is tested without a plugin host or an open port.
 //
+/**
+ * The one registry every copy of this plugin in a process shares.
+ *
+ * Module-level state is not enough: the plugin can be loaded more than once in
+ * one process, and each load gets its own copy of this module -- which is how a
+ * single DSH process ended up with eight Mizar listeners (19390 through 19397)
+ * after 0.8.6 shipped a module-level registry. Each copy saw an empty slot and
+ * bound its own port, so the port a phone had saved was always one generation
+ * behind.
+ *
+ * `globalThis` is shared by every copy in the process, and `Symbol.for` gives
+ * the key a stable identity across them. The registry therefore outlives a
+ * module copy exactly as long as the process does, which is the lifetime that
+ * matters for a listening port.
+ *
+ * @returns the process-wide registry.
+ */
+export function sharedMountRegistry() {
+    const key = Symbol.for('dsh-mizar.mount-registry');
+    const bag = globalThis;
+    let registry = bag[key];
+    if (registry === undefined) {
+        registry = new MountRegistry();
+        bag[key] = registry;
+    }
+    return registry;
+}
 /**
  * The serialized, single-instance mount slot.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mizar",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "Remote monitoring and guidance for DSH agents — host plugin backing the DSH-Mizar iOS app.",
   "license": "GPL-3.0-only",
   "type": "module",