@reactoo/watchtogether-sdk-js 2.8.43 → 2.8.44

package/package.json

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

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

@@ -956,12 +956,14 @@ class RoomSession {
 			if(label === null) {
 				Object.keys(this.#publisherHandle.webrtcStuff.dataChannel).forEach((key) => {
 					const channel = this.#publisherHandle.webrtcStuff.dataChannel[key];
-					channel.send(JSON.stringify(data));
+					if(channel && channel.readyState === 'open') {
+						channel.send(JSON.stringify(data));
+					}
 				})
 			}
 			else {
 				const channel = this.#publisherHandle.webrtcStuff.dataChannel[label];
-				if(channel) {
+				if(channel && channel.readyState === 'open') {
 					channel.send(JSON.stringify(data));
 				}
 			}
@@ -1437,8 +1439,8 @@ class RoomSession {
 							.catch((e) => {
 								this._log(e);
 							});
-						this.#emitRemoteFeedUpdate(null, {feedRemoval: true, attendee: {id:leaving}});
-						this.#removeAttendeeFromCache(leaving);
+						this.#emitRemoteFeedUpdate(null, {feedRemoval: true, attendee: {id:kicked}});
+						this.#removeAttendeeFromCache(kicked);
 					}
 
 					if(joining) {
@@ -1614,7 +1616,7 @@ class RoomSession {
 					transceiverMap: [], // got from msg["streams"]
 					streamMap: {}, // id to sources to mids?
 					availablePublishers: [],
-					subscribeMap: [], // subscribed to [id][mid]
+					subscribeMap: {}, // subscribed to [id][mid]
 					stats: {},
 					currentLayers : new Map(),
 					qualityHistory : new Map(),
@@ -1725,7 +1727,7 @@ class RoomSession {
 			transceiverMap: [], // got from msg["streams"]
 			streamMap: {}, // id to sources to mids?
 			availablePublishers: [],
-			subscribeMap: [], // subscribed to [id][mid]
+			subscribeMap: {}, // subscribed to [id][mid]
 			stats: {},
 			currentLayers : new Map(),
 			qualityHistory : new Map(),
@@ -1912,6 +1914,7 @@ class RoomSession {
 			};
 
 			this.ws.onerror = (e) => {
+				this.isEstablishingConnection = false
 				this._abortController.signal.removeEventListener('abort', abortConnect);
 				reject({type: 'error', id: 18, message: 'ws connection error', data: e});
 			}
@@ -2357,6 +2360,10 @@ class RoomSession {
 					this._log('onconnectionstatechange: connectionState === failed');
 					this.#iceRestart(handleId);
 				}
+				if (config.pc.connectionState === 'disconnected') {
+					this._log('onconnectionstatechange: connectionState === disconnected');
+					// TODO: keyframe request?
+				}
 				this.emit('connectionState', [handleId, handleId === this.#publisherHandle?.handleId, config.pc.connectionState]);
 			};
 			
@@ -2365,6 +2372,10 @@ class RoomSession {
 					this._log('oniceconnectionstatechange: iceConnectionState === failed');
 					this.#iceRestart(handleId);
 				}
+				if (config.pc.connectionState === 'disconnected') {
+					this._log('oniceconnectionstatechange: connectionState === disconnected');
+					// TODO: keyframe request?
+				}
 				this.emit('iceState', [handleId, handleId === this.#publisherHandle?.handleId, config.pc.iceConnectionState]);
 			};
 
@@ -2421,9 +2432,9 @@ class RoomSession {
 
 							let mid = transceiver?.mid || ev.track.id;
 
-							// transceiver may not exist already
-							if(mid === ev.target.id && config.mids?.[event.track.id]) {
-								mid = config.mids[event.track.id];
+							// Use the removed track’s id, not the outer ontrack event’s
+							if (mid === ev.track.id && config.mids?.[ev.track.id]) {
+								mid = config.mids[ev.track.id];
 							}
 
 							this.#emitRemoteFeedUpdate(mid, {
@@ -3200,6 +3211,8 @@ class RoomSession {
 		}
 		catch(e) {
 			this.emit('publishing', false);
+			this.emit('error', e);
+			throw e;
 		}