@decentnetwork/beagle 0.1.122 → 0.1.124

package/dist/carrier-node.d.ts

@@ -97,6 +97,15 @@ export declare class CarrierNode extends EventEmitter {
         force?: boolean;
     }): Promise<void>;
     acceptFriendRequest(pubkey: string): Promise<void>;
+    /** The SDK's pending inbound requests (empty before create or on an SDK
+     *  without the call). Re-read when answering friends-pending: a late
+     *  profile patches the SDK's entry without firing a new event. */
+    pendingFriendRequests(): Array<{
+        pubkey: string;
+        userid?: string;
+        punkId?: number;
+        avatarUrl?: string;
+    }>;
     removeFriend(userid: string): boolean;
     /** Decline an inbound request and clear what it created in the SDK. */
     rejectFriendRequest(pubkey: string): void;

package/dist/carrier-node.js

@@ -186,6 +186,13 @@ export class CarrierNode extends EventEmitter {
     acceptFriendRequest(pubkey) {
         return this.#require().acceptFriendRequest(pubkey);
     }
+    /** The SDK's pending inbound requests (empty before create or on an SDK
+     *  without the call). Re-read when answering friends-pending: a late
+     *  profile patches the SDK's entry without firing a new event. */
+    pendingFriendRequests() {
+        const list = this.#peer?.pendingFriendRequests?.();
+        return Array.isArray(list) ? list : [];
+    }
     removeFriend(userid) {
         return this.#require().removeFriend(userid);
     }

package/dist/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.122";
+window.__DK_UI_VERSION="0.1.124";
 "use strict";
 (() => {
   // packages/beagle-ui/dist/beagle-ui.js
@@ -1697,6 +1697,37 @@ ${lines}`, { assistant: { kind: "adopt", rows: fresh } }));
     }, [append, lang, onReloadFriends]);
     return { thread, handle, removeFriends, adoptServicePeers };
   }
+  var REQUEST_AVATAR_HOST = "ens-gateway.beaglechat.workers.dev";
+  var MAX_URL = 2048;
+  function requestAvatarUrl(r) {
+    const u = r && r.avatarUrl;
+    if (typeof u !== "string" || !u || u.length > MAX_URL)
+      return null;
+    let parsed;
+    try {
+      parsed = new URL(u);
+    } catch {
+      return null;
+    }
+    if (parsed.protocol !== "https:" || parsed.host !== REQUEST_AVATAR_HOST)
+      return null;
+    if (parsed.username || parsed.password)
+      return null;
+    return parsed.href;
+  }
+  function requestPunkId(r) {
+    const p = r && r.punkId;
+    return typeof p === "number" && Number.isInteger(p) && p >= 0 ? p : null;
+  }
+  function requestAvatarSource(r, skipUrl = false) {
+    const url = skipUrl ? null : requestAvatarUrl(r);
+    if (url)
+      return { kind: "url", url };
+    const id = requestPunkId(r);
+    if (id != null)
+      return { kind: "punk", id };
+    return { kind: "ens" };
+  }
   var DK_CMD_HIST_KEY = "beagle.assistant.history";
   var DK_CMD_HIST_MAX = 50;
   function RequestsBlock({ T, requests, onAct }) {
@@ -1740,7 +1771,7 @@ ${lines}`, { assistant: { kind: "adopt", rows: fresh } }));
       display: "flex",
       flexDirection: "column",
       gap: 8
-    } }, /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 8 } }, /* @__PURE__ */ React.createElement(DkEnsAvatar, { userid: r.userid || r.id, name: r.name, fallbackSeed: r.carrier, size: 30, radius: 7 }), /* @__PURE__ */ React.createElement("div", { style: { minWidth: 0, flex: 1 } }, r.name ? /* @__PURE__ */ React.createElement("div", { style: {
+    } }, /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 8 } }, /* @__PURE__ */ React.createElement(DkRequestAvatar, { r, size: 30, radius: 7 }), /* @__PURE__ */ React.createElement("div", { style: { minWidth: 0, flex: 1 } }, r.name ? /* @__PURE__ */ React.createElement("div", { style: {
       fontFamily: "var(--ui)",
       fontSize: 13,
       fontWeight: 600,
@@ -1757,6 +1788,32 @@ ${lines}`, { assistant: { kind: "adopt", rows: fresh } }));
       paddingLeft: 8
     } }, r.descr), failed[r.id] && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 11, color: "var(--danger)" } }, failed[r.id]), /* @__PURE__ */ React.createElement("div", { style: { display: "flex", gap: 6 } }, /* @__PURE__ */ React.createElement(Btn, { tone: "ok", icon: "check", size: "sm", onClick: () => act(r, "accept"), style: { flex: 1 } }, T.accept), /* @__PURE__ */ React.createElement(Btn, { tone: "danger", icon: "x", size: "sm", onClick: () => act(r, "reject"), style: { flex: 1 } }, T.reject))))));
   }
+  function DkRequestAvatar({ r, size, radius }) {
+    const [urlBroken, setUrlBroken] = React.useState(false);
+    const url = requestAvatarUrl(r);
+    React.useEffect(() => {
+      setUrlBroken(false);
+    }, [url]);
+    const src = requestAvatarSource(r, urlBroken);
+    const seed = r.carrier || r.userid || r.id;
+    if (src.kind === "url") {
+      return /* @__PURE__ */ React.createElement(
+        "img",
+        {
+          src: src.url,
+          alt: "",
+          width: size,
+          height: size,
+          referrerPolicy: "no-referrer",
+          onError: () => setUrlBroken(true),
+          style: { width: size, height: size, borderRadius: radius, objectFit: "cover", flexShrink: 0, background: "var(--panel-2)" }
+        }
+      );
+    }
+    if (src.kind === "punk")
+      return /* @__PURE__ */ React.createElement(DkPunkAvatar, { id: src.id, size, radius, fallbackSeed: seed });
+    return /* @__PURE__ */ React.createElement(DkEnsAvatar, { userid: r.userid || r.id, name: r.name, fallbackSeed: r.carrier, size, radius });
+  }
   function PeerRow({ peer, T, active, onClick, muted, isProtocol, fix }) {
     const name = peer.alias || peer.userId;
     const row = rosterRow(peer, isProtocol || (() => false), fix);

package/dist/embedded-host.js

@@ -18,6 +18,7 @@ import { MessageStore } from "./message-store.js";
 import { FriendMetaStore } from "./friend-meta.js";
 import { Logger } from "./logger.js";
 import { acquireIdentityLock } from "./identity-lock.js";
+import { refreshPendingAvatars, requesterAvatar } from "./pending-requests.js";
 /** Files bigger than this are not queued for an offline friend — the bytes sit
  *  on disk until they reconnect, and an unbounded queue is how you fill a
  *  user's disk by accident. Live transfers have no such limit. */
@@ -228,6 +229,9 @@ export class EmbeddedHost {
                 name: req.name,
                 descr: req.description,
                 hello: req.hello,
+                // The requester's punk / avatar URL (peer >= 0.1.170), so the card can
+                // draw it before accept. A later profile is picked up in friends-pending.
+                ...requesterAvatar(req),
                 arrivedAt: Date.now(),
             });
             this.#events.emit("event", { type: "friend-request", userid });
@@ -493,6 +497,9 @@ export class EmbeddedHost {
                 return {};
             }
             case "friends-pending":
+                // Re-read the SDK's list: a requester's profile that arrived after its
+                // request patches only the SDK's entry, with no new event.
+                refreshPendingAvatars(this.#pending.values(), this.#node.pendingFriendRequests());
                 return { pending: [...this.#pending.values()] };
             case "friends-accept": {
                 const entry = this.#pending.get(uid);

package/dist/pending-requests.d.ts

@@ -0,0 +1,28 @@
+export interface RequesterAvatar {
+    punkId?: number;
+    avatarUrl?: string;
+}
+/** The valid avatar fields of an SDK / backend friend-request record. Keys are
+ *  present only with a value; punk 0 is a real CryptoPunk. */
+export declare function requesterAvatar(src: {
+    punkId?: unknown;
+    avatarUrl?: unknown;
+} | undefined | null): RequesterAvatar;
+/** Fold the SDK's current pending list into the host's own entries, matched by
+ *  pubkey or userid. A value the SDK has wins (a late profile can change it); a
+ *  value only the host has is kept. Mutates `entries`; returns whether anything
+ *  changed. */
+export declare function refreshPendingAvatars<E extends {
+    userid: string;
+    pubkey: string;
+} & RequesterAvatar>(entries: Iterable<E>, live: ReadonlyArray<{
+    pubkey?: string;
+    userid?: string;
+    punkId?: unknown;
+    avatarUrl?: unknown;
+}>): boolean;
+/** One `/api/desktop` `requests[]` row from a friends-pending entry (daemon or
+ *  embedded). `punkId` / `avatarUrl` are null when the requester sent none —
+ *  the same convention as `peers[]` — and the card then falls back to the
+ *  beagles.eth lookup and a generated picture. */
+export declare function desktopRequestRow(p: Record<string, unknown>, i: number, fmtTime: (ts?: number) => string): Record<string, unknown>;

package/dist/pending-requests.js

@@ -0,0 +1,69 @@
+// The requester's avatar on a pending friend request, before anyone accepts.
+//
+// peer >= 0.1.170 carries the requester's punk (friendreq field 3, `gender`)
+// and custom avatar URL (field 4) in the request itself, and fills them from a
+// profile the requester pushed before accept. When that profile arrives after
+// the request, the SDK patches only its own pending list — no new event — so
+// a host that copied the event once must re-read peer.pendingFriendRequests()
+// to learn it. lan >= 0.1.313 does that for a daemon backend; the embedded host
+// does it here. See decent-hq docs/tasks/TASK-2026-11-01-avatar-on-friend-request.md.
+import { punkIdOf } from "./friend-store.js";
+/** The valid avatar fields of an SDK / backend friend-request record. Keys are
+ *  present only with a value; punk 0 is a real CryptoPunk. */
+export function requesterAvatar(src) {
+    const out = {};
+    if (!src)
+        return out;
+    const punk = punkIdOf(src.punkId);
+    if (punk !== undefined && Number.isInteger(punk))
+        out.punkId = punk;
+    if (typeof src.avatarUrl === "string" && src.avatarUrl.length > 0)
+        out.avatarUrl = src.avatarUrl;
+    return out;
+}
+/** Fold the SDK's current pending list into the host's own entries, matched by
+ *  pubkey or userid. A value the SDK has wins (a late profile can change it); a
+ *  value only the host has is kept. Mutates `entries`; returns whether anything
+ *  changed. */
+export function refreshPendingAvatars(entries, live) {
+    if (!live.length)
+        return false;
+    let changed = false;
+    for (const e of entries) {
+        const l = live.find((x) => (!!x.pubkey && x.pubkey === e.pubkey) || (!!x.userid && x.userid === e.userid));
+        if (!l)
+            continue;
+        const a = requesterAvatar(l);
+        if (a.punkId !== undefined && a.punkId !== e.punkId) {
+            e.punkId = a.punkId;
+            changed = true;
+        }
+        if (a.avatarUrl !== undefined && a.avatarUrl !== e.avatarUrl) {
+            e.avatarUrl = a.avatarUrl;
+            changed = true;
+        }
+    }
+    return changed;
+}
+/** One `/api/desktop` `requests[]` row from a friends-pending entry (daemon or
+ *  embedded). `punkId` / `avatarUrl` are null when the requester sent none —
+ *  the same convention as `peers[]` — and the card then falls back to the
+ *  beagles.eth lookup and a generated picture. */
+export function desktopRequestRow(p, i, fmtTime) {
+    const a = requesterAvatar(p);
+    return {
+        id: p.userid || p.address || `r${i}`,
+        carrier: p.address || p.userid || "",
+        userid: p.userid || "",
+        // 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),
+        // The requester's avatar, drawn before accept: URL first, then punk.
+        punkId: a.punkId ?? null,
+        avatarUrl: a.avatarUrl ?? null,
+    };
+}

package/dist/server.js

@@ -26,6 +26,7 @@ import { bridgeRoster } from "./bridge-roster.js";
 import { isSupervised } from "./relaunch.js";
 import { historyStats } from "./assistant-stats.js";
 import { readFriendStore, pickPunk } from "./friend-store.js";
+import { desktopRequestRow } from "./pending-requests.js";
 import { createDiscoverFetch } from "./discover-cache.js";
 import { applyWalletBind } from "@decentnetwork/beagle-ui/wallet-proof";
 // Directory holding the built desktop UI bundle (index.html, app.js, vendor/).
@@ -2093,18 +2094,9 @@ export function startBeagleServer(opts) {
                     };
                 });
                 const pend = pending.ok ? (pending.data?.pending ?? []) : [];
-                const requests = pend.map((p, i) => ({
-                    id: p.userid || p.address || `r${i}`,
-                    carrier: p.address || p.userid || "",
-                    userid: p.userid || "",
-                    // 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),
-                }));
+                // Same rows for both backends: lan >= 0.1.313 and the embedded host
+                // both answer friends-pending with punkId / avatarUrl when known.
+                const requests = pend.map((p, i) => desktopRequestRow(p, i, fmtTime));
                 // Exit nodes = the AVAILABLE exits this node knows about, grouped by
                 // region. The authoritative list is the shipped DEFAULT_EXITS
                 // (config/default-exits.yaml) — every install has it, so the panel is

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.122",
+  "version": "0.1.124",
   "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,10 +26,10 @@
     "start": "node dist/cli.js"
   },
   "dependencies": {
-    "@decentnetwork/beagle-ui": "^0.2.33",
+    "@decentnetwork/beagle-ui": "^0.2.35",
     "@decentnetwork/chat-components": "^0.1.3",
-    "@decentnetwork/lan": "^0.1.283",
-    "@decentnetwork/peer": "^0.1.168",
+    "@decentnetwork/lan": "^0.1.313",
+    "@decentnetwork/peer": "^0.1.170",
     "@decentnetwork/peer-webrtc": "^0.2.17",
     "js-yaml": "^4.1.0",
     "ws": "^8.21.1",