@reactoo/watchtogether-sdk-js 2.7.16 → 2.7.18

package/example/index.html

@@ -32,8 +32,8 @@
 
         //https://studio.reactoo.com/room/edf441b3-7415-49c4-9557-273cb93bc746/LJj4W2Cz-nG3U-lb0R-TAaY-o7Thmb8xHSbE
 
-        let roomId = "8cd6d475-629e-4fe7-b89e-ca480940b02e"; // It will create room automatically if not set
-        let pinHash = null//"OayoOVzK-XmWr-BTID-fVwH-eH44Tn3xSWeR";// '967ca05f-7fab-a205-5913-39393bbbe923';
+        let roomId = "c22ada04-6c95-4524-91d8-e915bcef2e61"; // It will create room automatically if not set
+        let pinHash = "OayoOVzK-XmWr-BTID-fVwH-eH44Tn3xSWeR";// '967ca05f-7fab-a205-5913-39393bbbe923';
 
         let participants = document.querySelector('.participants');
         var video = document.querySelector('.contentVideo');
@@ -199,7 +199,7 @@
             console.log('Iot message:', r);
         });
 
-        Instance.auth.providerLogin('observer', 'TPpHTkLL8lfzvFZ4JRww7w6A1pD1h5b~hZDthaj3me9i0jY4AX9ehKv1oVfOa7uKZiHiVzyjfc~RVK_Q~ZG0kui9UAyQR8pJD3P5LCLOAMngnjeU2kIt9io70rbdDg--') // login as browser
+        Instance.auth.deviceLogin(true) // login as browser
             .then(r => Instance.iot.iotLogin()) // login to mqtt
             .then(r => {
                 if(roomId) {
@@ -224,7 +224,7 @@
                         return r.data;
                     })
             })
