@dsh-sup/dsh-core-linux-x64 0.1.6-BETA.4 → 0.1.6-BETA.5

package/core.cjs

@@ -929,7 +929,7 @@ var require_version = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     function guardVersion() {
-      if (true) return String("0.1.6-BETA.4");
+      if (true) return String("0.1.6-BETA.5");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -3723,6 +3723,18 @@ var require_pool = __commonJS({
         this._save();
         return p;
       }
+      /** 登记固定端口，并保证该 role 在全表唯一（先清除同 role 的其它端口记录再登记）。
+       *  登记表以端口号为键，避让/重绑后新端口是**追加**记录；只 release 旧端口不足以立住不变式
+       *  （该调用在内核侧被 catch{} 包住且忽略返回值），残留两条同 role 记录时任何「按 role 取号」
+       *  的读法（本表 get、桌面壳读 ports.json）都可能拿到一个没人监听的端口。
+       *  @returns {number} port */
+      registerSole(role, port) {
+        const p = Number(port);
+        for (const [existing, r] of [...this._records]) {
+          if (r.role === role && existing !== p) this._records.delete(existing);
+        }
+        return this.register(role, p);
+      }
       /** 登记用户配置端口（实例内部端口等）；冲突（固定/保留池/已占）抛错。 */
       registerUser(port, owner) {
         const p = Number(port);
@@ -3757,10 +3769,15 @@ var require_pool = __commonJS({
         return true;
       }
       /* 查询 */
-      /** 按 role 取端口（固定端口）。 */
+      /** 按 role 取端口（固定端口）。同 role 有多条（老版本避让留下的残留记录）时取**最新登记**：
+       *  桌面壳读 ports.json 用的是同一判据，两侧不许对「哪个端口是当前的」给出不同答案。 */
       get(role) {
-        for (const r of this._records.values()) if (r.role === role) return r.port;
-        return null;
+        let best = null;
+        for (const r of this._records.values()) {
+          if (r.role !== role) continue;
+          if (!best || (r.createdAt || 0) >= (best.createdAt || 0)) best = r;
+        }
+        return best ? best.port : null;
       }
       isRegistered(port) {
         return this._records.has(Number(port));
@@ -6278,7 +6295,7 @@ var require_bootstrap = __commonJS({
     }
     function _registerFixedPorts(host2) {
       ports.register("dsh-main", host2.config.targetPort);
-      ports.register("supervisor-api", host2.config.apiPort);
+      ports.registerSole("supervisor-api", host2.config.apiPort);
     }
     function _bindNativeDshCommand(host2) {
       try {
@@ -6362,9 +6379,9 @@ var require_api_rebind = __commonJS({
           bind._tries = 0;
           host2.api = server;
           try {
-            portsShared.register("supervisor-api", host2.config.apiPort);
+            portsShared.registerSole("supervisor-api", host2.config.apiPort);
           } catch (e) {
-            host2.logger.warn("ports.register(supervisor-api) \u5931\u8D25: " + (e && e.message || e));
+            host2.logger.warn("ports.registerSole(supervisor-api) \u5931\u8D25: " + (e && e.message || e));
           }
           host2.events.append("api_listening", { host: host2.config.apiHost, port: host2.config.apiPort });
           host2.logger.info("api listening on " + host2.config.apiHost + ":" + host2.config.apiPort);
@@ -6392,17 +6409,13 @@ var require_api_rebind = __commonJS({
           host2.api = server;
           const prev = host2.config.apiPort;
           if (port !== prev) {
-            try {
-              portsShared.release(prev, "system:supervisor-api");
-            } catch {
-            }
             host2.config.apiPort = port;
             if (host2.configPath) host2.persistConfigPatch({ apiPort: port });
           }
           try {
-            portsShared.register("supervisor-api", port);
+            portsShared.registerSole("supervisor-api", port);
           } catch (e) {
-            host2.logger.warn("ports.register(actual) \u5931\u8D25: " + e.message);
+            host2.logger.warn("ports.registerSole(supervisor-api) \u5931\u8D25: " + e.message);
           }
           host2.events.append("api_listening", { host: host2.config.apiHost, port });
           host2.logger.info("api listening on " + host2.config.apiHost + ":" + port);
@@ -10201,7 +10214,7 @@ var require_identity = __commonJS({
         return null;
       }
     }
-    function pidAlive(pid) {
+    function pidAlive2(pid) {
       if (!Number.isInteger(pid) || pid <= 0) return false;
       try {
         process.kill(pid, 0);
@@ -10233,7 +10246,7 @@ var require_identity = __commonJS({
       if (attempt()) return true;
       const holder = lockPid(p);
       if (holder === process.pid) return true;
-      if (holder !== null && pidAlive(holder)) return false;
+      if (holder !== null && pidAlive2(holder)) return false;
       try {
         fs2.unlinkSync(p);
       } catch {
@@ -10271,7 +10284,7 @@ var require_identity = __commonJS({
     }
     module2.exports = {
       // 测试缝：锁的取/放/读主是纯 fs + kill(0) 语义，直接导出给回归用。
-      _lockPrimitives: { acquireLock: acquireLock2, releaseLock: releaseLock2, lockPid, pidAlive },
+      _lockPrimitives: { acquireLock: acquireLock2, releaseLock: releaseLock2, lockPid, pidAlive: pidAlive2 },
       methods: {
         _lanLockPath() {
           const d = depsOf(this);
@@ -25995,7 +26008,8 @@ var require_static = __commonJS({
       ".png": "image/png",
       ".ico": "image/x-icon"
     };
-    var CSP = "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; connect-src 'self'; frame-ancestors 'none'";
+    var FRAME_ANCESTORS = "tauri://localhost http://tauri.localhost https://tauri.localhost";
+    var CSP = "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; connect-src 'self'; frame-ancestors " + FRAME_ANCESTORS;
     function serveStatic(res, file, corsOrigin) {
       if (!UI_DIR) {
         res.writeHead(503, { "Content-Type": "text/plain; charset=utf-8" });
@@ -27946,6 +27960,41 @@ function readLock() {
 function isOwnGuardEntry(cmdline) {
   return typeof cmdline === "string" && cmdline.includes("dsh-supervisor");
 }
+var LOCK_HEARTBEAT_MS = 2e3;
+var LOCK_STALE_MS = LOCK_HEARTBEAT_MS * 15;
+function lockSilentMs() {
+  try {
+    return Math.max(0, Date.now() - fs.statSync(LOCK_FILE).mtimeMs);
+  } catch {
+    return null;
+  }
+}
+function pidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (e) {
+    return e.code === "EPERM";
+  }
+}
+var LOCK_TAKE_RETRY_MS = 8e3;
+var LOCK_TAKE_NAP_MS = 250;
+function napSync(ms) {
+  try {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+  } catch {
+  }
+}
+function startLockHeartbeat() {
+  const t = setInterval(() => {
+    try {
+      const d = /* @__PURE__ */ new Date();
+      fs.utimesSync(LOCK_FILE, d, d);
+    } catch {
+    }
+  }, LOCK_HEARTBEAT_MS);
+  if (t.unref) t.unref();
+}
 function acquireLock() {
   fs.mkdirSync(SUPERVISOR_DIR, { recursive: true });
   const tryCreate = () => {
@@ -27960,26 +28009,47 @@ function acquireLock() {
       process.exit(1);
     }
   };
-  if (tryCreate()) return true;
+  const take = () => {
+    if (!tryCreate()) return null;
+    startLockHeartbeat();
+    return true;
+  };
+  const first = take();
+  if (first) return true;
   const held = readLock();
   if (held) {
-    let alive = false;
-    try {
-      process.kill(held.pid, 0);
-      alive = true;
-    } catch (err) {
-      alive = err.code === "EPERM";
+    if (!pidAlive(held.pid)) {
+      console.log("[supervisor] \u6E05\u7406\u9648\u65E7\u5B88\u536B\u9501\uFF08\u6301\u6709 pid " + held.pid + " \u5DF2\u9000\u51FA\uFF09");
+    } else {
+      const cmdline = readCmdline(held.pid);
+      if (cmdline && isOwnGuardEntry(cmdline)) {
+        const deadline = Date.now() + LOCK_TAKE_RETRY_MS;
+        while (pidAlive(held.pid)) {
+          if (Date.now() >= deadline) {
+            return "\u6301\u6709 pid " + held.pid + " \u5B58\u6D3B\u3001\u547D\u4EE4\u884C\u662F\u672C\u4EA7\u54C1\u7684\u5B88\u536B\u5165\u53E3\uFF0C\u6709\u754C\u7B49\u5F85 " + Math.round(LOCK_TAKE_RETRY_MS / 1e3) + "s \u540E\u4ECD\u672A\u8BA9\u51FA";
+          }
+          napSync(LOCK_TAKE_NAP_MS);
+        }
+        console.log("[supervisor] \u524D\u4EFB\u5B88\u536B pid " + held.pid + " \u5728\u7B49\u5F85\u4E2D\u9000\u51FA -> \u63A5\u7BA1\u5B88\u536B\u9501");
+      } else if (cmdline) {
+        console.log("[supervisor] \u6E05\u7406\u9648\u65E7\u5B88\u536B\u9501\uFF08\u6301\u6709 pid " + held.pid + " \u5B58\u6D3B\u4F46\u547D\u4EE4\u884C\u4E0D\u662F\u672C\u4EA7\u54C1\u7684\u5B88\u536B\u5165\u53E3\uFF1A" + cmdline + "\uFF09");
+      } else {
+        const silent = lockSilentMs();
+        if (silent !== null && silent >= LOCK_STALE_MS) {
+          console.log("[supervisor] \u6E05\u7406\u9648\u65E7\u5B88\u536B\u9501\uFF08\u6301\u6709 pid " + held.pid + " \u5B58\u6D3B\u4F46\u547D\u4EE4\u884C\u8BFB\u4E0D\u5230\uFF0C\u4E14\u9501\u5DF2 " + Math.round(silent / 1e3) + "s \u672A\u7EED\u7EA6 -> \u5224\u5B9A\u539F\u6301\u6709\u8005\u5DF2\u6B7B\uFF09");
+        } else {
+          return "\u6301\u6709 pid " + held.pid + " \u5B58\u6D3B\u3001\u547D\u4EE4\u884C\u8BFB\u4E0D\u5230\uFF0C" + (silent === null ? "\u9501\u72B6\u6001\u4E0D\u53EF\u7EDF\u8BA1\uFF08\u4FDD\u5B88\u8BA9\u4F4D\uFF09" : "\u9501 " + Math.round(silent / 1e3) + "s \u524D\u4ECD\u5728\u7EED\u7EA6\uFF08\u4FDD\u5B88\u8BA9\u4F4D\uFF09");
+        }
+      }
     }
-    const cmdline = alive ? readCmdline(held.pid) : null;
-    if (alive && !cmdline) return false;
-    if (alive && isOwnGuardEntry(cmdline)) return false;
-    console.log("[supervisor] \u6E05\u7406\u9648\u65E7\u5B88\u536B\u9501\uFF08\u6301\u6709 pid " + held.pid + (alive ? " \u5B58\u6D3B\u4F46\u547D\u4EE4\u884C\u4E0D\u662F\u672C\u4EA7\u54C1\u7684\u5B88\u536B\u5165\u53E3\uFF1A" + cmdline : " \u5DF2\u9000\u51FA") + "\uFF09");
   }
   try {
     fs.unlinkSync(LOCK_FILE);
   } catch {
   }
-  return tryCreate();
+  const again = take();
+  if (again) return true;
+  return "\u6E05\u7406\u9648\u65E7\u9501\u540E\u4ECD\u521B\u5EFA\u4E0D\u4E86\uFF08" + LOCK_FILE + " \u4E0D\u53EF\u5199\uFF1F\uFF09";
 }
 function releaseLock() {
   try {
@@ -27991,8 +28061,9 @@ function releaseLock() {
 function cmdDaemon() {
   const moved = stateRoot.migrateLegacy();
   for (const m of moved) console.log("[migrate] \u72B6\u6001\u76EE\u5F55\u8FC1\u79FB: " + m);
-  if (!acquireLock()) {
-    console.error("[supervisor] \u5DF2\u6709\u5B88\u536B\u5B9E\u4F8B\u5728\u8FD0\u884C\uFF08\u9501 " + LOCK_FILE + "\uFF09\uFF0C\u672C\u8FDB\u7A0B\u9000\u51FA\u3002");
+  const lock = acquireLock();
+  if (lock !== true) {
+    console.error("[supervisor] \u672C\u8FDB\u7A0B\u9000\u51FA\uFF1A\u672A\u53D6\u5F97\u5B88\u536B\u9501\uFF08\u9501 " + LOCK_FILE + "\uFF09\u2014\u2014 " + lock);
     process.exit(1);
   }
   process.on("exit", releaseLock);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-sup/dsh-core-linux-x64",
-  "version": "0.1.6-BETA.4",
+  "version": "0.1.6-BETA.5",
   "description": "DSH lifecycle guard core (Node launcher) for linux-x64 — requires Node >=18.",
   "license": "UNLICENSED",
   "repository": {