@decentnetwork/lan 0.1.295 → 0.1.297

package/dist/cli/commands.js

@@ -77,6 +77,18 @@ function assertDaemonNotRunning(config, commandName) {
  * if the socket isn't there / hangs up.
  */
 /** Who, if anyone, is holding the identity lock without serving IPC. */
+class IdentityHeldByBeagle extends Error {
+    pid;
+    command;
+    port;
+    constructor(pid, command, port) {
+        super(`beagle (pid ${pid}) holds this identity on port ${port}`);
+        this.pid = pid;
+        this.command = command;
+        this.port = port;
+        this.name = "IdentityHeldByBeagle";
+    }
+}
 function readIdentityHolder(dataDir) {
     try {
         const pid = Number.parseInt(readFileSync(join(dataDir, "daemon.pid"), "utf8").trim(), 10);
@@ -89,7 +101,14 @@ function readIdentityHolder(dataDir) {
                 .trim().split("\n")[0]?.slice(0, 90) ?? command;
         }
         catch { /* ps is best-effort */ }
-        return { pid, command };
+        let port;
+        try {
+            const p = Number.parseInt(readFileSync(join(dataDir, "holder.http-port"), "utf8").trim(), 10);
+            if (Number.isFinite(p) && p > 0)
+                port = p;
+        }
+        catch { /* older beagle, or none running */ }
+        return { pid, command, port };
     }
     catch {
         return undefined;
@@ -109,6 +128,15 @@ async function ipcCall(config, req, timeoutMs = 30_000) {
         // beagle had been holding the identity for six hours.
         const holder = readIdentityHolder(config.carrier.dataDir);
         if (holder) {
+            // beagle publishes the port of its own HTTP API next to the lock, so we
+            // can finish the job instead of only naming the obstacle. The documented
+            // upgrade is `npm i -g @decentnetwork/lan@latest && agentnet restart`,
+            // and on a machine where beagle holds the identity the second half had
+            // nothing to talk to: the person was left with a new package installed
+            // and a process still running the old one, twice in one evening.
+            if (holder.port) {
+                throw new IdentityHeldByBeagle(holder.pid, holder.command, holder.port);
+            }
             throw new Error(`No daemon here — pid ${holder.pid} holds this identity (${holder.command}). ` +
                 `That is beagle running embedded; restart it from the app, or stop it and then \`agentnet up\`.`);
         }
@@ -2773,7 +2801,26 @@ export async function cmdRestart(args) {
     if (daemonPid(config) === null) {
         throw new Error("Daemon not running. Start it once with 'agentnet up' (needs sudo for TUN); after that 'agentnet restart' takes care of upgrades without further sudo prompts.");
     }
-    const res = await ipcCall(config, { op: "self-restart" });
+    let res;
+    try {
+        res = await ipcCall(config, { op: "self-restart" });
+    }
+    catch (err) {
+        // beagle holds the identity and runs its own HTTP API. Restart THAT — it is
+        // what "restart" means on this machine, and refusing here left the person
+        // with a freshly installed package and a process still running the old one.
+        if (err instanceof IdentityHeldByBeagle) {
+            const r = await fetch(`http://127.0.0.1:${err.port}/api/update-restart`, { method: "POST" })
+                .catch((e) => { throw new Error(`beagle (pid ${err.pid}) is on port ${err.port} but did not answer: ${String(e)}`); });
+            if (!r.ok)
+                throw new Error(`beagle refused the restart: HTTP ${r.status}`);
+            console.log(`No daemon here — beagle holds this identity (pid ${err.pid}). Asked it to restart.`);
+            console.log(`  ${err.command}`);
+            console.log("A beagle under launchd/pm2 comes back on its own; one started by hand in a terminal just exits — start it again there.");
+            return;
+        }
+        throw err;
+    }
     if (!res.ok)
         throw new Error(`Daemon refused: ${res.error}`);
     const data = res.data;

package/dist/ui/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.295";
+window.__DK_UI_VERSION="0.1.297";
 const ICON_PATHS = {
   // ---- tab bar (the four must feel like one set) ----
   users: '<path d="M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M22 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/>',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/lan",
-  "version": "0.1.295",
+  "version": "0.1.297",
   "description": "Private virtual LAN for self-hosted services and AI agents, built on Elastos Carrier. NAT-traversal, name service, ACL, all over a peer-to-peer mesh — no public IP required.",
   "type": "module",
   "main": "./dist/index.js",
@@ -84,7 +84,7 @@
   },
   "dependencies": {
     "@decentnetwork/dora": "^0.1.14",
-    "@decentnetwork/peer": "^0.1.163",
+    "@decentnetwork/peer": "^0.1.164",
     "@decentnetwork/peer-webrtc": "^0.2.10",
     "ink": "^5.2.1",
     "js-yaml": "^4.1.0",