@decentnetwork/beagle 0.1.120 → 0.1.122

package/dist/desktop/app.js

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

package/dist/desktop/vendor/peer-webrtc.js

@@ -57,6 +57,8 @@ var PeerWebRTC = (() => {
     fitSignalForInvite: () => fitSignalForInvite,
     looksLikeSignal: () => looksLikeSignal,
     mediaDirection: () => mediaDirection,
+    orphanPayloadTypeLines: () => orphanPayloadTypeLines,
+    sanitizeSdp: () => sanitizeSdp,
     shrinkSdpForInvite: () => shrinkSdpForInvite,
     videoIsSending: () => videoIsSending
   });
@@ -198,6 +200,29 @@ var PeerWebRTC = (() => {
     }
     return join(lines);
   }
+  function orphanPayloadTypeLines(sdp) {
+    const out = [];
+    let pts;
+    for (const line of sdp.replace(/\r\n/g, "\n").split("\n")) {
+      if (line.startsWith("m=")) {
+        pts = new Set(line.split(" ").slice(3));
+        continue;
+      }
+      const m = pts && /^a=(?:rtpmap|rtcp-fb|fmtp):(\d+)\b/.exec(line);
+      if (m && !pts.has(m[1]))
+        out.push(line);
+    }
+    return out;
+  }
+  function sanitizeSdp(sdp) {
+    const orphans = orphanPayloadTypeLines(sdp);
+    if (orphans.length === 0)
+      return sdp;
+    const drop = new Set(orphans);
+    const crlf = sdp.includes("\r\n");
+    const kept = sdp.replace(/\r\n/g, "\n").split("\n").filter((l) => !drop.has(l));
+    return kept.join(crlf ? "\r\n" : "\n");
+  }
 
   // node_modules/@decentnetwork/peer-webrtc/dist/signal.js
   var SDP_TYPES = /* @__PURE__ */ new Set([
@@ -297,7 +322,7 @@ var PeerWebRTC = (() => {
   var ICE_RESTART_MAX = 3;
   var ICE_DISCONNECT_GRACE_MS = 4e3;
   var ICE_FAILED_GRACE_MS = 12e4;
-  var _opts, _iceServers, _sessions, _restartOffersEnabled, _setOutgoingVideoTrack, setOutgoingVideoTrack_fn, _renegotiate, renegotiate_fn, _createOffer, createOffer_fn, _createAnswer, createAnswer_fn, _preferLeanVideoCodecs, preferLeanVideoCodecs_fn, _restartIce, restartIce_fn, _handleSignal, handleSignal_fn, _onOffer, onOffer_fn, _answerRenegotiation, answerRenegotiation_fn, _onAnswer, onAnswer_fn, _onCandidate, onCandidate_fn, _onBye, onBye_fn, _onAuxiliary, onAuxiliary_fn, _createSession, createSession_fn, _wirePeerConnection, wirePeerConnection_fn, _ensureRemoteStream, ensureRemoteStream_fn, _attachLocalMedia, attachLocalMedia_fn, _flushLocalCandidates, flushLocalCandidates_fn, _drainRemoteCandidates, drainRemoteCandidates_fn, _send, send_fn, _sendByeSafe, sendByeSafe_fn, _cleanup, cleanup_fn, _setState, setState_fn, _normId, normId_fn, _toInfo, _newCallId, newCallId_fn, _log, log_fn;
+  var _opts, _iceServers, _sessions, _restartOffersEnabled, _setOutgoingVideoTrack, setOutgoingVideoTrack_fn, _renegotiate, renegotiate_fn, _createOffer, createOffer_fn, _createAnswer, createAnswer_fn, _cleanOutbound, cleanOutbound_fn, _cleanInbound, cleanInbound_fn, _preferLeanVideoCodecs, preferLeanVideoCodecs_fn, _restartIce, restartIce_fn, _handleSignal, handleSignal_fn, _onOffer, onOffer_fn, _answerRenegotiation, answerRenegotiation_fn, _negotiationFailed, negotiationFailed_fn, _onAnswer, onAnswer_fn, _onCandidate, onCandidate_fn, _onBye, onBye_fn, _onAuxiliary, onAuxiliary_fn, _createSession, createSession_fn, _wirePeerConnection, wirePeerConnection_fn, _ensureRemoteStream, ensureRemoteStream_fn, _attachLocalMedia, attachLocalMedia_fn, _flushLocalCandidates, flushLocalCandidates_fn, _drainRemoteCandidates, drainRemoteCandidates_fn, _send, send_fn, _sendByeSafe, sendByeSafe_fn, _cleanup, cleanup_fn, _setState, setState_fn, _normId, normId_fn, _toInfo, _newCallId, newCallId_fn, _log, log_fn;
   var CallEngine = class extends Emitter {
     constructor(opts) {
       var _a, _b;
@@ -309,10 +334,31 @@ var PeerWebRTC = (() => {
       /** Create + send a fresh offer to renegotiate media (e.g. after adding a
        *  screen-share track). The peer applies it via #onOffer's renegotiation path. */
       __privateAdd(this, _renegotiate);
-      /** createOffer with the lean codec set applied (see #preferLeanVideoCodecs). */
+      /** createOffer with the lean codec set applied (see #preferLeanVideoCodecs)
+       *  and the result sanitized (see #cleanOutbound). Every offer — initial,
+       *  screen-share re-offer, ICE restart — goes through here. */
       __privateAdd(this, _createOffer);
-      /** createAnswer with the lean codec set applied. */
+      /** createAnswer with the lean codec set applied and the result sanitized. */
       __privateAdd(this, _createAnswer);
+      /**
+       * Strip orphan codec lines from a description WE produced, before it is
+       * applied locally and before it is sent.
+       *
+       * Firefox's setCodecPreferences drops VP9/AV1 from the m=video line but
+       * leaves their `a=fmtp:` / `a=rtcp-fb:` lines in place; Chrome's parser then
+       * rejects the whole re-offer ("Failed to parse codecs correctly") and the
+       * Firefox peer's screen share never shows up. Measured 2026-10-31 between
+       * the Firefox extension and a Chrome desktop, both on 0.2.16. The sanitizer
+       * is a no-op on a clean description (Chrome, Safari), so the same object
+       * comes back untouched there.
+       */
+      __privateAdd(this, _cleanOutbound);
+      /**
+       * The same cleanup for a description the PEER sent, before setRemoteDescription:
+       * Firefox extensions already in the field (AMO 1.4.14 ships 0.2.16) still
+       * produce the orphan lines, and a receiver on this engine must accept them.
+       */
+      __privateAdd(this, _cleanInbound);
       /**
        * Restrict video to the codecs the peers actually negotiate, so the SDP fits
        * the 8192-byte Carrier invite channel. Chrome otherwise advertises VP9 and
@@ -335,6 +381,7 @@ var PeerWebRTC = (() => {
       __privateAdd(this, _onOffer);
       /** Apply a mid-call re-offer (renegotiation) and send the answer. */
       __privateAdd(this, _answerRenegotiation);
+      __privateAdd(this, _negotiationFailed);
       __privateAdd(this, _onAnswer);
       __privateAdd(this, _onCandidate);
       __privateAdd(this, _onBye);
@@ -450,7 +497,7 @@ var PeerWebRTC = (() => {
         throw new Error(`accept: no pending incoming call ${callId}`);
       }
       await __privateMethod(this, _attachLocalMedia, attachLocalMedia_fn).call(this, session);
-      await session.pc.setRemoteDescription({ type: "offer", sdp: session.pendingOffer });
+      await session.pc.setRemoteDescription({ type: "offer", sdp: __privateMethod(this, _cleanInbound, cleanInbound_fn).call(this, session.pendingOffer, "offer") });
       session.hasReceivedSdp = true;
       session.pendingOffer = void 0;
       await __privateMethod(this, _drainRemoteCandidates, drainRemoteCandidates_fn).call(this, session);
@@ -638,12 +685,30 @@ var PeerWebRTC = (() => {
   _createOffer = new WeakSet();
   createOffer_fn = async function(session, opts) {
     __privateMethod(this, _preferLeanVideoCodecs, preferLeanVideoCodecs_fn).call(this, session.pc);
-    return session.pc.createOffer(opts);
+    return __privateMethod(this, _cleanOutbound, cleanOutbound_fn).call(this, await session.pc.createOffer(opts));
   };
   _createAnswer = new WeakSet();
   createAnswer_fn = async function(session) {
     __privateMethod(this, _preferLeanVideoCodecs, preferLeanVideoCodecs_fn).call(this, session.pc);
-    return session.pc.createAnswer();
+    return __privateMethod(this, _cleanOutbound, cleanOutbound_fn).call(this, await session.pc.createAnswer());
+  };
+  _cleanOutbound = new WeakSet();
+  cleanOutbound_fn = function(desc) {
+    var _a, _b;
+    const raw = (_a = desc.sdp) != null ? _a : "";
+    const sdp = sanitizeSdp(raw);
+    if (sdp === raw)
+      return desc;
+    __privateMethod(this, _log, log_fn).call(this, `${(_b = desc.type) != null ? _b : "sdp"}: removed ${orphanPayloadTypeLines(raw).length} orphan codec line(s) from our own description`);
+    return { type: desc.type, sdp };
+  };
+  _cleanInbound = new WeakSet();
+  cleanInbound_fn = function(raw, what) {
+    const sdp = sanitizeSdp(raw);
+    if (sdp !== raw) {
+      __privateMethod(this, _log, log_fn).call(this, `${what}: removed ${orphanPayloadTypeLines(raw).length} orphan codec line(s) from the peer's description`);
+    }
+    return sdp;
   };
   _preferLeanVideoCodecs = new WeakSet();
   preferLeanVideoCodecs_fn = function(pc) {
@@ -733,14 +798,21 @@ var PeerWebRTC = (() => {
   _answerRenegotiation = new WeakSet();
   answerRenegotiation_fn = async function(session, sdp) {
     try {
-      await session.pc.setRemoteDescription({ type: "offer", sdp });
+      await session.pc.setRemoteDescription({ type: "offer", sdp: __privateMethod(this, _cleanInbound, cleanInbound_fn).call(this, sdp, "offer") });
       const answer = await __privateMethod(this, _createAnswer, createAnswer_fn).call(this, session);
       await session.pc.setLocalDescription(answer);
       await __privateMethod(this, _send, send_fn).call(this, session.peerId, { type: "answer", sdp: answer.sdp, callId: session.callId });
     } catch (err) {
-      __privateMethod(this, _log, log_fn).call(this, `renegotiation answer failed: ${err.message}`);
+      __privateMethod(this, _negotiationFailed, negotiationFailed_fn).call(this, session, "re-offer", err);
     }
   };
+  _negotiationFailed = new WeakSet();
+  negotiationFailed_fn = function(session, what, err) {
+    const error = err instanceof Error ? err : new Error(String(err));
+    __privateMethod(this, _log, log_fn).call(this, `renegotiation failed (${what}) callId=${session.callId}: ${error.message}`);
+    console.warn(`[peer-webrtc] could not apply the peer's ${what} for call ${session.callId}: ${error.message}`);
+    this.emit("negotiationFailed", session.callId, error);
+  };
   _onAnswer = new WeakSet();
   onAnswer_fn = function(peerId, signal) {
     const session = __privateGet(this, _sessions).get(__privateMethod(this, _normId, normId_fn).call(this, signal.callId));
@@ -749,14 +821,14 @@ var PeerWebRTC = (() => {
     session.peerId = peerId;
     void (async () => {
       try {
-        await session.pc.setRemoteDescription({ type: "answer", sdp: signal.sdp });
+        await session.pc.setRemoteDescription({ type: "answer", sdp: __privateMethod(this, _cleanInbound, cleanInbound_fn).call(this, signal.sdp, "answer") });
         session.hasReceivedSdp = true;
         if (session.state !== "connected")
           __privateMethod(this, _setState, setState_fn).call(this, session, "connecting");
         await __privateMethod(this, _drainRemoteCandidates, drainRemoteCandidates_fn).call(this, session);
         await __privateMethod(this, _flushLocalCandidates, flushLocalCandidates_fn).call(this, session);
       } catch (err) {
-        __privateMethod(this, _log, log_fn).call(this, `setRemoteDescription(answer) failed: ${err.message}`);
+        __privateMethod(this, _negotiationFailed, negotiationFailed_fn).call(this, session, "answer", err);
       }
     })();
   };

package/dist/friend-store.d.ts

@@ -0,0 +1,25 @@
+export interface FriendStoreEntry {
+    requestedAt?: number;
+    acceptedAt?: number;
+    /** CryptoPunks id the friend advertised in its userinfo (Beagle's avatar). */
+    punkId?: number;
+    platform?: string;
+    appVersion?: string;
+}
+/** A punk id as the store or a backend may carry it: a finite non-negative
+ *  number. Punk 0 is a real CryptoPunk; a string or a negative is not one. */
+export declare function punkIdOf(v: unknown): number | undefined;
+/** Parse the store file's JSON (an array, `{friends:[…]}`, or an object keyed
+ *  by id — the SDK has written all three) into a map by userid. */
+export declare function parseFriendStore(raw: unknown): Map<string, FriendStoreEntry>;
+/** The friend store next to `keyFile`, by userid. Unreadable or absent (a
+ *  fresh install has no friends yet): whatever we last read, else nothing —
+ *  the list still renders, just without stamps or pushed avatars. */
+export declare function readFriendStore(keyFile: string | undefined): Map<string, FriendStoreEntry>;
+/** Which avatar to show for a friend. What they advertised over Carrier wins
+ *  over the directory: it is what they are using on their device right now,
+ *  it needs no gateway, and it is the only avatar a friend who never
+ *  registered a beagles.eth name will ever have. The backend's own report
+ *  first, then the SDK's store on disk (an older daemon reports none), then
+ *  the beagles.eth record. */
+export declare function pickPunk(pushed: unknown, stored: number | undefined, directory: number | null | undefined): number | null;

package/dist/friend-store.js

@@ -0,0 +1,75 @@
+// The SDK's own friend store (`<keyFile>.friends.json`, next to the identity)
+// is the source of truth both backends write, and it is a file in our own
+// config dir, so the UI server reads it for what the backend's friend list
+// does not report. Two things live here:
+//
+//  - the stamps (requestedAt / acceptedAt): a daemon backend reports only
+//    acceptedAt (as lastSeen) and nothing for a request we sent, so a friend
+//    just added had no stamp at all and sorted to the bottom;
+//  - what the friend pushed about itself (punk avatar, platform, app
+//    version): lan ≤ 0.1.308 dropped these from its friends-list, so on a
+//    daemon backend only a beagles.eth record could supply an avatar — on
+//    mac-dev 8 of 16 pushed punks never reached the screen (2026-10-31).
+//
+// Cached by mtime: the list is polled every 2.5s per tab.
+import { readFileSync, statSync } from "node:fs";
+/** A punk id as the store or a backend may carry it: a finite non-negative
+ *  number. Punk 0 is a real CryptoPunk; a string or a negative is not one. */
+export function punkIdOf(v) {
+    return typeof v === "number" && Number.isFinite(v) && v >= 0 ? v : undefined;
+}
+/** Parse the store file's JSON (an array, `{friends:[…]}`, or an object keyed
+ *  by id — the SDK has written all three) into a map by userid. */
+export function parseFriendStore(raw) {
+    const recs = Array.isArray(raw)
+        ? raw
+        : raw && typeof raw === "object" && Array.isArray(raw.friends)
+            ? raw.friends
+            : Object.values(raw ?? {});
+    const map = new Map();
+    for (const r of recs) {
+        if (!r || typeof r !== "object")
+            continue;
+        const id = r.userid || r.pubkey;
+        if (!id)
+            continue;
+        map.set(id, {
+            requestedAt: typeof r.requestedAt === "number" ? r.requestedAt : undefined,
+            acceptedAt: typeof r.acceptedAt === "number" ? r.acceptedAt : undefined,
+            punkId: punkIdOf(r.punkId),
+            platform: typeof r.platform === "string" ? r.platform : undefined,
+            appVersion: typeof r.appVersion === "string" ? r.appVersion : undefined,
+        });
+    }
+    return map;
+}
+let cache = null;
+/** The friend store next to `keyFile`, by userid. Unreadable or absent (a
+ *  fresh install has no friends yet): whatever we last read, else nothing —
+ *  the list still renders, just without stamps or pushed avatars. */
+export function readFriendStore(keyFile) {
+    const empty = new Map();
+    if (!keyFile)
+        return empty;
+    const path = `${keyFile}.friends.json`;
+    try {
+        const st = statSync(path);
+        if (cache && cache.path === path && cache.mtimeMs === st.mtimeMs)
+            return cache.map;
+        const map = parseFriendStore(JSON.parse(readFileSync(path, "utf-8")));
+        cache = { path, mtimeMs: st.mtimeMs, map };
+        return map;
+    }
+    catch {
+        return cache?.path === path ? cache.map : empty;
+    }
+}
+/** Which avatar to show for a friend. What they advertised over Carrier wins
+ *  over the directory: it is what they are using on their device right now,
+ *  it needs no gateway, and it is the only avatar a friend who never
+ *  registered a beagles.eth name will ever have. The backend's own report
+ *  first, then the SDK's store on disk (an older daemon reports none), then
+ *  the beagles.eth record. */
+export function pickPunk(pushed, stored, directory) {
+    return punkIdOf(pushed) ?? stored ?? directory ?? null;
+}

package/dist/server.js

@@ -25,6 +25,7 @@ import * as peerAddr from "@decentnetwork/peer";
 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 { 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/).
@@ -61,50 +62,6 @@ async function ensFetchJson(path) {
         clearTimeout(timer);
     }
 }
-/** requestedAt / acceptedAt per friend, read from the SDK's own friend store
- *  (`<keyFile>.friends.json`, next to the identity). The daemon's friends-list
- *  reports neither for a request we sent and only acceptedAt (as lastSeen)
- *  otherwise, so a friend just added had no stamp at all and sorted to the
- *  bottom — the third time this was reported. The store is the source of
- *  truth both backends write, and it is a file in our own config dir, so
- *  read it. Cached by mtime: the list is polled every 2.5s per tab. */
-let friendStampsCache = null;
-function friendStoreStamps(keyFile) {
-    const empty = new Map();
-    if (!keyFile)
-        return empty;
-    const path = `${keyFile}.friends.json`;
-    try {
-        const st = statSync(path);
-        if (friendStampsCache && friendStampsCache.mtimeMs === st.mtimeMs)
-            return friendStampsCache.map;
-        const raw = JSON.parse(readFileSync(path, "utf-8"));
-        const recs = Array.isArray(raw)
-            ? raw
-            : raw && typeof raw === "object" && Array.isArray(raw.friends)
-                ? raw.friends
-                : Object.values(raw ?? {});
-        const map = new Map();
-        for (const r of recs) {
-            if (!r || typeof r !== "object")
-                continue;
-            const id = r.userid || r.pubkey;
-            if (!id)
-                continue;
-            map.set(id, {
-                requestedAt: typeof r.requestedAt === "number" ? r.requestedAt : undefined,
-                acceptedAt: typeof r.acceptedAt === "number" ? r.acceptedAt : undefined,
-            });
-        }
-        friendStampsCache = { mtimeMs: st.mtimeMs, map };
-        return map;
-    }
-    catch {
-        // Unreadable or absent (a fresh install has no friends yet): whatever we
-        // last read, else nothing — the list still renders, just without stamps.
-        return friendStampsCache?.map ?? empty;
-    }
-}
 /** The machine-local service-peer overlay. Absent file = nothing adopted yet,
  *  which is the normal state, not an error. */
 function readLocalServicePeers(path) {
@@ -2071,7 +2028,7 @@ export function startBeagleServer(opts) {
                     beagleVer: beagleVersion(),
                 };
                 const fl = (flist.ok ? (flist.data?.friends ?? []) : []);
-                const stamps = friendStoreStamps(opts.callIce?.keyFile);
+                const stamps = readFriendStore(opts.callIce?.keyFile);
                 const peers = fl.map((f) => {
                     const uid = f.userid ?? "";
                     const sess = sessByUserid.get(uid);
@@ -2126,11 +2083,13 @@ export function startBeagleServer(opts) {
                         requestedAt: f.requestedAt ?? stamp?.requestedAt ?? 0,
                         wire: "163",
                         avatarUrl: ensPub.get(uid)?.avatarUrl ?? null,
-                        // What they advertised over Carrier wins over the directory: it is
-                        // what they are using on their device right now, it needs no
-                        // gateway, and it is the only avatar a friend who never registered
-                        // a beagles.eth name will ever have.
-                        punkId: f.punkId ?? ensPub.get(uid)?.punkId ?? null,
+                        // What they advertised over Carrier wins over the directory (see
+                        // pickPunk). The daemon's list only carries the pushed punk from
+                        // lan 0.1.309; the SDK's store on disk covers an older daemon.
+                        punkId: pickPunk(f.punkId, stamp?.punkId, ensPub.get(uid)?.punkId),
+                        // The client they advertised with their profile, for the UI.
+                        platform: f.platform ?? stamp?.platform ?? null,
+                        appVersion: f.appVersion ?? stamp?.appVersion ?? null,
                     };
                 });
                 const pend = pending.ok ? (pending.data?.pending ?? []) : [];
@@ -2339,7 +2298,7 @@ export function startBeagleServer(opts) {
                     opts.call({ op: "friends-list" }),
                     ensPublicByUserid(300),
                 ]);
-                const stamps = friendStoreStamps(opts.callIce?.keyFile);
+                const stamps = readFriendStore(opts.callIce?.keyFile);
                 const stats = historyStats(opts.messagesPath);
                 const fl = flist.ok ? (flist.data?.friends ?? []) : [];
                 const friends = fl.map((f) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.120",
+  "version": "0.1.122",
   "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",
@@ -30,7 +30,7 @@
     "@decentnetwork/chat-components": "^0.1.3",
     "@decentnetwork/lan": "^0.1.283",
     "@decentnetwork/peer": "^0.1.168",
-    "@decentnetwork/peer-webrtc": "^0.2.16",
+    "@decentnetwork/peer-webrtc": "^0.2.17",
     "js-yaml": "^4.1.0",
     "ws": "^8.21.1",
     "yargs": "^17.7.2"