@dsh-sup/dsh-core-linux-x64 0.1.6-BETA.6 → 0.1.6-BETA.7

package/core.cjs

@@ -947,7 +947,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.6");
+      if (true) return String("0.1.6-BETA.7");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -1207,7 +1207,7 @@ var require_main_store = __commonJS({
         if (!live) live = readDshMainFile();
         if (corrupt && !(typeof m.remoteToken === "string" && m.remoteToken)) {
           const l = logger();
-          if (l && l.warn) l.warn("_writeDshMain: \u6587\u4EF6\u635F\u574F\u6001\uFF0C\u62D2\u7EDD\u4EE5\u9ED8\u8BA4\u503C\u8986\u76D6\u5199\u56DE");
+          if (l && l.warn) l.warn("writeDshMain: \u6587\u4EF6\u635F\u574F\u6001\uFF0C\u62D2\u7EDD\u4EE5\u9ED8\u8BA4\u503C\u8986\u76D6\u5199\u56DE");
           return;
         }
         corrupt = false;
@@ -1227,7 +1227,7 @@ var require_main_store = __commonJS({
           writeAtomic(f, body, { mode: 384 });
         } catch (e) {
           const l = logger();
-          if (l && l.warn) l.warn("_writeDshMain: " + (e && e.message || e));
+          if (l && l.warn) l.warn("writeDshMain: " + (e && e.message || e));
         }
       }
       return { dshMainFile, registryFileName, readDshMain, readDshMainFile, writeDshMain };
@@ -3020,10 +3020,6 @@ var require_facades = __commonJS({
       _makeRouterFacade() {
         const client = createCtlClient({ getConfig: () => this.config });
         return createRouterCtlFacade({ getRouterPort: client.routerCtlPort, ctlCall: client.ctlCall });
-      },
-      _makeCtlFacade(port) {
-        const client = createCtlClient({ getConfig: () => this.config });
-        return createCtlFacade({ port, ctlCall: client.ctlCall });
       }
     };
     module2.exports = { createCtlFacade, createRouterCtlFacade, methods };
@@ -4006,27 +4002,7 @@ var require_orphan_scan = __commonJS({
         logger && logger.warn && logger.warn("[orphan] \u81EA\u68C0\u5F02\u5E38: " + (e && e.message || e));
       }
     }
-    function hostOrphanAudit() {
-      return orphanAudit({
-        getConfig: () => this.config,
-        getLogger: () => this.logger,
-        getEvents: () => this.events,
-        getInstances: () => this.instances,
-        getManagedObjects: () => this.managedObjects,
-        getCtl: () => this.ctl,
-        getDaemons: () => this.daemons,
-        getStopping: () => this._stopping,
-        getLastKey: () => this._lastOrphanKey,
-        setLastKey: (v) => {
-          this._lastOrphanKey = v;
-        },
-        getLastAt: () => this._lastOrphanAt,
-        setLastAt: (v) => {
-          this._lastOrphanAt = v;
-        }
-      });
-    }
-    module2.exports = { methods: { _orphanAudit: hostOrphanAudit }, orphanAudit };
+    module2.exports = { orphanAudit };
   }
 });
 
@@ -4132,7 +4108,6 @@ var require_collaborators = __commonJS({
         routerStatus: "routerStatus",
         status: "statusSummary"
       },
-      audit: { orphan: "_orphanAudit" },
       ui: { notify: "notify" }
     };
     var THIN_NAMES = Object.keys(THIN_SPEC);
