@decentnetwork/beagle 0.1.57 → 0.1.59

package/dist/embedded-host.js

@@ -201,6 +201,10 @@ export class EmbeddedHost {
             // evidence than any status flag, so use it.
             void this.#chainFlush(pubkey);
         });
+        // `description` is the self-introduction the sender was asked to write —
+        // the entire reason for asking is so the recipient knows who is knocking.
+        // It arrives on the packet and used to be dropped here, so the request
+        // card had nothing to show but a truncated key.
         this.#node.on("friend-request", (req) => {
             const userid = req.userid ?? req.pubkey;
             if (this.#autoAccept) {
@@ -214,6 +218,7 @@ export class EmbeddedHost {
                 userid,
                 pubkey: req.pubkey,
                 name: req.name,
+                descr: req.description,
                 hello: req.hello,
                 arrivedAt: Date.now(),
             });

package/dist/peer-host.d.ts

@@ -46,6 +46,8 @@ export interface OpenPeerHostOptions {
     /** Force a backend instead of auto-detecting. Mainly for testing the
      *  embedded path on a machine that also runs a daemon. */
     force?: BackendKind;
+    /** How long `force: "daemon"` waits for the daemon socket. Default 60s. */
+    waitForDaemonMs?: number;
 }
 /**
  * Pick a backend.

package/dist/peer-host.js

@@ -77,7 +77,35 @@ export async function openPeerHost(opts) {
         return { host: new DaemonHost(dataDir), why: `decentlan daemon at ${dataDir}` };
     }
     if (opts.force === "daemon") {
-        throw new Error(`--backend daemon was requested but no decentlan daemon is running (looked for ${ipcSocketPath(dataDir)}).`);
+        // Wait rather than die.
+        //
+        // A supervised beagle (pm2, systemd) routinely starts BEFORE the daemon it
+        // is meant to attach to. Throwing there turned a boot-order race into a
+        // permanent problem: beagle fell back to embedded, took <dataDir>/daemon.pid,
+        // and from then on `agentnet service restart` refused to start the daemon
+        // because a live process already held the identity — which is why upgrading
+        // needed a pm2 stop / restart / pm2 start dance instead of one command.
+        //
+        // Explicit --backend daemon means "this box's identity belongs to the
+        // daemon". Honour that by waiting for it to appear.
+        const waitMs = Math.max(0, opts.waitForDaemonMs ?? 60_000);
+        const deadline = Date.now() + waitMs;
+        let waited = false;
+        while (!daemonIsRunning(dataDir)) {
+            if (Date.now() >= deadline) {
+                throw new Error(`--backend daemon was requested but no decentlan daemon appeared within ${Math.round(waitMs / 1000)}s ` +
+                    `(looked for ${ipcSocketPath(dataDir)}).`);
+            }
+            if (!waited) {
+                waited = true;
+                console.log(`waiting up to ${Math.round(waitMs / 1000)}s for the decentlan daemon at ${ipcSocketPath(dataDir)}…`);
+            }
+            await new Promise((r) => setTimeout(r, 1000));
+        }
+        return {
+            host: new DaemonHost(dataDir),
+            why: waited ? `decentlan daemon at ${dataDir} (after waiting)` : `decentlan daemon at ${dataDir}`,
+        };
     }
     // Reuse decentlan's identity when it exists so friends carry over — this is
     // the same node, not a new one. The daemon is not running, so nothing else

package/dist/server.d.ts

@@ -49,6 +49,10 @@ export interface BeagleServerOptions {
             pk: string;
         }>;
     };
+    /** Bridge whose roster the "Here" tab shows. The desktop does not route
+     *  traffic through it — it only completes the handshake to prove its key
+     *  and read who else is there. */
+    bridgeWs?: string;
 }
 export declare function startBeagleServer(opts: BeagleServerOptions): {
     stop: () => void;

package/dist/server.js

@@ -21,6 +21,7 @@ import { INSTALL_COMMAND as LAN_INSTALL_COMMAND } from "./lan-handoff.js";
 import yaml from "js-yaml";
 import { DEFAULT_EXITS } from "./exits.js";
 import * as peerAddr from "@decentnetwork/peer";
+import { bridgeRoster } from "./bridge-roster.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");
@@ -760,7 +761,13 @@ export function startBeagleServer(opts) {
                     sendJson(res, 200, { ok: true, punk });
                 }
                 catch (err) {
-                    sendJson(res, 502, { ok: false, error: String(err?.message ?? err) });
+                    // An id the set does not contain is a normal negative answer, not a
+                    // gateway failure. Reporting 502 made a bad stored punkId look like
+                    // the punks service was down, and the client — which only cached
+                    // successes — retried it on every render.
+                    const msg = String(err?.message ?? err);
+                    const missing = /\b404\b|not found/i.test(msg);
+                    sendJson(res, missing ? 404 : 502, { ok: false, error: missing ? "no such punk" : msg });
                 }
                 return;
             }
@@ -1152,6 +1159,9 @@ export function startBeagleServer(opts) {
                 }
                 const q = new URL(req.url || "", "http://x").searchParams;
                 const userid = q.get("userid") || "";
+                // The sender's own copy needs saving too, or its chip renders as an
+                // empty 0 B card: the bytes went peer-to-peer and never touched here.
+                const dir = q.get("dir") === "out" ? "out" : "in";
                 const rawName = q.get("name") || "agentnet-file";
                 const safe = rawName.replace(/[/\\]/g, "_").slice(0, 200) || "agentnet-file";
                 if (!userid) {
@@ -1178,7 +1188,7 @@ export function startBeagleServer(opts) {
                         ws.on("finish", () => resolve2());
                     });
                     const st = statSync(finalPath);
