@whereby.com/media 3.1.1 → 5.0.0

package/dist/index.cjs

@@ -2231,10 +2231,6 @@ class Session {
         });
         this.wasEverConnected = false;
         this.connectionStatus = null;
-        this.stats = {
-            totalSent: 0,
-            totalRecv: 0,
-        };
         this.bandwidth = bandwidth || 0;
         this.pending = [];
         this.isOperationPending = false;
@@ -2244,25 +2240,18 @@ class Session {
         this.afterConnected = new Promise((resolve) => {
             this.registerConnected = resolve;
         });
-        this.offerOptions = { offerToReceiveAudio: true, offerToReceiveVideo: true };
         this._deprioritizeH264Encoding = deprioritizeH264Encoding;
         this._incrementAnalyticMetric = incrementAnalyticMetric;
     }
     addStream(stream) {
         this.streamIds.push(stream.id);
         this.streams.push(stream);
-        if (RTCPeerConnection.prototype.addTrack) {
-            stream.getAudioTracks().forEach((track) => {
-                this.pc.addTrack(track, stream);
-            });
-            stream.getVideoTracks().forEach((track) => {
-                this.pc.addTrack(track, stream);
-            });
-        }
-        else {
-            rtcStats.sendEvent("P2PNoAddTrackSupport", {});
-            this.pc.addStream(stream);
-        }
+        stream.getAudioTracks().forEach((track) => {
+            this.pc.addTrack(track, stream);
+        });
+        stream.getVideoTracks().forEach((track) => {
+            this.pc.addTrack(track, stream);
+        });
     }
     addTrack(track, stream) {
         if (!stream) {
@@ -2288,17 +2277,12 @@ class Session {
         if (streamIndex !== -1) {
             this.streams.splice(streamIndex, 1);
         }
-        if (this.pc.removeTrack) {
-            stream.getTracks().forEach((track) => {
-                const sender = this.pc.getSenders().find((sender) => sender.track === track);
-                if (sender) {
-                    this.pc.removeTrack(sender);
-                }
-            });
-        }
-        else if (this.pc.removeStream) {
-            this.pc.removeStream(stream);
-        }
+        stream.getTracks().forEach((track) => {
+            const sender = this.pc.getSenders().find((sender) => sender.track === track);
+            if (sender) {
+                this.pc.removeTrack(sender);
+            }
+        });
     }
     _setRemoteDescription(desc) {
         if (this._deprioritizeH264Encoding)
@@ -2397,12 +2381,6 @@ class Session {
         return __awaiter(this, void 0, void 0, function* () {
             logger$7.info("replacetrack() [oldTrackId: %s, newTrackId: %s]", oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.id, newTrack.id);
             if (newTrack.readyState === "ended") {
-                rtcStats.sendEvent("P2PReplaceTrackNewTrackEnded", {
-                    newTrackId: newTrack.id,
-                    newTrackKind: newTrack.kind,
-                    newTrackIsEffect: trackAnnotations(newTrack).isEffectTrack,
-                });
-                this._incrementAnalyticMetric("P2PReplaceTrackNewTrackEnded");
                 throw new Error(`refusing to replace track trackId: ${newTrack.id} kind: ${newTrack.kind} with readyState: ${newTrack.readyState}`);
             }
             const pc = this.pc;
@@ -2417,20 +2395,6 @@ class Session {
                 return (track === null || track === void 0 ? void 0 : track.kind) === newTrack.kind && !trackAnnotations(track).fromGetDisplayMedia;
             });
             if (sender) {
-                this._incrementAnalyticMetric("P2PReplaceTrackOldTrackNotFound");
-                const track = sender.track;
-                rtcStats.sendEvent("P2PReplaceTrackOldTrackNotFound", {
-                    targetTrackId: track === null || track === void 0 ? void 0 : track.id,
-                    targetTrackKind: track === null || track === void 0 ? void 0 : track.kind,
-                    targetTrackIsEffect: track && trackAnnotations(track).isEffectTrack,
-                    targetTrackReadyState: track === null || track === void 0 ? void 0 : track.readyState,
-                    newTrackId: newTrack.id,
-                    newTrackKind: newTrack.kind,
-                    newTrackIsEffect: trackAnnotations(newTrack).isEffectTrack,
-                    oldTrackId: oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.id,
-                    oldTrackKind: oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.kind,
-                    oldTrackIsEffect: oldTrack && trackAnnotations(oldTrack).isEffectTrack,
-                });
                 return yield sender.replaceTrack(newTrack);
             }
             let stream = this.streams.find((s) => s.getTracks().find((t) => t.id === newTrack.id));
@@ -2451,15 +2415,6 @@ class Session {
                 this._incrementAnalyticMetric("P2PReplaceTrackNoStream");
                 throw new Error("replaceTrack: No stream?");
             }
-            rtcStats.sendEvent("P2PReplaceTrackSourceKindNotFound", {
-                oldTrackId: oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.id,
-                oldTrackKind: oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.kind,
-                oldTrackIsEffect: oldTrack && trackAnnotations(oldTrack).isEffectTrack,
-                newTrackId: newTrack.id,
-                newTrackKind: newTrack.kind,
-                newTrackIsEffect: trackAnnotations(newTrack).isEffectTrack,
-            });
-            this._incrementAnalyticMetric("P2PReplaceTrackSourceKindNotFound");
             pc.addTrack(newTrack, stream);
         });
     }
@@ -2562,12 +2517,6 @@ var rtcManagerEvents = {
     DOMINANT_SPEAKER: "dominant_speaker",
 };
 
-const CAMERA_STREAM_ID = "0";
-const STREAM_TYPES = {
-    webcam: "webcam",
-    screenshare: "screenshare",
-};
-
 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();
@@ -2588,8 +2537,6 @@ class P2pRtcManager {
         this._roomName = name;
         this._roomSessionId = session && session.id;
         this.peerConnections = {};
-        this.localStreams = {};
-        this.enabledLocalStreamIds = [];
         this._screenshareVideoTrackIds = [];
         this._socketListenerDeregisterFunctions = [];
         this._localStreamDeregisterFunction = null;
@@ -2599,7 +2546,6 @@ class P2pRtcManager {
         this._features = features || {};
         this._isAudioOnlyMode = false;
         this._closed = false;
-        this.skipEmittingServerMessageCount = 0;
         this.offerOptions = { offerToReceiveAudio: true, offerToReceiveVideo: true };
         this._audioTrackOnEnded = () => {
             rtcStats.sendEvent("audio_ended", { unloading: unloading$1 });
@@ -2634,13 +2580,8 @@ class P2pRtcManager {
             numPcOnAnswerFailure: 0,
             numPcOnOfferFailure: 0,
             P2PChangeBandwidthEmptySDPType: 0,
-            P2PSessionAlreadyCreated: 0,
             P2PReplaceTrackNoStream: 0,
-            P2PReplaceTrackNewTrackEnded: 0,
             P2PReplaceTrackNewTrackNotInStream: 0,
-            P2PReplaceTrackOldTrackNotFound: 0,
-            P2PReplaceTrackWithoutPC: 0,
-            P2PReplaceTrackSourceKindNotFound: 0,
             P2POnTrackNoStream: 0,
             P2PSetCodecPreferenceError: 0,
             P2PCreateOfferNoSDP: 0,
@@ -2648,6 +2589,7 @@ class P2pRtcManager {
             P2PMicNotWorking: 0,
             P2PLocalNetworkFailed: 0,
             P2PRelayedIceCandidate: 0,
+            P2PStartScreenshareNoStream: 0,
         };
     }
     numberOfPeerconnections() {
@@ -2656,52 +2598,64 @@ class P2pRtcManager {
     isInitializedWith({ selfId, roomName, isSfu }) {
         return this._selfId === selfId && this._roomName === roomName && !isSfu;
     }
-    addNewStream(streamId, stream, audioPaused, videoPaused, beforeEffectTracks = []) {
-        if (stream === this.localStreams[streamId]) {
+    addCameraStream(stream, { beforeEffectTracks = [] } = { beforeEffectTracks: [] }) {
+        logger$6.info("addCameraStream: [stream.id: %s]", stream.id);
+        if (stream === this._localCameraStream) {
             return;
         }
-        this._addLocalStream(streamId, stream);
-        if (streamId === CAMERA_STREAM_ID) {
-            this._addStreamToPeerConnections(stream);
-            const audioTrack = stream.getAudioTracks()[0];
-            const videoTrack = stream.getVideoTracks()[0];
-            if (audioTrack) {
-                if (!trackAnnotations(audioTrack).isEffectTrack) {
-                    this._monitorAudioTrack(audioTrack);
-                }
-                const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "audio");
-                if (beforeEffectTrack) {
-                    this._monitorAudioTrack(beforeEffectTrack);
-                }
+        this._localCameraStream = stream;
+        this._addStreamToPeerConnections(stream);
+        const videoTrack = stream.getVideoTracks()[0];
+        const audioTrack = stream.getAudioTracks()[0];
+        if (audioTrack) {
+            if (!trackAnnotations(audioTrack).isEffectTrack) {
+                this._monitorAudioTrack(audioTrack);
             }
-            if (videoTrack) {
-                if (!trackAnnotations(videoTrack).isEffectTrack) {
-                    this._monitorVideoTrack(videoTrack);
-                }
-                const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "video");
-                if (beforeEffectTrack) {
-                    this._monitorVideoTrack(beforeEffectTrack);
-                }
+            const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "audio");
+            if (beforeEffectTrack) {
+                this._monitorAudioTrack(beforeEffectTrack);
             }
-            if (this._localStreamDeregisterFunction) {
-                this._localStreamDeregisterFunction();
-                this._localStreamDeregisterFunction = null;
+        }
+        if (videoTrack) {
+            if (!trackAnnotations(videoTrack).isEffectTrack) {
+                this._monitorVideoTrack(videoTrack);
             }
-            const localStreamHandler = (e) => {
-                const { enable, track } = e.detail;
-                this._handleStopOrResumeVideo({ enable, track });
-            };
-            stream.addEventListener("stopresumevideo", localStreamHandler);
-            this._localStreamDeregisterFunction = () => {
-                stream.removeEventListener("stopresumevideo", localStreamHandler);
-            };
+            const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "video");
+            if (beforeEffectTrack) {
+                this._monitorVideoTrack(beforeEffectTrack);
+            }
+        }
+        this._enableStopResumeVideoForBrowserSDK(stream);
+    }
+    _enableStopResumeVideoForBrowserSDK(stream) {
+        if (this._localStreamDeregisterFunction) {
+            this._localStreamDeregisterFunction();
+            this._localStreamDeregisterFunction = null;
+        }
+        const localStreamHandler = (e) => {
+            const { enable, track } = e.detail;
+            this._handleStopOrResumeVideo({ enable, track });
+        };
+        stream.addEventListener("stopresumevideo", localStreamHandler);
+        this._localStreamDeregisterFunction = () => {
+            stream.removeEventListener("stopresumevideo", localStreamHandler);
+        };
+    }
+    addScreenshareStream(stream) {
+        logger$6.info("addScreenshareStream() [stream.id: %s]", stream.id);
+        if (stream === this._localScreenshareStream) {
             return;
         }
+        this._localScreenshareStream = stream;
         this._screenshareVideoTrackIds.push(stream.getVideoTracks()[0].id);
-        this._shareScreen(streamId, stream);
-        return;
+        this._emitServerEvent(PROTOCOL_REQUESTS.START_SCREENSHARE, {
+            streamId: stream.id,
+            hasAudioTrack: !!stream.getAudioTracks().length,
+        });
+        this._addStreamToPeerConnections(stream);
     }
     replaceTrack(oldTrack, newTrack) {
+        logger$6.info("replaceTrack() [kind: %s, oldTrackId: %s, newTrackId: %s]", newTrack.kind, oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.id, newTrack.id);
         if (newTrack.kind === "audio" && !trackAnnotations(newTrack).isEffectTrack) {
             this._monitorAudioTrack(newTrack);
         }
@@ -2715,6 +2669,7 @@ class P2pRtcManager {
         this.disconnectAll();
     }
     disconnectAll() {
+        logger$6.info("disconnectAll()");
         Object.keys(this.peerConnections).forEach((peerConnectionId) => {
             this.disconnect(peerConnectionId);
         });
@@ -2740,10 +2695,11 @@ 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}`);
+                logger$6.info(`Got ready_to_receive_offer from client ${data.clientId}`);
                 this._connect(data.clientId);
             }),
             this._serverSocket.on(RELAY_MESSAGES.ICE_CANDIDATE, (data) => {
+                logger$6.info(`Got ice_candidate from client ${data.clientId}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on ICE_CANDIDATE", data);
@@ -2752,7 +2708,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}`);
+                logger$6.info(`Got end_of_ice_candidates from client ${data.clientId}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on ICE_END_OF_CANDIDATES", data);
@@ -2762,7 +2718,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)}`);
+                logger$6.info(`Got offer from client ${data.clientId}, isInitialOffer: ${Boolean(data.message.isInitialOffer)}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on SDP_OFFER", data);
@@ -2785,6 +2741,7 @@ class P2pRtcManager {
                 (_b = (_a = session
                     .handleOffer(sdp)
                     .then((answer) => {
+                    logger$6.info(`Sending answer to client ${data.clientId}`);
                     this._emitServerEvent(RELAY_MESSAGES.SDP_ANSWER, {
                         receiverId: data.clientId,
                         message: answer,
@@ -2795,7 +2752,7 @@ class P2pRtcManager {
             }),
             this._serverSocket.on(RELAY_MESSAGES.SDP_ANSWER, (data) => {
                 var _a, _b;
-                logger$6.info(`got offer from ${data.clientId}`);
+                logger$6.info(`Got answer from client ${data.clientId}`);
                 const session = this._getSession(data.clientId);
                 if (!session) {
                     logger$6.warn("No RTCPeerConnection on SDP_ANSWER", data);
@@ -2853,11 +2810,12 @@ class P2pRtcManager {
         });
     }
     setRemoteScreenshareVideoTrackIds(remoteScreenshareVideoTrackIds = []) {
-        const localScreenshareStream = this._getFirstLocalNonCameraStream();
-        this._screenshareVideoTrackIds = [
-            ...((localScreenshareStream === null || localScreenshareStream === void 0 ? void 0 : localScreenshareStream.track) ? [localScreenshareStream.track.id] : []),
-            ...remoteScreenshareVideoTrackIds,
-        ];
+        var _a, _b;
+        this._screenshareVideoTrackIds = [...remoteScreenshareVideoTrackIds];
+        const localScreenShareTrack = (_b = (_a = this._localScreenshareStream) === null || _a === void 0 ? void 0 : _a.getVideoTracks()) === null || _b === void 0 ? void 0 : _b[0];
+        if (localScreenShareTrack) {
+            this._screenshareVideoTrackIds.push(localScreenShareTrack.id);
+        }
     }
     setRoomSessionId(roomSessionId) {
         this._roomSessionId = roomSessionId;
@@ -2903,7 +2861,6 @@ class P2pRtcManager {
         }
         if (this._features.awaitJoinRoomFinished && !this._serverSocket.joinRoomFinished) {
             rtcStats.sendEvent("skip_emitting_server_message", { eventName });
-            this.skipEmittingServerMessageCount++;
         }
         else {
             this._serverSocket.emit(eventName, data);
@@ -2912,34 +2869,12 @@ class P2pRtcManager {
     _emit(eventName, data) {
         this._emitter.emit(eventName, data);
     }
-    _addEnabledLocalStreamId(streamId) {
-        this.enabledLocalStreamIds.push(streamId);
-    }
-    _deleteEnabledLocalStreamId(streamId) {
-        const index = this.enabledLocalStreamIds.indexOf(streamId);
-        if (index !== -1) {
-            this.enabledLocalStreamIds.splice(index, 1);
-        }
-    }
     _getSession(peerConnectionId) {
         if (!(peerConnectionId in this.peerConnections)) {
             return null;
         }
         return this.peerConnections[peerConnectionId];
     }
-    _getLocalCameraStream() {
-        return this.localStreams[CAMERA_STREAM_ID];
-    }
-    _getNonLocalCameraStreamIds() {
-        return Object.keys(this.localStreams).filter((streamId) => streamId !== CAMERA_STREAM_ID);
-    }
-    _isScreensharingLocally() {
-        return this._getNonLocalCameraStreamIds().length > 0;
-    }
-    _getFirstLocalNonCameraStream() {
-        const streamIds = this._getNonLocalCameraStreamIds();
-        return streamIds.length === 0 ? null : this.localStreams[streamIds[0]];
-    }
     _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId }) {
         if (!peerConnectionId) {
             throw new Error("peerConnectionId is missing");
@@ -3072,29 +3007,34 @@ class P2pRtcManager {
                     break;
             }
         };
-        const localCameraStream = this.localStreams[CAMERA_STREAM_ID];
-        if (localCameraStream) {
-            session.addStream(localCameraStream);
+        if (this._localCameraStream) {
+            session.addStream(this._localCameraStream);
         }
-        Object.keys(this.localStreams).forEach((id) => {
-            if (id === CAMERA_STREAM_ID) {
-                return;
-            }
-            const screenshareStream = this.localStreams[id];
+        if (this._localScreenshareStream) {
             if (isOfferer) {
-                session.addStream(screenshareStream);
+                session.addStream(this._localScreenshareStream);
             }
             else {
                 session.afterConnected.then(() => {
+                    if (!this._localScreenshareStream)
+                        return;
                     this._emitServerEvent(PROTOCOL_REQUESTS.START_SCREENSHARE, {
                         receiverId: session.clientId,
-                        streamId: screenshareStream.id,
-                        hasAudioTrack: !!screenshareStream.getAudioTracks().length,
+                        streamId: this._localScreenshareStream.id,
+                        hasAudioTrack: !!this._localScreenshareStream.getAudioTracks().length,
+                    });
+                    this._withForcedRenegotiation(session, () => {
+                        if (this._localScreenshareStream) {
+                            session.addStream(this._localScreenshareStream);
+                        }
+                        else {
+                            this.analytics.P2PStartScreenshareNoStream++;
+                            rtcStats.sendEvent("P2PStartScreenshareNoStream", {});
+                        }
                     });
-                    this._withForcedRenegotiation(session, () => session.addStream(screenshareStream));
                 });
             }
-        });
+        }
         return session;
     }
     _cleanup(peerConnectionId) {
@@ -3128,11 +3068,6 @@ class P2pRtcManager {
                 if (session.pc.connectionState === "closed")
                     return;
                 logger$6.info("Session doesn't have a connected PeerConnection, adding pending action!");
-                this.analytics.P2PReplaceTrackWithoutPC++;
-                rtcStats.sendEvent("P2PReplaceTrackWithoutPC", {
-                    connectionState: session.pc.connectionState,
-                    iceConnectionState: session.pc.iceConnectionState,
-                });
                 const promise = new Promise((resolve, reject) => {
                     const action = () => __awaiter(this, void 0, void 0, function* () {
                         try {
@@ -3164,14 +3099,6 @@ class P2pRtcManager {
             this._withForcedRenegotiation(session, () => session.removeTrack(track));
         });
     }
-    _addLocalStream(streamId, stream) {
-        this._addEnabledLocalStreamId(streamId);
-        this.localStreams[streamId] = stream;
-    }
-    _removeLocalStream(streamId) {
-        delete this.localStreams[streamId];
-        this._deleteEnabledLocalStreamId(streamId);
-    }
     _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, mediaserverConfigTtlSeconds, }) {
         this._iceServers = iceServers;
         this._turnServers = turnServers;
@@ -3332,6 +3259,7 @@ class P2pRtcManager {
                     type: offer.type,
                     isInitialOffer,
                 };
+                logger$6.info(`sending offer to client ${clientId}`);
                 this._emitServerEvent(RELAY_MESSAGES.SDP_OFFER, {
                     receiverId: clientId,
                     message,
@@ -3381,6 +3309,7 @@ class P2pRtcManager {
         return bandwidth;
     }
     _createP2pSession({ clientId, initialBandwidth, isOfferer = false, }) {
+        var _a, _b;
         const session = this._createSession({
             peerConnectionId: clientId,
             clientId,
@@ -3391,9 +3320,8 @@ class P2pRtcManager {
         if (this._features.increaseIncomingMediaBufferOn) {
             this._setJitterBufferTarget(pc);
         }
-        const localCameraStream = this.localStreams[CAMERA_STREAM_ID];
-        if (localCameraStream && !localCameraStream.getVideoTracks().length && this._stoppedVideoTrack) {
-            pc.addTrack(this._stoppedVideoTrack, localCameraStream);
+        if (((_b = (_a = this._localCameraStream) === null || _a === void 0 ? void 0 : _a.getVideoTracks()) === null || _b === void 0 ? void 0 : _b.length) && this._stoppedVideoTrack) {
+            pc.addTrack(this._stoppedVideoTrack, this._localCameraStream);
         }
         pc.onicegatheringstatechange = (event) => {
             const connection = event.target;
@@ -3497,11 +3425,13 @@ class P2pRtcManager {
             if (pc.iceConnectionState === "new" || !session.connectionStatus) {
                 return;
             }
+            logger$6.info(`onnegotiationneeded client ${clientId}`);
             this._negotiatePeerConnection({ clientId, session });
         };
         return session;
     }
     acceptNewStream({ streamId, clientId }) {
+        logger$6.info("acceptNewStream() [streamId: %s}, clientId: %s]", streamId, clientId);
         let session = this._getSession(clientId);
         if (session && streamId !== clientId) {
             return session;
@@ -3524,6 +3454,7 @@ class P2pRtcManager {
         return session;
     }
     disconnect(clientId) {
+        logger$6.info("disconnect() [clientId: %s]", clientId);
         this._cleanup(clientId);
         this._changeBandwidthForAllClients(false);
         const numPeers = this.numberOfPeerconnections();
@@ -3555,6 +3486,7 @@ class P2pRtcManager {
     }
     stopOrResumeVideo(localStream, enable) {
         var _a;
+        logger$6.info("stopOrResumeVideo() [enable: %s]", enable);
         if (!["chrome", "safari"].includes(browserName$1)) {
             return;
         }
@@ -3603,19 +3535,11 @@ class P2pRtcManager {
             }
         }
     }
-    _shareScreen(streamId, stream) {
-        this._emitServerEvent(PROTOCOL_REQUESTS.START_SCREENSHARE, {
-            streamId,
-            hasAudioTrack: !!stream.getAudioTracks().length,
-        });
-        this._wasScreenSharing = true;
-        this._addStreamToPeerConnections(stream);
-    }
-    removeStream(streamId, stream, requestedByClientId) {
-        this._removeLocalStream(streamId);
+    removeScreenshareStream(stream, { requestedByClientId } = {}) {
+        logger$6.info("removeScreenshareStream() [stream.id: %s, requestedByClientId: %s]", stream.id, requestedByClientId);
         this._removeStreamFromPeerConnections(stream);
-        this._wasScreenSharing = false;
-        this._emitServerEvent(PROTOCOL_REQUESTS.STOP_SCREENSHARE, { streamId, requestedByClientId });
+        this._emitServerEvent(PROTOCOL_REQUESTS.STOP_SCREENSHARE, { streamId: stream.id, requestedByClientId });
+        delete this._localScreenshareStream;
     }
     hasClient(clientId) {
         return Object.keys(this.peerConnections).includes(clientId);
@@ -4447,6 +4371,12 @@ function createVegaConnectionManager(config) {
     return { connect, updateHostList, networkIsUp, networkIsPossiblyDown };
 }
 
+const CAMERA_STREAM_ID = "0";
+const STREAM_TYPES = {
+    webcam: "webcam",
+    screenshare: "screenshare",
+};
+
 var _a$1;
 const adapter$1 = (_a$1 = adapterRaw.default) !== null && _a$1 !== void 0 ? _a$1 : adapterRaw;
 const logger$2 = new Logger();
@@ -5390,7 +5320,7 @@ class VegaRtcManager {
             (_a = this._vegaConnection) === null || _a === void 0 ? void 0 : _a.message("eventClaim", { eventClaim });
         }
     }
-    replaceTrack(oldTrack, track) {
+    replaceTrack(_, track) {
         if (track.kind === "audio") {
             if (!trackAnnotations(track).isEffectTrack) {
                 this._monitorAudioTrack(track);
@@ -5406,8 +5336,8 @@ class VegaRtcManager {
             this._replaceWebcamTrack();
         }
     }
-    removeStream(streamId, _stream, requestedByClientId) {
-        logger$2.info("removeStream() [streamId:%s, requestedByClientId:%s]", streamId, requestedByClientId);
+    removeScreenshareStream(stream, { requestedByClientId } = { requestedByClientId: undefined }) {
+        logger$2.info("removeScreenshareStream() [streamId:%s, requestedByClientId:%s]", stream.id, requestedByClientId);
         this._emitToSignal(PROTOCOL_REQUESTS.STOP_SCREENSHARE, {
             streamId: OUTBOUND_SCREEN_OUTBOUND_STREAM_ID,
             requestedByClientId,
@@ -5424,57 +5354,58 @@ class VegaRtcManager {
         (_b = (_a = this._micAnalyserDebugger) === null || _a === void 0 ? void 0 : _a.onScoreUpdated) === null || _b === void 0 ? void 0 : _b.call(_a, data);
         this._sendMicScore(this._micPaused ? 0 : data.out);
     }
-    addNewStream(streamId, stream, audioPaused, videoPaused, beforeEffectTracks = []) {
-        if (streamId === CAMERA_STREAM_ID) {
-            this._micPaused = audioPaused;
-            this._webcamPaused = videoPaused;
-            const videoTrack = stream.getVideoTracks()[0];
-            const audioTrack = stream.getAudioTracks()[0];
-            if (videoTrack) {
-                this._sendWebcam(videoTrack);
-                if (!trackAnnotations(videoTrack).isEffectTrack) {
-                    this._monitorVideoTrack(videoTrack);
-                }
-                const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "video");
-                if (beforeEffectTrack) {
-                    this._monitorVideoTrack(beforeEffectTrack);
-                }
+    addCameraStream(stream, { audioPaused, videoPaused, beforeEffectTracks = [] } = { beforeEffectTracks: [] }) {
+        this._micPaused = audioPaused;
+        this._webcamPaused = videoPaused;
+        const videoTrack = stream.getVideoTracks()[0];
+        const audioTrack = stream.getAudioTracks()[0];
+        if (videoTrack) {
+            this._sendWebcam(videoTrack);
+            if (!trackAnnotations(videoTrack).isEffectTrack) {
+                this._monitorVideoTrack(videoTrack);
             }
-            if (audioTrack) {
-                this._sendMic(audioTrack);
-                this._syncMicAnalyser();
-                if (!trackAnnotations(audioTrack).isEffectTrack) {
-                    this._monitorAudioTrack(audioTrack);
-                }
-                const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "audio");
-                if (beforeEffectTrack) {
-                    this._monitorAudioTrack(beforeEffectTrack);
-                }
+            const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "video");
+            if (beforeEffectTrack) {
+                this._monitorVideoTrack(beforeEffectTrack);
             }
-            if (this._localStreamDeregisterFunction) {
-                this._localStreamDeregisterFunction();
-                this._localStreamDeregisterFunction = null;
+        }
+        if (audioTrack) {
+            this._sendMic(audioTrack);
+            this._syncMicAnalyser();
+            if (!trackAnnotations(audioTrack).isEffectTrack) {
+                this._monitorAudioTrack(audioTrack);
+            }
+            const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "audio");
+            if (beforeEffectTrack) {
+                this._monitorAudioTrack(beforeEffectTrack);
             }
-            const localStreamHandler = (e) => {
-                const { enable, track } = e.detail;
-                this._webcamPaused = !enable;
-                this._pauseResumeWebcam();
-                this._handleStopOrResumeVideo({ enable, track });
-            };
-            stream.addEventListener("stopresumevideo", localStreamHandler);
-            this._localStreamDeregisterFunction = () => {
-                stream.removeEventListener("stopresumevideo", localStreamHandler);
-            };
         }
-        else {
-            const videoTrack = stream.getVideoTracks()[0];
-            const audioTrack = stream.getAudioTracks()[0];
-            if (videoTrack)
-                this._sendScreenVideo(videoTrack);
-            if (audioTrack)
-                this._sendScreenAudio(audioTrack);
-            this._emitScreenshareStarted();
+        this._enableStopResumeVideoForBrowserSDK(stream);
+    }
+    _enableStopResumeVideoForBrowserSDK(stream) {
+        if (this._localStreamDeregisterFunction) {
+            this._localStreamDeregisterFunction();
+            this._localStreamDeregisterFunction = null;
         }
+        const localStreamHandler = (e) => {
+            const { enable, track } = e.detail;
+            this._webcamPaused = !enable;
+            this._pauseResumeWebcam();
+            this._handleStopOrResumeVideo({ enable, track });
+        };
+        stream.addEventListener("stopresumevideo", localStreamHandler);
+        this._localStreamDeregisterFunction = () => {
+            stream.removeEventListener("stopresumevideo", localStreamHandler);
+        };
+    }
+    addScreenshareStream(stream) {
+        const videoTrack = stream.getVideoTracks()[0];
+        const audioTrack = stream.getAudioTracks()[0];
+        if (videoTrack)
+            this._sendScreenVideo(videoTrack);
+        if (audioTrack)
+            this._sendScreenAudio(audioTrack);
+        this._emitScreenshareStarted();
     }
     _syncMicAnalyser() {
         if (this._micTrack && this._colocation && !this._micAnalyser) {