@reactoo/watchtogether-sdk-js 2.6.44 → 2.6.46

package/example/index.html

@@ -285,7 +285,7 @@
                 });
 
                 session.$on('error', (e) => {
-                	console.log(e);
+                	console.error(e);
                     if(e && e.type === 'error') {
                         session.disconnect().catch(e => console.log(e));
                     }

package/package.json

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

package/src/modules/wt-room.js

@@ -203,8 +203,8 @@ class RoomSession {
 		this._maxRetries = 5;
 		this._keepAliveId = null;
 		this._participants = [];
-		this._talkIntercomGroups = [];
-		this._listenIntercomGroups = [];
+		this._talkIntercomGroups = ['all'];
+		this._listenIntercomGroups = ['all'];
 		this._roomType = 'watchparty';
 		this._isDataChannelOpen = false;
 		this._abortController = null;
@@ -380,7 +380,7 @@ class RoomSession {
 					messageTimeoutId = setTimeout(() => {
 						this.ws.removeEventListener('message', parseResponse);
 						this._abortController.signal.removeEventListener('abort', abortResponse);
-						reject({type: 'error', id: 3, message: 'send timeout', data: requestData});
+						reject({type: 'warning', id: 3, message: 'send timeout', data: requestData});
 					}, 10000);
 
 					this._abortController.signal.addEventListener('abort', abortResponse);
@@ -556,6 +556,7 @@ class RoomSession {
 											"room": this.roomId,
 											"ptype": "subscriber",
 											"private_id": this.privateId,
+											//TODO: check which groups we want to subscribe to
 											streams: streams.filter(s => !s.disabled).map(stream => ({feed: stream.id, mid: stream.mid})),
 											//"feed": id,
 											...(this.webrtcVersion > 1000 ? {id: this.userId} : {}),
@@ -590,15 +591,17 @@ class RoomSession {
 							let handle = this._getHandle(null, id);
 							if(handle) {
 
-								//description: 'camera0'
+								//TODO: check which groups we want to subscribe to
 								const _sfn = (stream) => {
 									if(stream.type === 'data') {
 										return true;
 									}
+									// if stream.description is not set, we assume it's a data stream, and we shouldn't get here at all
+									const source = stream.description ? JSON.parse(stream.description)?.source : undefined;
 									if(!this.options?.restrictSources?.length) {
 										return true
 									}
-									else if(this.options?.restrictSources?.includes(stream.description)) {
+									else if(this.options?.restrictSources?.includes(source)) {
 										return true;
 									}
 									return false;
@@ -627,6 +630,7 @@ class RoomSession {
 												"room": this.roomId,
 												"ptype": "subscriber",
 												"private_id": this.privateId,
+												//TODO: check which groups we want to subscribe to
 												streams: streams.filter(s => !s.disabled).map(stream => ({feed: stream.id, mid: stream.mid})),
 												...(this.webrtcVersion > 1000 ? {id: this.userId} : {}),
 												pin: this.pin
@@ -941,7 +945,6 @@ class RoomSession {
 					dtmfSender: null,
 					trickle: true,
 					iceDone: false,
-					isIceRestarting: false
 				}
 			};
 			this._participants.push(handle);
@@ -986,12 +989,15 @@ class RoomSession {
 			if(tItem.active === false) {
 				return;
 			}
-			if(!config.streamMap[tItem.feed_description]) {
-				config.streamMap[tItem.feed_description] = [];
+
+			const source = JSON.parse(tItem.feed_description)?.source;
+
+			if(!config.streamMap[source]) {
+				config.streamMap[source] = [];
 			}
 			let trackId = config.pc.getTransceivers().find(t => t.mid === tItem.mid).receiver.track.id;
 			if(trackId) {
-				config.streamMap[tItem.feed_description].push(trackId);
+				config.streamMap[source].push(trackId);
 			}
 		})
 	}
@@ -1397,9 +1403,9 @@ class RoomSession {
 			};
 
 			config.pc.onconnectionstatechange = () => {
-				//TODO: check if this isnt fired prematurely when we switch internet connection
 				if (config.pc.connectionState === 'failed') {
 					this._log('connectionState failed');
+					this._iceRestart(handleId);
 				}
 				this.emit('connectionState', [handleId, handleId === this.handleId, config.pc.connectionState]);
 				if(handleId !== this.handleId && config.pc.connectionState === 'connected') {
@@ -1694,14 +1700,8 @@ class RoomSession {
 		}
 		var config = handle.webrtcStuff;
 
-		// Already restarting;
-		if (config.isIceRestarting) {
-			return;
-		}
-
 		if (this.handleId === handleId) {
 			this._log('Performing local ICE restart');
-			config.isIceRestarting = true;
 			let hasAudio = !!(config.stream && config.stream.getAudioTracks().length > 0);
 			let hasVideo = !!(config.stream && config.stream.getVideoTracks().length > 0);
 			this._createAO('offer', handleId, true )
@@ -1715,23 +1715,17 @@ class RoomSession {
 					});
 				})
 				.then(r => {
-					config.isIceRestarting = false;
 					this._log('ICE restart success');
 				})
 				.catch((e) => {
-					config.isIceRestarting = false;
 					this.emit('error', {type: 'warning', id: 28, message: 'iceRestart failed', data: e});
 				});
 		} else {
 			this._log('Performing remote ICE restart', handleId);
-			config.isIceRestarting = true;
 			return this.sendMessage(handleId, {
 				body: {"request": "configure", "restart": true}
 			}).then(() => {
-				config.isIceRestarting = false;
-			}).catch(() => {
-				config.isIceRestarting = false;
-			});
+			}).catch(() => {});
 		}
 
 	}
@@ -2269,7 +2263,7 @@ class RoomSession {
 					config.streamMap[source].forEach(trackId => {
 						let t = transceivers.find(transceiver => transceiver.sender.track && transceiver.sender.track.id === trackId)
 						if(t) {
-							descriptions.push({mid: t.mid, description: source});
+							descriptions.push({mid: t.mid, description: JSON.stringify({source, intercomGroups: this._talkIntercomGroups})});
 						}
 					})
 				});
@@ -2424,16 +2418,11 @@ class RoomSession {
 	}
 
 
-	setTalkIntercomGroups(groups = []) {
+	setTalkIntercomGroups(groups = ['all']) {
 		this._talkIntercomGroups = structuredClone(groups);
 		let handle = this._getHandle(this.handleId);
 		if (!handle) {
-			return Promise.reject({
-				type: 'warning',
-				id: 21,
-				message: 'no local id, connect before publishing',
-				data: null
-			})
+			return Promise.resolve();
 		}
 		let config = handle.webrtcStuff;
 		let transceivers = config.pc.getTransceivers();
@@ -2446,8 +2435,6 @@ class RoomSession {
 				}
 			})
 		});
-		//TODO: under development
-		return Promise.resolve();
 		return this.sendMessage(this.handleId, {
 			body: {
 				"request": "configure",
@@ -2456,7 +2443,7 @@ class RoomSession {
 		})
 	}
 
-	setListenIntercomGroups(groups = []) {
+	setListenIntercomGroups(groups = ['all']) {
 		this._listenIntercomGroups = groups;
 	}