@reactoo/watchtogether-sdk-js 2.8.39 → 2.8.41

package/package.json

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

package/src/models/room-session.js

@@ -63,7 +63,7 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 
 	room.on('error', (e) => {
 		if(e?.type === 'error') {
-			___.disconnect(true);
+			___.disconnect();
 		}
 	});
 
@@ -152,10 +152,10 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 				})
 		},
 
-		disconnect: function (dontWaitForResponses) {
+		disconnect: function () {
 			clearTimeout(alpTimeoutId);
 			abortController?.abort?.();
-			return room.disconnect(dontWaitForResponses);
+			return room.disconnect();
 		},
 
 		//TODO: refactor restart method

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

@@ -253,7 +253,6 @@ class RoomSession {
 		this.simulcastSettings = null;
 		this.useWebsockets = null;
 
-
 		this.defaultSimulcastSettings = {
 			"default" : {
 				mode: "controlled", // controlled, manual, browserControlled
@@ -662,7 +661,11 @@ class RoomSession {
 
 	async #updateSubscriptions() {
 
-		// no subscriber handle, we create one and subscribe to relevant participants
+
+		// added sanity check
+		await this.#availablePublishersSanityCheck();
+
+		// no subscription yet, we create one and subscribe to relevant participants
 
 		if(!this.#subscriberJoinPromise) {
 			await this.#joinAsSubscriber(this.roomId,  this.pin, this.userId);
@@ -818,6 +821,43 @@ class RoomSession {
 		}
 	}
 
+	async #availablePublishersSanityCheck() {
+		const list = await this.sendMessage(this.handleId, {body: {request: 'listparticipants', room: this.roomId}})
+		const participants = list.participants || [];
+		const availablePublishers = [...(this.#subscriberHandle?.webrtcStuff?.availablePublishers ?? [])];
+
+		availablePublishers.forEach(publisher => {
+
+			const checkedParticipant = participants.find(p => p.id === publisher.id);
+			if(!checkedParticipant) {
+				// this publisher is not in the list, we need to remove it
+				this._log('Sanity check - Removing publisher', publisher.id, 'from availablePublishers');
+				this.#updateAvailablePublishersTrackData([], publisher.id);
+				this.#emitRemoteFeedUpdate(null, {feedRemoval: true, attendee: {id: publisher.id}});
+				this.#removeAttendeeFromCache(publisher.id);
+				this.emit('error', {
+					type: 'warning',
+					id: 50,
+					message: 'sanity check - removing publisher from availablePublishers',
+					data: publisher.id
+				});
+			}
+			else if(checkedParticipant.publisher === false) {
+				// this publisher is not in the list, we need to remove it
+				this._log('Sanity check - Removing publisher', publisher.id, 'from availablePublishers');
+				this.#updateAvailablePublishersTrackData([], publisher.id);
+				this.#emitRemoteFeedUpdate(null, {feedRemoval: true, attendee: {id: publisher.id}});
+				this.emit('error', {
+					type: 'warning',
+					id: 51,
+					message: 'sanity check - removing publisher from availablePublishers',
+					data: publisher.id
+				});
+			}
+
+		});
+	}
+
 	#getTransceiverDataByMid(mid) {
 		return this.#subscriberHandle.webrtcStuff.transceiverMap.find(t => t.mid === mid);
 	}
@@ -2098,21 +2138,38 @@ class RoomSession {
 			})
 		}
 
-		await this.#destroyHandle(this.#publisherHandle?.handleId, false);
-		await this.#destroyHandle(this.#subscriberHandle?.handleId, false);
-		
+		try {
+			await this.#destroyHandle(this.#publisherHandle?.handleId, false);
+		} catch (e) {
+			this._log('Error destroying publisher handle:', e);
+		}
+
+		try {
+			await this.#destroyHandle(this.#subscriberHandle?.handleId, false);
+		} catch (e) {
+			this._log('Error destroying subscriber handle:', e);
+		}
+
 		this.#wipeListeners();
 
 		if(!this.useWebsockets) {
 
 			if(this.token) {
-				await this.#send({"janus": "destroy"}, true);
+				try {
+					await this.#send({"janus": "destroy"}, true);
+				} catch (e) {
+					this._log('Error sending destroy message:', e);
+				}
 			}
 		}
 
 		else if (this.ws && this.ws.readyState === 1) {
-			await this.#send({"janus": "destroy"}, true);
-			this.ws.close();
+			try {
+				await this.#send({"janus": "destroy"}, true);
+				this.ws.close();
+			} catch (e) {
+				this._log('Error in websocket cleanup:', e);
+			}
 		}
 
 		this.#subscriberJoinPromise = null;