@@ -4227,7 +4202,6 @@ var require_collaborators = __commonJS({
       host2._registryFileName = () => state.registryFileName();
       host2._readDshMain = () => state.readMainMeta();
       host2._readDshMainFile = () => state.readMainMetaFile();
-      host2._writeDshMain = (meta) => state.writeMainMeta(meta);
       host2.writeState = (force) => state.write(force);
       host2.loadState = () => state.loadState();
       host2._migrateMainRecord = () => state.migrateMainRecord();
@@ -12150,7 +12124,8 @@ var require_facets = __commonJS({
       { name: "domain-actions/router", mod: require_router2(), factory: "createRouterActions" },
       { name: "domain-actions/lan", mod: require_lan2(), factory: "createLanActions" },
       { name: "domain-actions/main", mod: require_main2(), factory: "createMainActions" },
-      { name: "audit/orphan-scan", mod: require_orphan_scan() },
+      // audit/orphan-scan 不在本清单：它是真 ctor 工厂（assembly/collaborators.js 的 installAuditFactory
+      //   构造 host.audit），实现体本身只是纯函数，不再需要 host 兼容外壳切面。
       { name: "settings/env", mod: require_env() },
       { name: "settings/node-lts", mod: require_node_lts() },
       { name: "settings/versions", mod: require_versions() },
@@ -13944,7 +13919,7 @@ var require_model = __commonJS({
         adapter: p.adapter || null,
         proxyAppId: p.proxyAppId || null,
         proxyRunning: p.proxyRunning || false,
-        selectedAccountKeyId: p.selectedAccountKeyId || p.selectedProxyKeyId || null,
+        selectedAccountKeyId: p.selectedAccountKeyId || null,
         activeAccountKeyId: p.activeAccount && p.activeAccount.keyId || null,
         accounts: (p.accounts || []).map((a) => {
           p._normalizeConsistency(a);
@@ -14356,7 +14331,6 @@ var require_freeze = __commonJS({
       const usable = !!acc && acc.status === "ready" && (typeof provider.isAccountUsable !== "function" || provider.isAccountUsable(acc));
       if (!usable) {
         provider.selectedAccountKeyId = null;
-        if (provider.selectedProxyKeyId === lockedId) provider.selectedProxyKeyId = null;
       }
     }
     module2.exports = { setStatus, ensureLimit, previewLimit, setLimit, freezeLimited, markCreditsExhausted, markQuotaExhausted, markBanned, applyDetection, normalizeConsistency, reconcileLock };
@@ -26911,10 +26885,7 @@ var require_managed = __commonJS({
       const main = typeof mainOf === "function" ? mainOf() : null;
       return main ? [...sandboxes, main] : sandboxes;
     }
-    function findManaged(list, id) {
-      return (list || []).find((x) => x.id === id) || null;
-    }
-    module2.exports = { localAddresses, allManaged, findManaged };
+    module2.exports = { localAddresses, allManaged };
   }
 });
 
@@ -27620,7 +27591,6 @@ var require_ops5 = __commonJS({
         this.instances = opts.instances;
         this.configPath = opts.configPath || "";
         this.mainOf = opts.mainOf || null;
-        this.persist = opts.persist || null;
         this.frp = opts.frp || new FrpManager({ dir: opts.stateDir, logger: this.logger, events: this.events });
         this.lanInstances = [];
         this._reconcileInFlight = null;
@@ -27631,31 +27601,10 @@ var require_ops5 = __commonJS({
       localAddresses() {
         return managed.localAddresses();
       }
-      /** 持久化：优先注入的 persist 路由，否则回退沙箱 instances.save()。 */
-      _saveAll() {
-        if (typeof this.persist === "function") {
-          try {
-            this.persist();
-          } catch (e) {
-            this.logger && this.logger.warn && this.logger.warn("lan persist: " + (e && e.message));
-          }
-          return;
-        }
-        if (this.instances && typeof this.instances.save === "function") {
-          try {
-            this.instances.save();
-          } catch {
-          }
-        }
-      }
       /** 受管 DSH 合成清单（沙箱 + 原生主干 main）。 */
       _allManaged() {
         return managed.allManaged({ instances: this.instances, mainOf: this.mainOf });
       }
-      /** 合成查找：按 id 取首个匹配。 */
-      _findManaged(id) {
-        return managed.findManaged(this._allManaged(), id);
-      }
       /** frpc 子进程句柄只读访问器：不暴露 frp 私有对象，供 daemon 优雅停机等待其退出。 */
       frpChild() {
         return this.frp && this.frp.child || null;
@@ -27935,13 +27884,6 @@ var require_supervisor = __commonJS({
               m.kind = "native";
               return m;
             },
-            persist: () => {
-              try {
-                if (this.instances && this.instances.save) this.instances.save();
-              } catch {
-              }
-              this._writeDshMain({});
-            },
             tokenOf: (id) => this.tokenService.get(id)
           });
         }

package/package.json

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