@decentnetwork/beagle 0.1.47 → 0.1.48

package/dist/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.47";
+window.__DK_UI_VERSION="0.1.48";
 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"/>',
@@ -3977,43 +3977,6 @@ function RtcFileInbox({ T, peers, ctl }) {
   }));
 }
 Object.assign(window, { useRtcFileController, RtcFileInbox });
-const VIDEO_CODEC_KEEP = /^video\/(H264|VP8|rtx|red|ulpfec)$/i;
-const SDP_BUDGET = 8192;
-function trimVideoCodecs(pc) {
-  var _a, _b, _c, _d, _e, _f, _g;
-  const supported = (_c = (_b = (_a = window.RTCRtpSender) == null ? void 0 : _a.getCapabilities) == null ? void 0 : _b.call(_a, "video")) == null ? void 0 : _c.codecs;
-  if (!supported)
-    return;
-  const keep = supported.filter((c) => VIDEO_CODEC_KEEP.test(c.mimeType));
-  if (!keep.length || keep.length === supported.length)
-    return;
-  for (const t of pc.getTransceivers()) {
-    const kind = ((_e = (_d = t.receiver) == null ? void 0 : _d.track) == null ? void 0 : _e.kind) || ((_g = (_f = t.sender) == null ? void 0 : _f.track) == null ? void 0 : _g.kind);
-    if (kind !== "video" || !t.setCodecPreferences)
-      continue;
-    try {
-      t.setCodecPreferences(keep);
-    } catch (e) {
-      console.warn("[call] setCodecPreferences failed", e);
-    }
-  }
-}
-function createLeanPeerConnection(config) {
-  const pc = new RTCPeerConnection(config);
-  for (const method of ["createOffer", "createAnswer"]) {
-    const original = pc[method].bind(pc);
-    pc[method] = async (...args) => {
-      trimVideoCodecs(pc);
-      const desc = await original(...args);
-      const bytes = new TextEncoder().encode(desc.sdp || "").length;
-      console[bytes > SDP_BUDGET ? "warn" : "log"](
-        `[call] ${method} SDP ${bytes}B / ${SDP_BUDGET}B budget` + (bytes > SDP_BUDGET ? " \u2014 too large for the Carrier invite channel, falling back to the offline path" : "")
-      );
-      return desc;
-    };
-  }
-  return pc;
-}
 function useCallController(selfId, onCallLog) {
   const [incoming, setIncoming] = React.useState(null);
   const [active, setActive] = React.useState(null);
@@ -4047,7 +4010,7 @@ function useCallController(selfId, onCallLog) {
       const engine = new CallEngine({
         selfId,
         signaling,
-        createPeerConnection: (c) => createLeanPeerConnection(c),
+        createPeerConnection: (c) => new RTCPeerConnection(c),
         getLocalMedia: (k) => navigator.mediaDevices.getUserMedia({ audio: k.audio, video: k.video }),
         getDisplayMedia: (c) => navigator.mediaDevices.getDisplayMedia(c || { video: true, audio: false }),
         iceServers: DK_LIVE_ICE_SERVERS,
@@ -4088,6 +4051,7 @@ function useCallController(selfId, onCallLog) {
         setIncoming((i) => i && i.callId === id ? null : i);
         setLocalStream(null);
         setRemoteStream(null);
+        setSharing(false);
       });
       engineRef.current = engine;
       console.log("[call] CallEngine ready with ICE:", DK_LIVE_ICE_SERVERS.map((s) => s.urls));

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

@@ -44,15 +44,21 @@ var PeerWebRTC = (() => {
   __export(dist_exports, {
     BeaglePushClient: () => BeaglePushClient,
     BroadcastChannelSignaling: () => BroadcastChannelSignaling,
+    CARRIER_MAX_INVITE_DATA_LEN: () => CARRIER_MAX_INVITE_DATA_LEN,
     CallEngine: () => CallEngine,
     CarrierSignaling: () => CarrierSignaling,
     Emitter: () => Emitter,
     SocketIoSignaling: () => SocketIoSignaling,
+    byteLength: () => byteLength,
     decodeSignal: () => decodeSignal,
     decodeSignalBytesGuard: () => decodeSignalBytesGuard,
     encodeSignal: () => encodeSignal,
     encodeSignalBytes: () => encodeSignalBytes,
-    looksLikeSignal: () => looksLikeSignal
+    fitSignalForInvite: () => fitSignalForInvite,
+    looksLikeSignal: () => looksLikeSignal,
+    mediaDirection: () => mediaDirection,
+    shrinkSdpForInvite: () => shrinkSdpForInvite,
+    videoIsSending: () => videoIsSending
   });
 
   // node_modules/@decentnetwork/peer-webrtc/dist/emitter.js
@@ -91,6 +97,82 @@ var PeerWebRTC = (() => {
   };
   _handlers = new WeakMap();
 
+  // node_modules/@decentnetwork/peer-webrtc/dist/sdp.js
+  var CARRIER_MAX_INVITE_DATA_LEN = 8192;
+  function mediaSection(sdp, kind) {
+    const norm = sdp.replace(/\r\n/g, "\n");
+    const start = norm.indexOf(`m=${kind} `);
+    if (start < 0)
+      return void 0;
+    const next = norm.indexOf("\nm=", start + 1);
+    return next < 0 ? norm.slice(start) : norm.slice(start, next);
+  }
+  function mediaDirection(sdp, kind) {
+    const block = mediaSection(sdp, kind);
+    if (block === void 0)
+      return void 0;
+    for (const dir of ["sendrecv", "sendonly", "recvonly", "inactive"]) {
+      if (block.includes(`a=${dir}`))
+        return dir;
+    }
+    return "sendrecv";
+  }
+  function videoIsSending(sdp) {
+    const dir = mediaDirection(sdp, "video");
+    return dir === "sendrecv" || dir === "sendonly";
+  }
+  function byteLength(text) {
+    return new TextEncoder().encode(text).length;
+  }
+  var DROPPABLE_CODECS = [
+    /^(VP9|AV1|AV1X|H265|HEVC)$/i,
+    /^(red|ulpfec|flexfec-03)$/i
+  ];
+  function payloadTypesFor(lines, codec) {
+    const pts = /* @__PURE__ */ new Set();
+    for (const line of lines) {
+      const m = /^a=rtpmap:(\d+)\s+([A-Za-z0-9-]+)\//.exec(line);
+      if (m && codec.test(m[2]))
+        pts.add(m[1]);
+    }
+    for (const line of lines) {
+      const m = /^a=fmtp:(\d+)\s+apt=(\d+)/.exec(line);
+      if (m && pts.has(m[2]))
+        pts.add(m[1]);
+    }
+    return pts;
+  }
+  function stripPayloadTypes(lines, pts) {
+    if (pts.size === 0)
+      return [...lines];
+    const out = [];
+    for (const line of lines) {
+      if (line.startsWith("m=video ")) {
+        const parts = line.split(" ");
+        out.push([...parts.slice(0, 3), ...parts.slice(3).filter((pt) => !pts.has(pt))].join(" "));
+        continue;
+      }
+      const m = /^a=(?:rtpmap|rtcp-fb|fmtp):(\d+)\b/.exec(line);
+      if (m && pts.has(m[1]))
+        continue;
+      out.push(line);
+    }
+    return out;
+  }
+  function shrinkSdpForInvite(sdp, budget = CARRIER_MAX_INVITE_DATA_LEN) {
+    if (byteLength(sdp) <= budget)
+      return sdp;
+    const crlf = sdp.includes("\r\n");
+    let lines = sdp.replace(/\r\n/g, "\n").split("\n");
+    for (const codec of DROPPABLE_CODECS) {
+      lines = stripPayloadTypes(lines, payloadTypesFor(lines, codec));
+      const candidate = lines.join(crlf ? "\r\n" : "\n");
+      if (byteLength(candidate) <= budget)
+        return candidate;
+    }
+    return lines.join(crlf ? "\r\n" : "\n");
+  }
+
   // node_modules/@decentnetwork/peer-webrtc/dist/signal.js
   var SDP_TYPES = /* @__PURE__ */ new Set([
     "offer",
@@ -128,6 +210,20 @@ var PeerWebRTC = (() => {
   function encodeSignalBytes(signal) {
     return new TextEncoder().encode(encodeSignal(signal));
   }
+  function fitSignalForInvite(signal, budget = CARRIER_MAX_INVITE_DATA_LEN) {
+    let bytes = encodeSignalBytes(signal).length;
+    if (bytes <= budget)
+      return { signal, bytes, shrunk: false };
+    let out = signal;
+    if (signal.type === "offer" && signal.sdp) {
+      out = { ...signal, sdp: shrinkSdpForInvite(signal.sdp, budget - (bytes - byteLength(signal.sdp))) };
+      bytes = encodeSignalBytes(out).length;
+    }
+    if (bytes > budget) {
+      throw new Error(`RtcSignal "${signal.type}" is ${bytes}B, over the ${budget}B invite cap \u2014 the peer would never receive it`);
+    }
+    return { signal: out, bytes, shrunk: true };
+  }
   function decodeSignal(input) {
     const text = (typeof input === "string" ? input : new TextDecoder().decode(input)).replace(/\0+$/u, "").trim();
     const obj = JSON.parse(text);
@@ -167,10 +263,11 @@ var PeerWebRTC = (() => {
   var DEFAULT_ICE_SERVERS = [
     { urls: "stun:stun.l.google.com:19302" }
   ];
+  var LEAN_VIDEO_CODECS = /^video\/(H264|VP8|rtx|red|ulpfec)$/i;
   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, _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, _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 CallEngine = class extends Emitter {
     constructor(opts) {
       var _a, _b;
@@ -182,6 +279,20 @@ 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). */
+      __privateAdd(this, _createOffer);
+      /** createAnswer with the lean codec set applied. */
+      __privateAdd(this, _createAnswer);
+      /**
+       * Restrict video to the codecs the peers actually negotiate, so the SDP fits
+       * the 8192-byte Carrier invite channel. Chrome otherwise advertises VP9 and
+       * AV1 with their profile/rtx/fmtp lines and the offer lands at 8.4-9.8 KB —
+       * over the cap, rejected by the transport, invisible to the peer.
+       *
+       * setCodecPreferences (not SDP munging) keeps the browser the one producing a
+       * valid, self-consistent description. No-ops wherever the API is missing.
+       */
+      __privateAdd(this, _preferLeanVideoCodecs);
       /** Recover a dead transport with an ICE restart (RFC 8445 §12): a re-offer
        *  carrying fresh ufrag/pwd, sent over the SAME renegotiation path that
        *  screen-share re-offers use — any peer that answers those (web, iOS,
@@ -279,7 +390,7 @@ var PeerWebRTC = (() => {
         } catch {
         }
       }
-      const offer = await session.pc.createOffer();
+      const offer = await __privateMethod(this, _createOffer, createOffer_fn).call(this, session);
       await session.pc.setLocalDescription(offer);
       const options = [];
       if (audio)
@@ -313,7 +424,7 @@ var PeerWebRTC = (() => {
       session.hasReceivedSdp = true;
       session.pendingOffer = void 0;
       await __privateMethod(this, _drainRemoteCandidates, drainRemoteCandidates_fn).call(this, session);
-      const answer = await session.pc.createAnswer();
+      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 });
       try {
@@ -376,7 +487,14 @@ var PeerWebRTC = (() => {
       track.addEventListener("ended", () => {
         void this.stopScreenShare(callId);
       });
-      await __privateMethod(this, _renegotiate, renegotiate_fn).call(this, session);
+      try {
+        await __privateMethod(this, _renegotiate, renegotiate_fn).call(this, session);
+      } catch (err) {
+        __privateMethod(this, _log, log_fn).call(this, `shareScreen renegotiation failed: ${err.message}`);
+        await this.stopScreenShare(callId).catch(() => {
+        });
+        throw err;
+      }
       __privateMethod(this, _log, log_fn).call(this, `shareScreen started for ${callId}`);
     }
     /** Stop screen sharing; re-acquire the camera if there was one. */
@@ -394,7 +512,9 @@ var PeerWebRTC = (() => {
       }
       session.hadCamera = false;
       await __privateMethod(this, _setOutgoingVideoTrack, setOutgoingVideoTrack_fn).call(this, session, (_a = cam == null ? void 0 : cam.getVideoTracks()[0]) != null ? _a : null, cam);
-      await __privateMethod(this, _renegotiate, renegotiate_fn).call(this, session);
+      await __privateMethod(this, _renegotiate, renegotiate_fn).call(this, session).catch((err) => {
+        __privateMethod(this, _log, log_fn).call(this, `stopScreenShare renegotiation failed: ${err.message}`);
+      });
       __privateMethod(this, _log, log_fn).call(this, `shareScreen stopped for ${callId}`);
     }
     /** True when the call is currently sharing the screen. */
@@ -426,42 +546,94 @@ var PeerWebRTC = (() => {
   _restartOffersEnabled = new WeakMap();
   _setOutgoingVideoTrack = new WeakSet();
   setOutgoingVideoTrack_fn = async function(session, track, stream) {
-    var _a;
-    const transceivers = session.pc.getTransceivers();
-    const tr = (_a = transceivers.find((t) => {
+    var _a, _b, _c, _d;
+    const transceivers = (_c = (_b = (_a = session.pc).getTransceivers) == null ? void 0 : _b.call(_a)) != null ? _c : [];
+    const tr = (_d = transceivers.find((t) => {
       var _a2;
       return ((_a2 = t.sender.track) == null ? void 0 : _a2.kind) === "video";
-    })) != null ? _a : transceivers.find((t) => {
+    })) != null ? _d : transceivers.find((t) => {
       var _a2;
       return ((_a2 = t.receiver.track) == null ? void 0 : _a2.kind) === "video";
     });
-    if (tr) {
-      await tr.sender.replaceTrack(track);
-      if (track) {
-        if (tr.direction === "recvonly")
-          tr.direction = "sendrecv";
-        else if (tr.direction === "inactive")
-          tr.direction = "sendonly";
+    if (track) {
+      let sending = false;
+      if (tr) {
+        try {
+          await tr.sender.replaceTrack(track);
+          if (tr.direction === "recvonly" || tr.direction === "inactive")
+            tr.direction = "sendrecv";
+          sending = tr.direction === "sendrecv" || tr.direction === "sendonly";
+        } catch (err) {
+          __privateMethod(this, _log, log_fn).call(this, `replaceTrack/direction failed: ${err.message}`);
+        }
+      }
+      if (!sending) {
+        __privateMethod(this, _log, log_fn).call(this, tr ? `video transceiver stuck at ${tr.direction}; addTrack fallback` : "no video m-line; addTrack");
+        if (stream)
+          session.pc.addTrack(track, stream);
+        else
+          session.pc.addTrack(track);
+      }
+    } else if (tr) {
+      try {
+        await tr.sender.replaceTrack(null);
+        if (tr.direction === "sendrecv")
+          tr.direction = "recvonly";
+        else if (tr.direction === "sendonly")
+          tr.direction = "inactive";
+      } catch (err) {
+        __privateMethod(this, _log, log_fn).call(this, `clear video track failed: ${err.message}`);
       }
-    } else if (track && stream) {
-      session.pc.addTrack(track, stream);
     }
     session.localStream = stream;
     this.emit("localStream", session.callId, stream != null ? stream : new MediaStream());
   };
   _renegotiate = new WeakSet();
   renegotiate_fn = async function(session) {
-    try {
-      const offer = await session.pc.createOffer();
-      await session.pc.setLocalDescription(offer);
-      const options = [];
-      if (session.audio)
-        options.push("audio");
-      if (session.video || session.screenStream)
-        options.push("video");
-      await __privateMethod(this, _send, send_fn).call(this, session.peerId, { type: "offer", sdp: offer.sdp, options, callId: session.callId });
-    } catch (err) {
-      __privateMethod(this, _log, log_fn).call(this, `renegotiate failed: ${err.message}`);
+    var _a, _b;
+    const offer = await __privateMethod(this, _createOffer, createOffer_fn).call(this, session);
+    await session.pc.setLocalDescription(offer);
+    const options = [];
+    if (session.audio)
+      options.push("audio");
+    if (session.video || session.screenStream)
+      options.push("video");
+    const sdp = (_a = offer.sdp) != null ? _a : "";
+    __privateMethod(this, _log, log_fn).call(this, `renegotiate callId=${session.callId} video=${(_b = mediaDirection(sdp, "video")) != null ? _b : "none"} sdp=${byteLength(sdp)}B`);
+    if (session.screenStream && !videoIsSending(sdp)) {
+      __privateMethod(this, _log, log_fn).call(this, "renegotiate: WARNING share offer has no sending video m-line \u2014 peer will see black");
+    }
+    await __privateMethod(this, _send, send_fn).call(this, session.peerId, { type: "offer", sdp: offer.sdp, options, callId: session.callId });
+  };
+  _createOffer = new WeakSet();
+  createOffer_fn = async function(session, opts) {
+    __privateMethod(this, _preferLeanVideoCodecs, preferLeanVideoCodecs_fn).call(this, session.pc);
+    return 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();
+  };
+  _preferLeanVideoCodecs = new WeakSet();
+  preferLeanVideoCodecs_fn = function(pc) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    if (__privateGet(this, _opts).leanVideoCodecs === false)
+      return;
+    const caps = (_b = (_a = globalThis.RTCRtpSender) == null ? void 0 : _a.getCapabilities) == null ? void 0 : _b.call(_a, "video");
+    if (!((_c = caps == null ? void 0 : caps.codecs) == null ? void 0 : _c.length))
+      return;
+    const keep = caps.codecs.filter((c) => LEAN_VIDEO_CODECS.test(c.mimeType));
+    if (!keep.length || keep.length === caps.codecs.length)
+      return;
+    for (const t of (_e = (_d = pc.getTransceivers) == null ? void 0 : _d.call(pc)) != null ? _e : []) {
+      const kind = (_j = (_g = (_f = t.receiver) == null ? void 0 : _f.track) == null ? void 0 : _g.kind) != null ? _j : (_i = (_h = t.sender) == null ? void 0 : _h.track) == null ? void 0 : _i.kind;
+      if (kind !== "video" || typeof t.setCodecPreferences !== "function")
+        continue;
+      try {
+        t.setCodecPreferences(keep);
+      } catch {
+      }
     }
   };
   _restartIce = new WeakSet();
@@ -471,7 +643,7 @@ var PeerWebRTC = (() => {
     session.restartAttempts += 1;
     __privateMethod(this, _log, log_fn).call(this, `ICE restart ${session.restartAttempts}/${ICE_RESTART_MAX} for call ${session.callId}`);
     try {
-      const offer = await session.pc.createOffer({ iceRestart: true });
+      const offer = await __privateMethod(this, _createOffer, createOffer_fn).call(this, session, { iceRestart: true });
       await session.pc.setLocalDescription(offer);
       const options = [];
       if (session.audio)
@@ -532,7 +704,7 @@ var PeerWebRTC = (() => {
   answerRenegotiation_fn = async function(session, sdp) {
     try {
       await session.pc.setRemoteDescription({ type: "offer", sdp });
-      const answer = await session.pc.createAnswer();
+      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) {
@@ -764,8 +936,13 @@ var PeerWebRTC = (() => {
   };
   _send = new WeakSet();
   send_fn = async function(peerId, signal) {
+    var _a;
     try {
-      await __privateGet(this, _opts).signaling.send(peerId, signal);
+      const budget = (_a = __privateGet(this, _opts).maxSignalBytes) != null ? _a : CARRIER_MAX_INVITE_DATA_LEN;
+      const fitted = fitSignalForInvite(signal, budget);
+      if (fitted.shrunk)
+        __privateMethod(this, _log, log_fn).call(this, `signal ${signal.type} shrunk to ${fitted.bytes}B (cap ${budget}B)`);
+      await __privateGet(this, _opts).signaling.send(peerId, fitted.signal);
     } catch (err) {
       __privateMethod(this, _log, log_fn).call(this, `signal send failed (${signal.type} \u2192 ${peerId}): ${err.message}`);
       throw err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.47",
+  "version": "0.1.48",
   "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",
@@ -28,7 +28,7 @@
     "@decentnetwork/chat-components": "^0.1.3",
     "@decentnetwork/lan": "^0.1.276",
     "@decentnetwork/peer": "^0.1.139",
-    "@decentnetwork/peer-webrtc": "^0.2.14",
+    "@decentnetwork/peer-webrtc": "^0.2.15",
     "js-yaml": "^4.1.0",
     "yargs": "^17.7.2"
   },