oasis_test_v2 2.2.102 → 2.2.103

package/dist/index.js

@@ -247578,7 +247578,8 @@ function nodesDomain(deps) {
         resolve11({ ok: false, code: "timeout", reason: `\u8FD9\u53F0\u8282\u70B9\u6CA1\u5728 ${Math.round(RUNTIME_DETECT_TIMEOUT_MS / 1e3)} \u79D2\u5185\u56DE\u8BDD\uFF0C\u6CA1\u62FF\u5230\u63A2\u6D4B\u7ED3\u679C` });
       }, RUNTIME_DETECT_TIMEOUT_MS);
       runtimeDetectWaiters.set(requestId, {
-        resolve: (r) => resolve11(r.ok ? { ok: true, runtimes: r.runtimes ?? [] } : { ok: false, code: "node", reason: r.reason ?? "\u8FD9\u53F0\u8282\u70B9\u63A2\u6D4B\u8FD0\u884C\u65F6\u65F6\u51FA\u9519\u4E86" }),
+        nodeId,
+        resolve: (r) => resolve11(r.ok ? { ok: true, runtimes: r.runtimes ?? [] } : { ok: false, code: r.code ?? "node", reason: r.reason ?? "\u8FD9\u53F0\u8282\u70B9\u63A2\u6D4B\u8FD0\u884C\u65F6\u65F6\u51FA\u9519\u4E86" }),
         timer
       });
       const sent = hub.dispatch(nodeId, { type: "detect_runtimes", requestId });
@@ -247594,6 +247595,27 @@ function nodesDomain(deps) {
     runtimeDetectInFlight.set(nodeId, task);
     return task;
   }
+  const reenrollDetects = /* @__PURE__ */ new Map();
+  const REENROLL_DETECT_TTL_MS = 30 * 6e4;
+  function startReenrollDetect(enrollToken, nodeId, conn) {
+    const nowMs = Date.now();
+    for (const [k2, v2] of reenrollDetects) if (v2.expiresAt <= nowMs) reenrollDetects.delete(k2);
+    const rec2 = { nodeId, conn, expiresAt: nowMs + REENROLL_DETECT_TTL_MS };
+    reenrollDetects.set(enrollToken, rec2);
+    void detectNodeRuntimes(nodeId).then((outcome) => {
+      rec2.outcome = outcome;
+      if (!outcome.ok) console.log(`[nodes] \u91CD\u65B0\u63A5\u5165\u65F6\u73B0\u573A\u63A2\u6D4B\u6CA1\u62FF\u5230\u7ED3\u679C(node=${nodeId})\uFF1A${outcome.reason}\uFF1B\u7B2C 3 \u6B65\u9000\u56DE\u8FD9\u53F0\u8282\u70B9\u4E0A\u6B21\u4E0A\u62A5\u7684\u5217\u8868`);
+    });
+  }
+  function detectedForEnrollment(enrollToken, nodeId) {
+    const latest = detectedRuntimesOf(nodeId);
+    const rec2 = reenrollDetects.get(enrollToken);
+    if (!rec2 || rec2.nodeId !== nodeId) return latest;
+    const conn = deps.getHub()?.connectedDaemons().find((d) => d.daemonId === nodeId);
+    if (!conn || conn !== rec2.conn) return latest;
+    if (!rec2.outcome) return void 0;
+    return rec2.outcome.ok ? rec2.outcome.runtimes : latest;
+  }
   let hubWired = false;
   function wireHub(hub) {
     if (hubWired) return;
@@ -247691,6 +247713,14 @@ function nodesDomain(deps) {
         deps.onStatusChange?.();
       }
     });
