@dsh-sup/dsh-core-linux-x64 0.1.5-BETA.5 → 0.1.5-BETA.6

package/core.cjs

@@ -80,6 +80,71 @@ var require_exec = __commonJS({
   }
 });
 
+// src/platform/state-root.js
+var require_state_root = __commonJS({
+  "src/platform/state-root.js"(exports2, module2) {
+    "use strict";
+    var fs2 = require("node:fs");
+    var os2 = require("node:os");
+    var path2 = require("node:path");
+    var SCHEMA = 1;
+    function root() {
+      const override = process.env.DSH_SUPERVISOR_HOME;
+      if (override && String(override).trim()) return path2.resolve(String(override).trim());
+      if (process.platform === "win32") {
+        const local = process.env.LOCALAPPDATA || path2.join(os2.homedir(), "AppData", "Local");
+        return path2.join(local, "dsh-supervisor");
+      }
+      if (process.platform === "darwin") {
+        return path2.join(os2.homedir(), "Library", "Application Support", "dsh-supervisor");
+      }
+      const xdg = process.env.XDG_STATE_HOME;
+      return xdg && String(xdg).trim() ? path2.join(String(xdg).trim(), "dsh-supervisor") : path2.join(os2.homedir(), ".local", "state", "dsh-supervisor");
+    }
+    function supervisorDir() {
+      return path2.join(root(), "supervisor");
+    }
+    function shellDir() {
+      return path2.join(root(), "shell");
+    }
+    function legacySupervisorDir() {
+      return path2.join(os2.homedir(), ".dsh", "supervisor");
+    }
+    function legacyShellDir() {
+      return path2.join(os2.homedir(), ".dsh", "shell");
+    }
+    function migrateLegacy() {
+      const moved = [];
+      for (const [from, to] of [
+        [legacySupervisorDir(), supervisorDir()],
+        [legacyShellDir(), shellDir()]
+      ]) {
+        try {
+          if (!fs2.existsSync(from)) continue;
+          fs2.mkdirSync(to, { recursive: true });
+          for (const name of fs2.readdirSync(from)) {
+            const src = path2.join(from, name);
+            const dst = path2.join(to, name);
+            if (fs2.existsSync(dst)) continue;
+            try {
+              fs2.renameSync(src, dst);
+              moved.push(src + " -> " + dst);
+            } catch {
+            }
+          }
+          try {
+            if (fs2.readdirSync(from).length === 0) fs2.rmdirSync(from);
+          } catch {
+          }
+        } catch {
+        }
+      }
+      return moved;
+    }
+    module2.exports = { SCHEMA, root, supervisorDir, shellDir, legacySupervisorDir, legacyShellDir, migrateLegacy };
+  }
+});
+
 // src/platform/config.js
 var require_config = __commonJS({
   "src/platform/config.js"(exports2, module2) {
@@ -92,6 +157,7 @@ var require_config = __commonJS({
       if (p.startsWith("~/")) return path2.join(os2.homedir(), p.slice(2));
       return p;
     }
+    var SUP = require_state_root().supervisorDir();
     var DEFAULTS = {
       probeIntervalMs: 5e3,
       // 健康探测（三层）：L0 进程存活 + L1 端口监听 + L2 HTTP GET healthUrl。
@@ -117,15 +183,15 @@ var require_config = __commonJS({
       // managed = relay/proxyInstance/oauthCallback 共享池（K8s 单一范围思想，杜绝段碎片化）；
       // providerApi = 智能路由供应商独立端点池（按供应商规模调大）。null = 用内置默认池。
       portPools: null,
-      stateFile: "~/.dsh/supervisor/state.json",
+      stateFile: path2.join(SUP, "state.json"),
       // 系统日志框架目录布局：log/ 与 events/ 分目录；
       // 守卫(guard) 事件在 events/guard.events.log、分级日志在 log/guard.log（daemon 用 router/lan 同构文件）。
       // 显式配置（既有生产 config.json / 测试）仍尊重用户给定路径——不强行改写。
-      logFile: "~/.dsh/supervisor/events/guard.events.log",
+      logFile: path2.join(SUP, "events", "guard.events.log"),
       eventsMaxBytes: 5 * 1024 * 1024,
-      supervisorLogFile: "~/.dsh/supervisor/log/guard.log",
-      dshLogFile: "~/.dsh/supervisor/log/dsh.log",
-      upgradeLogFile: "~/.dsh/supervisor/log/upgrade.log",
+      supervisorLogFile: path2.join(SUP, "log", "guard.log"),
+      dshLogFile: path2.join(SUP, "log", "dsh.log"),
+      upgradeLogFile: path2.join(SUP, "log", "upgrade.log"),
       logLevel: "info",
       logMaxBytes: 5 * 1024 * 1024,
       notifyEnabled: true,
@@ -223,7 +289,7 @@ var require_version = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     function guardVersion() {
-      if (true) return String("0.1.5-BETA.5");
+      if (true) return String("0.1.5-BETA.6");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -1551,7 +1617,7 @@ var require_autostart = __commonJS({
       return String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
     }
     function macGuiPlist(guiExe) {
-      const log = path2.join(os2.homedir(), ".dsh", "shell", "gui-stdio.log");
+      const log = path2.join(require_state_root().shellDir(), "gui-stdio.log");
       return '<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0"><dict>\n  <key>Label</key><string>' + xmlEscape(GUI_LABEL) + "</string>\n  <key>ProgramArguments</key>\n  <array><string>" + xmlEscape(guiExe) + "</string></array>\n  <key>RunAtLoad</key><true/>\n  <key>LimitLoadToSessionType</key><string>Aqua</string>\n  <key>ProcessType</key><string>Interactive</string>\n  <key>StandardOutPath</key><string>" + xmlEscape(log) + "</string>\n  <key>StandardErrorPath</key><string>" + xmlEscape(log) + "</string>\n</dict></plist>\n";
     }
     function guiFile() {
@@ -1605,54 +1671,14 @@ var require_autostart = __commonJS({
       const errors = [];
       if (isWindows) {
         try {
-          const watchdogPs1 = path2.join(os2.homedir(), ".dsh", "supervisor", "watchdog.ps1");
           if (on) {
-            const apiPort = process.env.DSH_SUPERVISOR_API_PORT || "36361";
-            const daemon = daemonCommand();
-            const guiPath = guiCommand();
-            const ps = [
-              '$ErrorActionPreference = "SilentlyContinue"',
-              "$port = " + JSON.stringify(String(apiPort)),
-              "$daemon = " + JSON.stringify(String(daemon)),
-              "$gui = " + JSON.stringify(String(guiPath)),
-              "$up = Test-NetConnection -ComputerName 127.0.0.1 -Port $port -InformationLevel Quiet -WarningAction SilentlyContinue",
-              "# \u2500\u2500 \u5B88\u536B\u4FDD\u6D3B\uFF08\u4EC5\u5728\u5B88\u536B\u4E0D\u53EF\u8FBE\u65F6\uFF09\u2500\u2500",
-              "if (-not $up) {",
-              "  $p = @(Get-Process -Name dsh-supervisor -ErrorAction SilentlyContinue)",
-              "  if (-not $p) { Start-Process -FilePath $daemon -ArgumentList 'daemon' -WindowStyle Hidden }",
-              "}",
-              "# \u2500\u2500 \u58F3\u4FDD\u6D3B\uFF08\u26A0 \u5FC5\u987B**\u72EC\u7ACB\u4E8E\u5B88\u536B\u72B6\u6001**\uFF09\u2500\u2500",
-              "#   2026-09-11 \u5BA1\u8BA1\u4FEE\u590D\uFF1A\u65E7\u5B9E\u73B0\u628A\u58F3\u68C0\u67E5\u5D4C\u5728\u4E0A\u9762\u7684 if (-not $up) \u5185\uFF0C",
-              "#   \u4E8E\u662F\u300C\u58F3\u5D29\u3001\u5B88\u536B\u6D3B\u300D\u65F6 $up \u4E3A\u771F \u2192 \u6574\u5757\u8DF3\u8FC7 \u2192 **\u58F3\u6C38\u8FDC\u4E0D\u4F1A\u88AB\u62C9\u8D77**\u3002",
-              "#   \u800C\u90A3\u6070\u662F\u58F3\u81EA\u6108\u552F\u4E00\u9700\u8981\u751F\u6548\u7684\u573A\u666F\uFF08\u5B88\u536B\u7531\u670D\u52A1\u7BA1\u7406\u5668\u4FDD\u6D3B\uFF0C\u58F3\u65E0\u4EBA\u7BA1\uFF09\u3002",
-              "$g = @(Get-Process -Name dsh-supervisor-gui -ErrorAction SilentlyContinue)",
-              "if (-not $g -and (Test-Path $gui)) { Start-Process -FilePath $gui -WindowStyle Hidden }",
-              "exit 0"
-            ].join(String.fromCharCode(13, 10));
-            fs2.mkdirSync(path2.dirname(watchdogPs1), { recursive: true });
-            const atmp = watchdogPs1 + ".tmp";
-            fs2.writeFileSync(atmp, ps);
-            fs2.renameSync(atmp, watchdogPs1);
-            {
-              const r = ex2.runDetail("schtasks", ["/Create", "/TN", "DSH-Supervisor-GUI", "/SC", "ONLOGON", "/RL", "HIGHEST", "/F", "/TR", '"' + guiCommand() + '"']);
-              if (!r.ok) errors.push("schtasks gui: " + (r.error || "\u6267\u884C\u5931\u8D25"));
-            }
-            ex2.run("schtasks", ["/Change", "/TN", "DSH-Supervisor", "/ENABLE"]);
-            {
-              const r = ex2.runDetail("schtasks", ["/Create", "/TN", "DSH-Supervisor-Watchdog", "/SC", "MINUTE", "/MO", "5", "/RL", "HIGHEST", "/F", "/TR", 'powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File "' + watchdogPs1 + '"']);
-              if (!r.ok) errors.push("schtasks watchdog: " + (r.error || "\u6267\u884C\u5931\u8D25"));
-            }
+            const r = ex2.runDetail("schtasks", ["/Create", "/TN", "DSH-Supervisor-GUI", "/SC", "ONLOGON", "/RL", "HIGHEST", "/F", "/TR", '"' + guiCommand() + '"']);
+            if (!r.ok) errors.push("schtasks gui: " + (r.error || "\u6267\u884C\u5931\u8D25"));
           } else {
-            ex2.run("schtasks", ["/Delete", "/TN", "DSH-Supervisor-Watchdog", "/F"]);
             ex2.run("schtasks", ["/Delete", "/TN", "DSH-Supervisor-GUI", "/F"]);
-            ex2.run("schtasks", ["/Change", "/TN", "DSH-Supervisor", "/DISABLE"]);
-            try {
-              fs2.unlinkSync(watchdogPs1);
-            } catch {
-            }
           }
         } catch (e) {
-          errors.push("watchdog setup: " + e.message);
+          errors.push("gui autostart: " + e.message);
         }
         return { ok: errors.length === 0, errors, ...status() };
       }
@@ -1834,7 +1860,7 @@ var require_os = __commonJS({
       return path2.join(os2.homedir(), ".dsh");
     }
     function supervisorDir() {
-      return path2.join(dataDir(), "supervisor");
+      return require_state_root().supervisorDir();
     }
     function capabilityProfile(platform, arch) {
       const pl = platform || PLATFORM;
@@ -2067,7 +2093,7 @@ var require_ports = __commonJS({
     };
     var PortRegistry = class {
       constructor(opts) {
-        this._file = opts && opts.file || path2.join(os2.homedir(), ".dsh", "supervisor", "ports.json");
+        this._file = opts && opts.file || path2.join(require_state_root().supervisorDir(), "ports.json");
         this._records = /* @__PURE__ */ new Map();
         this._allocLock = false;
         this._pools = Object.assign({}, DEFAULT_POOLS, opts && opts.pools || {});
@@ -3391,6 +3417,7 @@ var require_proxy = __commonJS({
         this.kind = "proxy";
         this.proxyAppId = opts.proxyAppId;
         this.app = opts.app || null;
+        this.stateDir = opts.stateDir || null;
         this.proxyRunning = false;
         this.instances = [];
         this.selectedAccountKeyId = null;
@@ -3624,7 +3651,8 @@ var require_proxy = __commonJS({
         const logFilter = /error|streaming|idle|timeout|ECONN|abort|socket|finish|truncat/i;
         let logStream = null;
         try {
-          const logDir = require("node:path").join(require("node:os").homedir(), ".dsh", "supervisor", "logs");
+          const baseDir = this.stateDir || require("../../platform/state-root").supervisorDir();
+          const logDir = require("node:path").join(baseDir, "logs");
           require("node:fs").mkdirSync(logDir, { recursive: true });
           logStream = require("node:fs").createWriteStream(require("node:path").join(logDir, "proxy-instance-" + this.proxyAppId + "-" + port + ".log"), { flags: "a" });
         } catch {
@@ -4728,7 +4756,7 @@ var require_runtime_contract = __commonJS({
     var path2 = require("node:path");
     var SUPPORTED_SCHEMA = 2;
     function file() {
-      return path2.join(os2.homedir(), ".dsh", "supervisor", "runtime.json");
+      return path2.join(require_state_root().supervisorDir(), "runtime.json");
     }
     function read() {
       let j;
@@ -6752,7 +6780,7 @@ var require_router = __commonJS({
         }
       }
       _deserializeProvider(p) {
-        const common = { id: p.id, name: p.name, logger: this.logger, events: this.events, dist: this.dist, onPersist: () => this._save(), apiPort: p.apiPort || null, activated: p.activated === true };
+        const common = { id: p.id, name: p.name, logger: this.logger, events: this.events, dist: this.dist, onPersist: () => this._save(), stateDir: this.config && this.config.stateFile ? path2.dirname(this.config.stateFile) : null, apiPort: p.apiPort || null, activated: p.activated === true };
         let prov;
         if (p.kind === "proxy") {
           prov = new ProxyProvider({ ...common, kind: "proxy", proxyAppId: p.proxyAppId, app: PROXY_APPS[p.proxyAppId] || null });
@@ -11763,7 +11791,7 @@ var require_shell = __commonJS({
     var path2 = require("node:path");
     var { semverCompare } = require_dist();
     function shellDir() {
-      return path2.join(os2.homedir(), ".dsh", "shell");
+      return require_state_root().shellDir();
     }
     function readJson(p) {
       try {
@@ -19835,10 +19863,20 @@ var require_supervisor = __commonJS({
           });
           server.listen(port, this.config.apiHost, () => {
             this.api = server;
-            if (port !== this.config.apiPort) {
+            const prev = this.config.apiPort;
+            if (port !== prev) {
+              try {
+                ports.release(prev, "system:supervisor-api");
+              } catch {
+              }
               this.config.apiPort = port;
               if (this.configPath) this.persistConfigPatch({ apiPort: port });
             }
+            try {
+              ports.register("supervisor-api", port);
+            } catch (e) {
+              this.logger.warn("ports.register(actual) \u5931\u8D25: " + e.message);
+            }
             this.events.append("api_listening", { host: this.config.apiHost, port });
             this.logger.info("api listening on " + this.config.apiHost + ":" + port);
           });
@@ -20340,6 +20378,10 @@ var require_supervisor = __commonJS({
           server.listen(this.config.apiPort, this.config.apiHost, () => {
             bind._tries = 0;
             this.api = server;
+            try {
+              ports.register("supervisor-api", this.config.apiPort);
+            } catch {
+            }
             this.events.append("api_listening", { host: this.config.apiHost, port: this.config.apiPort });
             this.logger.info("api listening on " + this.config.apiHost + ":" + this.config.apiPort);
           });
@@ -20720,7 +20762,8 @@ function findPackageRoot(start) {
   return path.join(__dirname, "..");
 }
 var ROOT = findPackageRoot(__dirname);
-var SUPERVISOR_DIR = path.join(os.homedir(), ".dsh", "supervisor");
+var stateRoot = require_state_root();
+var SUPERVISOR_DIR = stateRoot.supervisorDir();
 var USER_CONFIG = path.join(SUPERVISOR_DIR, "config.json");
 var DEFAULT_CONFIG = Object.assign(
   {},
@@ -20730,10 +20773,6 @@ var DEFAULT_CONFIG = Object.assign(
 var STATE_FILE = path.join(SUPERVISOR_DIR, "state.json");
 var EVENTS_FILE = path.join(SUPERVISOR_DIR, "events", "guard.events.log");
 var UNIT_PATH = path.join(os.homedir(), ".config", "systemd", "user", "dsh-supervisor.service");
-var UNIT_TEMPLATE = path.join(ROOT, "systemd", "dsh-supervisor.service");
-var DESKTOP_DIR = path.join(os.homedir(), ".local", "share", "applications");
-var ICON_DIR = path.join(os.homedir(), ".local", "share", "icons");
-var DESKTOP_TEMPLATE = path.join(ROOT, "desktop", "dsh-supervisor.desktop");
 var AUTOSTART_TEMPLATE = path.join(ROOT, "desktop", "dsh-supervisor-gui-autostart.desktop");
 var AUTOSTART_FILE = path.join(os.homedir(), ".config", "autostart", "dsh-supervisor-gui-autostart.desktop");
 var IS_WINDOWS = process.platform === "win32";
@@ -20866,6 +20905,8 @@ 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");
     process.exit(1);
@@ -20982,6 +21023,8 @@ function finishControl(r) {
   }
 }
 function cmdInstall() {
+  const moved = stateRoot.migrateLegacy();
+  for (const m of moved) console.log("[migrate] \u72B6\u6001\u76EE\u5F55\u8FC1\u79FB: " + m);
   fs.mkdirSync(SUPERVISOR_DIR, { recursive: true });
   if (!fs.existsSync(USER_CONFIG)) {
     fs.mkdirSync(SUPERVISOR_DIR, { recursive: true });
@@ -21004,50 +21047,8 @@ function cmdInstall() {
     fs.symlinkSync(path.join(ROOT, "bin", "dsh-supervisor"), BIN_PATH);
     console.log("[install] \u547D\u4EE4\u884C\u94FE\u63A5: " + BIN_PATH + " \u2192 " + __dirname + "/dsh-supervisor");
   }
-  if (!fs.existsSync(UNIT_TEMPLATE)) {
-    console.warn("[install] \u672A\u627E\u5230 systemd \u6A21\u677F\uFF08" + UNIT_TEMPLATE + "\uFF09\u2014\u2014npm \u5185\u6838\u5305\u5F62\u6001\uFF0C\u8DF3\u8FC7\u7CFB\u7EDF\u670D\u52A1\u90E8\u7F72\u3002");
-    console.warn("[install] \u5982\u9700 systemd \u5E38\u9A7B\uFF0C\u8BF7\u4ECE\u6E90\u7801\u4ED3\u5B89\u88C5\uFF08systemd/dsh-supervisor.service\uFF09\u6216\u624B\u52A8\u8FD0\u884C\uFF1Adsh-supervisor daemon");
-  } else {
-    let unit = fs.readFileSync(UNIT_TEMPLATE, "utf8");
-    unit = unit.replace("@BIN@", BIN_PATH);
-    const unitDir = path.dirname(UNIT_PATH);
-    fs.mkdirSync(unitDir, { recursive: true });
-    fs.writeFileSync(UNIT_PATH, unit);
-    console.log("[install] systemd unit: " + UNIT_PATH);
-    try {
-      execInherit("systemctl", ["--user", "daemon-reload"]);
-      execInherit("systemctl", ["--user", "enable", "dsh-supervisor.service"]);
-    } catch (e) {
-      console.warn("[install] systemctl \u6267\u884C\u5931\u8D25\uFF08\u53EF\u80FD\u4E0D\u5728 systemd \u4F1A\u8BDD\u4E2D\uFF09:", e.message);
-    }
-    try {
-      execInherit("loginctl", ["enable-linger", os.userInfo().username]);
-      console.log("[install] loginctl enable-linger \u5DF2\u542F\u7528");
-    } catch {
-      console.warn("[install] enable-linger \u5931\u8D25\uFF0C\u5F00\u673A\u81EA\u542F\u53EF\u80FD\u4E0D\u751F\u6548");
-    }
-    installDesktopEntry();
-    console.log("\n\u5B89\u88C5\u5B8C\u6210\u3002\u542F\u52A8\u5B88\u536B\uFF1A\n  systemctl --user start dsh-supervisor");
-    console.log("\u67E5\u770B\u72B6\u6001\uFF1A\n  dsh-supervisor status");
-  }
-}
-function installDesktopEntry() {
-  try {
-    if (!fs.existsSync(DESKTOP_TEMPLATE)) return;
-    fs.mkdirSync(ICON_DIR, { recursive: true });
-    const shellDir = process.env.DSH_SHELL_DIR || null;
-    const iconSrc = shellDir ? path.join(shellDir, "src-tauri", "icons", "128x128.png") : null;
-    const iconDst = path.join(ICON_DIR, "dsh-supervisor.png");
-    if (iconSrc && fs.existsSync(iconSrc)) fs.copyFileSync(iconSrc, iconDst);
-    else console.warn("[install] \u672A\u627E\u5230\u58F3\u56FE\u6807\uFF08\u53EF\u8BBE DSH_SHELL_DIR \u6307\u5411\u58F3 checkout\uFF09\uFF0C\u684C\u9762\u56FE\u6807\u7F3A\u5931\uFF1B\u4E0D\u5F71\u54CD\u529F\u80FD\u3002");
-    fs.mkdirSync(DESKTOP_DIR, { recursive: true });
-    const entry = fs.readFileSync(DESKTOP_TEMPLATE, "utf8").replace(/@HOME@/g, os.homedir());
-    const dst = path.join(DESKTOP_DIR, "dsh-supervisor.desktop");
-    fs.writeFileSync(dst, entry);
-    console.log("[install] \u684C\u9762\u83DC\u5355\u5165\u53E3: " + dst);
-  } catch (e) {
-    console.warn("[install] \u684C\u9762\u5165\u53E3\u90E8\u7F72\u5931\u8D25:", e.message);
-  }
+  console.log("[install] \u670D\u52A1\u5B9A\u4E49/\u5F00\u673A\u81EA\u542F/\u684C\u9762\u5165\u53E3\u7531\u684C\u9762\u58F3\u8D1F\u8D23\uFF08\u672C\u547D\u4EE4\u4E0D\u518D\u90E8\u7F72\uFF09\u3002");
+  console.log("[install] \u5185\u6838\u672C\u4F53\u5DF2\u5C31\u7EEA\u3002\u542F\u52A8\u7531\u684C\u9762\u58F3\u6216\u670D\u52A1\u7BA1\u7406\u5668\u53D1\u8D77\uFF1Adsh-supervisor daemon");
 }
 function cmdGuiAutostart(onoff) {
   if (onoff === "on") {

package/package.json

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