@decentnetwork/beagle 0.1.34 → 0.1.36

package/dist/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.33";
+window.__DK_UI_VERSION="0.1.35";
 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"/>',
@@ -3795,6 +3795,14 @@ function useCallController(selfId, onCallLog) {
         return;
       }
       engine.on("incomingCall", (info) => {
+        const claimedAt = claimedCalls.current.get(String(info.callId).toLowerCase());
+        if (claimedAt && Date.now() - claimedAt < 5 * 6e4) {
+          try {
+            engine.discard && engine.discard(info.callId);
+          } catch (e) {
+          }
+          return;
+        }
         setIncoming(info);
         if (onCallLogRef.current)
           onCallLogRef.current(info.peerId, !!info.video, "incoming");
@@ -3860,6 +3868,7 @@ function useCallController(selfId, onCallLog) {
   }, [active]);
   const claimTabId = React.useRef(Math.random().toString(36).slice(2));
   const claimBus = React.useRef(null);
+  const claimedCalls = React.useRef(/* @__PURE__ */ new Map());
   React.useEffect(() => {
     let ch = null;
     try {
@@ -3872,9 +3881,16 @@ function useCallController(selfId, onCallLog) {
       const m = ev.data || {};
       if (!m || m.tabId === claimTabId.current || m.type !== "claimed")
         return;
+      if (m.callId)
+        claimedCalls.current.set(String(m.callId).toLowerCase(), Date.now());
       const inc = incomingRef.current;
-      if (inc && (inc.callId === m.callId || inc.peerId === m.peerId))
+      if (inc && (inc.callId === m.callId || inc.peerId === m.peerId)) {
         setIncoming(null);
+        try {
+          engineRef.current && engineRef.current.discard && engineRef.current.discard(inc.callId);
+        } catch (e) {
+        }
+      }
     };
     return () => {
       try {
@@ -4664,7 +4680,7 @@ function DkApp() {
   }, [refreshBackend]);
   React.useEffect(() => {
     const mine = window.__DK_UI_VERSION;
-    const served = me && me.lanVer;
+    const served = me && me.beagleVer;
     if (!mine || !served || mine === served)
       return;
     const key = "dk-reloaded-for-" + served;
@@ -4672,7 +4688,7 @@ function DkApp() {
       return;
     sessionStorage.setItem(key, "1");
     window.location.reload();
-  }, [me && me.lanVer]);
+  }, [me && me.beagleVer]);
   const peers = data.peers;
   const [pendingAddr, setPendingAddr] = React.useState(() => dkParseDeepLinkAddress());
   React.useEffect(() => {

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

@@ -169,11 +169,11 @@ var PeerWebRTC = (() => {
   ];
   var ICE_RESTART_MAX = 3;
   var ICE_DISCONNECT_GRACE_MS = 4e3;
-  var ICE_FAILED_GRACE_MS = 15e3;
-  var _opts, _iceServers, _sessions, _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 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 CallEngine = class extends Emitter {
     constructor(opts) {
-      var _a;
+      var _a, _b;
       super();
       /** Point the outgoing video sender at `track` (replaceTrack, no renegotiation
        *  needed if a sender exists), flip the transceiver to send, and refresh the
@@ -220,6 +220,8 @@ var PeerWebRTC = (() => {
       __privateAdd(this, _opts, void 0);
       __privateAdd(this, _iceServers, void 0);
       __privateAdd(this, _sessions, /* @__PURE__ */ new Map());
+      /** See CallEngineOptions.iceRestartOffers — off by default for native-app safety. */
+      __privateAdd(this, _restartOffersEnabled, void 0);
       __privateAdd(this, _toInfo, (session) => ({
         callId: session.callId,
         peerId: session.peerId,
@@ -231,6 +233,7 @@ var PeerWebRTC = (() => {
       }));
       __privateSet(this, _opts, opts);
       __privateSet(this, _iceServers, (_a = opts.iceServers) != null ? _a : DEFAULT_ICE_SERVERS);
+      __privateSet(this, _restartOffersEnabled, (_b = opts.iceRestartOffers) != null ? _b : false);
       opts.signaling.onSignal((peerId, signal) => {
         try {
           __privateMethod(this, _handleSignal, handleSignal_fn).call(this, peerId, signal);
@@ -399,6 +402,16 @@ var PeerWebRTC = (() => {
       var _a;
       return !!((_a = __privateGet(this, _sessions).get(__privateMethod(this, _normId, normId_fn).call(this, callId))) == null ? void 0 : _a.screenStream);
     }
+    /** Silently drop a call WITHOUT signaling the peer — for a tab that lost
+     *  the cross-tab answer race: another tab owns the call now, so sending
+     *  reject/bye from this one would kill the live call. Local cleanup only. */
+    discard(callId) {
+      const session = __privateGet(this, _sessions).get(__privateMethod(this, _normId, normId_fn).call(this, callId));
+      if (!session)
+        return;
+      __privateMethod(this, _log, log_fn).call(this, `discarding call ${callId} (claimed elsewhere)`);
+      __privateMethod(this, _cleanup, cleanup_fn).call(this, session, "close");
+    }
     /** Tear down every call (e.g. on app shutdown). */
     dispose() {
       for (const session of [...__privateGet(this, _sessions).values()]) {
@@ -410,6 +423,7 @@ var PeerWebRTC = (() => {
   _opts = new WeakMap();
   _iceServers = new WeakMap();
   _sessions = new WeakMap();
+  _restartOffersEnabled = new WeakMap();
   _setOutgoingVideoTrack = new WeakSet();
   setOutgoingVideoTrack_fn = async function(session, track, stream) {
     var _a;
@@ -655,7 +669,7 @@ var PeerWebRTC = (() => {
           break;
         case "disconnected":
           __privateMethod(this, _setState, setState_fn).call(this, session, "disconnected");
-          if (session.direction === "outgoing" && !session.restartTimer && session.restartAttempts < ICE_RESTART_MAX) {
+          if (__privateGet(this, _restartOffersEnabled) && session.direction === "outgoing" && !session.restartTimer && session.restartAttempts < ICE_RESTART_MAX) {
             session.restartTimer = setTimeout(() => {
               session.restartTimer = void 0;
               const st = pc.iceConnectionState;
@@ -667,7 +681,7 @@ var PeerWebRTC = (() => {
         case "failed":
           if (session.restartAttempts < ICE_RESTART_MAX) {
             __privateMethod(this, _setState, setState_fn).call(this, session, "disconnected");
-            if (session.direction === "outgoing")
+            if (__privateGet(this, _restartOffersEnabled) && session.direction === "outgoing")
               void __privateMethod(this, _restartIce, restartIce_fn).call(this, session);
             if (session.restartTimer)
               clearTimeout(session.restartTimer);

package/dist/server.js

@@ -1406,6 +1406,11 @@ export function startBeagleServer(opts) {
                     autoAccept: typeof node.autoAccept === "boolean" ? node.autoAccept : null,
                     avatarUrl: ensPub.get(identity.userid ?? "")?.avatarUrl ?? null,
                     punkId: ensPub.get(identity.userid ?? "")?.punkId ?? null,
+                    // The UI compares this against its baked-in __DK_UI_VERSION and
+                    // reloads itself when they differ — an open tab otherwise runs a
+                    // stale bundle forever after a beagle update (multi-tab call fixes
+                    // "didn't work" purely because old tabs never picked them up).
+                    beagleVer: beagleVersion(),
                 };
                 const fl = (flist.ok ? (flist.data?.friends ?? []) : []);
                 const peers = fl.map((f) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "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.256",
     "@decentnetwork/peer": "^0.1.138",
-    "@decentnetwork/peer-webrtc": "^0.2.12",
+    "@decentnetwork/peer-webrtc": "^0.2.14",
     "js-yaml": "^4.1.0",
     "yargs": "^17.7.2"
   },