-                    const r = await opts.call({ op: "file-log-local", userid, dir: "in", name: finalName, size: st.size });
+                    const r = await opts.call({ op: "file-log-local", userid, dir, name: finalName, size: st.size });
                     if (!r.ok) {
                         sendJson(res, 502, r);
                         return;
@@ -1359,6 +1369,32 @@ export function startBeagleServer(opts) {
                 }
                 return;
             }
+            if (req.method === "GET" && url === "/api/bridge-roster") {
+                // Same shape the browser build returns, so discover.jsx renders it
+                // without knowing which client it is running in.
+                if (!opts.bridgeWs || !opts.callIce?.keyFile) {
+                    return sendJson(res, 200, { ok: true, list: [], pending: true });
+                }
+                try {
+                    // diag already carries both facts, so there is no second round trip
+                    // and no op to add: the address is the identity, the nickname is the
+                    // node's own name.
+                    const diag = (await opts.call({ op: "diag" }));
+                    const r = await bridgeRoster(opts.bridgeWs, opts.callIce.keyFile, {
+                        name: diag?.node?.name,
+                        address: diag?.identity?.address,
+                    });
+                    if (!r)
+                        return sendJson(res, 200, { ok: true, list: [], pending: true });
+                    return sendJson(res, 200, {
+                        ok: true, bridge: r.bridge, online: r.online,
+                        list: r.peers.map((p) => ({ ...p, punkId: p.punk ?? null })),
+                    });
+                }
+                catch (err) {
+                    return sendJson(res, 200, { ok: false, error: String(err?.message ?? err) });
+                }
+            }
             if (req.method === "GET" && url === "/api/discover-registered") {
                 try {
                     const raw = (await fetchDiscoverJson(`${ENS_GATEWAY}/names`));
@@ -1475,8 +1511,28 @@ export function startBeagleServer(opts) {
             if (req.method === "GET" && url === "/api/ens-profile") {
                 const q = new URL(req.url || "", "http://localhost").searchParams;
                 let userid = q.get("userid") || "";
+                // Also accept ?name= (a beagles.eth display name), so a group sender
+                // known only by nickname still resolves to its avatar — the userid is
+                // simply not available for those.
+                const qname = q.get("name") || "";
+                if (!userid && qname) {
+                    const norm = (x) => String(x || "").toLowerCase().replace(/\s+/g, "");
+                    for (const [uid, prof] of await ensPublicByUserid(1500)) {
+                        if (norm(prof.displayName || "") === norm(qname) || norm(prof.ens || "") === norm(qname)) {
+                            userid = uid;
+                            break;
+                        }
+                    }
+                }
+                // A name nobody has registered is a lookup that found nothing, not a
+                // bad request: 400 makes the caller log an error and, worse, retry.
+                // Only the missing PARAMETER is the client's mistake.
                 if (!userid) {
-                    sendJson(res, 400, { ok: false, error: "userid required" });
+                    if (qname) {
+                        sendJson(res, 200, { ok: true, registered: false, profile: null });
+                        return;
+                    }
+                    sendJson(res, 400, { ok: false, error: "userid or name required" });
                     return;
                 }
                 // A 52-char Carrier ADDRESS also works (group cards only have that):
@@ -1596,6 +1652,10 @@ export function startBeagleServer(opts) {
                         agent: false,
                         lastMsg: lm ? (lm.dir === "out" ? "you: " : "") + (lm.text ?? "") : "",
                         lastTime: fmtTime(lm?.ts),
+                        // The raw stamp too: lastTime is formatted for display and cannot
+                        // be ordered, which is why the sidebar never reordered on new
+                        // activity.
+                        lastTs: lm?.ts ?? 0,
                         wire: "163",
                         avatarUrl: ensPub.get(uid)?.avatarUrl ?? null,
                         punkId: ensPub.get(uid)?.punkId ?? null,
@@ -1606,8 +1666,13 @@ export function startBeagleServer(opts) {
                     id: p.userid || p.address || `r${i}`,
                     carrier: p.address || p.userid || "",
                     userid: p.userid || "",
-                    via: "lan",
-                    time: "",
+                    // Name and introduction travel in the friend-request packet and were
+                    // being dropped here, so every request looked identical and there
+                    // was nothing to decide on.
+                    name: p.name || "",
+                    descr: p.descr || "",
+                    via: p.hello || "lan",
+                    time: fmtTime(p.arrivedAt),
                 }));
                 // Exit nodes = the AVAILABLE exits this node knows about, grouped by
                 // region. The authoritative list is the shipped DEFAULT_EXITS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.57",
+  "version": "0.1.59",
   "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",
@@ -19,7 +19,7 @@
     }
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json && chmod +x dist/cli.js && node scripts/build-ui.mjs",
+    "build": "npm run build -w @decentnetwork/beagle-ui && tsc -p tsconfig.json && chmod +x dist/cli.js && node scripts/build-ui.mjs",
     "typecheck": "tsc --noEmit",
     "clean": "rm -rf dist",
     "start": "node dist/cli.js"
@@ -33,6 +33,7 @@
     "yargs": "^17.7.2"
   },
   "devDependencies": {
+    "@decentnetwork/beagle-ui": "0.1.0",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.11.0",
     "@types/yargs": "^17.0.32",
@@ -42,5 +43,8 @@
   "engines": {
     "node": ">=20"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "workspaces": [
+    "packages/*"
+  ]
 }