@decentnetwork/beagle 0.1.49 → 0.1.50

package/dist/cli.js

@@ -50,6 +50,46 @@ const readJsonVer = (file) => {
         return "";
     }
 };
+const moduleDir = dirname(fileURLToPath(import.meta.url));
+// Version lookup for the "my node" panel.
+//
+// NOT via createRequire().resolve(): peer and lan declare `exports` with an
+// "import" condition only, so CJS resolution throws
+// ERR_PACKAGE_PATH_NOT_EXPORTED for both the bare specifier and
+// "<pkg>/package.json". (decentlan's own UI has the same call and has been
+// silently showing an empty peer version because of it.) import.meta.resolve
+// uses ESM resolution, which honours that condition.
+const resolveVer = (pkg) => {
+    const manifestFrom = (start) => {
+        let dir = start;
+        for (let depth = 0; depth < 6; depth++) {
+            const manifest = join(dir, "package.json");
+            if (existsSync(manifest)) {
+                try {
+                    const parsed = JSON.parse(readFileSync(manifest, "utf-8"));
+                    if (parsed.name === pkg)
+                        return parsed.version ?? "";
+                }
+                catch {
+                    // unreadable manifest — keep walking
+                }
+            }
+            const up = dirname(dir);
+            if (up === dir)
+                break;
+            dir = up;
+        }
+        return undefined;
+    };
+    try {
+        return manifestFrom(dirname(fileURLToPath(import.meta.resolve(pkg)))) ?? "";
+    }
+    catch {
+        // Fall back to a plain node_modules lookup beside this package, which
+        // also covers the case where the dependency is absent entirely.
+        return manifestFrom(join(moduleDir, "..", "node_modules", ...pkg.split("/"))) ?? "";
+    }
+};
 async function main() {
     const args = parseArgs(process.argv.slice(2));
     // Bootstrap list: prefer the user's decentlan config so both stacks agree on
@@ -67,6 +107,7 @@ async function main() {
             statusMessage,
             autoAcceptFriends: autoAccept,
             onAutoAcceptChange: (enabled) => saveAutoAccept(args.configDir, enabled),
+            peerVersion: resolveVer("@decentnetwork/peer"),
             force: args.backend,
         }));
     }
@@ -94,46 +135,6 @@ async function main() {
         makeDaemon: () => makeDaemonHost(decentlanCarrierDir(args.configDir)),
         onChange: (state) => console.log(`[LAN] backend is now: ${state}`),
     });
-    const moduleDir = dirname(fileURLToPath(import.meta.url));
-    // Version lookup for the "my node" panel.
-    //
-    // NOT via createRequire().resolve(): peer and lan declare `exports` with an
-    // "import" condition only, so CJS resolution throws
-    // ERR_PACKAGE_PATH_NOT_EXPORTED for both the bare specifier and
-    // "<pkg>/package.json". (decentlan's own UI has the same call and has been
-    // silently showing an empty peer version because of it.) import.meta.resolve
-    // uses ESM resolution, which honours that condition.
-    const resolveVer = (pkg) => {
-        const manifestFrom = (start) => {
-            let dir = start;
-            for (let depth = 0; depth < 6; depth++) {
-                const manifest = join(dir, "package.json");
-                if (existsSync(manifest)) {
-                    try {
-                        const parsed = JSON.parse(readFileSync(manifest, "utf-8"));
-                        if (parsed.name === pkg)
-                            return parsed.version ?? "";
-                    }
-                    catch {
-                        // unreadable manifest — keep walking
-                    }
-                }
-                const up = dirname(dir);
-                if (up === dir)
-                    break;
-                dir = up;
-            }
-            return undefined;
-        };
-        try {
-            return manifestFrom(dirname(fileURLToPath(import.meta.resolve(pkg)))) ?? "";
-        }
-        catch {
-            // Fall back to a plain node_modules lookup beside this package, which
-            // also covers the case where the dependency is absent entirely.
-            return manifestFrom(join(moduleDir, "..", "node_modules", ...pkg.split("/"))) ?? "";
-        }
-    };
     // If this machine also runs a dora, surface its allocation table.
     const doraCandidates = args.doraDir
         ? [resolve(args.doraDir, "roster.yaml")]