+    hub.addDisconnectListener?.((daemonId) => {
+      for (const [requestId, waiter] of runtimeDetectWaiters) {
+        if (waiter.nodeId !== daemonId) continue;
+        runtimeDetectWaiters.delete(requestId);
+        clearTimeout(waiter.timer);
+        waiter.resolve({ ok: false, code: "offline", reason: "\u8FDE\u63A5\u65AD\u5F00\u4E86\uFF0C\u8282\u70B9\u6CA1\u6765\u5F97\u53CA\u56DE\u62A5\u63A2\u6D4B\u7ED3\u679C" });
+      }
+    });
     hub.onDaemonDisconnected = async (daemonId) => {
       quotaByNode.delete(daemonId);
       try {
@@ -247895,7 +247925,7 @@ function nodesDomain(deps) {
       const crossCompany = raw?.companyId !== void 0 && companyId !== void 0 && raw.companyId !== companyId;
       const entry = crossCompany ? null : raw;
       const nodeId = entry?.issuedNodeId;
-      const detected = nodeId !== void 0 ? detectedRuntimesOf(nodeId) : void 0;
+      const detected = nodeId !== void 0 ? detectedForEnrollment(enrollToken, nodeId) : void 0;
       const nodeConnected = nodeId !== void 0 && (deps.getHub()?.connectedDaemons() ?? []).some((d) => d.daemonId === nodeId);
       const boundNodeReady = nodeId !== void 0 && (nodeConnected || usable.some((r) => r.nodeId === nodeId));
       const boundNode = boundNodeReady && nodeId !== void 0 ? await deps.nodeStore.getNode(nodeId) : null;
@@ -247987,6 +248017,8 @@ function nodesDomain(deps) {
       deps.nodeTokens.clearRevocations(nodeId);
       const existing = deps.nodeTokens.list().find((e) => e.nodeId === nodeId);
       const token2 = existing?.token ?? deps.nodeTokens.issue(nodeId);
+      const liveConn = deps.getHub()?.connectedDaemons().find((d) => d.daemonId === nodeId);
+      if (liveConn) startReenrollDetect(enrollToken, nodeId, liveConn);
       return { status: 200, body: { nodeId, token: token2 } };
     });
     router.patch("/api/nodes/:nodeId", async (req) => {
@@ -297882,7 +297914,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.102" ? "2.2.102" : "dev";
+var CLI_VERSION = "2.2.103" ? "2.2.103" : "dev";
 function apiHeaders(token2, company) {
   const headers = {
     authorization: `Bearer ${token2}`,
@@ -301918,7 +301950,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.102" : "dev";
+var PKG_VERSION = true ? "2.2.103" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;
@@ -302310,8 +302342,14 @@ async function startOneInstance(o) {
   }
   const pidNow = readPid();
   const alive2 = !!pidNow && isRunning2(pidNow);
-  if (alive2 && !enrollToken && label2 === before && !serverChanged && !companyChanged && !nameChanged) {
-    console.log(`\u2713 ${INSTANCE}\uFF1A\u5DF2\u5728\u8DD1\uFF08PID ${pidNow}\uFF0C${label2 ?? "?"}\uFF09\uFF0C\u7248\u672C\u4E0E\u914D\u7F6E\u5747\u672A\u53D8\uFF0C\u672A\u91CD\u542F`);
+  const identityChanged = !!prev && (prev.nodeId !== nodeId || prev.token !== token2);
+  if (alive2 && label2 === before && !serverChanged && !companyChanged && !identityChanged) {
+    if (enrollToken) {
+      console.log(`\u2713 ${INSTANCE}\uFF1A\u5DF2\u5728\u8FD0\u884C\uFF0C\u672A\u91CD\u542F\uFF08PID ${pidNow}\uFF0C${label2 ?? "?"}\uFF09\uFF1B\u63A5\u5165\u5DF2\u786E\u8BA4\uFF0C\u8BF7\u56DE\u5230\u9875\u9762\u9009\u62E9\u8981\u6DFB\u52A0\u7684\u8FD0\u884C\u65F6`);
+    } else {
+      console.log(`\u2713 ${INSTANCE}\uFF1A\u5DF2\u5728\u8DD1\uFF08PID ${pidNow}\uFF0C${label2 ?? "?"}\uFF09\uFF0C\u7248\u672C\u4E0E\u914D\u7F6E\u5747\u672A\u53D8\uFF0C\u672A\u91CD\u542F`);
+    }
+    if (nameChanged) console.log(`  \u672C\u673A\u8BB0\u5F55\u7684\u8282\u70B9\u540D\u5DF2\u66F4\u65B0\uFF1A${prev.name} \u2192 ${name}`);
     return;
   }
   stopDaemon(INSTANCE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.2.102",
+  "version": "2.2.103",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "0f65390893b8eb868ae7c38792ef34c1a00cb0b0"
+    "sourceHead": "be78091fa39438c497835a6207b5df1d519afcc9"
   }
 }