@reactoo/watchtogether-sdk-js 2.6.28 → 2.6.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.6.28",
+  "version": "2.6.30",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",

package/src/modules/wt-room.js

@@ -854,7 +854,6 @@ class RoomSession {
 					// Do nothing
 				}
 
-				handle.webrtcStuff.clearTrackRemovedListener?.();
 				handle.webrtcStuff.stream.onremovetrack = null;
 				handle.webrtcStuff.stream = null;
 
@@ -890,7 +889,6 @@ class RoomSession {
 					dtmfSender: null,
 					trickle: true,
 					iceDone: false,
-					clearTrackRemovedListener: null,
 				};
 
 				if (handleId === this.handleId) {
@@ -2041,7 +2039,6 @@ class RoomSession {
 				this._log(e);
 			}
 			config.stream.removeTrack(oldAudioStream);
-			config.stream.dispatchEvent(new CustomEvent("trackremoved", {detail: {track: oldAudioStream, source}}))
 		}
 
 		// remove old video track related to this source
@@ -2053,7 +2050,6 @@ class RoomSession {
 				this._log(e);
 			}
 			config.stream.removeTrack(oldVideoStream);
-			config.stream.dispatchEvent(new CustomEvent("trackremoved", {detail: {track: oldVideoStream, source}}))
 		}
 
 		let audioTrackReplacePromise = Promise.resolve();
@@ -2157,7 +2153,6 @@ class RoomSession {
 		this.isVideoEnabled = !!(config.stream && config.stream.getVideoTracks().length > 0);
 
 		// we possibly created new transceivers, so we need to get them again
-
 		transceivers = config.pc.getTransceivers();
 		existingTracks = [...(config.streamMap[source] || [])];
 		if(!audioTransceiver) {
@@ -2171,44 +2166,32 @@ class RoomSession {
 		let hasVideo = !!(stream && stream.getVideoTracks().length > 0);
 		this._setupTransceivers(this.handleId, [hasAudio, false, hasVideo, false, audioTransceiver, videoTransceiver]);
 
-
 		const emitEvents = () => {
 			this.isPublished = true;
 
 			if(!config.stream.onremovetrack) {
 				config.stream.onremovetrack = (ev) => {};
-
-				let trackremoved = (ev) => {
-
-					config.streamMap[ev.detail.source] = config.streamMap[ev.detail.source].filter(id => id !== ev.detail.track.id);
-					if(config.streamMap[ev.detail.source].length === 0) {
-						delete config.streamMap[ev.detail.source];
-					}
-
-					this.emit('addLocalParticipant', {
-						tid: generateUUID(),
-						id: handle.handleId,
-						constructId: this.constructId,
-						userId: decodeJanusDisplay(handle.userId)?.userId,
-						role: decodeJanusDisplay(this.display)?.role,
-						track: ev.detail.track,
-						stream: config.stream,
-						streamMap: structuredClone(config.streamMap),
-						source: ev.detail.source,
-						adding: false,
-						removing: true,
-						hasAudioTrack: hasAudio,
-						hasVideoTrack: hasVideo,
-					});
-				}
-
-				config.stream.addEventListener('trackremoved', trackremoved);
-				config.clearTrackRemovedListener = () => {
-					config.stream.removeEventListener('trackremoved', trackremoved);
-				}
 			}
 
+			let republishTimeoutId = null;
 			let tracks = config.stream.getTracks();
+
+			this.emit('addLocalParticipant', {
+				tid: generateUUID(),
+				id: handle.handleId,
+				userId: decodeJanusDisplay(handle.userId)?.userId,
+				role: decodeJanusDisplay(this.display)?.role,
+				stream: tracks.length ? config.stream : null, // that null is there due to backward compatibility
+				track: null,
+				streamMap: structuredClone(config.streamMap),
+				source,
+				adding: false,
+				removing: false,
+				constructId: this.constructId,
+				hasAudioTrack: hasAudio,
+				hasVideoTrack: hasVideo
+			});
+
 			if(tracks.length) {
 				tracks.forEach(track => {
 					// used as a flag to not emit tracks that been already emitted
@@ -2224,6 +2207,7 @@ class RoomSession {
 							streamMap: structuredClone(config.streamMap),
 							source,
 							adding: true,
+							removing: false,
 							constructId: this.constructId,
 							hasAudioTrack: hasAudio,
 							hasVideoTrack: hasVideo
@@ -2231,29 +2215,16 @@ class RoomSession {
 
 						track.onended = (ev) => {
 							config.stream.removeTrack(track);
-							config.stream.dispatchEvent(new CustomEvent("trackremoved", {detail: {track, source}}))
-							this._republishOnTrackEnded(source);
+							clearTimeout(republishTimeoutId);
+							republishTimeoutId = setTimeout(() => {
+								this._republishOnTrackEnded(source);
+							}, 100);
+
 						}
 					}
 				})
 			}
 
-			else {
-				this.emit('addLocalParticipant', {
-					tid: generateUUID(),
-					id: handle.handleId,
-					userId: decodeJanusDisplay(handle.userId)?.userId,
-					role: decodeJanusDisplay(this.display)?.role,
-					stream: null,
-					streamMap: structuredClone(config.streamMap),
-					source,
-					adding: false,
-					constructId: this.constructId,
-					hasAudioTrack: hasAudio,
-					hasVideoTrack: hasVideo
-				});
-			}
-
 			this.isMuted = [];
 			for(const source of Object.keys(config.streamMap)) {
 				const audioTrack = config.stream?.getAudioTracks()?.find(track => config.streamMap[source].includes(track.id));
@@ -2374,7 +2345,7 @@ class RoomSession {
 			return Promise.reject({type: 'error', id: 21, message: 'no local id, connect first', data: null})
 		}
 		let config = handle.webrtcStuff;
-		let transceivers = config.pc.getTransceivers().filter(t => t.currentDirection !== 'inactive');
+		let transceivers = config.pc.getTransceivers()?.filter(t => t.currentDirection !== 'inactive');
 		let transceiver = null;
 		if(source) {
 			transceiver = transceivers
@@ -2408,7 +2379,7 @@ class RoomSession {
 			return Promise.reject({type: 'error', id: 21, message: 'no local id, connect first', data: null})
 		}
 		let config = handle.webrtcStuff;
-		let transceivers = config.pc.getTransceivers().filter(t => t.currentDirection !== 'inactive');
+		let transceivers = config.pc.getTransceivers()?.filter(t => t.currentDirection !== 'inactive');
 		let transceiver = null;
 		if(source) {
 			transceiver = transceivers