@whereby.com/media 3.0.0 → 3.1.1

package/dist/index.cjs

@@ -2572,6 +2572,7 @@ var _a$2, _b$1;
 const adapter$2 = (_a$2 = adapterRaw.default) !== null && _a$2 !== void 0 ? _a$2 : adapterRaw;
 const logger$6 = new Logger();
 const ICE_PUBLIC_IP_GATHERING_TIMEOUT = 3 * 1000;
+const ICE_RESTART_DELAY = 2 * 1000;
 const browserName$1 = (_b$1 = adapter$2.browserDetails) === null || _b$1 === void 0 ? void 0 : _b$1.browser;
 const browserVersion = adapter$2.browserDetails.version;
 let unloading$1 = false;
@@ -2616,6 +2617,7 @@ class P2pRtcManager {
             mediaserverConfigTtlSeconds,
         });
         this.analytics = {
+            P2POffendingInitialOffer: 0,
             P2PNonErrorRejectionValueGUMError: 0,
             numNewPc: 0,
             numIceConnected: 0,
@@ -2738,6 +2740,7 @@ class P2pRtcManager {
                 this._updateAndScheduleMediaServersRefresh(data);
             }),
             this._serverSocket.on(RELAY_MESSAGES.READY_TO_RECEIVE_OFFER, (data) => {
+                logger$6.info(`got ready_to_receive_offer from ${data.clientId}`);
                 this._connect(data.clientId);
             }),
             this._serverSocket.on(RELAY_MESSAGES.ICE_CANDIDATE, (data) => {
@@ -2749,6 +2752,7 @@ class P2pRtcManager {
                 session.addIceCandidate(data.message);
             }),
             this._serverSocket.on(RELAY_MESSAGES.ICE_END_OF_CANDIDATES, (data) => {
+                logger$6.info(`got end_of_ice_candidates from ${data.clientId}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on ICE_END_OF_CANDIDATES", data);
@@ -2758,6 +2762,7 @@ class P2pRtcManager {
             }),
             this._serverSocket.on(RELAY_MESSAGES.SDP_OFFER, (data) => {
                 var _a, _b;
+                logger$6.info(`got offer from ${data.clientId}, isInitialOffer: ${Boolean(data.message.isInitialOffer)}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on SDP_OFFER", data);
@@ -2767,6 +2772,16 @@ class P2pRtcManager {
                     sdp: data.message.sdp || data.message.sdpU,
                     type: data.message.type,
                 };
+                if ("isInitialOffer" in data.message &&
+                    data.message.isInitialOffer === false &&
+                    session.pc.connectionState === "new" &&
+                    session.pc.iceConnectionState === "new" &&
+                    !session.connectionStatus) {
+                    logger$6.info("We have asked for an initial offer, ignoring all others");
+                    this.analytics.P2POffendingInitialOffer++;
+                    rtcStats.sendEvent("P2POffendingInitialOffer", { clientId: session.clientId });
+                    return;
+                }
                 (_b = (_a = session
                     .handleOffer(sdp)
                     .then((answer) => {
@@ -2780,6 +2795,7 @@ class P2pRtcManager {
             }),
             this._serverSocket.on(RELAY_MESSAGES.SDP_ANSWER, (data) => {
                 var _a, _b;
+                logger$6.info(`got offer from ${data.clientId}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on SDP_ANSWER", data);
@@ -2973,6 +2989,7 @@ class P2pRtcManager {
         };
         pc.oniceconnectionstatechange = () => {
             var _a;
+            logger$6.info(`iceConnectionState changed to ${pc.iceConnectionState} for session ${session.clientId}`);
             let newStatus;
             const currentStatus = session.connectionStatus;
             switch (pc.iceConnectionState) {
@@ -3002,7 +3019,7 @@ class P2pRtcManager {
                         if (pc.iceConnectionState === "disconnected") {
                             this._maybeRestartIce(clientId, session);
                         }
-                    }, 2000);
+                    }, ICE_RESTART_DELAY);
                     break;
                 case "failed":
                     newStatus = TYPES.CONNECTION_FAILED;
@@ -3025,6 +3042,7 @@ class P2pRtcManager {
         };
         pc.onconnectionstatechange = () => {
             var _a;
+            logger$6.info(`connectionState changed to ${pc.connectionState} for session ${session.clientId}`);
             switch (pc.connectionState) {
                 case "connected":
                     setTimeout(() => {
@@ -3205,7 +3223,7 @@ class P2pRtcManager {
             initialBandwidth,
             isOfferer: true,
         });
-        this._negotiatePeerConnection(clientId, session);
+        this._negotiatePeerConnection({ clientId, session, isInitialOffer: true });
         return session;
     }
     _maybeRestartIce(clientId, session) {
@@ -3223,7 +3241,8 @@ class P2pRtcManager {
             session.ipv6HostCandidate6to4Seen = false;
             session.mdnsHostCandidateSeen = false;
             this.analytics.numIceRestart++;
-            this._negotiatePeerConnection(clientId, session, Object.assign({}, this.offerOptions, { iceRestart: true }));
+            const constraints = Object.assign(Object.assign({}, this.offerOptions), { iceRestart: true });
+            this._negotiatePeerConnection({ clientId, session, constraints });
         }
     }
     _setCodecPreferences(pc) {
@@ -3267,7 +3286,7 @@ class P2pRtcManager {
             }
         });
     }
-    _negotiatePeerConnection(clientId, session, constraints) {
+    _negotiatePeerConnection({ clientId, session, constraints, isInitialOffer = false, }) {
         if (!session) {
             logger$6.warn("No RTCPeerConnection in negotiatePeerConnection()", clientId);
             return;
@@ -3275,7 +3294,7 @@ class P2pRtcManager {
         const pc = session.pc;
         if (!session.canModifyPeerConnection()) {
             session.pending.push(() => {
-                this._negotiatePeerConnection(clientId, session, constraints);
+                this._negotiatePeerConnection({ clientId, session, constraints, isInitialOffer });
             });
             return;
         }
@@ -3311,6 +3330,7 @@ class P2pRtcManager {
                     sdp: offer.sdp,
                     sdpU: offer.sdp,
                     type: offer.type,
+                    isInitialOffer,
                 };
                 this._emitServerEvent(RELAY_MESSAGES.SDP_OFFER, {
                     receiverId: clientId,
@@ -3327,7 +3347,7 @@ class P2pRtcManager {
         const originalOnnegotationneeded = pc.onnegotiationneeded;
         pc.onnegotiationneeded = null;
         action();
-        this._negotiatePeerConnection(session.clientId, session);
+        this._negotiatePeerConnection({ clientId: session.clientId, session });
         setTimeout(() => (pc.onnegotiationneeded = originalOnnegotationneeded), 0);
     }
     _changeBandwidthForAllClients(isJoining) {
@@ -3477,7 +3497,7 @@ class P2pRtcManager {
             if (pc.iceConnectionState === "new" || !session.connectionStatus) {
                 return;
             }
-            this._negotiatePeerConnection(clientId, session);
+            this._negotiatePeerConnection({ clientId, session });
         };
         return session;
     }

package/dist/index.d.cts

@@ -1016,14 +1016,25 @@ type RtcEvents = {
     remote_stream_track_added: void;
     remote_stream_track_removed: void;
 };
-type RTCSessionDescription = {
+type SignalRTCSessionDescription = {
     sdp?: string;
     sdpU?: string;
     type: RTCSdpType;
+    isInitialOffer?: boolean;
 };
-type SDPRelayMessage = {
+type SignalSDPMessage = {
+    clientId: string;
+    message: SignalRTCSessionDescription;
+};
+type SignalIceCandidateMessage = {
+    clientId: string;
+    message: RTCIceCandidate;
+};
+type SignalReadyToReceiveOfferMessage = {
+    clientId: string;
+};
+type SignalIceEndOfCandidatesMessage = {
     clientId: string;
-    message: RTCSessionDescription;
 };
 interface WebRTCProvider {
     getMediaConstraints: () => MediaStreamConstraints;
@@ -1138,16 +1149,7 @@ declare function stopStreamTracks(stream: MediaStream, only?: "audio" | "video"
 declare function replaceTracksInStream(stream: MediaStream, newStream: MediaStream, only: "audio" | "video" | false): MediaStreamTrack[];
 declare function getStream(constraintOpt: any, { replaceStream, fallback }?: GetStreamOptions): Promise<GetStreamResult>;
 declare function hasGetDisplayMedia(): boolean;
-declare function getDisplayMedia(constraints?: {
-    video: {
-        width: {
-            max: number;
-        };
-        height: {
-            max: number;
-        };
-    };
-}, contentHint?: string): Promise<MediaStream>;
+declare function getDisplayMedia(constraints?: DisplayMediaStreamOptions, contentHint?: string): Promise<MediaStream>;
 declare function compareLocalDevices(before: MediaDeviceInfo[], after: MediaDeviceInfo[]): any;
 declare function getUpdatedDevices({ oldDevices, newDevices, currentAudioId, currentVideoId, currentSpeakerId, }: {
     oldDevices: MediaDeviceInfo[];
@@ -1205,10 +1207,10 @@ declare class Session {
     addTrack(track: MediaStreamTrack, stream?: MediaStream): void;
     removeTrack(track: MediaStreamTrack): void;
     removeStream(stream: MediaStream): void;
-    _setRemoteDescription(desc: RTCSessionDescription): Promise<void>;
-    handleOffer(offer: RTCSessionDescription): Promise<RTCSessionDescription>;
-    handleAnswer(message: RTCSessionDescription): Promise<void>;
-    addIceCandidate(candidate: any): void;
+    _setRemoteDescription(desc: SignalRTCSessionDescription): Promise<void>;
+    handleOffer(offer: SignalRTCSessionDescription): Promise<SignalRTCSessionDescription>;
+    handleAnswer(message: SignalRTCSessionDescription): Promise<void>;
+    addIceCandidate(candidate: RTCIceCandidate | null): void;
     canModifyPeerConnection(): boolean;
     close(): void;
     hasConnectedPeerConnection(): boolean;
@@ -1223,7 +1225,14 @@ interface CreateSessionOptions {
     initialBandwidth: number;
     isOfferer: boolean;
 }
+interface NegotiatePeerConnectionOptions {
+    clientId: string;
+    session: Session;
+    constraints?: RTCOfferOptions;
+    isInitialOffer?: boolean;
+}
 type P2PAnalytics = {
+    P2POffendingInitialOffer: number;
     P2PNonErrorRejectionValueGUMError: number;
     numNewPc: number;
     numIceConnected: number;
@@ -1340,7 +1349,7 @@ declare class P2pRtcManager implements RtcManager {
     _connect(clientId: string): Session;
     _maybeRestartIce(clientId: string, session: any): void;
     _setCodecPreferences(pc: RTCPeerConnection): Promise<void>;
-    _negotiatePeerConnection(clientId: string, session: Session, constraints?: any): void;
+    _negotiatePeerConnection({ clientId, session, constraints, isInitialOffer, }: NegotiatePeerConnectionOptions): void;
     _withForcedRenegotiation(session: Session, action: any): void;
     _changeBandwidthForAllClients(isJoining: boolean): number;
     _createP2pSession({ clientId, initialBandwidth, isOfferer, }: {
@@ -1918,4 +1927,4 @@ declare const STREAM_TYPES: {
 };
 
 export { ADDITIONAL_SCREEN_SHARE_SETTINGS, AUDIO_SETTINGS, BandwidthTester, CAMERA_STREAM_ID, EVENTS, KNOCK_MESSAGES, KalmanFilter, Logger, MEDIA_JITTER_BUFFER_TARGET, NoDevicesError, P2pRtcManager, PROTOCOL_ERRORS, PROTOCOL_EVENTS, PROTOCOL_REQUESTS, PROTOCOL_RESPONSES, RELAY_MESSAGES, ReconnectManager, RtcEventNames, RtcManagerDispatcher, SCREEN_SHARE_SETTINGS, SCREEN_SHARE_SIMULCAST_SETTINGS, STREAM_TYPES, ServerSocket, Session, SfuV2Parser, TYPES, VIDEO_SETTINGS_HD, VIDEO_SETTINGS_SD, VIDEO_SETTINGS_VP9, VIDEO_SETTINGS_VP9_LOW_BANDWIDTH, VegaConnection, VegaMediaQualityMonitor, VegaRtcManager, addAbsCaptureTimeExtMap, addExtMap, assert, buildDeviceList, calculateStd, captureAudioSsrcMetrics, captureCandidatePairInfoMetrics, captureCommonSsrcMetrics, captureSsrcInfo, captureVideoSsrcMetrics, cleanSdp, compareLocalDevices, createACFCalculator, createMicAnalyser, createWorker, deprioritizeH264, detectMicrophoneNotWorking, enumerate, external_stun_servers, filterMidExtension, filterMsidSemantic, fromLocation, generateByteString, getConstraints, getCurrentPeerConnections, getDeviceData, getDisplayMedia, getIssuesAndMetrics, getMediaConstraints, getMediaSettings, getMediasoupDeviceAsync, getNumFailedStatsReports, getNumFailedTrackSsrcLookups, getNumMissingTrackSsrcLookups, getPeerConnectionIndex, getStats, getStream, getUpdatedDevices, getUpdatedStats, getUserMedia, hasGetDisplayMedia, ipRegex, isMobile, issueDetectorOrMetricEnabled, maybeTurnOnly, modifyMediaCapabilities, removePeerConnection, replaceTracksInStream, _default as rtcManagerEvents, rtcStats, setClientProvider, setCodecPreferenceSDP, setPeerConnectionsForTests, setVideoBandwidthUsingSetParameters, sortCodecs, standardDeviation, startPerformanceMonitor, stopStreamTracks, subscribeIssues, subscribeStats, trackAnnotations, turnServerOverride, variance };
-export type { AddSpotlightRequest, AudioEnableRequest, AudioEnableRequestedEvent, AudioEnabledEvent, BreakoutConfig, BreakoutGroupJoinedEvent, BreakoutSessionUpdatedEvent, CannotJoinUnclaimedRoomError, ChatMessage, ClientKickedEvent, ClientLeftEvent, ClientMetadataPayload, ClientMetadataReceivedEvent, ClientRole, ClientUnableToJoinEvent, CloudRecordingStartedEvent, Codec, Credentials, ForbiddenError, ForbiddenErrorNames, GetConstraintsOptions, GetDeviceDataResult, GetMediaConstraintsOptions, GetStreamOptions, GetStreamResult, GetUpdatedDevicesResult, HostPresenceControlsError, IdentifyDeviceRequest, InternalServerError, InvalidAssistantKeyError, IssuesAndMetricsByView, JoinRoomRequest, KnockAcceptedEvent, KnockRejectedEvent, KnockRoomRequest, KnockerLeftEvent, LiveTranscriptionStartedEvent, LiveTranscriptionStoppedEvent, MaxViewerLimitReachedError, Metric, NewClientEvent, OrganizationAssistantNotEnabledError, OrganizationAssistantNotFoundError, OrganizationPlanExhaustedError, RTCSessionDescription, RemoveSpotlightRequest, RoleName, RoomConcurrencyControlsError, RoomFullError, RoomJoinedErrors, RoomJoinedEvent, RoomJoinedSuccess, RoomKnockedEvent, RoomLockedError, RoomLockedEvent, RoomMeetingTimeExhaustedError, RoomMode, RoomSessionEndedEvent, RtcClientConnectionStatusChangedPayload, RtcEventEmitter, RtcEvents, RtcLocalStreamTrackAddedPayload, RtcLocalStreamTrackRemovedPayload, RtcManager, RtcManagerCreatedPayload, RtcManagerOptions, RtcStreamAddedPayload, SDPRelayMessage, ScreenshareStartedEvent, ScreenshareStoppedEvent, SendClientMetadataRequest, SignalClient, SignalEvents, SignalIceServer, SignalKnocker, SignalMediaServerConfig, SignalRequests, SignalRoom, SignalSFUServer, SignalTurnServer, SocketConf, SocketManager, Spotlight, SpotlightAddedEvent, SpotlightRemovedEvent, StatsMonitorOptions, StatsMonitorState, StatsSubscription, TurnTransportProtocol, UpdatedDeviceInfo, UpdatedDevicesInfo, VegaRtcManagerOptions, VideoEnableRequest, VideoEnableRequestedEvent, VideoEnabledEvent, WebRTCProvider };
+export type { AddSpotlightRequest, AudioEnableRequest, AudioEnableRequestedEvent, AudioEnabledEvent, BreakoutConfig, BreakoutGroupJoinedEvent, BreakoutSessionUpdatedEvent, CannotJoinUnclaimedRoomError, ChatMessage, ClientKickedEvent, ClientLeftEvent, ClientMetadataPayload, ClientMetadataReceivedEvent, ClientRole, ClientUnableToJoinEvent, CloudRecordingStartedEvent, Codec, Credentials, ForbiddenError, ForbiddenErrorNames, GetConstraintsOptions, GetDeviceDataResult, GetMediaConstraintsOptions, GetStreamOptions, GetStreamResult, GetUpdatedDevicesResult, HostPresenceControlsError, IdentifyDeviceRequest, InternalServerError, InvalidAssistantKeyError, IssuesAndMetricsByView, JoinRoomRequest, KnockAcceptedEvent, KnockRejectedEvent, KnockRoomRequest, KnockerLeftEvent, LiveTranscriptionStartedEvent, LiveTranscriptionStoppedEvent, MaxViewerLimitReachedError, Metric, NewClientEvent, OrganizationAssistantNotEnabledError, OrganizationAssistantNotFoundError, OrganizationPlanExhaustedError, RemoveSpotlightRequest, RoleName, RoomConcurrencyControlsError, RoomFullError, RoomJoinedErrors, RoomJoinedEvent, RoomJoinedSuccess, RoomKnockedEvent, RoomLockedError, RoomLockedEvent, RoomMeetingTimeExhaustedError, RoomMode, RoomSessionEndedEvent, RtcClientConnectionStatusChangedPayload, RtcEventEmitter, RtcEvents, RtcLocalStreamTrackAddedPayload, RtcLocalStreamTrackRemovedPayload, RtcManager, RtcManagerCreatedPayload, RtcManagerOptions, RtcStreamAddedPayload, ScreenshareStartedEvent, ScreenshareStoppedEvent, SendClientMetadataRequest, SignalClient, SignalEvents, SignalIceCandidateMessage, SignalIceEndOfCandidatesMessage, SignalIceServer, SignalKnocker, SignalMediaServerConfig, SignalRTCSessionDescription, SignalReadyToReceiveOfferMessage, SignalRequests, SignalRoom, SignalSDPMessage, SignalSFUServer, SignalTurnServer, SocketConf, SocketManager, Spotlight, SpotlightAddedEvent, SpotlightRemovedEvent, StatsMonitorOptions, StatsMonitorState, StatsSubscription, TurnTransportProtocol, UpdatedDeviceInfo, UpdatedDevicesInfo, VegaRtcManagerOptions, VideoEnableRequest, VideoEnableRequestedEvent, VideoEnabledEvent, WebRTCProvider };

package/dist/index.d.mts

@@ -1016,14 +1016,25 @@ type RtcEvents = {
     remote_stream_track_added: void;
     remote_stream_track_removed: void;
 };
-type RTCSessionDescription = {
+type SignalRTCSessionDescription = {
     sdp?: string;
     sdpU?: string;
     type: RTCSdpType;
+    isInitialOffer?: boolean;
 };
-type SDPRelayMessage = {
+type SignalSDPMessage = {
+    clientId: string;
+    message: SignalRTCSessionDescription;
+};
+type SignalIceCandidateMessage = {
+    clientId: string;
+    message: RTCIceCandidate;
+};
+type SignalReadyToReceiveOfferMessage = {
+    clientId: string;
+};
+type SignalIceEndOfCandidatesMessage = {
     clientId: string;
-    message: RTCSessionDescription;
 };
 interface WebRTCProvider {
     getMediaConstraints: () => MediaStreamConstraints;
@@ -1138,16 +1149,7 @@ declare function stopStreamTracks(stream: MediaStream, only?: "audio" | "video"
 declare function replaceTracksInStream(stream: MediaStream, newStream: MediaStream, only: "audio" | "video" | false): MediaStreamTrack[];
 declare function getStream(constraintOpt: any, { replaceStream, fallback }?: GetStreamOptions): Promise<GetStreamResult>;
 declare function hasGetDisplayMedia(): boolean;
-declare function getDisplayMedia(constraints?: {
-    video: {
-        width: {
-            max: number;
-        };
-        height: {
-            max: number;
-        };
-    };
-}, contentHint?: string): Promise<MediaStream>;
+declare function getDisplayMedia(constraints?: DisplayMediaStreamOptions, contentHint?: string): Promise<MediaStream>;
 declare function compareLocalDevices(before: MediaDeviceInfo[], after: MediaDeviceInfo[]): any;
 declare function getUpdatedDevices({ oldDevices, newDevices, currentAudioId, currentVideoId, currentSpeakerId, }: {
     oldDevices: MediaDeviceInfo[];
@@ -1205,10 +1207,10 @@ declare class Session {
     addTrack(track: MediaStreamTrack, stream?: MediaStream): void;
     removeTrack(track: MediaStreamTrack): void;
     removeStream(stream: MediaStream): void;
-    _setRemoteDescription(desc: RTCSessionDescription): Promise<void>;
-    handleOffer(offer: RTCSessionDescription): Promise<RTCSessionDescription>;
-    handleAnswer(message: RTCSessionDescription): Promise<void>;
-    addIceCandidate(candidate: any): void;
+    _setRemoteDescription(desc: SignalRTCSessionDescription): Promise<void>;
+    handleOffer(offer: SignalRTCSessionDescription): Promise<SignalRTCSessionDescription>;
+    handleAnswer(message: SignalRTCSessionDescription): Promise<void>;
+    addIceCandidate(candidate: RTCIceCandidate | null): void;
     canModifyPeerConnection(): boolean;
     close(): void;
     hasConnectedPeerConnection(): boolean;
@@ -1223,7 +1225,14 @@ interface CreateSessionOptions {
     initialBandwidth: number;
     isOfferer: boolean;
 }
+interface NegotiatePeerConnectionOptions {
+    clientId: string;
+    session: Session;
+    constraints?: RTCOfferOptions;
+    isInitialOffer?: boolean;
+}
 type P2PAnalytics = {
+    P2POffendingInitialOffer: number;
     P2PNonErrorRejectionValueGUMError: number;
     numNewPc: number;
     numIceConnected: number;
@@ -1340,7 +1349,7 @@ declare class P2pRtcManager implements RtcManager {
     _connect(clientId: string): Session;
     _maybeRestartIce(clientId: string, session: any): void;
     _setCodecPreferences(pc: RTCPeerConnection): Promise<void>;
-    _negotiatePeerConnection(clientId: string, session: Session, constraints?: any): void;
+    _negotiatePeerConnection({ clientId, session, constraints, isInitialOffer, }: NegotiatePeerConnectionOptions): void;
     _withForcedRenegotiation(session: Session, action: any): void;
     _changeBandwidthForAllClients(isJoining: boolean): number;
     _createP2pSession({ clientId, initialBandwidth, isOfferer, }: {
@@ -1918,4 +1927,4 @@ declare const STREAM_TYPES: {
 };
 
 export { ADDITIONAL_SCREEN_SHARE_SETTINGS, AUDIO_SETTINGS, BandwidthTester, CAMERA_STREAM_ID, EVENTS, KNOCK_MESSAGES, KalmanFilter, Logger, MEDIA_JITTER_BUFFER_TARGET, NoDevicesError, P2pRtcManager, PROTOCOL_ERRORS, PROTOCOL_EVENTS, PROTOCOL_REQUESTS, PROTOCOL_RESPONSES, RELAY_MESSAGES, ReconnectManager, RtcEventNames, RtcManagerDispatcher, SCREEN_SHARE_SETTINGS, SCREEN_SHARE_SIMULCAST_SETTINGS, STREAM_TYPES, ServerSocket, Session, SfuV2Parser, TYPES, VIDEO_SETTINGS_HD, VIDEO_SETTINGS_SD, VIDEO_SETTINGS_VP9, VIDEO_SETTINGS_VP9_LOW_BANDWIDTH, VegaConnection, VegaMediaQualityMonitor, VegaRtcManager, addAbsCaptureTimeExtMap, addExtMap, assert, buildDeviceList, calculateStd, captureAudioSsrcMetrics, captureCandidatePairInfoMetrics, captureCommonSsrcMetrics, captureSsrcInfo, captureVideoSsrcMetrics, cleanSdp, compareLocalDevices, createACFCalculator, createMicAnalyser, createWorker, deprioritizeH264, detectMicrophoneNotWorking, enumerate, external_stun_servers, filterMidExtension, filterMsidSemantic, fromLocation, generateByteString, getConstraints, getCurrentPeerConnections, getDeviceData, getDisplayMedia, getIssuesAndMetrics, getMediaConstraints, getMediaSettings, getMediasoupDeviceAsync, getNumFailedStatsReports, getNumFailedTrackSsrcLookups, getNumMissingTrackSsrcLookups, getPeerConnectionIndex, getStats, getStream, getUpdatedDevices, getUpdatedStats, getUserMedia, hasGetDisplayMedia, ipRegex, isMobile, issueDetectorOrMetricEnabled, maybeTurnOnly, modifyMediaCapabilities, removePeerConnection, replaceTracksInStream, _default as rtcManagerEvents, rtcStats, setClientProvider, setCodecPreferenceSDP, setPeerConnectionsForTests, setVideoBandwidthUsingSetParameters, sortCodecs, standardDeviation, startPerformanceMonitor, stopStreamTracks, subscribeIssues, subscribeStats, trackAnnotations, turnServerOverride, variance };
-export type { AddSpotlightRequest, AudioEnableRequest, AudioEnableRequestedEvent, AudioEnabledEvent, BreakoutConfig, BreakoutGroupJoinedEvent, BreakoutSessionUpdatedEvent, CannotJoinUnclaimedRoomError, ChatMessage, ClientKickedEvent, ClientLeftEvent, ClientMetadataPayload, ClientMetadataReceivedEvent, ClientRole, ClientUnableToJoinEvent, CloudRecordingStartedEvent, Codec, Credentials, ForbiddenError, ForbiddenErrorNames, GetConstraintsOptions, GetDeviceDataResult, GetMediaConstraintsOptions, GetStreamOptions, GetStreamResult, GetUpdatedDevicesResult, HostPresenceControlsError, IdentifyDeviceRequest, InternalServerError, InvalidAssistantKeyError, IssuesAndMetricsByView, JoinRoomRequest, KnockAcceptedEvent, KnockRejectedEvent, KnockRoomRequest, KnockerLeftEvent, LiveTranscriptionStartedEvent, LiveTranscriptionStoppedEvent, MaxViewerLimitReachedError, Metric, NewClientEvent, OrganizationAssistantNotEnabledError, OrganizationAssistantNotFoundError, OrganizationPlanExhaustedError, RTCSessionDescription, RemoveSpotlightRequest, RoleName, RoomConcurrencyControlsError, RoomFullError, RoomJoinedErrors, RoomJoinedEvent, RoomJoinedSuccess, RoomKnockedEvent, RoomLockedError, RoomLockedEvent, RoomMeetingTimeExhaustedError, RoomMode, RoomSessionEndedEvent, RtcClientConnectionStatusChangedPayload, RtcEventEmitter, RtcEvents, RtcLocalStreamTrackAddedPayload, RtcLocalStreamTrackRemovedPayload, RtcManager, RtcManagerCreatedPayload, RtcManagerOptions, RtcStreamAddedPayload, SDPRelayMessage, ScreenshareStartedEvent, ScreenshareStoppedEvent, SendClientMetadataRequest, SignalClient, SignalEvents, SignalIceServer, SignalKnocker, SignalMediaServerConfig, SignalRequests, SignalRoom, SignalSFUServer, SignalTurnServer, SocketConf, SocketManager, Spotlight, SpotlightAddedEvent, SpotlightRemovedEvent, StatsMonitorOptions, StatsMonitorState, StatsSubscription, TurnTransportProtocol, UpdatedDeviceInfo, UpdatedDevicesInfo, VegaRtcManagerOptions, VideoEnableRequest, VideoEnableRequestedEvent, VideoEnabledEvent, WebRTCProvider };
+export type { AddSpotlightRequest, AudioEnableRequest, AudioEnableRequestedEvent, AudioEnabledEvent, BreakoutConfig, BreakoutGroupJoinedEvent, BreakoutSessionUpdatedEvent, CannotJoinUnclaimedRoomError, ChatMessage, ClientKickedEvent, ClientLeftEvent, ClientMetadataPayload, ClientMetadataReceivedEvent, ClientRole, ClientUnableToJoinEvent, CloudRecordingStartedEvent, Codec, Credentials, ForbiddenError, ForbiddenErrorNames, GetConstraintsOptions, GetDeviceDataResult, GetMediaConstraintsOptions, GetStreamOptions, GetStreamResult, GetUpdatedDevicesResult, HostPresenceControlsError, IdentifyDeviceRequest, InternalServerError, InvalidAssistantKeyError, IssuesAndMetricsByView, JoinRoomRequest, KnockAcceptedEvent, KnockRejectedEvent, KnockRoomRequest, KnockerLeftEvent, LiveTranscriptionStartedEvent, LiveTranscriptionStoppedEvent, MaxViewerLimitReachedError, Metric, NewClientEvent, OrganizationAssistantNotEnabledError, OrganizationAssistantNotFoundError, OrganizationPlanExhaustedError, RemoveSpotlightRequest, RoleName, RoomConcurrencyControlsError, RoomFullError, RoomJoinedErrors, RoomJoinedEvent, RoomJoinedSuccess, RoomKnockedEvent, RoomLockedError, RoomLockedEvent, RoomMeetingTimeExhaustedError, RoomMode, RoomSessionEndedEvent, RtcClientConnectionStatusChangedPayload, RtcEventEmitter, RtcEvents, RtcLocalStreamTrackAddedPayload, RtcLocalStreamTrackRemovedPayload, RtcManager, RtcManagerCreatedPayload, RtcManagerOptions, RtcStreamAddedPayload, ScreenshareStartedEvent, ScreenshareStoppedEvent, SendClientMetadataRequest, SignalClient, SignalEvents, SignalIceCandidateMessage, SignalIceEndOfCandidatesMessage, SignalIceServer, SignalKnocker, SignalMediaServerConfig, SignalRTCSessionDescription, SignalReadyToReceiveOfferMessage, SignalRequests, SignalRoom, SignalSDPMessage, SignalSFUServer, SignalTurnServer, SocketConf, SocketManager, Spotlight, SpotlightAddedEvent, SpotlightRemovedEvent, StatsMonitorOptions, StatsMonitorState, StatsSubscription, TurnTransportProtocol, UpdatedDeviceInfo, UpdatedDevicesInfo, VegaRtcManagerOptions, VideoEnableRequest, VideoEnableRequestedEvent, VideoEnabledEvent, WebRTCProvider };

package/dist/index.d.ts

@@ -1016,14 +1016,25 @@ type RtcEvents = {
     remote_stream_track_added: void;
     remote_stream_track_removed: void;
 };
-type RTCSessionDescription = {
+type SignalRTCSessionDescription = {
     sdp?: string;
     sdpU?: string;
     type: RTCSdpType;
+    isInitialOffer?: boolean;
 };
-type SDPRelayMessage = {
+type SignalSDPMessage = {
+    clientId: string;
+    message: SignalRTCSessionDescription;
+};
+type SignalIceCandidateMessage = {
+    clientId: string;
+    message: RTCIceCandidate;
+};
+type SignalReadyToReceiveOfferMessage = {
+    clientId: string;
+};
+type SignalIceEndOfCandidatesMessage = {
     clientId: string;
-    message: RTCSessionDescription;
 };
 interface WebRTCProvider {
     getMediaConstraints: () => MediaStreamConstraints;
@@ -1138,16 +1149,7 @@ declare function stopStreamTracks(stream: MediaStream, only?: "audio" | "video"
 declare function replaceTracksInStream(stream: MediaStream, newStream: MediaStream, only: "audio" | "video" | false): MediaStreamTrack[];
 declare function getStream(constraintOpt: any, { replaceStream, fallback }?: GetStreamOptions): Promise<GetStreamResult>;
 declare function hasGetDisplayMedia(): boolean;
-declare function getDisplayMedia(constraints?: {
-    video: {
-        width: {
-            max: number;
-        };
-        height: {
-            max: number;
-        };
-    };
-}, contentHint?: string): Promise<MediaStream>;
+declare function getDisplayMedia(constraints?: DisplayMediaStreamOptions, contentHint?: string): Promise<MediaStream>;
 declare function compareLocalDevices(before: MediaDeviceInfo[], after: MediaDeviceInfo[]): any;
 declare function getUpdatedDevices({ oldDevices, newDevices, currentAudioId, currentVideoId, currentSpeakerId, }: {
     oldDevices: MediaDeviceInfo[];
@@ -1205,10 +1207,10 @@ declare class Session {
     addTrack(track: MediaStreamTrack, stream?: MediaStream): void;
     removeTrack(track: MediaStreamTrack): void;
     removeStream(stream: MediaStream): void;
-    _setRemoteDescription(desc: RTCSessionDescription): Promise<void>;
-    handleOffer(offer: RTCSessionDescription): Promise<RTCSessionDescription>;
-    handleAnswer(message: RTCSessionDescription): Promise<void>;
-    addIceCandidate(candidate: any): void;
+    _setRemoteDescription(desc: SignalRTCSessionDescription): Promise<void>;
+    handleOffer(offer: SignalRTCSessionDescription): Promise<SignalRTCSessionDescription>;
+    handleAnswer(message: SignalRTCSessionDescription): Promise<void>;
+    addIceCandidate(candidate: RTCIceCandidate | null): void;
     canModifyPeerConnection(): boolean;
     close(): void;
     hasConnectedPeerConnection(): boolean;
@@ -1223,7 +1225,14 @@ interface CreateSessionOptions {
     initialBandwidth: number;
     isOfferer: boolean;
 }
+interface NegotiatePeerConnectionOptions {
+    clientId: string;
+    session: Session;
+    constraints?: RTCOfferOptions;
+    isInitialOffer?: boolean;
+}
 type P2PAnalytics = {
+    P2POffendingInitialOffer: number;
     P2PNonErrorRejectionValueGUMError: number;
     numNewPc: number;
     numIceConnected: number;
@@ -1340,7 +1349,7 @@ declare class P2pRtcManager implements RtcManager {
     _connect(clientId: string): Session;
     _maybeRestartIce(clientId: string, session: any): void;
     _setCodecPreferences(pc: RTCPeerConnection): Promise<void>;
-    _negotiatePeerConnection(clientId: string, session: Session, constraints?: any): void;
+    _negotiatePeerConnection({ clientId, session, constraints, isInitialOffer, }: NegotiatePeerConnectionOptions): void;
     _withForcedRenegotiation(session: Session, action: any): void;
     _changeBandwidthForAllClients(isJoining: boolean): number;
     _createP2pSession({ clientId, initialBandwidth, isOfferer, }: {
@@ -1918,4 +1927,4 @@ declare const STREAM_TYPES: {
 };
 
 export { ADDITIONAL_SCREEN_SHARE_SETTINGS, AUDIO_SETTINGS, BandwidthTester, CAMERA_STREAM_ID, EVENTS, KNOCK_MESSAGES, KalmanFilter, Logger, MEDIA_JITTER_BUFFER_TARGET, NoDevicesError, P2pRtcManager, PROTOCOL_ERRORS, PROTOCOL_EVENTS, PROTOCOL_REQUESTS, PROTOCOL_RESPONSES, RELAY_MESSAGES, ReconnectManager, RtcEventNames, RtcManagerDispatcher, SCREEN_SHARE_SETTINGS, SCREEN_SHARE_SIMULCAST_SETTINGS, STREAM_TYPES, ServerSocket, Session, SfuV2Parser, TYPES, VIDEO_SETTINGS_HD, VIDEO_SETTINGS_SD, VIDEO_SETTINGS_VP9, VIDEO_SETTINGS_VP9_LOW_BANDWIDTH, VegaConnection, VegaMediaQualityMonitor, VegaRtcManager, addAbsCaptureTimeExtMap, addExtMap, assert, buildDeviceList, calculateStd, captureAudioSsrcMetrics, captureCandidatePairInfoMetrics, captureCommonSsrcMetrics, captureSsrcInfo, captureVideoSsrcMetrics, cleanSdp, compareLocalDevices, createACFCalculator, createMicAnalyser, createWorker, deprioritizeH264, detectMicrophoneNotWorking, enumerate, external_stun_servers, filterMidExtension, filterMsidSemantic, fromLocation, generateByteString, getConstraints, getCurrentPeerConnections, getDeviceData, getDisplayMedia, getIssuesAndMetrics, getMediaConstraints, getMediaSettings, getMediasoupDeviceAsync, getNumFailedStatsReports, getNumFailedTrackSsrcLookups, getNumMissingTrackSsrcLookups, getPeerConnectionIndex, getStats, getStream, getUpdatedDevices, getUpdatedStats, getUserMedia, hasGetDisplayMedia, ipRegex, isMobile, issueDetectorOrMetricEnabled, maybeTurnOnly, modifyMediaCapabilities, removePeerConnection, replaceTracksInStream, _default as rtcManagerEvents, rtcStats, setClientProvider, setCodecPreferenceSDP, setPeerConnectionsForTests, setVideoBandwidthUsingSetParameters, sortCodecs, standardDeviation, startPerformanceMonitor, stopStreamTracks, subscribeIssues, subscribeStats, trackAnnotations, turnServerOverride, variance };
-export type { AddSpotlightRequest, AudioEnableRequest, AudioEnableRequestedEvent, AudioEnabledEvent, BreakoutConfig, BreakoutGroupJoinedEvent, BreakoutSessionUpdatedEvent, CannotJoinUnclaimedRoomError, ChatMessage, ClientKickedEvent, ClientLeftEvent, ClientMetadataPayload, ClientMetadataReceivedEvent, ClientRole, ClientUnableToJoinEvent, CloudRecordingStartedEvent, Codec, Credentials, ForbiddenError, ForbiddenErrorNames, GetConstraintsOptions, GetDeviceDataResult, GetMediaConstraintsOptions, GetStreamOptions, GetStreamResult, GetUpdatedDevicesResult, HostPresenceControlsError, IdentifyDeviceRequest, InternalServerError, InvalidAssistantKeyError, IssuesAndMetricsByView, JoinRoomRequest, KnockAcceptedEvent, KnockRejectedEvent, KnockRoomRequest, KnockerLeftEvent, LiveTranscriptionStartedEvent, LiveTranscriptionStoppedEvent, MaxViewerLimitReachedError, Metric, NewClientEvent, OrganizationAssistantNotEnabledError, OrganizationAssistantNotFoundError, OrganizationPlanExhaustedError, RTCSessionDescription, RemoveSpotlightRequest, RoleName, RoomConcurrencyControlsError, RoomFullError, RoomJoinedErrors, RoomJoinedEvent, RoomJoinedSuccess, RoomKnockedEvent, RoomLockedError, RoomLockedEvent, RoomMeetingTimeExhaustedError, RoomMode, RoomSessionEndedEvent, RtcClientConnectionStatusChangedPayload, RtcEventEmitter, RtcEvents, RtcLocalStreamTrackAddedPayload, RtcLocalStreamTrackRemovedPayload, RtcManager, RtcManagerCreatedPayload, RtcManagerOptions, RtcStreamAddedPayload, SDPRelayMessage, ScreenshareStartedEvent, ScreenshareStoppedEvent, SendClientMetadataRequest, SignalClient, SignalEvents, SignalIceServer, SignalKnocker, SignalMediaServerConfig, SignalRequests, SignalRoom, SignalSFUServer, SignalTurnServer, SocketConf, SocketManager, Spotlight, SpotlightAddedEvent, SpotlightRemovedEvent, StatsMonitorOptions, StatsMonitorState, StatsSubscription, TurnTransportProtocol, UpdatedDeviceInfo, UpdatedDevicesInfo, VegaRtcManagerOptions, VideoEnableRequest, VideoEnableRequestedEvent, VideoEnabledEvent, WebRTCProvider };
+export type { AddSpotlightRequest, AudioEnableRequest, AudioEnableRequestedEvent, AudioEnabledEvent, BreakoutConfig, BreakoutGroupJoinedEvent, BreakoutSessionUpdatedEvent, CannotJoinUnclaimedRoomError, ChatMessage, ClientKickedEvent, ClientLeftEvent, ClientMetadataPayload, ClientMetadataReceivedEvent, ClientRole, ClientUnableToJoinEvent, CloudRecordingStartedEvent, Codec, Credentials, ForbiddenError, ForbiddenErrorNames, GetConstraintsOptions, GetDeviceDataResult, GetMediaConstraintsOptions, GetStreamOptions, GetStreamResult, GetUpdatedDevicesResult, HostPresenceControlsError, IdentifyDeviceRequest, InternalServerError, InvalidAssistantKeyError, IssuesAndMetricsByView, JoinRoomRequest, KnockAcceptedEvent, KnockRejectedEvent, KnockRoomRequest, KnockerLeftEvent, LiveTranscriptionStartedEvent, LiveTranscriptionStoppedEvent, MaxViewerLimitReachedError, Metric, NewClientEvent, OrganizationAssistantNotEnabledError, OrganizationAssistantNotFoundError, OrganizationPlanExhaustedError, RemoveSpotlightRequest, RoleName, RoomConcurrencyControlsError, RoomFullError, RoomJoinedErrors, RoomJoinedEvent, RoomJoinedSuccess, RoomKnockedEvent, RoomLockedError, RoomLockedEvent, RoomMeetingTimeExhaustedError, RoomMode, RoomSessionEndedEvent, RtcClientConnectionStatusChangedPayload, RtcEventEmitter, RtcEvents, RtcLocalStreamTrackAddedPayload, RtcLocalStreamTrackRemovedPayload, RtcManager, RtcManagerCreatedPayload, RtcManagerOptions, RtcStreamAddedPayload, ScreenshareStartedEvent, ScreenshareStoppedEvent, SendClientMetadataRequest, SignalClient, SignalEvents, SignalIceCandidateMessage, SignalIceEndOfCandidatesMessage, SignalIceServer, SignalKnocker, SignalMediaServerConfig, SignalRTCSessionDescription, SignalReadyToReceiveOfferMessage, SignalRequests, SignalRoom, SignalSDPMessage, SignalSFUServer, SignalTurnServer, SocketConf, SocketManager, Spotlight, SpotlightAddedEvent, SpotlightRemovedEvent, StatsMonitorOptions, StatsMonitorState, StatsSubscription, TurnTransportProtocol, UpdatedDeviceInfo, UpdatedDevicesInfo, VegaRtcManagerOptions, VideoEnableRequest, VideoEnableRequestedEvent, VideoEnabledEvent, WebRTCProvider };

package/dist/index.mjs

@@ -2551,6 +2551,7 @@ var _a$2, _b$1;
 const adapter$2 = (_a$2 = adapterRaw.default) !== null && _a$2 !== void 0 ? _a$2 : adapterRaw;
 const logger$6 = new Logger();
 const ICE_PUBLIC_IP_GATHERING_TIMEOUT = 3 * 1000;
+const ICE_RESTART_DELAY = 2 * 1000;
 const browserName$1 = (_b$1 = adapter$2.browserDetails) === null || _b$1 === void 0 ? void 0 : _b$1.browser;
 const browserVersion = adapter$2.browserDetails.version;
 let unloading$1 = false;
@@ -2595,6 +2596,7 @@ class P2pRtcManager {
             mediaserverConfigTtlSeconds,
         });
         this.analytics = {
+            P2POffendingInitialOffer: 0,
             P2PNonErrorRejectionValueGUMError: 0,
             numNewPc: 0,
             numIceConnected: 0,
@@ -2717,6 +2719,7 @@ class P2pRtcManager {
                 this._updateAndScheduleMediaServersRefresh(data);
             }),
             this._serverSocket.on(RELAY_MESSAGES.READY_TO_RECEIVE_OFFER, (data) => {
+                logger$6.info(`got ready_to_receive_offer from ${data.clientId}`);
                 this._connect(data.clientId);
             }),
             this._serverSocket.on(RELAY_MESSAGES.ICE_CANDIDATE, (data) => {
@@ -2728,6 +2731,7 @@ class P2pRtcManager {
                 session.addIceCandidate(data.message);
             }),
             this._serverSocket.on(RELAY_MESSAGES.ICE_END_OF_CANDIDATES, (data) => {
+                logger$6.info(`got end_of_ice_candidates from ${data.clientId}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on ICE_END_OF_CANDIDATES", data);
@@ -2737,6 +2741,7 @@ class P2pRtcManager {
             }),
             this._serverSocket.on(RELAY_MESSAGES.SDP_OFFER, (data) => {
                 var _a, _b;
+                logger$6.info(`got offer from ${data.clientId}, isInitialOffer: ${Boolean(data.message.isInitialOffer)}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on SDP_OFFER", data);
@@ -2746,6 +2751,16 @@ class P2pRtcManager {
                     sdp: data.message.sdp || data.message.sdpU,
                     type: data.message.type,
                 };
+                if ("isInitialOffer" in data.message &&
+                    data.message.isInitialOffer === false &&
+                    session.pc.connectionState === "new" &&
+                    session.pc.iceConnectionState === "new" &&
+                    !session.connectionStatus) {
+                    logger$6.info("We have asked for an initial offer, ignoring all others");
+                    this.analytics.P2POffendingInitialOffer++;
+                    rtcStats.sendEvent("P2POffendingInitialOffer", { clientId: session.clientId });
+                    return;
+                }
                 (_b = (_a = session
                     .handleOffer(sdp)
                     .then((answer) => {
@@ -2759,6 +2774,7 @@ class P2pRtcManager {
             }),
             this._serverSocket.on(RELAY_MESSAGES.SDP_ANSWER, (data) => {
                 var _a, _b;
+                logger$6.info(`got offer from ${data.clientId}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on SDP_ANSWER", data);
@@ -2952,6 +2968,7 @@ class P2pRtcManager {
         };
         pc.oniceconnectionstatechange = () => {
             var _a;
+            logger$6.info(`iceConnectionState changed to ${pc.iceConnectionState} for session ${session.clientId}`);
             let newStatus;
             const currentStatus = session.connectionStatus;
             switch (pc.iceConnectionState) {
@@ -2981,7 +2998,7 @@ class P2pRtcManager {
                         if (pc.iceConnectionState === "disconnected") {
                             this._maybeRestartIce(clientId, session);
                         }
-                    }, 2000);
+                    }, ICE_RESTART_DELAY);
                     break;
                 case "failed":
                     newStatus = TYPES.CONNECTION_FAILED;
@@ -3004,6 +3021,7 @@ class P2pRtcManager {
         };
         pc.onconnectionstatechange = () => {
             var _a;
+            logger$6.info(`connectionState changed to ${pc.connectionState} for session ${session.clientId}`);
             switch (pc.connectionState) {
                 case "connected":
                     setTimeout(() => {
@@ -3184,7 +3202,7 @@ class P2pRtcManager {
             initialBandwidth,
             isOfferer: true,
         });
-        this._negotiatePeerConnection(clientId, session);
+        this._negotiatePeerConnection({ clientId, session, isInitialOffer: true });
         return session;
     }
     _maybeRestartIce(clientId, session) {
@@ -3202,7 +3220,8 @@ class P2pRtcManager {
             session.ipv6HostCandidate6to4Seen = false;
             session.mdnsHostCandidateSeen = false;
             this.analytics.numIceRestart++;
-            this._negotiatePeerConnection(clientId, session, Object.assign({}, this.offerOptions, { iceRestart: true }));
+            const constraints = Object.assign(Object.assign({}, this.offerOptions), { iceRestart: true });
+            this._negotiatePeerConnection({ clientId, session, constraints });
         }
     }
     _setCodecPreferences(pc) {
@@ -3246,7 +3265,7 @@ class P2pRtcManager {
             }
         });
     }
-    _negotiatePeerConnection(clientId, session, constraints) {
+    _negotiatePeerConnection({ clientId, session, constraints, isInitialOffer = false, }) {
         if (!session) {
             logger$6.warn("No RTCPeerConnection in negotiatePeerConnection()", clientId);
             return;
@@ -3254,7 +3273,7 @@ class P2pRtcManager {
         const pc = session.pc;
         if (!session.canModifyPeerConnection()) {
             session.pending.push(() => {
-                this._negotiatePeerConnection(clientId, session, constraints);
+                this._negotiatePeerConnection({ clientId, session, constraints, isInitialOffer });
             });
             return;
         }
@@ -3290,6 +3309,7 @@ class P2pRtcManager {
                     sdp: offer.sdp,
                     sdpU: offer.sdp,
                     type: offer.type,
+                    isInitialOffer,
                 };
                 this._emitServerEvent(RELAY_MESSAGES.SDP_OFFER, {
                     receiverId: clientId,
@@ -3306,7 +3326,7 @@ class P2pRtcManager {
         const originalOnnegotationneeded = pc.onnegotiationneeded;
         pc.onnegotiationneeded = null;
         action();
-        this._negotiatePeerConnection(session.clientId, session);
+        this._negotiatePeerConnection({ clientId: session.clientId, session });
         setTimeout(() => (pc.onnegotiationneeded = originalOnnegotationneeded), 0);
     }
     _changeBandwidthForAllClients(isJoining) {
@@ -3456,7 +3476,7 @@ class P2pRtcManager {
             if (pc.iceConnectionState === "new" || !session.connectionStatus) {
                 return;
             }
-            this._negotiatePeerConnection(clientId, session);
+            this._negotiatePeerConnection({ clientId, session });
         };
         return session;
     }

package/dist/legacy-esm.js

@@ -2551,6 +2551,7 @@ var _a$2, _b$1;
 const adapter$2 = (_a$2 = adapterRaw.default) !== null && _a$2 !== void 0 ? _a$2 : adapterRaw;
 const logger$6 = new Logger();
 const ICE_PUBLIC_IP_GATHERING_TIMEOUT = 3 * 1000;
+const ICE_RESTART_DELAY = 2 * 1000;
 const browserName$1 = (_b$1 = adapter$2.browserDetails) === null || _b$1 === void 0 ? void 0 : _b$1.browser;
 const browserVersion = adapter$2.browserDetails.version;
 let unloading$1 = false;
@@ -2595,6 +2596,7 @@ class P2pRtcManager {
             mediaserverConfigTtlSeconds,
         });
         this.analytics = {
+            P2POffendingInitialOffer: 0,
             P2PNonErrorRejectionValueGUMError: 0,
             numNewPc: 0,
             numIceConnected: 0,
@@ -2717,6 +2719,7 @@ class P2pRtcManager {
                 this._updateAndScheduleMediaServersRefresh(data);
             }),
             this._serverSocket.on(RELAY_MESSAGES.READY_TO_RECEIVE_OFFER, (data) => {
+                logger$6.info(`got ready_to_receive_offer from ${data.clientId}`);
                 this._connect(data.clientId);
             }),
             this._serverSocket.on(RELAY_MESSAGES.ICE_CANDIDATE, (data) => {
@@ -2728,6 +2731,7 @@ class P2pRtcManager {
                 session.addIceCandidate(data.message);
             }),
             this._serverSocket.on(RELAY_MESSAGES.ICE_END_OF_CANDIDATES, (data) => {
+                logger$6.info(`got end_of_ice_candidates from ${data.clientId}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on ICE_END_OF_CANDIDATES", data);
@@ -2737,6 +2741,7 @@ class P2pRtcManager {
             }),
             this._serverSocket.on(RELAY_MESSAGES.SDP_OFFER, (data) => {
                 var _a, _b;
+                logger$6.info(`got offer from ${data.clientId}, isInitialOffer: ${Boolean(data.message.isInitialOffer)}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on SDP_OFFER", data);
@@ -2746,6 +2751,16 @@ class P2pRtcManager {
                     sdp: data.message.sdp || data.message.sdpU,
                     type: data.message.type,
                 };
+                if ("isInitialOffer" in data.message &&
+                    data.message.isInitialOffer === false &&
+                    session.pc.connectionState === "new" &&
+                    session.pc.iceConnectionState === "new" &&
+                    !session.connectionStatus) {
+                    logger$6.info("We have asked for an initial offer, ignoring all others");
+                    this.analytics.P2POffendingInitialOffer++;
+                    rtcStats.sendEvent("P2POffendingInitialOffer", { clientId: session.clientId });
+                    return;
+                }
                 (_b = (_a = session
                     .handleOffer(sdp)
                     .then((answer) => {
@@ -2759,6 +2774,7 @@ class P2pRtcManager {
             }),
             this._serverSocket.on(RELAY_MESSAGES.SDP_ANSWER, (data) => {
                 var _a, _b;
+                logger$6.info(`got offer from ${data.clientId}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on SDP_ANSWER", data);
@@ -2952,6 +2968,7 @@ class P2pRtcManager {
         };
         pc.oniceconnectionstatechange = () => {
             var _a;
+            logger$6.info(`iceConnectionState changed to ${pc.iceConnectionState} for session ${session.clientId}`);
             let newStatus;
             const currentStatus = session.connectionStatus;
             switch (pc.iceConnectionState) {
@@ -2981,7 +2998,7 @@ class P2pRtcManager {
                         if (pc.iceConnectionState === "disconnected") {
                             this._maybeRestartIce(clientId, session);
                         }
-                    }, 2000);
+                    }, ICE_RESTART_DELAY);
                     break;
                 case "failed":
                     newStatus = TYPES.CONNECTION_FAILED;
@@ -3004,6 +3021,7 @@ class P2pRtcManager {
         };
         pc.onconnectionstatechange = () => {
             var _a;
+            logger$6.info(`connectionState changed to ${pc.connectionState} for session ${session.clientId}`);
             switch (pc.connectionState) {
                 case "connected":
                     setTimeout(() => {
@@ -3184,7 +3202,7 @@ class P2pRtcManager {
             initialBandwidth,
             isOfferer: true,
         });
-        this._negotiatePeerConnection(clientId, session);
+        this._negotiatePeerConnection({ clientId, session, isInitialOffer: true });
         return session;
     }
     _maybeRestartIce(clientId, session) {
@@ -3202,7 +3220,8 @@ class P2pRtcManager {
             session.ipv6HostCandidate6to4Seen = false;
             session.mdnsHostCandidateSeen = false;
             this.analytics.numIceRestart++;
-            this._negotiatePeerConnection(clientId, session, Object.assign({}, this.offerOptions, { iceRestart: true }));
+            const constraints = Object.assign(Object.assign({}, this.offerOptions), { iceRestart: true });
+            this._negotiatePeerConnection({ clientId, session, constraints });
         }
     }
     _setCodecPreferences(pc) {
@@ -3246,7 +3265,7 @@ class P2pRtcManager {
             }
         });
     }
-    _negotiatePeerConnection(clientId, session, constraints) {
+    _negotiatePeerConnection({ clientId, session, constraints, isInitialOffer = false, }) {
         if (!session) {
             logger$6.warn("No RTCPeerConnection in negotiatePeerConnection()", clientId);
             return;
@@ -3254,7 +3273,7 @@ class P2pRtcManager {
         const pc = session.pc;
         if (!session.canModifyPeerConnection()) {
             session.pending.push(() => {
-                this._negotiatePeerConnection(clientId, session, constraints);
+                this._negotiatePeerConnection({ clientId, session, constraints, isInitialOffer });
             });
             return;
         }
@@ -3290,6 +3309,7 @@ class P2pRtcManager {
                     sdp: offer.sdp,
                     sdpU: offer.sdp,
                     type: offer.type,
+                    isInitialOffer,
                 };
                 this._emitServerEvent(RELAY_MESSAGES.SDP_OFFER, {
                     receiverId: clientId,
@@ -3306,7 +3326,7 @@ class P2pRtcManager {
         const originalOnnegotationneeded = pc.onnegotiationneeded;
         pc.onnegotiationneeded = null;
         action();
-        this._negotiatePeerConnection(session.clientId, session);
+        this._negotiatePeerConnection({ clientId: session.clientId, session });
         setTimeout(() => (pc.onnegotiationneeded = originalOnnegotationneeded), 0);
     }
     _changeBandwidthForAllClients(isJoining) {
@@ -3456,7 +3476,7 @@ class P2pRtcManager {
             if (pc.iceConnectionState === "new" || !session.connectionStatus) {
                 return;
             }
-            this._negotiatePeerConnection(clientId, session);
+            this._negotiatePeerConnection({ clientId, session });
         };
         return session;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@whereby.com/media",
   "description": "Media library for Whereby",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "license": "MIT",
   "homepage": "https://github.com/whereby/sdk",
   "repository": {