@@ -159,6 +160,9 @@ async function main() {
             // node look like it was running lan 0.1.0.
             lanVer: resolveVer("@decentnetwork/lan") || "(none)",
             peerVer: resolveVer("@decentnetwork/peer"),
+            // The call engine compiled into the served vendor bundle — the version
+            // that decides whether a screen share fits the Carrier invite cap.
+            webrtcVer: resolveVer("@decentnetwork/peer-webrtc"),
             wire: "163",
             channel: "@next",
         },

package/dist/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.49";
+window.__DK_UI_VERSION="0.1.50";
 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"/>',
@@ -2983,6 +2983,20 @@ function CopyBtn({ value, copiedText = "Copied", copyFailedText = "Copy failed",
 function FieldRow({ T, label, value, mono = true, copy, qr, onQr, last }) {
   return /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 14, padding: "13px 16px", borderBottom: last ? "none" : "1px solid var(--line)" } }, /* @__PURE__ */ React.createElement("span", { style: { width: 130, flexShrink: 0, fontFamily: "var(--mono)", fontSize: 11.5, fontWeight: 600, color: "var(--faint)", textTransform: "uppercase", letterSpacing: 0.5 } }, label), /* @__PURE__ */ React.createElement("span", { style: { flex: 1, minWidth: 0, fontFamily: mono ? "var(--mono)" : "var(--ui)", fontSize: 13.5, color: "var(--text)", overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" } }, value), copy && /* @__PURE__ */ React.createElement(CopyBtn, { value, copiedText: T.copied, copyFailedText: T.copyFailed, copyTitle: T.copy }), qr && /* @__PURE__ */ React.createElement(Btn, { icon: "qr", size: "sm", onClick: () => onQr && onQr(value, label) }));
 }
+function DkVersionRow({ T, me }) {
+  const unsure = me.verFromBackend === false;
+  const pill = (name, ver, mark) => /* @__PURE__ */ React.createElement("span", { key: name, style: { display: "inline-flex", alignItems: "baseline", gap: 5 } }, /* @__PURE__ */ React.createElement("span", { style: { color: "var(--faint)" } }, name), /* @__PURE__ */ React.createElement("span", { title: mark && unsure ? T.verInstalledHint : void 0 }, ver || "\u2014", mark && unsure && ver ? /* @__PURE__ */ React.createElement("span", { style: { color: "var(--faint)" } }, " ?") : null));
+  const line = (label, items) => /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "baseline", gap: 10, flexWrap: "wrap" } }, /* @__PURE__ */ React.createElement("span", { style: { width: 52, flexShrink: 0, fontSize: 11, color: "var(--faint)" } }, label), /* @__PURE__ */ React.createElement("span", { style: { display: "flex", gap: 12, flexWrap: "wrap" } }, items));
+  const embedded = me.backend === "embedded";
+  return /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "flex-start", gap: 14, padding: "13px 16px", borderBottom: "1px solid var(--line)" } }, /* @__PURE__ */ React.createElement("span", { style: { width: 130, flexShrink: 0, fontFamily: "var(--mono)", fontSize: 11.5, fontWeight: 600, color: "var(--faint)", textTransform: "uppercase", letterSpacing: 0.5 } }, T.version), /* @__PURE__ */ React.createElement("div", { style: { flex: 1, minWidth: 0, display: "flex", flexDirection: "column", gap: 6, fontFamily: "var(--mono)", fontSize: 13, color: "var(--text)" } }, line(T.verApp || "app", [
+    pill("beagle", me.beagleVer),
+    pill("peer-webrtc", me.webrtcVer),
+    ...embedded ? [pill("peer", me.peerVer)] : []
+  ]), !embedded && line(T.verDaemon || "daemon", [
+    pill("lan", me.lanVer, true),
+    pill("peer", me.peerVer, true)
+  ]), !embedded && unsure && /* @__PURE__ */ React.createElement("div", { style: { fontSize: 11, color: "var(--faint)", fontFamily: "var(--ui)" } }, T.verInstalledHint), line(T.verChannel || "channel", [/* @__PURE__ */ React.createElement("span", { key: "ch" }, me.channel)])));
+}
 function DkQrModal({ T, value, label, onClose }) {
   const qr = React.useMemo(() => {
     if (typeof qrcode === "undefined")
@@ -3472,7 +3486,7 @@ function ProfileTab({ T, me, onEdit }) {
       },
       style: { width: 16, height: 16, accentColor: "var(--accent)" }
     }
-  ), /* @__PURE__ */ React.createElement("div", { style: { flex: 1 } }, /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--mono)", fontSize: 13.5, fontWeight: 600, color: "var(--text)" } }, T && T.autoAcceptLabel || "Auto-accept friend requests"), /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 11.5, color: "var(--dim)", marginTop: 2 } }, T && T.autoAcceptSub || "Off: requests wait in the sidebar for your approval.")))), /* @__PURE__ */ React.createElement(Card, { label: T.network }, /* @__PURE__ */ React.createElement(FieldRow, { T, label: T.virtualIp, value: me.ip, copy: true }), /* @__PURE__ */ React.createElement(FieldRow, { T, label: T.wireLabel, value: `${me.wire} \xB7 lossless`, mono: false }), /* @__PURE__ */ React.createElement(FieldRow, { T, label: T.version, value: `lan ${me.lanVer} \xB7 peer ${me.peerVer} \xB7 ${me.channel}` }), /* @__PURE__ */ React.createElement(DkUpdateCheck, { T })), /* @__PURE__ */ React.createElement(Card, { label: T.dangerZone }, /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 13, padding: "14px 16px" } }, /* @__PURE__ */ React.createElement("div", { style: { width: 34, height: 34, borderRadius: 8, flexShrink: 0, background: "color-mix(in oklab, var(--danger), transparent 86%)", display: "flex", alignItems: "center", justifyContent: "center", color: "var(--danger)" } }, /* @__PURE__ */ React.createElement(Icon, { name: "trash", size: 17, stroke: 2 })), /* @__PURE__ */ React.createElement("div", { style: { flex: 1 } }, /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--mono)", fontSize: 13.5, fontWeight: 600, color: "var(--danger)" } }, T.deleteNode), /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--faint)", marginTop: 1 } }, T.deleteSub)), /* @__PURE__ */ React.createElement(Btn, { tone: "danger", size: "sm" }, T.delete)))), qr && /* @__PURE__ */ React.createElement(DkQrModal, { T, value: qr.value, label: qr.label, onClose: () => setQr(null) }), editing && /* @__PURE__ */ React.createElement(DkEditModal, { T, me, onClose: () => setEditing(false), onSave: (name, description) => {
+  ), /* @__PURE__ */ React.createElement("div", { style: { flex: 1 } }, /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--mono)", fontSize: 13.5, fontWeight: 600, color: "var(--text)" } }, T && T.autoAcceptLabel || "Auto-accept friend requests"), /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 11.5, color: "var(--dim)", marginTop: 2 } }, T && T.autoAcceptSub || "Off: requests wait in the sidebar for your approval.")))), /* @__PURE__ */ React.createElement(Card, { label: T.network }, /* @__PURE__ */ React.createElement(FieldRow, { T, label: T.virtualIp, value: me.ip, copy: true }), /* @__PURE__ */ React.createElement(FieldRow, { T, label: T.wireLabel, value: `${me.wire} \xB7 lossless`, mono: false }), /* @__PURE__ */ React.createElement(DkVersionRow, { T, me }), /* @__PURE__ */ React.createElement(DkUpdateCheck, { T })), /* @__PURE__ */ React.createElement(Card, { label: T.dangerZone }, /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 13, padding: "14px 16px" } }, /* @__PURE__ */ React.createElement("div", { style: { width: 34, height: 34, borderRadius: 8, flexShrink: 0, background: "color-mix(in oklab, var(--danger), transparent 86%)", display: "flex", alignItems: "center", justifyContent: "center", color: "var(--danger)" } }, /* @__PURE__ */ React.createElement(Icon, { name: "trash", size: 17, stroke: 2 })), /* @__PURE__ */ React.createElement("div", { style: { flex: 1 } }, /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--mono)", fontSize: 13.5, fontWeight: 600, color: "var(--danger)" } }, T.deleteNode), /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--faint)", marginTop: 1 } }, T.deleteSub)), /* @__PURE__ */ React.createElement(Btn, { tone: "danger", size: "sm" }, T.delete)))), qr && /* @__PURE__ */ React.createElement(DkQrModal, { T, value: qr.value, label: qr.label, onClose: () => setQr(null) }), editing && /* @__PURE__ */ React.createElement(DkEditModal, { T, me, onClose: () => setEditing(false), onSave: (name, description) => {
     if (onEdit)
       onEdit(name, description);
     setEditing(false);
