@reactoo/watchtogether-sdk-js 2.8.56 → 2.8.58

package/example/index.html

@@ -584,6 +584,14 @@
             Instance.room.getSessionByConstructId(constructId).sendMessageViaDataChannel(null, {cicina:true})
         }
 
+		window.audioOnlyOn = function() {
+			Instance.room.getSessionByConstructId(constructId).setRestrictToAudioOnly(true)
+		}
+
+		window.audioOnlyOff = function() {
+			Instance.room.getSessionByConstructId(constructId).setRestrictToAudioOnly(false)
+		}
+
     </script>
 
 </body>

package/package.json

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

package/src/models/iot.js

@@ -275,7 +275,7 @@ let iot = function () {
                     }
 
                     this.__privates.iot.log('Connection check failed:', error);
-					this.iot.$emit('iotConnectionLost');
+					this.iot.$emit('iotConnectionLost', error);
                     return this.iot.__updateCredentials();
                 });
         },

package/src/models/room-session.js

@@ -371,6 +371,10 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 			return room.toggleVideo(value, source);
 		},
 
+		setRestrictToAudioOnly: (value = false) => {
+			return room.setRestrictToAudioOnly(value);
+		},
+
 		setRestrictSubscribeToUserIds: (userIds = []) => {
 			return room.setRestrictSubscribeToUserIds(userIds);
 		},

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

@@ -317,12 +317,14 @@ class RoomSession {
 		this._longPollTimeout = 60000;
 		this._maxev = 10;
 		this._keepAliveId = null;
+		this._isDataChannelOpen = false;
+		this._abortController = null;
+
+		this._restrictToAudioOnly = false;
 		this._restrictSubscribeToUserIds = []; // all if empty
 		this._talkIntercomChannels = ['participants'];
 		this._listenIntercomChannels = ['participants'];
 		this._roomType = 'watchparty';
-		this._isDataChannelOpen = false;
-		this._abortController = null;
 
 		this.userRoleSubscriptionRules = {
 			...RoomSession.userRoleSubscriptionRules,
@@ -330,11 +332,10 @@ class RoomSession {
 		}
 
 		this._log = RoomSession.noop;
+
 		if (this.options.debug) {
 			this.#enableDebug();
 		}
-
-
 	}
 
 	#httpAPICall = function(url, options) {
@@ -718,6 +719,7 @@ class RoomSession {
 				for (let i in streams) {
 					const track = streams[i];
 					const mid = track.mid; // source.mid
+					const type = track.type; // source.type
 					flatSourceMap.push({id: id, mid: mid});
 
 					const isSubscribed = this.#isSubscribedToMid(id, mid);
@@ -730,6 +732,14 @@ class RoomSession {
 						continue;
 					}
 
+					if(type === 'video' && this._restrictToAudioOnly) {
+						if(isSubscribed) {
+							unsubscribe.push({feed: id, mid: mid});
+							this.#removeFromSubscribeMap(id, mid);
+						}
+						continue;
+					}
+
 					if(!this.#shouldSubscribeParticipant(id, userId, description)) {
 						if(isSubscribed) {
 							unsubscribe.push({feed: id, mid: mid});
@@ -1220,6 +1230,7 @@ class RoomSession {
 						this.disconnect().catch(()=>{});
 					}
 				}
+				// we got warning, so just emit it
 				else {
 					this.emit('error', e)
 				}
@@ -1812,10 +1823,15 @@ class RoomSession {
 			for (let i in streams) {
 				const track = streams[i];
 				const mid = track.mid; // source.mid
+				const type = track.type;
 				if(track.disabled) {
 					continue;
 				}
 
+				if(type === 'video' && this._restrictToAudioOnly) {
+					continue;
+				}
+
 				if(!this.#shouldSubscribeParticipant(id, userId, description)) {
 					continue;
 				}
@@ -2294,9 +2310,10 @@ class RoomSession {
 	#webrtc(handleId, enableOntrack = false, enableOnnegotiationneeded = false) {
 
 		let handle = this.#getHandle(handleId);
+
 		if (!handle) {
 			this.emit('error', {
-				type: 'error',
+				type: 'warning',
 				id: 24,
 				message: 'id non-existent',
 				data: [handleId, 'create rtc connection']
@@ -2962,39 +2979,39 @@ class RoomSession {
 	async publishLocal(stream = null, source = 'camera0') {
 
 		if(!this.isConnected || this.isDisconnecting) {
-			return {
+			return Promise.reject({
 				type: 'warning',
 				id: 35,
 				message: 'Either not connected or disconnecting',
-			}
+			})
 		}
 
 		if(stream?.getVideoTracks()?.length > 1) {
-			return {
+			return Promise.reject({
 				type: 'warning',
 				id: 36,
 				message: 'multiple video tracks not supported',
 				data: null
-			}
+			})
 		}
 
 		if(stream?.getAudioTracks()?.length > 1) {
-			return {
+			return Promise.reject({
 				type: 'warning',
 				id: 37,
 				message: 'multiple audio tracks not supported',
 				data: null
-			}
+			})
 		}
 
 		let handle = this.#publisherHandle;
 		if (!handle) {
-			return {
+			return Promise.reject({
 				type: 'error',
 				id: 38,
 				message: 'no local handle, connect before publishing',
 				data: null
-			}
+			})
 		}
 
 		this.emit('publishing', true);
@@ -3008,21 +3025,21 @@ class RoomSession {
 		}
 
 		if(config.stream?.getVideoTracks()?.length > 5) {
-			return {
+			return Promise.reject({
 				type: 'warning',
 				id: 48,
 				message: 'too many video tracks, only 5 supported',
 				data: null
-			}
+			})
 		}
 
 		if(config.stream?.getAudioTracks()?.length > 5) {
-			return {
+			return Promise.reject( {
 				type: 'warning',
 				id: 49,
 				message: 'too many audio tracks, only 5 supported',
 				data: null
-			}
+			})
 		}
 
 		let transceivers = config.pc.getTransceivers();
@@ -3251,7 +3268,7 @@ class RoomSession {
 		catch(e) {
 			this.emit('publishing', false);
 			this.emit('error', e);
-			throw e;
+			return Promise.reject(e);
 		}
 
 
@@ -3489,6 +3506,17 @@ class RoomSession {
 		return await this.#updateSubscriptions();
 	}
 
+	async setRestrictToAudioOnly(value = false) {
+
+		this._restrictToAudioOnly = !!value;
+		if(!this.isConnected) {
+			return
+		}
+
+		return await this.#updateSubscriptions();
+
+	}
+
 	async setRestrictSubscribeToUserIds(userIds = []) {
 
 		if(typeof userIds !== 'object' || !("length" in userIds)) {