oasis_test 0.1.15 → 0.1.17

package/dist/index.js

@@ -33532,6 +33532,15 @@ function nodesDomain(deps) {
       await deps.nodeStore.deleteNode(nodeId);
       return { status: 200, body: { ok: true } };
     });
+    router.post("/api/nodes/:nodeId/update", async (req) => {
+      const nodeId = req.params["nodeId"];
+      if (!nodeId) return { status: 400, body: { error: "missing nodeId" } };
+      const hub = deps.getHub();
+      if (!hub) return { status: 503, body: { error: "node gateway \u672A\u5C31\u7EEA" } };
+      const sent = hub.dispatch(nodeId, { type: "update" });
+      if (!sent) return { status: 409, body: { error: `\u8282\u70B9 ${nodeId} \u5F53\u524D\u4E0D\u5728\u7EBF\uFF0C\u65E0\u6CD5\u66F4\u65B0` } };
+      return { status: 200, body: { ok: true } };
+    });
     router.delete("/api/runtimes/:runtimeId", async (req) => {
       const runtimeId = req.params["runtimeId"];
       if (!runtimeId) return { status: 400, body: { error: "missing runtimeId" } };
@@ -49303,7 +49312,7 @@ async function preflightOasisAccess(job) {
   }
 }
 var DaemonWsClient = class {
-  constructor(serverUrl, daemonId, sessions, adapters = ["claude-code"], token, runtimes = adapters.map((kind) => ({ kind })), nodeName, reportRuntimes = true, preflight = true) {
+  constructor(serverUrl, daemonId, sessions, adapters = ["claude-code"], token, runtimes = adapters.map((kind) => ({ kind })), nodeName, reportRuntimes = true, preflight = true, onUpdate) {
     this.serverUrl = serverUrl;
     this.daemonId = daemonId;
     this.sessions = sessions;
@@ -49313,6 +49322,7 @@ var DaemonWsClient = class {
     this.nodeName = nodeName;
     this.reportRuntimes = reportRuntimes;
     this.preflight = preflight;
+    this.onUpdate = onUpdate;
   }
   ws = null;
   pingTimer = null;
@@ -49409,6 +49419,12 @@ var DaemonWsClient = class {
       case "ping":
         this.send({ type: "pong" });
         break;
+      case "update": {
+        log2("[node-cli]", "\u2190 update\uFF1A\u62C9\u53D6\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F");
+        if (this.onUpdate) this.onUpdate();
+        else log2("[node-cli]", "  update \u5FFD\u7565\uFF1A\u672C\u8FDB\u7A0B\u672A\u6CE8\u5165\u81EA\u66F4\u65B0\u903B\u8F91\uFF08\u975E node-daemon \u6258\u7BA1\uFF1F\uFF09");
+        break;
+      }
     }
   }
   send(msg) {
@@ -49517,7 +49533,7 @@ async function startNode(opts) {
       claude
     )
   );
-  const client = new DaemonWsClient(opts.serverUrl, opts.nodeId, sessions, adapters, opts.token, runtimes, opts.nodeName, opts.reportRuntimes ?? false);
+  const client = new DaemonWsClient(opts.serverUrl, opts.nodeId, sessions, adapters, opts.token, runtimes, opts.nodeName, opts.reportRuntimes ?? false, true, opts.onUpdate);
   console.log(`[oasis node] ${opts.nodeId} \u2192 ${opts.serverUrl}`);
   client.start();
   await new Promise((resolve3) => {
@@ -50974,6 +50990,7 @@ var PID_FILE = path13.join(OASIS_DIR, "node.pid");
 var BIN_FILE = path13.join(OASIS_DIR, "bin", "oasis.js");
 var LOCAL_BIN = path13.join(os8.homedir(), ".local", "bin", "oasis");
 var LOG_FILE = path13.join(OASIS_DIR, "node.log");
+var PKG_NAME = "oasis_test";
 var parseFlags = (argv) => {
   const flags = /* @__PURE__ */ new Map();
   for (let i = 0; i < argv.length; i++) {
@@ -51102,6 +51119,14 @@ function stopDaemon() {
   } catch {
   }
 }
+function selfUpdate() {
+  const cfg = readConfig();
+  if (!cfg?.serverUrl) throw new Error("no config \u2014 run `oasis start` first");
+  const args = ["-y", `${PKG_NAME}@latest`, "start", "--server-ws", cfg.serverUrl, ...cfg.name ? ["--name", cfg.name] : []];
+  const log3 = fs16.openSync(LOG_FILE, "a");
+  const child = (0, import_node_child_process12.spawn)("npx", args, { detached: true, stdio: ["ignore", log3, log3] });
+  child.unref();
+}
 void (async () => {
   const [, , cmd] = process.argv;
   const flags = parseFlags(process.argv.slice(3));
@@ -51146,7 +51171,14 @@ void (async () => {
         process.exit(1);
       })(),
       nodeName: cfg.name ?? cfg.nodeId,
-      reportRuntimes
+      reportRuntimes,
+      onUpdate: () => {
+        try {
+          selfUpdate();
+        } catch (e) {
+          console.error("[oasis] self-update failed:", String(e));
+        }
+      }
     });
     return;
   }
@@ -51161,19 +51193,20 @@ void (async () => {
     let nodeId = serverChanged ? void 0 : prev?.nodeId;
     let token = serverChanged ? flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] : flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? prev?.token;
     const enrollToken = flags.get("enroll-token") ?? process.env["OASIS_ENROLL_TOKEN"];
-    if (prev?.nodeId && prev?.token && !serverChanged) {
-      nodeId = prev.nodeId;
-      token = prev.token;
-    } else if (enrollToken) {
+    const derivedNodeId = resolveNodeId();
+    if (enrollToken) {
       const res = await fetch(`${httpBase(serverUrl)}/api/nodes/exchange`, {
         method: "POST",
         headers: { "content-type": "application/json" },
-        body: JSON.stringify({ enrollToken, hostname: os8.hostname() })
+        body: JSON.stringify({ enrollToken, nodeId: derivedNodeId, hostname: os8.hostname() })
       });
       if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
       const body = await res.json();
       token = body.token;
       nodeId = body.nodeId;
+    } else if (prev?.nodeId && prev?.token && !serverChanged) {
+      nodeId = prev.nodeId;
+      token = prev.token;
     }
     if (!token || !nodeId) {
       console.error("Usage: oasis start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>]");
@@ -51207,6 +51240,16 @@ void (async () => {
     console.log(`\u2713 restarted (PID ${pid})`);
     return;
   }
+  if (cmd === "update") {
+    if (!readConfig()?.serverUrl) {
+      console.error("no config \u2014 run `oasis start` first");
+      process.exit(1);
+    }
+    console.log(`\u2192 \u66F4\u65B0 ${PKG_NAME} \u5230\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F\u8282\u70B9\u2026`);
+    selfUpdate();
+    console.log(`\u2713 \u66F4\u65B0\u5DF2\u89E6\u53D1\uFF08\u540E\u53F0\u62C9\u53D6 ${PKG_NAME}@latest \u5E76\u91CD\u542F\uFF09\uFF1B\u67E5\u770B\u65E5\u5FD7\uFF1Atail -f ${LOG_FILE}`);
+    return;
+  }
   if (cmd === "status") {
     const pid = readPid();
     const cfg = readConfig();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"