@reactoo/watchtogether-sdk-js 2.7.1 → 2.7.2

package/example/index.html

@@ -175,8 +175,8 @@
 
         let Instance = WatchTogetherSDK({debug:true})({instanceType:'reactooDemo'});
 
-        Instance.auth.$on('login', () => {
-            console.log('We are in');
+        Instance.auth.$on('login', (r) => {
+            console.log('We are in', r);
         });
 
         Instance.iot.$on('connect', () => {

package/package.json

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

package/src/modules/wt-room.js

@@ -223,7 +223,7 @@ class RoomSession {
 		this._maxRetries = 5;
 		this._keepAliveId = null;
 		this._participants = [];
-		this._subscribeToUserIds = []; // all if empty
+		this._restrictSubscribeToUserIds = []; // all if empty
 		this._talkIntercomChannels = ['participants'];
 		this._listenIntercomChannels = ['participants'];
 		this._roomType = 'watchparty';
@@ -264,7 +264,7 @@ class RoomSession {
 		let localUserRole = myUser?.role || 'participant';
 		let remoteUserRole = remoteUser?.role || 'participant';
 		return this.userRoleSubscriptionRules[localUserRole][(this._roomType || 'watchparty')].indexOf(remoteUserRole) > -1
-			&& (this._subscribeToUserIds.length === 0 || this._subscribeToUserIds.indexOf(remoteUser?.userId) > -1);
+			&& (this._restrictSubscribeToUserIds.length === 0 || this._restrictSubscribeToUserIds.indexOf(remoteUser?.userId) > -1);
 	}
 
 	_intercomSubscribe = (stream) => {
@@ -602,11 +602,8 @@ class RoomSession {
 							streams[i]["display"] = userId;
 						}
 						this._log('Remote userId: ', userId);
-
 						this._pushToRemoteUsersCache(userId, streams, id);
-
 						if (this._participantShouldSubscribe(userId)) {
-
 							this._log('Creating user: ', userId);
 							this._createParticipant(userId, id)
 								.then(handle => {
@@ -3180,7 +3177,9 @@ class RoomSession {
 
 	setRestrictSubscribeToUserIds(userIds = []) {
 		this._restrictSubscribeToUserIds = structuredClone(userIds);
-
+		if(!this.isConnected) {
+			return Promise.resolve(this._restrictSubscribeToUserIds);
+		}
 		// sanity check by getting listparticipants and comparing it to _remoteUsersCache
 		this.sendMessage(this.handleId, {body: {request: 'listparticipants', room: this.roomId}})
 			.then(r => {
@@ -3193,25 +3192,49 @@ class RoomSession {
 
 				// get rid of participants that are in participants but not in remoteUsersCache
 				remoteUsersCache = remoteUsersCache.filter(r => participants.find(p => p.id === r.id));
-
 				remoteUsersCache.forEach(r => {
-					if(this._participantShouldSubscribe(r.id)) {
-						// if(this._getHandle(null, id)) {
-						//
-						// }
-					}
-					else {
+					const handle = this._getHandle(null, null, decodeJanusDisplay(r.userId)?.userId);
 
-					}
-				})
+					if(this._participantShouldSubscribe(r.userId)) {
+						// todo: do a nicer flag to indicate inactive handle than just checking for pc
+						if(!handle || !handle.webrtcStuff?.pc) {
+							this._log('Subscribing to ', r.userId)
+							this._createParticipant(r.userId, r.id)
+								.then(handle => {
+									this._updateParticipantsTrackData(handle.handleId, r.streams);
+									const subscribe = r.streams.filter(s => !s.disabled && this._intercomSubscribe(s)).map(stream => ({feed: stream.id, mid: stream.mid}));
+									handle.webrtcStuff.subscribeMap = structuredClone(subscribe);
+									return this.sendMessage(handle.handleId, {
+										body: {
+											"request": "join",
+											"room": this.roomId,
+											"ptype": "subscriber",
+											"private_id": this.privateId,
+											streams: subscribe,
+											//"feed": id,
+											...(this.webrtcVersion > 1000 ? {id: this.userId} : {}),
+											pin: this.pin
+										}
+									})
+								})
+								.catch(err => {
+									this.emit('error', err);
+								})
 
+						}
 
-				console.log(participants, remoteUsersCache);
+						else {
+							this._log('Already subscribed to ', r.userId);
+						}
 
+					} else if(handle) {
+						this._log('Unsubscribing from ', r.userId)
+						this._removeParticipant(handle.handleId);
+					}
+				})
 			});
 
 
-		return this._restrictSubscribeToUserIds;
 	}