npm - @decentnetwork/beagle - Versions diffs - 0.1.58 → 0.1.60 - Mend

@decentnetwork/beagle 0.1.58 → 0.1.60

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/embedded-host.js CHANGED Viewed

@@ -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/server.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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");
@@ -54,7 +55,7 @@ async function fetchDiscoverJson(url) {
 // ── beagles.eth names (ens-gateway worker) ──────────────────────────────────
 // The same registry the mobile apps register into. Web-side registration
 // signs the record with THIS node's Carrier identity (XEdDSA via the backend
-// `sign` op) — the gateway verifies it the same way Sign in with Decent does.
+// `sign` op) — the gateway verifies it the same way Sign in with Beagle does.
 const ENS_GATEWAY = process.env.BEAGLE_ENS_GATEWAY || "https://ens-gateway.beaglechat.workers.dev";
 async function ensFetchJson(path) {
     const ctl = new AbortController();
@@ -413,7 +414,7 @@ function findSavedFile(downloadsDir, name) {
     return null;
 }
 /** True only when the request came from the local machine. Used to gate the
- *  "Sign in with Decent" routes so binding the UI to a LAN IP can't expose
+ *  "Sign in with Beagle" routes so binding the UI to a LAN IP cannot expose
  *  identity signing to other hosts. The popup always runs in the local user's
  *  browser, so it connects over the loopback interface. */
 function isLocalRequest(req) {
@@ -507,7 +508,7 @@ function validateOrigin(raw) {
         return null;
     }
 }
-// The "Sign in with Decent" consent popup. Self-contained (no external assets),
+// The "Sign in with Beagle" consent popup. Self-contained (no external assets),
 // dark theme matching the desktop UI. Reads origin+nonce from its own query,
 // shows the requesting site and this node's identity, and on Approve calls the
 // local /api/connect-approve to sign, then postMessages the result to the
@@ -516,7 +517,7 @@ function validateOrigin(raw) {
 const CONNECT_PAGE = `<!doctype html>
 <html lang="en"><head><meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
-<title>Sign in with Decent</title>
+<title>Sign in with Beagle</title>
 <style>
   :root{--bg:#0c0d11;--panel:#14161d;--line:#262a35;--text:#e7e9ef;--faint:#8b91a3;
         --accent:#5b8cff;--good:#46a758;--bad:#e5604d;--mono:ui-monospace,SFMono-Regular,Menlo,monospace}
@@ -533,7 +534,9 @@ const CONNECT_PAGE = `<!doctype html>
   .origin{color:var(--text);font-weight:600;word-break:break-all}
   .id{background:#0e1016;border:1px solid var(--line);border-radius:10px;padding:11px 12px;margin-bottom:14px}
   .lbl{font-size:11px;text-transform:uppercase;letter-spacing:.6px;color:var(--faint);margin-bottom:4px}
+  .who{font-size:13.5px;font-weight:600;margin-bottom:3px}
   .userid{font-family:var(--mono);font-size:12.5px;color:var(--text);word-break:break-all}
+  [hidden]{display:none !important}
   .err{background:rgba(229,96,77,.12);border:1px solid rgba(229,96,77,.4);color:#ffb4a8;
        border-radius:9px;padding:9px 11px;font-size:12.5px;margin-bottom:13px}
   .row{display:flex;gap:10px;margin-top:4px}
@@ -546,10 +549,14 @@ const CONNECT_PAGE = `<!doctype html>
 </style></head>
 <body>
   <div class="card">
-    <div class="brand"><span class="d"></span>Decent</div>
+    <div class="brand"><span class="d"></span>Beagle</div>
     <h1>Sign in</h1>
-    <p class="sub"><span id="origin" class="origin">…</span> wants to sign you in with your Decent identity.</p>
-    <div class="id"><div class="lbl">Your identity</div><div id="userid" class="userid">loading…</div></div>
+    <p class="sub"><span id="origin" class="origin">…</span> wants to sign you in with your Beagle identity.</p>
+    <div class="id">
+      <div class="lbl">Your identity</div>
+      <div id="who" class="who" hidden></div>
+      <div id="userid" class="userid">loading…</div>
+    </div>
     <div id="err" class="err" hidden></div>
     <div class="row">
       <button id="deny" class="btn ghost">Deny</button>
@@ -571,10 +578,11 @@ const CONNECT_PAGE = `<!doctype html>
   if(!validOrigin) fail("This sign-in request has an invalid origin and was blocked.");
   if(nonce.length===0||nonce.length>512){ validOrigin=false; fail("This sign-in request is missing a valid nonce."); }
   fetch("/api/state").then(function(r){return r.json();}).then(function(s){
-    var uid=(s.me&&s.me.userid)||"";
+    var uid=(s.me&&s.me.userid)||"", nm=(s.me&&s.me.name)||"";
     document.getElementById("userid").textContent=uid||"(no identity)";
+    if(nm){var w=document.getElementById("who"); w.textContent=nm; w.hidden=false;}
     if(uid&&validOrigin) approve.disabled=false;
-    else if(!uid) fail("No local Decent identity found — is the daemon running?");
+    else if(!uid) fail("No local Beagle identity found — is the daemon running?");
   }).catch(function(){ fail("Could not reach the local agentnet daemon."); });
   deny.onclick=function(){ reply({error:"denied"}); setTimeout(function(){window.close();},60); };
   approve.onclick=function(){
@@ -583,7 +591,7 @@ const CONNECT_PAGE = `<!doctype html>
       body:JSON.stringify({origin:origin,nonce:nonce})})
       .then(function(r){return r.json();})
       .then(function(j){ if(!j.ok) throw new Error(j.error||"sign failed");
-        reply({userid:j.userid,sig:j.sig}); setTimeout(function(){window.close();},60); })
+        reply({userid:j.userid,sig:j.sig,name:j.name,avatar:j.avatar}); setTimeout(function(){window.close();},60); })
       .catch(function(e){ approve.disabled=false; approve.textContent="Approve"; fail("Signing failed: "+e.message); });
   };
 })();
@@ -678,7 +686,7 @@ export function startBeagleServer(opts) {
                 res.end("not found");
                 return;
             }
-            // ── Sign in with Decent ────────────────────────────────────────────
+            // ── Sign in with Beagle ────────────────────────────────────────────
             // A website opens http://localhost:8765/connect?origin=…&nonce=… in a
             // popup; on Approve we sign "decent-auth\n<origin>\n<nonce>" with this
             // node's Carrier identity and postMessage {userid,nonce,sig} back to the
@@ -689,7 +697,7 @@ export function startBeagleServer(opts) {
             if (url === "/connect" || url === "/api/connect-approve") {
                 if (!isLocalRequest(req)) {
                     res.writeHead(403, { "content-type": "text/plain" });
-                    res.end("Sign in with Decent is available only on this machine (localhost).");
+                    res.end("Sign in with Beagle is available only on this machine (localhost).");
                     return;
                 }
             }
@@ -718,11 +726,30 @@ export function startBeagleServer(opts) {
                     sendJson(res, 502, { ok: false, error: r.error || "sign failed" });
                     return;
                 }
-                sendJson(res, 200, {
-                    ok: true,
-                    userid: r.data?.userid ?? "",
-                    sig: r.data?.sig ?? "",
-                });
+                const userid = r.data?.userid ?? "";
+                // Name and avatar ride along so the site can render the person without
+                // a second lookup it has no way to make — nothing public maps a userid
+                // to a display name unless that user registered a beagles.eth name.
+                // Additive: a caller that ignores them behaves exactly as before, and
+                // neither is part of what the signature proves.
+                let name = "";
+                let avatar = null;
+                try {
+                    const diag = await opts.call({ op: "diag" });
+                    name = ((diag.ok ? diag.data : {})?.node?.name) ?? "";
+                    const pub = (await ensPublicByUserid(1200)).get(userid);
+                    if (pub) {
+                        if (!name)
+                            name = pub.displayName ?? "";
+                        avatar = pub.avatarUrl ?? null;
+                        if (!avatar && pub.punkId != null) {
+                            const punk = await punksFetch(`/api/punks/${pub.punkId}`).catch(() => null);
+                            avatar = punk?.image ?? null;
+                        }
+                    }
+                }
+                catch { /* identity is what matters; the trimmings are best-effort */ }
+                sendJson(res, 200, { ok: true, userid, sig: r.data?.sig ?? "", name, avatar });
                 return;
             }
             // ── beagles.eth name registration ──
@@ -760,7 +787,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 +1185,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 +1214,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;
@@ -1311,9 +1347,13 @@ export function startBeagleServer(opts) {
                 const d = diag.ok ? (diag.data ?? {}) : {};
                 const identity = d.identity ?? {};
                 const tun = d.tun ?? {};
+                const node = d.node ?? {};
                 const me = {
                     userid: identity.userid,
                     address: identity.address,
+                    // The sign-in popup shows this above the key: a userid alone does not
+                    // tell you which of your identities is about to answer.
+                    name: node.name ?? "",
                     // The configured TUN address is what this host can actually route.
                     // Prefer it over a stale init/default allocation during Dora outage.
                     ip: tun.ip ?? d.allocatedIp,
@@ -1359,6 +1399,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 +1541,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 +1682,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 +1696,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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.58",
+  "version": "0.1.60",
   "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.1",
     "@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/*"
+  ]
 }