@decentnetwork/beagle 0.1.125 → 0.1.126

package/dist/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.125";
+window.__DK_UI_VERSION="0.1.126";
 "use strict";
 (() => {
   // packages/beagle-ui/dist/beagle-ui.js

package/dist/global-prefix.d.ts

@@ -0,0 +1,13 @@
+/**
+ * The npm global prefix a file inside a globally installed package lives
+ * under — the value `npm i -g --prefix` needs to replace THAT copy.
+ *
+ *   /Users/x/.nvm/versions/node/v24.2.0/lib/node_modules/@decentnetwork/beagle → /Users/x/.nvm/versions/node/v24.2.0
+ *   /usr/local/lib/node_modules/@decentnetwork/lan/dist/cli/index.js            → /usr/local
+ *   C:\Users\x\AppData\Roaming\npm\node_modules\@decentnetwork\beagle           → C:\Users\x\AppData\Roaming\npm
+ *
+ * Empty when the path is not inside a global node_modules (dev checkout, npx).
+ * The FIRST match is the global root; a nested dependency's node_modules
+ * sits below it.
+ */
+export declare function globalPrefixOf(path: string, s?: string): string;

package/dist/global-prefix.js

@@ -0,0 +1,25 @@
+import { sep } from "node:path";
+/**
+ * The npm global prefix a file inside a globally installed package lives
+ * under — the value `npm i -g --prefix` needs to replace THAT copy.
+ *
+ *   /Users/x/.nvm/versions/node/v24.2.0/lib/node_modules/@decentnetwork/beagle → /Users/x/.nvm/versions/node/v24.2.0
+ *   /usr/local/lib/node_modules/@decentnetwork/lan/dist/cli/index.js            → /usr/local
+ *   C:\Users\x\AppData\Roaming\npm\node_modules\@decentnetwork\beagle           → C:\Users\x\AppData\Roaming\npm
+ *
+ * Empty when the path is not inside a global node_modules (dev checkout, npx).
+ * The FIRST match is the global root; a nested dependency's node_modules
+ * sits below it.
+ */
+export function globalPrefixOf(path, s = sep) {
+    const posix = `${s}lib${s}node_modules${s}`;
+    const i = path.indexOf(posix);
+    if (i > 0)
+        return path.slice(0, i);
+    if (s === "\\") {
+        const w = path.indexOf(`${s}node_modules${s}`);
+        if (w > 0)
+            return path.slice(0, w);
+    }
+    return "";
+}

package/dist/server.js

@@ -30,6 +30,7 @@ import { desktopRequestRow } from "./pending-requests.js";
 import { createDiscoverFetch } from "./discover-cache.js";
 import { applyWalletBind } from "@decentnetwork/beagle-ui/wallet-proof";
 import { settleUpload } from "./upload-settle.js";
+import { globalPrefixOf } from "./global-prefix.js";
 // Directory holding the built desktop UI bundle (index.html, app.js, vendor/).
 // scripts/build-ui.mjs emits it next to this compiled module at dist/ui/desktop/.
 const DESKTOP_DIR = join(dirname(fileURLToPath(import.meta.url)), "desktop");
@@ -345,9 +346,15 @@ function verLt(a, b) {
  *  different node than this app (nvm: launchd starts v24.2.0 while the shell's
  *  npm is v24.3.0), and a global install lands in the prefix of whichever npm
  *  ran it — the wrong one leaves the daemon on the old code with no error. */
-async function npmGlobalInstall(pkg, nodePath) {
+/** `targetPrefix` is the global prefix the RUNNING copy lives in. Pinning node
+ *  is not enough: an nvm npm-cli.js runs under whatever node its caller picks,
+ *  and npm on PATH (pm2's PATH on mac-dev: v24.3.0) installs into its own
+ *  prefix — beagle 0.1.124 ran from v24.2.0 while every click of Update put
+ *  the new version into v24.3.0, reported success, and restarted onto the old
+ *  code. An explicit --prefix puts the files where the restart will load them. */
+async function npmGlobalInstall(pkg, nodePath, targetPrefix) {
     const { spawn } = await import("node:child_process");
-    const args = ["i", "-g", `${pkg}@latest`];
+    const args = ["i", "-g", `${pkg}@latest`, ...(targetPrefix ? ["--prefix", targetPrefix] : [])];
     const cliFor = (node) => join(dirname(node), "..", "lib", "node_modules", "npm", "bin", "npm-cli.js");
     const npmCli = cliFor(process.execPath);
     const pinned = nodePath && existsSync(nodePath) && existsSync(cliFor(nodePath)) ? cliFor(nodePath) : "";
@@ -386,10 +393,10 @@ async function npmGlobalInstall(pkg, nodePath) {
             const npmCmd = a.cmd === "npm" ? resolveNpmOnPath(npmCli) : [a.cmd, a.args[0]];
             if (npmCmd.length) {
                 const [exe, ...pre0] = npmCmd;
-                const pre = await runOnce(exe, [...pre0, "prefix", "-g"], 15_000);
-                const prefix = pre.code === 0 ? pre.out.trim().split("\n").pop()?.trim() : "";
+                const pre = targetPrefix ? undefined : await runOnce(exe, [...pre0, "prefix", "-g"], 15_000);
+                const prefix = targetPrefix || (pre?.code === 0 ? pre.out.trim().split("\n").pop()?.trim() : "");
                 if (prefix) {
-                    const s = await runOnce("sudo", ["-n", "-H", ...npmCmd, ...args, "--prefix", prefix]);
+                    const s = await runOnce("sudo", ["-n", "-H", ...npmCmd, ...args, ...(targetPrefix ? [] : ["--prefix", prefix])]);
                     if (s.code === 0)
                         return { ok: true, log: s.out.slice(-2000) };
                     return { ok: false, error: `sudo -n npm exited ${s.code}`, log: s.out.slice(-2000) };
@@ -555,13 +562,31 @@ async function npmQuery(args) {
 /** The node binary the running daemon was started with, from its pid's
  *  command line (`/…/bin/node /…/bin/agentnet up …`). Empty when unknown. */
 async function daemonNodePath(dataDir) {
+    const first = (await daemonCommand(dataDir))[0] ?? "";
+    return /(^|\/)node(\.exe)?$/.test(first) && existsSync(first) ? first : "";
+}
+/** The global prefix the running daemon's lan was loaded from: its script
+ *  (`/…/bin/agentnet`, a symlink into `<prefix>/lib/node_modules/…`) resolved.
+ *  Empty when unknown — the install then falls back to npm's own prefix. */
+async function daemonLanPrefix(dataDir) {
+    const script = (await daemonCommand(dataDir))[1] ?? "";
+    if (!script || !existsSync(script))
+        return "";
+    try {
+        return globalPrefixOf(realpathSync(script));
+    }
+    catch {
+        return "";
+    }
+}
+/** The daemon's command line split on whitespace, from its pidfile's pid. */
+async function daemonCommand(dataDir) {
     const pid = dataDir ? readDaemonPid(dataDir) : "";
     if (!/^\d+$/.test(pid) || process.platform === "win32")
-        return "";
+        return [];
     const { execFile } = await import("node:child_process");
     const cmd = await new Promise((res) => execFile("ps", ["-o", "command=", "-p", pid], { timeout: 5000 }, (err, out) => res(err ? "" : String(out).trim())));
-    const first = cmd.split(/\s+/)[0] ?? "";
-    return /(^|\/)node(\.exe)?$/.test(first) && existsSync(first) ? first : "";
+    return cmd ? cmd.split(/\s+/) : [];
 }
 async function agentnetRestart(dataDir) {
     const pidBefore = dataDir ? readDaemonPid(dataDir) : "";
@@ -1895,7 +1920,7 @@ export function startBeagleServer(opts) {
                 // lan (the agentnet daemon) updates independently of beagle's own
                 // install mode: global reinstall, then ask the daemon to re-exec.
                 if (body.pkg === "lan") {
-                    const inst = await npmGlobalInstall("@decentnetwork/lan", await daemonNodePath(opts.lanHost?.dataDir));
+                    const inst = await npmGlobalInstall("@decentnetwork/lan", await daemonNodePath(opts.lanHost?.dataDir), await daemonLanPrefix(opts.lanHost?.dataDir));
                     if (!inst.ok) {
                         sendJson(res, 502, inst);
                         return;
@@ -1919,7 +1944,8 @@ export function startBeagleServer(opts) {
                     sendJson(res, 200, { ok: true, npx: true });
                     return;
                 }
-                const r = await npmGlobalInstall(BEAGLE_PKG);
+                // Into the prefix THIS copy runs from, with this node's npm — see npmGlobalInstall.
+                const r = await npmGlobalInstall(BEAGLE_PKG, process.execPath, globalPrefixOf(BEAGLE_ROOT) || undefined);
                 updateCache = null; // next check reflects the new install
                 sendJson(res, r.ok ? 200 : 502, r);
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.125",
+  "version": "0.1.126",
   "description": "Beagle — P2P chat, file transfer and calls for regular users, on the Decent Network. No admin privilege required.",
   "type": "module",
   "main": "./dist/index.js",