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

package/core.cjs

@@ -143,7 +143,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.1");
+      if (true) return String("0.1.3-BETA.3");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -6813,7 +6813,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 +6827,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) => {
@@ -7730,8 +7741,9 @@ var require_manager = __commonJS({
           }
           if (!await this.targetReachable(inst)) return;
           const hasPersistedBinding = !!(inst.wanPort && Number.isInteger(Number(inst.wanPort)) && inst.wanPort > 0);
+          const relayPool = ports.rangeOf("relay");
           const slot = await ports.claimSlot("relay", owner, {
-            preferred: hasPersistedBinding ? inst.wanPort : inst.id === "main" ? 4e4 : void 0,
+            preferred: hasPersistedBinding ? inst.wanPort : inst.id === "main" ? relayPool.base : void 0,
             bindingPreferred: hasPersistedBinding,
             onBindingLost: (e) => {
               if (this.events) {

package/package.json

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