@dsh-sup/dsh-core-linux-x64 0.1.6-BETA.17 → 0.1.6-BETA.19

package/core.cjs

@@ -15,9 +15,7 @@ var require_exec = __commonJS({
     function options(opts) {
       const o = opts || {};
       return {
-        // timeout 是历史别名（兼容旧调用点拼写，若不与 timeoutMs 归一会被静默忽略）：
-        // 两种拼写都收，timeoutMs 优先；新调用一律用 timeoutMs。
-        timeout: o.timeoutMs || o.timeout || DEFAULT_TIMEOUT_MS,
+        timeout: o.timeoutMs || DEFAULT_TIMEOUT_MS,
         // 必须 SIGKILL：SIGTERM 对挂起或被停住的进程可能无效。
         killSignal: o.killSignal || "SIGKILL",
         maxBuffer: o.maxBuffer || DEFAULT_MAX_BUFFER,
@@ -725,33 +723,51 @@ var require_state_root = __commonJS({
     function legacyShellDir() {
       return path2.join(os2.homedir(), ".dsh", "shell");
     }
+    function why(e) {
+      return (e && e.code ? e.code + ": " : "") + (e && e.message || String(e));
+    }
     function migrateLegacy() {
       const moved = [];
+      const skipped = [];
+      const failed = [];
       for (const [from, to] of [
         [legacySupervisorDir(), supervisorDir()],
         [legacyShellDir(), shellDir()]
       ]) {
+        if (!fs2.existsSync(from)) continue;
         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 {
-            }
+        } catch (e) {
+          failed.push({ from, entry: null, error: why(e) });
+          continue;
+        }
+        let names = [];
+        try {
+          names = fs2.readdirSync(from);
+        } catch (e) {
+          failed.push({ from, entry: null, error: why(e) });
+          continue;
+        }
+        for (const name of names) {
+          const src = path2.join(from, name);
+          const dst = path2.join(to, name);
+          if (fs2.existsSync(dst)) {
+            skipped.push(src);
+            continue;
           }
           try {
-            if (fs2.readdirSync(from).length === 0) fs2.rmdirSync(from);
-          } catch {
+            fs2.renameSync(src, dst);
+            moved.push(src + " -> " + dst);
+          } catch (e) {
+            failed.push({ from, entry: name, error: why(e) });
           }
+        }
+        try {
+          if (fs2.readdirSync(from).length === 0) fs2.rmdirSync(from);
         } catch {
         }
       }
-      return moved;
+      return { moved, skipped, failed };
     }
     module2.exports = { SCHEMA, root, supervisorDir, shellDir, migrateLegacy };
   }
@@ -951,7 +967,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.17");
+      if (true) return String("0.1.6-BETA.19");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -2490,9 +2506,6 @@ var require_sources = __commonJS({
       _sources.length = 0;
       registerSources(list);
     }
-    function getSources() {
-      return _sources.map((s) => ({ name: s.name, key: s.key, local: s.local }));
-    }
     function resolvedSources() {
       if (_sources.length) return _sources.slice();
       return [normalizeSource(LOCAL_SOURCE, { local: true })];
@@ -2552,7 +2565,6 @@ var require_sources = __commonJS({
       registerSource,
       registerSources,
       setSources,
-      getSources,
       resolvedSources,
       registerInternalType,
       setInternalTypes,
@@ -2963,7 +2975,6 @@ var require_hub = __commonJS({
       registerSource: sources.registerSource,
       registerSources: sources.registerSources,
       setSources: sources.setSources,
-      getSources: sources.getSources,
       registerInternalType: sources.registerInternalType,
       setInternalTypes: sources.setInternalTypes
     };
@@ -11237,7 +11248,7 @@ var require_signals = __commonJS({
           if (!cmd2) return false;
           const bin = d.config().command && d.config().command[1];
           if (typeof bin === "string" && bin && cmd2.includes(bin)) return true;
-          return pidlook.isDshCmdline(pid);
+          return /(^|\s)web(\s|$)/.test(cmd2) && pidlook.isDshCmdline(pid);
         },
         /** 向进程组发信号（detached spawn 的子进程是组长）；组信号失败退回单进程。平台层封装：
          *  POSIX 组信号；Windows 无组语义则单进程信号，树语义由 killTree 提供。 */
@@ -11942,9 +11953,6 @@ var require_runtime2 = __commonJS({
           events() {
             return host2.events;
           },
-          name() {
-            return host2.name;
-          },
           daemons() {
             return host2.daemons;
           },
@@ -12032,7 +12040,6 @@ var require_runtime2 = __commonJS({
         },
         /** ensure 结果 -> 旧调用方契约翻译（adopted 不带 spawned：避免监督误报“失联重拉”）。 */
         _daemonEnsureResult(lc, writeOwnerLock) {
-          const d = depsOf(this);
           const rr = lc.ensureRunning();
           if (rr.mode === "started" || rr.mode === "adopted") {
             if (writeOwnerLock) writeOwnerLock();
@@ -12041,7 +12048,7 @@ var require_runtime2 = __commonJS({
           if (rr.mode === "barrier") return { active: false, mode: "barrier", reason: "\u751F\u547D\u5468\u671F\u7A97\u53E3\u5185" };
           if (rr.mode === "reclaiming") return { active: false, mode: "reclaiming", stale: rr.stale };
           if (rr.mode === "stopping") return { active: false, mode: "stopping" };
-          if (rr.mode === "failed") return { active: false, mode: "error", error: rr.error || "daemon \u672A\u542F\u52A8: " + d.name() };
+          if (rr.mode === "failed") return { active: false, mode: "error", error: rr.error || "daemon \u672A\u542F\u52A8: " + lc.name };
           return { active: false, mode: "error", error: "unexpected lifecycle mode: " + rr.mode };
         },
         /** 实例清单+令牌 -> lan-state.json（原子 0600；daemon 轮询消费）。hash 相同不落盘。 */
@@ -14227,7 +14234,6 @@ var require_facets = __commonJS({
         }
         if (f.mod.methods) installMethods(host2, f.mod.methods);
         if (f.mod.accessors) installAccessors(host2, f.mod.accessors);
-        if (typeof f.mod.buildFieldHelpers === "function") f.mod.buildFieldHelpers(host2);
       }
       installCollaborators(host2, { validate: true });
     }
@@ -15395,7 +15401,7 @@ var require_task_store = __commonJS({
           if (t && t.id && !mine.has(t.id)) mine.set(t.id, t);
         }
         merged = Array.from(mine.values());
-        merged.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
+        merged.sort((a, b) => (b.startedAt || 0) - (a.startedAt || 0));
         if (merged.length > maxTasks) merged = merged.slice(0, maxTasks);
       }
       writeTasks(file, merged);
@@ -15934,7 +15940,6 @@ var require_core5 = __commonJS({
       host2._routerFacade = null;
       host2._lc = null;
       host2._dshMainLive = null;
-      host2._lastStateBody = null;
       host2._shadowSeq = 0;
       host2._shadowConsistentBeats = 0;
       host2._shadowDiffBeats = 0;
@@ -16284,15 +16289,7 @@ var require_quota = __commonJS({
       const now = typeof q.monthlyRemaining === "number" && Number.isFinite(q.monthlyRemaining) ? q.monthlyRemaining : q.credits && typeof q.credits.monthlyCredits === "number" ? q.credits.monthlyCredits : NaN;
       return Number.isFinite(now) && now > base;
     }
-    function quotaPercent(acc) {
-      const q = acc && acc.quota || {};
-      let max = 0;
-      for (const w of [q.rolling, q.weekly, q.monthly]) {
-        if (w && Number.isFinite(Number(w.percent))) max = Math.max(max, Number(w.percent));
-      }
-      return max;
-    }
-    module2.exports = { classifyUpstreamLimited, headerRetryMs, bodyResetMs, normalizeResetTs, fmtClock, isQuotaCreditsLow, quotaOverallStatus, monthlyResetAtOf, accountQuotaSummary, windowExhausted, nextResetAt, creditsResetDue, creditsRefilled, quotaPercent };
+    module2.exports = { classifyUpstreamLimited, headerRetryMs, bodyResetMs, normalizeResetTs, fmtClock, isQuotaCreditsLow, quotaOverallStatus, monthlyResetAtOf, accountQuotaSummary, windowExhausted, nextResetAt, creditsResetDue, creditsRefilled };
   }
 });
 
@@ -16982,10 +16979,7 @@ var require_model2 = __commonJS({
       i.port = o.port || null;
       return i;
     }
-    function stateContainer(opts) {
-      return new ProxyInstance(opts || {});
-    }
-    module2.exports = { ProxyInstance, INSTANCE_STATES, isServable, occupiesSlot, stateContainer, serializeInstance, deserializeInstance };
+    module2.exports = { ProxyInstance, INSTANCE_STATES, isServable, occupiesSlot, serializeInstance, deserializeInstance };
   }
 });
 
@@ -20229,8 +20223,6 @@ var require_views = __commonJS({
             keyId: a.keyId,
             maskedKey: a.maskedKey,
             status: a.status,
-            validity: a.status,
-            // 兼容字段（=status，避免旧前端读 undefined）
             usage: usageOf,
             // 纯派生（activeAccount/实例实况）
             quota: a.quota || null,
@@ -22262,11 +22254,7 @@ var require_dsh_install = __commonJS({
         if (r.ok && r.version) _latestDsh = Object.assign({ at: Date.now() }, r);
         return r;
       }
-      async function latestDshVersion() {
-        const r = await latestDsh();
-        return r.version;
-      }
-      return { installSandbox, readInstalledVersion, latestDsh, latestDshVersion };
+      return { installSandbox, readInstalledVersion, latestDsh };
     }
     module2.exports = { createDshInstall };
   }
@@ -22317,9 +22305,6 @@ var require_upgrade = __commonJS({
       async function latestDsh() {
         return install.latestDsh();
       }
-      async function latestDshVersion() {
-        return install.latestDshVersion();
-      }
       function versionInfo(inst) {
         const cached = _updCache[inst.id];
         return { version: readInstalledVersion(inst), latest: cached && cached.latest || null };
@@ -22565,7 +22550,7 @@ var require_upgrade = __commonJS({
         if (!job) return { error: "no upgrade job for " + id };
         return { state: job.state, step: job.step, errors: job.errors, error: job.error, startedAt: job.startedAt, finishedAt: job.finishedAt };
       }
-      return { _scheduleJobCleanup, installSandbox, readInstalledVersion, latestDshVersion, versionInfo, jobView, checkUpdate, upgradeInstance, upgradeStatus };
+      return { _scheduleJobCleanup, installSandbox, readInstalledVersion, versionInfo, jobView, checkUpdate, upgradeInstance, upgradeStatus };
     }
     module2.exports = { createUpgrade };
   }
@@ -30308,9 +30293,19 @@ function releaseLock() {
   } catch {
   }
 }
+function migrateStateRoot() {
+  const r = stateRoot.migrateLegacy();
+  for (const m of r.moved) console.log("[migrate] \u72B6\u6001\u76EE\u5F55\u8FC1\u79FB: " + m);
+  for (const s of r.skipped) console.log("[migrate] \u65E7\u6761\u76EE\u4EE5\u65B0\u6839\u540C\u540D\u6587\u4EF6\u4E3A\u51C6\uFF0C\u539F\u6837\u7559\u5728: " + s);
+  if (!r.failed.length) return;
+  for (const f of r.failed) {
+    console.error("[migrate] \u642C\u8FC1\u5931\u8D25: " + f.from + (f.entry ? "/" + f.entry : "") + " \u2014\u2014 " + f.error);
+  }
+  console.error("[migrate] \u62D2\u7EDD\u542F\u52A8\uFF1A\u65E7\u72B6\u6001\u672A\u5B8C\u6574\u8FC1\u81F3\u4EA7\u54C1\u72B6\u6001\u6839 " + stateRoot.root() + "\uFF08\u672C\u6B21\u672A\u5728\u65B0\u6839\u5199\u5165\u4EFB\u4F55\u914D\u7F6E\uFF09\u3002\u8BF7\u4FEE\u6B63\u4E0A\u8FF0\u76EE\u5F55\u6743\u9650/\u6302\u8F7D\u70B9\uFF0C\u6216\u4EE5\u540C\u7528\u6237\u624B\u5DE5\u642C\u79FB\u540E\u91CD\u8BD5\u3002");
+  process.exit(1);
+}
 function cmdDaemon() {
-  const moved = stateRoot.migrateLegacy();
-  for (const m of moved) console.log("[migrate] \u72B6\u6001\u76EE\u5F55\u8FC1\u79FB: " + m);
+  migrateStateRoot();
   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);
@@ -30428,8 +30423,7 @@ function finishControl(r) {
   }
 }
 function cmdInstall() {
-  const moved = stateRoot.migrateLegacy();
-  for (const m of moved) console.log("[migrate] \u72B6\u6001\u76EE\u5F55\u8FC1\u79FB: " + m);
+  migrateStateRoot();
   fs.mkdirSync(SUPERVISOR_DIR, { recursive: true });
   if (!fs.existsSync(USER_CONFIG)) {
     fs.mkdirSync(SUPERVISOR_DIR, { recursive: true });

package/package.json

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