oasis_test 0.1.4 → 0.1.5

package/dist/index.js

@@ -27451,6 +27451,13 @@ function nodesDomain(deps) {
       const npxCmd = buildNpxCmd({ gatewayUrl: deps.gatewayUrl, nodeId, token, nodeName });
       return { status: 200, body: { nodeId, nodeName, token, script, gatewayUrl: deps.gatewayUrl, npxCmd } };
     });
+    router.patch("/api/nodes/:nodeId", async (req) => {
+      const nodeId = req.params["nodeId"];
+      if (!nodeId) return { status: 400, body: { error: "missing nodeId" } };
+      const body = req.body ?? {};
+      if (body.name) nodeNames.set(nodeId, body.name);
+      return { status: 200, body: { ok: true } };
+    });
     router.delete("/api/nodes/:nodeId", async (req) => {
       const nodeId = req.params["nodeId"];
       if (!nodeId) return { status: 400, body: { error: "missing nodeId" } };
@@ -40765,6 +40772,7 @@ var isRunning = (pid) => {
     return false;
   }
 };
+var httpBase = (wsUrl) => wsUrl.replace(/^wss?:\/\//, "http://").replace(/\/node-gateway.*$/, "");
 function installBinary() {
   fs14.mkdirSync(path13.dirname(BIN_FILE), { recursive: true });
   fs14.copyFileSync(process.argv[1], BIN_FILE);
@@ -40829,22 +40837,24 @@ function spawnDaemon() {
 }
 function stopDaemon() {
   const pid = readPid();
-  if (!pid || !isRunning(pid)) {
+  if (pid && isRunning(pid)) {
     try {
-      fs14.unlinkSync(PID_FILE);
+      process.kill(pid, "SIGTERM");
     } catch {
     }
-    return false;
   }
   try {
-    process.kill(pid, "SIGTERM");
+    fs14.unlinkSync(PID_FILE);
   } catch {
   }
   try {
-    fs14.unlinkSync(PID_FILE);
+    (0, import_node_child_process10.execSync)('pkill -f "oasis.js --_daemon"', { stdio: "ignore" });
+  } catch {
+  }
+  try {
+    (0, import_node_child_process10.execSync)("systemctl --user stop oasis-node 2>/dev/null", { stdio: "ignore" });
   } catch {
   }
-  return true;
 }
 void (async () => {
   const [, , cmd] = process.argv;
@@ -40871,6 +40881,15 @@ void (async () => {
       cleanup();
       process.exit(0);
     });
+    if (cfg.nodeId && cfg.name) {
+      const base = httpBase(cfg.serverUrl);
+      fetch(`${base}/api/nodes/${cfg.nodeId}`, {
+        method: "PATCH",
+        headers: { authorization: `Bearer ${cfg.token}`, "content-type": "application/json" },
+        body: JSON.stringify({ name: cfg.name })
+      }).catch(() => {
+      });
+    }
     await startNode({
       serverUrl: cfg.serverUrl,
       token: cfg.token,
@@ -40880,26 +40899,30 @@ void (async () => {
     return;
   }
   if (cmd === "start") {
-    const serverUrl = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"] ?? readConfig()?.serverUrl;
-    const token = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? readConfig()?.token;
+    const prev = readConfig();
+    const serverUrl = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"] ?? prev?.serverUrl;
+    const token = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? prev?.token;
     if (!serverUrl || !token) {
-      console.error("Usage: oasis start --server-ws <wss://...> --token <token> [--name <name>]");
+      console.error("Usage: oasis start --server-ws <wss://...> --token <token> [--name <name>] [--id <nodeId>]");
       process.exit(1);
     }
-    const nodeId = flags.get("id") ?? readConfig()?.nodeId ?? `node-${(0, import_node_crypto21.randomUUID)()}`;
-    saveConfig({ serverUrl, token, name: flags.get("name") ?? readConfig()?.name, nodeId });
+    const nodeId = prev?.nodeId ?? flags.get("id") ?? `node-${(0, import_node_crypto21.randomUUID)()}`;
+    const name = flags.get("name") ?? prev?.name;
+    const nameChanged = prev?.name !== void 0 && name !== prev.name;
+    saveConfig({ serverUrl, token, nodeId, ...name ? { name } : {} });
     installBinary();
     stopDaemon();
     setupAutostart();
     const pid = spawnDaemon();
-    console.log(`\u2713 daemon started (PID ${pid})
-  logs: tail -f ${LOG_FILE}`);
+    console.log(`\u2713 daemon started (PID ${pid})${nameChanged ? `  [name updated: ${prev.name} \u2192 ${name}]` : ""}`);
+    console.log(`  logs: tail -f ${LOG_FILE}`);
     if (!process.env["PATH"]?.includes(path13.dirname(LOCAL_BIN)))
       console.log(`  add to PATH: echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc && source ~/.bashrc`);
     return;
   }
   if (cmd === "stop") {
-    console.log(stopDaemon() ? "\u2713 stopped" : "not running");
+    stopDaemon();
+    console.log("\u2713 stopped");
     return;
   }
   if (cmd === "restart") {
@@ -40914,7 +40937,12 @@ void (async () => {
   }
   if (cmd === "status") {
     const pid = readPid();
-    console.log(pid && isRunning(pid) ? `running (PID ${pid})` : "not running");
+    const cfg = readConfig();
+    if (pid && isRunning(pid)) {
+      console.log(`running  PID=${pid}  nodeId=${cfg?.nodeId ?? "?"}  name=${cfg?.name ?? "(none)"}`);
+    } else {
+      console.log("not running");
+    }
     return;
   }
   await runCli(process.argv.slice(2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": { "oasis": "./dist/index.js" },
   "files": ["dist"],