-            .then(r => Instance.room.createSession({constructId, roomId:r.roomId, pinHash: r.pinHash, role:'observerSolo1', options: {
+            .then(r => Instance.room.createSession({constructId, roomId:r.roomId, pinHash: r.pinHash, role:'participant', options: {
                     // simulcast: true,
                     // simulcastSettings: {
                     //     "default" : {

package/package.json

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

package/src/modules/wt-room.js

@@ -866,6 +866,7 @@ class RoomSession {
 					id: handle.handleId,
 					userId: decodeJanusDisplay(handle.userId)?.userId,
 					role: decodeJanusDisplay(handle.userId)?.role,
+					fullUserId: handle.userId,
 					stream: null,
 					streamMap: structuredClone(handle.webrtcStuff?.streamMap),
 					tracksMap: structuredClone(handle.webrtcStuff?.tracksMap),
@@ -1029,13 +1030,15 @@ class RoomSession {
 					this.emit('removeLocalParticipant', {
 						id: handleId,
 						userId: decodeJanusDisplay(handle.userId)?.userId,
-						role: decodeJanusDisplay(handle.userId)?.role}
+						role: decodeJanusDisplay(handle.userId)?.role,
+						fullUserId: handle.userId}
 					);
 				} else {
 					this.emit(this._getRemoveParticipantEventName(handleId), {
 						id: handleId,
 						userId: decodeJanusDisplay(handle.userId)?.userId,
-						role: decodeJanusDisplay(handle.userId)?.role}
+						role: decodeJanusDisplay(handle.userId)?.role,
+						fullUserId: handle.userId}
 					);
 				}
 
@@ -1573,8 +1576,8 @@ class RoomSession {
 		this._log = console.log.bind(console);
 	}
 
-	_getHandle(handleId, rfid = null, userId = null) {
-		return this._participants.find(p => p.handleId === handleId || (rfid && p.rfid === rfid) || (userId && decodeJanusDisplay(p.userId)?.userId === userId));
+	_getHandle(handleId, rfid = null, userId = null, fullUserId = null) {
+		return this._participants.find(p => p.handleId === handleId || (rfid && p.rfid === rfid) || (userId && decodeJanusDisplay(p.userId)?.userId === userId) || (fullUserId && p.userId === fullUserId));
 	}
 
 
@@ -1926,6 +1929,7 @@ class RoomSession {
 						id: handle.handleId,
 						userId: decodeJanusDisplay(handle.userId)?.userId,
 						role: decodeJanusDisplay(handle.userId)?.role,
+						fullUserId: handle.userId,
 						stream: config.stream,
 						streamMap: structuredClone(config.streamMap),
 						tracksMap: structuredClone(config.tracksMap),
@@ -1952,6 +1956,7 @@ class RoomSession {
 						id: handle.handleId,
 						userId: decodeJanusDisplay(handle.userId)?.userId,
 						role: decodeJanusDisplay(handle.userId)?.role,
+						fullUserId: handle.userId,
 						stream: config.stream,
 						streamMap: structuredClone(config.streamMap),
 						tracksMap: structuredClone(config.tracksMap),
@@ -2021,6 +2026,7 @@ class RoomSession {
 								constructId: this.constructId,
 								userId: decodeJanusDisplay(handle.userId)?.userId,
 								role: decodeJanusDisplay(handle.userId)?.role,
+								fullUserId: handle.userId,
 								stream: config.stream,
 								streamMap: structuredClone(config.streamMap),
 								tracksMap: structuredClone(config.tracksMap),
@@ -2049,6 +2055,7 @@ class RoomSession {
 							id: handle.handleId,
 							userId: decodeJanusDisplay(handle.userId)?.userId,
 							role: decodeJanusDisplay(handle.userId)?.role,
+							fullUserId: handle.userId,
 							stream: config.stream,
 							streamMap: structuredClone(config.streamMap),
 							tracksMap: structuredClone(config.tracksMap),
@@ -2084,6 +2091,7 @@ class RoomSession {
 								constructId: this.constructId,
 								userId: decodeJanusDisplay(handle.userId)?.userId,
 								role: decodeJanusDisplay(handle.userId)?.role,
+								fullUserId: handle.userId,
 								stream: config.stream,
 								streamMap: structuredClone(config.streamMap),
 								tracksMap: structuredClone(config.tracksMap),
@@ -2114,6 +2122,7 @@ class RoomSession {
 								constructId: this.constructId,
 								userId: decodeJanusDisplay(handle.userId)?.userId,
 								role: decodeJanusDisplay(handle.userId)?.role,
+								fullUserId: handle.userId,
 								stream: config.stream,
 								streamMap: structuredClone(config.streamMap),
 								source,
@@ -2172,6 +2181,7 @@ class RoomSession {
 								constructId: this.constructId,
 								userId: decodeJanusDisplay(handle.userId)?.userId,
 								role: decodeJanusDisplay(handle.userId)?.role,
+								fullUserId: handle.userId,
 								stream: config.stream,
 								streamMap: structuredClone(config.streamMap),
 								source,
@@ -2936,6 +2946,7 @@ class RoomSession {
 
 	getUserTalkIntercomChannels(userId) {
 		let talkIntercomChannels = []
+		// TODO: check if we don't need full userId
 		let handle = this._getHandle(null, null, userId);
 		if (handle) {
 			let config = handle.webrtcStuff;
@@ -3292,13 +3303,11 @@ class RoomSession {
 				let remoteUsersCache = this._remoteUsersCache;
 				let handle = this._getHandle(this.handleId);
 				// filter out my user id from response and compare it to remoteUsersCache
-				participants = participants.filter(p => decodeJanusDisplay(p.id)?.userId !== decodeJanusDisplay(handle.userId)?.userId);
-
+				participants = participants.filter(p => p.id !== handle.userId);
 				// 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 => {
-					const handle = this._getHandle(null, null, decodeJanusDisplay(r.userId)?.userId);
-
+					const handle = this._getHandle(null, null, null, r.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) {