@reactoo/watchtogether-sdk-js 2.8.61 → 2.8.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.8.61",
+  "version": "2.8.63",
   "description": "Javascript SDK for Reactoo",
   "main": "dist/watchtogether-sdk.min.js",
   "module": "dist/watchtogether-sdk.min.js",

package/src/models/asset.js

@@ -41,9 +41,9 @@ let asset =  function() {
             return this.__privates.auth.__client
                 .then(client => client.apis.asset.deleteAsset({id}))
         },
-		modifyAsset: ({id, operation, segments} = {}) => {
+		modifyAsset: ({id, operation, segments, disposition} = {}) => {
 			return this.__privates.auth.__client
-				.then(client => client.apis.asset.modifyAsset({id}, {requestBody: {operation, segments}}))
+				.then(client => client.apis.asset.modifyAsset({id}, {requestBody: {operation, segments, disposition}}))
 		},
 
 		initiateAssetUpload: (id = null) => {

package/src/modules/wt-room-sfu.js

@@ -442,7 +442,7 @@ class RoomSession {
 	}
 
 	#getDisplayById(id) {
-		return this.#subscriberHandle.webrtcStuff.userIdToDisplay[id];
+		return this.#subscriberHandle?.webrtcStuff?.userIdToDisplay?.[id];
 	}
 
 	#emitLocalFeedUpdate({feedRemoval = false, addingTrack = false, removingTrack = false, track = null, source = null, mid = null} = {}) {
@@ -1050,7 +1050,7 @@ class RoomSession {
 			let cleanup = () => {
 				clearTimeout(messageTimeoutId);
 				this._abortController?.signal?.removeEventListener('abort', abortResponse);
-				this.ws.removeEventListener('message', parseResponse);
+				this.ws?.removeEventListener('message', parseResponse);
 			};
 
 			let abortResponse = () => {
@@ -1261,13 +1261,17 @@ class RoomSession {
 				this.#connectionClosed();
 			});
 
-		this._keepAliveId = setTimeout(() => {
-			this.#startKeepAlive();
-		}, this._keepAlivePeriod);
+		if(!this._keepAliveId) {
+			this._keepAliveId = setTimeout(() => {
+				this._keepAliveId = null;
+				this.#startKeepAlive();
+			}, this._keepAlivePeriod);
+		}
 	}
 
 	#stopKeepAlive() {
 		clearTimeout(this._keepAliveId);
+		this._keepAliveId = null;
 	}
 
 	#handleWsEvents(event, skipPoll = false) {
@@ -1344,7 +1348,7 @@ class RoomSession {
 			//none universal
 		} else if (type === 'timeout') {
 			this._log('WebSockets Gateway timeout', json);
-			this.ws.close(3504, "Gateway timeout");
+			this.ws?.close?.(3504, "Gateway timeout");
 		} else if (type === 'success' || type === 'error') {
 			// we're capturing those elsewhere
 		} else {
@@ -3093,16 +3097,33 @@ class RoomSession {
 		let replaceAudio = stream?.getAudioTracks()?.length;
 		let replaceVideo = stream?.getVideoTracks()?.length;
 
-		for(const transceiver of transceivers) {
-			if(['sendonly', 'sendrecv'].includes(transceiver.currentDirection) && transceiver.sender?.track?.kind === 'audio' && existingTracks.includes(transceiver.sender?.track?.id)) {
-				audioTransceiver = transceiver;
-			}
-			else if(['sendonly', 'sendrecv'].includes(transceiver.currentDirection) && transceiver.sender?.track?.kind === 'video' && existingTracks.includes(transceiver.sender?.track?.id)) {
-				videoTransceiver = transceiver;
+
+		for (const transceiver of transceivers) {
+
+			const kind = transceiver.receiver.track.kind;
+			const isActive = ['sendonly', 'sendrecv'].includes(transceiver.currentDirection);
+
+			// Check if the current transceiver's ID is the one we are replacing/resuming
+			const isMyTrack = existingTracks.includes(transceiver.sender?.track?.id);
+			// Check if the slot is currently active but sending nothing (i.e., replaceTrack(null) was called)
+			const isEmptySlot = transceiver.sender.track === null;
+
+
+			// 1. Audio Transceiver (Check Active or Empty Slot)
+			if (isActive && kind === 'audio') {
+				// If it's already my track OR if it is an empty slot that belonged to an existing source
+				if (isMyTrack || (isEmptySlot && replaceAudio && !audioTransceiver)) {
+					audioTransceiver = transceiver;
+				}
 			}
 
-			// Reusing existing transceivers
-			// TODO: if we start using different codecs for different sources, we need to check for that here
+			// 2. Video Transceiver (Check Active or Empty Slot)
+			else if (isActive && kind === 'video') {
+				// If it's already my track OR if it is an empty slot that belonged to an existing source
+				if (isMyTrack || (isEmptySlot && replaceVideo && !videoTransceiver)) {
+					videoTransceiver = transceiver;
+				}
+			}
 
 			else if(transceiver.currentDirection === 'inactive' && transceiver.sender?.getParameters()?.codecs?.find(c => c.mimeType.indexOf('audio') > -1) && replaceAudio && !audioTransceiver) {
 				audioTransceiver = transceiver;
@@ -3112,6 +3133,7 @@ class RoomSession {
 			}
 		}
 
+
 		if (replaceAudio) {
 			config.stream.addTrack(stream.getAudioTracks()[0]);
 			config.tracks.push(stream.getAudioTracks()[0]);