@decentnetwork/beagle 0.1.32 → 0.1.34

package/dist/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.31";
+window.__DK_UI_VERSION="0.1.33";
 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"/>',
@@ -3858,10 +3858,44 @@ function useCallController(selfId, onCallLog) {
   React.useEffect(() => {
     activeRef.current = active;
   }, [active]);
+  const claimTabId = React.useRef(Math.random().toString(36).slice(2));
+  const claimBus = React.useRef(null);
+  React.useEffect(() => {
+    let ch = null;
+    try {
+      ch = new BroadcastChannel("dk-call-claim");
+    } catch (e) {
+      return void 0;
+    }
+    claimBus.current = ch;
+    ch.onmessage = (ev) => {
+      const m = ev.data || {};
+      if (!m || m.tabId === claimTabId.current || m.type !== "claimed")
+        return;
+      const inc = incomingRef.current;
+      if (inc && (inc.callId === m.callId || inc.peerId === m.peerId))
+        setIncoming(null);
+    };
+    return () => {
+      try {
+        ch.close();
+      } catch (e) {
+      }
+      claimBus.current = null;
+    };
+  }, []);
+  const broadcastClaim = React.useCallback((inc, action) => {
+    try {
+      if (claimBus.current)
+        claimBus.current.postMessage({ type: "claimed", tabId: claimTabId.current, callId: inc.callId, peerId: inc.peerId, action });
+    } catch (e) {
+    }
+  }, []);
   const accept = React.useCallback(() => {
     const pending = incomingRef.current;
     if (!pending)
       return;
+    broadcastClaim(pending, "accepted");
     setIncoming(null);
     setActive({ callId: pending.callId, peerId: pending.peerId, video: pending.video, direction: "incoming", state: "connecting" });
     waitEngine().then((eng) => {
@@ -3873,10 +3907,12 @@ function useCallController(selfId, onCallLog) {
   const reject = React.useCallback(() => {
     const eng = engineRef.current;
     const inc = incomingRef.current;
+    if (inc)
+      broadcastClaim(inc, "rejected");
     if (eng && inc)
       eng.reject(inc.callId);
     setIncoming(null);
-  }, []);
+  }, [broadcastClaim]);
   const hangup = React.useCallback(() => {
     const eng = engineRef.current;
     const a = activeRef.current;

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

@@ -167,7 +167,10 @@ var PeerWebRTC = (() => {
   var DEFAULT_ICE_SERVERS = [
     { urls: "stun:stun.l.google.com:19302" }
   ];
-  var _opts, _iceServers, _sessions, _setOutgoingVideoTrack, setOutgoingVideoTrack_fn, _renegotiate, renegotiate_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_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 CallEngine = class extends Emitter {
     constructor(opts) {
       var _a;
@@ -179,6 +182,13 @@ 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);
+      /** 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,
+       *  Android) cooperates with no new protocol. Only the ORIGINAL CALLER
+       *  initiates, so both ends noticing the outage can't glare offers at each
+       *  other; the callee just answers. */
+      __privateAdd(this, _restartIce);
       // ---- internals -------------------------------------------------------
       __privateAdd(this, _handleSignal);
       __privateAdd(this, _onOffer);
@@ -440,6 +450,25 @@ var PeerWebRTC = (() => {
       __privateMethod(this, _log, log_fn).call(this, `renegotiate failed: ${err.message}`);
     }
   };
+  _restartIce = new WeakSet();
+  restartIce_fn = async function(session) {
+    if (session.closed)
+      return;
+    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 });
+      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, `ICE restart failed: ${err.message}`);
+    }
+  };
   _handleSignal = new WeakSet();
   handleSignal_fn = function(peerId, signal) {
     switch (signal.type) {
@@ -578,6 +607,7 @@ var PeerWebRTC = (() => {
       hasReceivedSdp: false,
       localCandidateQueue: [],
       remoteCandidateQueue: [],
+      restartAttempts: 0,
       closed: false
     };
     __privateGet(this, _sessions).set(__privateMethod(this, _normId, normId_fn).call(this, callId), session);
@@ -616,14 +646,42 @@ var PeerWebRTC = (() => {
       switch (pc.iceConnectionState) {
         case "connected":
         case "completed":
+          if (session.restartTimer) {
+            clearTimeout(session.restartTimer);
+            session.restartTimer = void 0;
+          }
+          session.restartAttempts = 0;
           __privateMethod(this, _setState, setState_fn).call(this, session, "connected");
           break;
         case "disconnected":
           __privateMethod(this, _setState, setState_fn).call(this, session, "disconnected");
+          if (session.direction === "outgoing" && !session.restartTimer && session.restartAttempts < ICE_RESTART_MAX) {
+            session.restartTimer = setTimeout(() => {
+              session.restartTimer = void 0;
+              const st = pc.iceConnectionState;
+              if (!session.closed && (st === "disconnected" || st === "failed"))
+                void __privateMethod(this, _restartIce, restartIce_fn).call(this, session);
+            }, ICE_DISCONNECT_GRACE_MS);
+          }
           break;
         case "failed":
-          __privateMethod(this, _setState, setState_fn).call(this, session, "failed");
-          __privateMethod(this, _cleanup, cleanup_fn).call(this, session, "close", "failed");
+          if (session.restartAttempts < ICE_RESTART_MAX) {
+            __privateMethod(this, _setState, setState_fn).call(this, session, "disconnected");
+            if (session.direction === "outgoing")
+              void __privateMethod(this, _restartIce, restartIce_fn).call(this, session);
+            if (session.restartTimer)
+              clearTimeout(session.restartTimer);
+            session.restartTimer = setTimeout(() => {
+              session.restartTimer = void 0;
+              if (!session.closed && pc.iceConnectionState === "failed") {
+                __privateMethod(this, _setState, setState_fn).call(this, session, "failed");
+                __privateMethod(this, _cleanup, cleanup_fn).call(this, session, "close", "failed");
+              }
+            }, ICE_FAILED_GRACE_MS);
+          } else {
+            __privateMethod(this, _setState, setState_fn).call(this, session, "failed");
+            __privateMethod(this, _cleanup, cleanup_fn).call(this, session, "close", "failed");
+          }
           break;
         case "closed":
           if (!session.closed)
@@ -713,6 +771,10 @@ var PeerWebRTC = (() => {
     if (session.closed)
       return;
     session.closed = true;
+    if (session.restartTimer) {
+      clearTimeout(session.restartTimer);
+      session.restartTimer = void 0;
+    }
     try {
       session.pc.onicecandidate = null;
       session.pc.ontrack = null;

package/package.json

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