@reactoo/watchtogether-sdk-js 2.8.0-beta.3 → 2.8.0-beta.4

package/package.json

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

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

@@ -406,6 +406,13 @@ class RoomSession {
 		}
 	}
 
+	#hasAttendeeInCache(id) {
+		if(this.#subscriberHandle) {
+			return !!this.#subscriberHandle.webrtcStuff.userIdToDisplay[id];
+		}
+		return false
+	}
+
 	#getCachedAttendeeIds() {
 		return Object.keys(this.#subscriberHandle?.webrtcStuff?.userIdToDisplay || {});
 	}
@@ -448,7 +455,7 @@ class RoomSession {
 		});
 	}
 
-	#emitRemoteFeedUpdate(mid, {feedRemoval = false, addingTrack = false, removingTrack = false, track = null, source = null, attendee = null} = {}) {
+	#emitRemoteFeedUpdate(mid, {forceEmit = false,feedRemoval = false, addingTrack = false, removingTrack = false, track = null, source = null, attendee = null} = {}) {
 
 		const transceiverData = this.#getTransceiverDataByMid(mid);
 
@@ -462,7 +469,7 @@ class RoomSession {
 				description = JSON.parse(transceiverData.feed_description);
 			} catch (e) {}
 
-			if(!this.#shouldEmitFeedUpdate(parsedDisplay)) {
+			if(!this.#shouldEmitFeedUpdate(parsedDisplay) && !forceEmit && !removingTrack) {
 				this._log('Not emitting feed update for', display, 'because of subscription rules');
 				// we don't want to emit this event
 				return;
@@ -513,7 +520,8 @@ class RoomSession {
 			const display = this.#getDisplayById(id);
 			const parsedDisplay = decodeJanusDisplay(display);
 
-			if(!this.#shouldEmitFeedUpdate(parsedDisplay)) {
+			// we sometimes need to force emit, or emit when we unsubscribed and we're removing tracks
+			if(!this.#shouldEmitFeedUpdate(parsedDisplay, id) && !forceEmit && !removingTrack) {
 				this._log('Not emitting feed update for', display, 'because of subscription rules');
 				// we don't want to emit this event
 				return;
@@ -654,6 +662,7 @@ class RoomSession {
 			const subscribe = [];
 			const unsubscribe = [];
 			const flatSourceMap = [];
+			const forceEmitFeedRemoval = []
 
 			for (let index in publishers) {
 				if(publishers[index]["dummy"])
@@ -692,6 +701,10 @@ class RoomSession {
 						if(isSubscribed) {
 							unsubscribe.push({feed: id, mid: mid});
 							this.#removeFromSubscribeMap(id, mid);
+							// we need to get rid of feed if we we're subscribed to it
+							if(forceEmitFeedRemoval.indexOf(id) === -1) {
+								forceEmitFeedRemoval.push(id);
+							}
 						}
 						continue;
 					}
@@ -703,6 +716,9 @@ class RoomSession {
 				}
 			}
 
+			// we need to get rid of feed if we we're subscribed to it
+			forceEmitFeedRemoval.forEach(id => this.#emitRemoteFeedUpdate(null, {feedRemoval: true, forceEmit: true, attendee: {id:id}}))
+
 			// check if we're subscribed to any mid that is no longer available in sources
 
 			Object.keys(subscribedTo).forEach(id => {