@@ -4595,6 +4609,10 @@ const STR = {
     virtualIp: "virtual ip",
     version: "version",
     editProfile: "edit",
+    verApp: "app",
+    verDaemon: "daemon",
+    verChannel: "channel",
+    verInstalledHint: "installed on disk \u2014 restart the daemon so it can report what it is actually running",
     copy: "Copy",
     copied: "Copied",
     copyFailed: "Copy failed",
@@ -4764,6 +4782,10 @@ const STR = {
     virtualIp: "\u865A\u62DF IP",
     version: "\u7248\u672C",
     editProfile: "\u7F16\u8F91",
+    verApp: "\u5E94\u7528",
+    verDaemon: "\u5B88\u62A4\u8FDB\u7A0B",
+    verChannel: "\u901A\u9053",
+    verInstalledHint: "\u8FD9\u662F\u78C1\u76D8\u4E0A\u5DF2\u5B89\u88C5\u7684\u7248\u672C\uFF1B\u91CD\u542F\u5B88\u62A4\u8FDB\u7A0B\u540E\u624D\u80FD\u663E\u793A\u5B83\u771F\u6B63\u8FD0\u884C\u7684\u7248\u672C",
     copy: "\u590D\u5236",
     copied: "\u5DF2\u590D\u5236",
     copyFailed: "\u590D\u5236\u5931\u8D25",

package/dist/embedded-host.d.ts

@@ -24,6 +24,9 @@ export interface EmbeddedHostOptions {
         description?: string;
     }) => void;
     onAutoAcceptChange?: (enabled: boolean) => void;
+    /** @decentnetwork/peer version backing this embedded node, surfaced by `ping`
+     *  so the panel can name the code that is actually running. */
+    peerVersion?: string;
 }
 export declare class EmbeddedHost implements PeerHost {
     #private;

package/dist/embedded-host.js

@@ -313,7 +313,10 @@ export class EmbeddedHost {
         const uid = (req.userid ?? "");
         switch (req.op) {
             case "ping":
-                return { ok: true };
+                // Embedded backend: there is no daemon, so the versions the UI should
+                // show are this process's own — reported the same way the daemon
+                // reports its, so the panel needs no special case.
+                return { ok: true, backend: "embedded", peerVer: this.#opts.peerVersion ?? "" };
             case "diag": {
                 const id = this.#node.identity();
                 return {

package/dist/peer-host.d.ts

@@ -37,6 +37,10 @@ export interface OpenPeerHostOptions {
     nickname?: string;
     statusMessage?: string;
     autoAcceptFriends?: boolean;
+    /** @decentnetwork/peer version, forwarded to an embedded host so its `ping`
+     *  can name the code actually running. Ignored for a daemon host — the
+     *  daemon reports its own. */
+    peerVersion?: string;
     /** Persist a runtime auto-accept toggle (embedded backend only). */
     onAutoAcceptChange?: (enabled: boolean) => void;
     /** Force a backend instead of auto-detecting. Mainly for testing the

package/dist/peer-host.js

@@ -98,6 +98,7 @@ export async function openPeerHost(opts) {
         statusMessage: opts.statusMessage,
         autoAcceptFriends: opts.autoAcceptFriends ?? true,
         onAutoAcceptChange: opts.onAutoAcceptChange,
+        peerVersion: opts.peerVersion,
     });
     await host.start();
     return {

package/dist/server.d.ts

@@ -14,6 +14,7 @@ export interface BeagleServerOptions {
     meExtra?: {
         lanVer?: string;
         peerVer?: string;
+        webrtcVer?: string;
         wire?: string;
         channel?: string;
     };

package/dist/server.js

@@ -206,6 +206,35 @@ function beagleVersion() {
         return "";
     }
 }
+/**
+ * Versions of the code the BACKEND process is running, straight from its `ping`.
+ *
+ * meExtra reads beagle's own node_modules, which describes the packages sitting
+ * beside beagle — not the daemon answering our calls. After `npm i -g` but
+ * before a daemon restart those disagree, and the panel confidently showed the
+ * new version while the old build was still serving every message. Ask the
+ * process itself; fall back to meExtra when it is too old to answer.
+ */
+const RUNNING_VER_TTL_MS = 30_000;
+let runningVerCache = null;
+async function runningVersions(call) {
+    if (runningVerCache && Date.now() - runningVerCache.at < RUNNING_VER_TTL_MS) {
+        return { lanVer: runningVerCache.lanVer, peerVer: runningVerCache.peerVer };
+    }
+    let lanVer = "";
+    let peerVer = "";
+    try {
+        const r = await call({ op: "ping" });
+        const data = (r.ok ? r.data : undefined) ?? {};
+        lanVer = String(data.lanVer ?? "");
+        peerVer = String(data.peerVer ?? "");
+    }
+    catch {
+        // Backend down or too old to report — the caller falls back.
+    }
+    runningVerCache = { at: Date.now(), lanVer, peerVer };
+    return { lanVer, peerVer };
+}
 /** How this copy of beagle got onto disk — decides what "update" can do.
  *  npx cache paths contain _npx AND node_modules, so test _npx first. */
 function installMode() {
@@ -1309,7 +1338,8 @@ export function startBeagleServer(opts) {
                     npmLatest("@decentnetwork/peer"),
                     npmLatest("@decentnetwork/lan"),
                 ]);
-                const curLan = opts.meExtra?.lanVer ?? "";
+                const running = await runningVersions(opts.call);
+                const curLan = running.lanVer || (opts.meExtra?.lanVer ?? "");
                 const row = (pkg, current, latest) => ({
                     pkg,
                     current,
@@ -1322,8 +1352,10 @@ export function startBeagleServer(opts) {
                     mode: installMode(),
                     updates: [
                         row(BEAGLE_PKG, beagleVersion(), beagleLatest),
-                        // peer ships inside beagle: reinstalling beagle refreshes it too.
-                        row("@decentnetwork/peer", opts.meExtra?.peerVer ?? "", peerLatest),
+                        // The peer the BACKEND is running — a daemon that has been updated
+                        // on disk but not restarted must still read as behind, or the panel
+                        // reports a fix as live while the old build is serving.
+                        row("@decentnetwork/peer", running.peerVer || (opts.meExtra?.peerVer ?? ""), peerLatest),
                         ...(curLan && curLan !== "(none)" ? [row("@decentnetwork/lan", curLan, lanLatest)] : []),
                     ],
                 };
@@ -1403,11 +1435,12 @@ export function startBeagleServer(opts) {
                 return;
             }
             if (req.method === "GET" && url === "/api/desktop") {
-                const [diag, pending, flist, ensPub] = await Promise.all([
+                const [diag, pending, flist, ensPub, running] = await Promise.all([
                     opts.call({ op: "diag" }),
                     opts.call({ op: "friends-pending" }),
                     opts.call({ op: "friends-list" }),
                     ensPublicByUserid(),
+                    runningVersions(opts.call),
                 ]);
                 const d = (diag.ok ? diag.data : {}) ?? {};
                 const identity = d.identity ?? {};
@@ -1449,8 +1482,15 @@ export function startBeagleServer(opts) {
                     ip: tun.ip ?? d.allocatedIp ?? "",
                     online: node.backend === "embedded" ? embeddedOnline : !!tun.ip,
                     lan: !!tun.ip,
-                    lanVer: opts.meExtra?.lanVer ?? "",
-                    peerVer: opts.meExtra?.peerVer ?? "",
+                    // Prefer what the backend says it is running over what sits in our
+                    // node_modules — see `runningVersions`.
+                    lanVer: running.lanVer || (opts.meExtra?.lanVer ?? ""),
+                    peerVer: running.peerVer || (opts.meExtra?.peerVer ?? ""),
+                    webrtcVer: opts.meExtra?.webrtcVer ?? "",
+                    backend: String(node.backend ?? "daemon"),
+                    // false = the backend is too old to report its own versions, so the
+                    // numbers above are what is INSTALLED, which is not the same claim.
+                    verFromBackend: !!running.peerVer,
                     channel: opts.meExtra?.channel ?? "@next",
                     wire: opts.meExtra?.wire ?? "163",
                     isExit: !!meExit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.49",
+  "version": "0.1.50",
   "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",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@decentnetwork/chat-components": "^0.1.3",
-    "@decentnetwork/lan": "^0.1.276",
+    "@decentnetwork/lan": "^0.1.277",
     "@decentnetwork/peer": "^0.1.139",
     "@decentnetwork/peer-webrtc": "^0.2.16",
     "js-yaml": "^4.1.0",