@dsh-sup/dsh-core-linux-x64 0.1.3-BETA.2 → 0.1.4-BETA.1

package/core.cjs

@@ -68,13 +68,17 @@ var require_config = __commonJS({
       selfUpdateDir: null,
       pluginsProfileName: "web",
       packageName: "@deepseek-ai/dsh",
-      // 默认候选镜像源 = 预设全集（npm官方/国内三大镜像）。自动模式按延迟测速选最快可达，
-      // 与 UI 预设保持一致——系统任何 npm 拉包/更新都从这组候选选源。
+      // 默认候选镜像源。自动模式按延迟测速选最快可达，与 UI 预设/壳 mirror.rs 保持同一集合。
+      // ⚠ 每一项都经**真实 tarball 下载验证**（2026-09-11）——仅「元数据可读」不足以判定可用，
+      //   部分镜像只代理元数据、不代理 tarball。
+      //   已排除：mirrors.aliyun.com/npm、mirrors.tuna.tsinghua.edu.cn/npm（元数据不可用）。
       registries: [
         "https://registry.npmmirror.com",
         "https://registry.npmjs.org",
+        "https://repo.huaweicloud.com/repository/npm/",
         "https://mirrors.cloud.tencent.com/npm",
-        "https://repo.huaweicloud.com/repository/npm/"
+        "https://npmreg.proxy.ustclug.org",
+        "https://r.cnpmjs.org"
       ],
       updateCheckEnabled: true,
       updateCheckIntervalMs: 36e5,
@@ -143,7 +147,7 @@ var require_version = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     function guardVersion() {
-      if (true) return String("0.1.3-BETA.2");
+      if (true) return String("0.1.4-BETA.1");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -1290,18 +1294,19 @@ var require_autostart = __commonJS({
     }
     function status() {
       if (isWindows) {
-        let on = false, watchdog = false;
-        try {
-          const out = execFileSync2("schtasks", ["/Query", "/TN", "DSH-Supervisor"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).toString();
-          on = out.includes("DSH-Supervisor");
-        } catch {
-        }
-        try {
-          const w = execFileSync2("schtasks", ["/Query", "/TN", "DSH-Supervisor-Watchdog"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).toString();
-          watchdog = w.includes("Watchdog");
-        } catch {
-        }
-        return { kind: "schtasks", on: on || watchdog, gui: on, watchdog };
+        let guard = false, gui = false, watchdog = false;
+        const has = (tn) => {
+          try {
+            const out = execFileSync2("schtasks", ["/Query", "/TN", tn], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).toString();
+            return out.includes(tn);
+          } catch {
+            return false;
+          }
+        };
+        guard = has("DSH-Supervisor");
+        gui = has("DSH-Supervisor-GUI");
+        watchdog = has("DSH-Supervisor-Watchdog");
+        return { kind: "schtasks", on: guard || gui || watchdog, gui, watchdog, guard };
       }
       if (isMac) {
         const on = fs2.existsSync(laFile("com.dsh.supervisor"));
@@ -1343,9 +1348,13 @@ var require_autostart = __commonJS({
             fs2.writeFileSync(atmp, ps);
             fs2.renameSync(atmp, watchdogPs1);
             try {
-              execFileSync2("schtasks", ["/Create", "/TN", "DSH-Supervisor", "/SC", "ONLOGON", "/RL", "HIGHEST", "/F", "/TR", '"' + guiCommand() + '"']);
+              execFileSync2("schtasks", ["/Create", "/TN", "DSH-Supervisor-GUI", "/SC", "ONLOGON", "/RL", "HIGHEST", "/F", "/TR", '"' + guiCommand() + '"']);
             } catch (e) {
-              errors.push("schtasks logon: " + e.message);
+              errors.push("schtasks gui: " + e.message);
+            }
+            try {
+              execFileSync2("schtasks", ["/Change", "/TN", "DSH-Supervisor", "/ENABLE"]);
+            } catch {
             }
             try {
               execFileSync2("schtasks", ["/Create", "/TN", "DSH-Supervisor-Watchdog", "/SC", "MINUTE", "/MO", "5", "/RL", "HIGHEST", "/F", "/TR", 'powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File "' + watchdogPs1 + '"']);
@@ -1358,7 +1367,11 @@ var require_autostart = __commonJS({
             } catch {
             }
             try {
-              execFileSync2("schtasks", ["/Delete", "/TN", "DSH-Supervisor", "/F"]);
+              execFileSync2("schtasks", ["/Delete", "/TN", "DSH-Supervisor-GUI", "/F"]);
+            } catch {
+            }
+            try {
+              execFileSync2("schtasks", ["/Change", "/TN", "DSH-Supervisor", "/DISABLE"]);
             } catch {
             }
             try {
@@ -4281,8 +4294,10 @@ var require_dist = __commonJS({
     var REGISTRY_PRESETS = [
       { label: "npm \u5B98\u65B9", origin: "https://registry.npmjs.org" },
       { label: "npmmirror\uFF08\u56FD\u5185\xB7\u6DD8\u5B9D\uFF09", origin: "https://registry.npmmirror.com" },
+      { label: "\u534E\u4E3A\u4E91\u955C\u50CF", origin: "https://repo.huaweicloud.com/repository/npm/" },
       { label: "\u817E\u8BAF\u4E91\u955C\u50CF", origin: "https://mirrors.cloud.tencent.com/npm" },
-      { label: "\u534E\u4E3A\u4E91\u955C\u50CF", origin: "https://repo.huaweicloud.com/repository/npm/" }
+      { label: "\u4E2D\u79D1\u5927\u955C\u50CF", origin: "https://npmreg.proxy.ustclug.org" },
+      { label: "cnpmjs \u955C\u50CF", origin: "https://r.cnpmjs.org" }
     ];
     var DistributionManager = class {
       constructor(opts) {
@@ -6813,7 +6828,13 @@ var require_frpmgr = __commonJS({
         } catch {
           return { ok: false, error: "no config generated yet" };
         }
-        const child = spawn(this.binPath, ["-c", this.configFile], { stdio: ["ignore", "pipe", "pipe"] });
+        let child;
+        try {
+          child = spawn(this.binPath, ["-c", this.configFile], { stdio: ["ignore", "pipe", "pipe"] });
+        } catch (e) {
+          if (this._stableTimer) clearTimeout(this._stableTimer);
+          return { ok: false, error: "frpc spawn failed: " + (e && e.message || e), needInstall: true };
+        }
         this.child = child;
         const pushLog = (line) => {
           line = String(line).trim();
@@ -6821,6 +6842,11 @@ var require_frpmgr = __commonJS({
           this.logTail.push((/* @__PURE__ */ new Date()).toISOString().slice(11, 19) + " " + line);
           if (this.logTail.length > 200) this.logTail.splice(0, this.logTail.length - 200);
         };
+        child.on("error", (e) => {
+          pushLog("[spawn error] " + (e && e.message || e));
+          if (this.child === child) this.child = null;
+          if (!this._intentionalStop) this._scheduleRestart();
+        });
         child.stdout.on("data", (c) => String(c).split("\n").forEach(pushLog));
         child.stderr.on("data", (c) => String(c).split("\n").forEach(pushLog));
         child.on("exit", (code) => {
@@ -18771,7 +18797,20 @@ var path = require("node:path");
 var os = require("node:os");
 var http = require("node:http");
 var { execFileSync } = require("node:child_process");
-var ROOT = path.join(__dirname, "..");
+function findPackageRoot(start) {
+  let d = start;
+  for (let i = 0; i < 6; i += 1) {
+    try {
+      if (fs.existsSync(path.join(d, "package.json"))) return d;
+    } catch {
+    }
+    const up = path.dirname(d);
+    if (up === d) break;
+    d = up;
+  }
+  return path.join(__dirname, "..");
+}
+var ROOT = findPackageRoot(__dirname);
 var SUPERVISOR_DIR = path.join(os.homedir(), ".dsh", "supervisor");
 var USER_CONFIG = path.join(SUPERVISOR_DIR, "config.json");
 var DEFAULT_CONFIG = Object.assign(
@@ -19036,12 +19075,12 @@ function cmdInstall() {
   } catch {
   }
   if (IS_WINDOWS) {
-    const target = path.join(__dirname, "dsh-supervisor");
+    const target = path.join(ROOT, "bin", "dsh-supervisor");
     const shim = '@echo off\r\n"' + process.execPath + '" "' + target + '" %*\r\n';
     fs.writeFileSync(BIN_PATH, shim);
     console.log("[install] \u547D\u4EE4\u884C\u57AB\u7247: " + BIN_PATH + " \u2192 " + target);
   } else {
-    fs.symlinkSync(path.join(__dirname, "dsh-supervisor"), BIN_PATH);
+    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)) {

package/package.json

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