@reactoo/watchtogether-sdk-js 2.8.11 → 2.8.13

package/package.json

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

package/src/models/user.js

@@ -141,16 +141,28 @@ let user = function () {
                     });
                 }, Promise.resolve({data: {items: [], size: 0, startKey: null}}));
         },
-        getUsers: ({type, userId, roomId, size = 20, startKey = null} = {}) => {
-            let apiParams = {
-                type,
-                size,
-                ...(roomId && {roomId}),
-                ...(userId && {userId}),
-                ...(startKey && {startKey})
-            };
-            return this.__privates.auth.__client
-                .then(client => client.apis.user.getUsers(apiParams))
+        getUserList:  ({type = 'instanceType', roomId, ids, size = 20, startKey = null}) => {
+            return chunkArray(ids, 50)
+                .reduce((promiseChain, idsChunk) => {
+                    return promiseChain.then(chainResponse => {
+                        let apiParams = {
+                            type,
+                            ...(roomId && {roomId}),
+                            ...(idsChunk?.length && {ids: idsChunk.join(',')}),
+                            ...(size && !ids && {size}),
+                            ...(startKey && {startKey})
+                        };
+                        return this.__privates.auth.__client
+                            .then(client => client.apis.user.getUsers(apiParams))
+                            .then(response => type === 'ids' ? ({
+                                data: {
+                                    items: [...chainResponse.data.items, ...response.data.items],
+                                    size: chainResponse.data.size + response.data.size,
+                                    startKey: null,
+                                },
+                            }) : response);
+                    });
+                }, Promise.resolve({data: {items: [], size: 0, startKey: null}}));
         },
 
         //TODO:deprecated

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

@@ -2233,7 +2233,7 @@ class RoomSession {
 
 						let descriptions = [];
 						let transceivers = config.pc.getTransceivers();
-						Object.keys(config.streamMap[this.id]).forEach(source => {
+						Object.keys(config.streamMap[this.id]??{}).forEach(source => {
 							const simulcastConfigForSource = this.#findSimulcastConfig(source, this.simulcastSettings);
 							config.streamMap[this.id][source].forEach(trackId => {
 								let t = transceivers.find(transceiver => transceiver.sender.track && transceiver.sender.track.id === trackId)
@@ -2532,9 +2532,6 @@ class RoomSession {
 
 		config.isIceRestarting = true;
 
-		// // removing this so we can cache ice candidates again
-		// config.remoteSdp = null;
-
 		if (this.handleId === handleId) {
 			this._log('Performing local ICE restart');
 			let hasAudio = !!(config.stream && config.stream.getAudioTracks().length > 0);
@@ -2808,7 +2805,7 @@ class RoomSession {
 		if (!config.stream) {
 			return;
 		}
-		let sourceTrackIds = (config.streamMap[this.id][source] || []);
+		let sourceTrackIds = (config.streamMap[this.id]?.[source] || []);
 		let remainingTracks = [];
 		for(let i = 0; i < sourceTrackIds.length; i++) {
 			let foundTrack = config.tracks.find(t => t.id === sourceTrackIds[i]);
@@ -2986,7 +2983,7 @@ class RoomSession {
 		// we possibly created new transceivers, so we need to get them again
 
 		transceivers = config.pc.getTransceivers();
-		existingTracks = [...(config.streamMap[this.id][source] || [])];
+		existingTracks = [...(config.streamMap[this.id]?.[source] || [])];
 		if(!audioTransceiver) {
 			audioTransceiver = transceivers.find(transceiver => transceiver.sender.track && transceiver.sender.track.kind === 'audio' && existingTracks.includes(transceiver.sender.track.id))
 		}
@@ -3045,7 +3042,7 @@ class RoomSession {
 			}
 
 			this.isMuted = [];
-			for(const source of Object.keys(config.streamMap[this.id])) {
+			for(const source of Object.keys(config.streamMap[this.id]??{})) {
 				const audioTrack = config.stream?.getAudioTracks()?.find(track => config.streamMap[this.id][source].includes(track.id));
 				const videoTrack = config.stream?.getVideoTracks()?.find(track => config.streamMap[this.id][source].includes(track.id));
 				this.isMuted.push({type: 'audio', value: !audioTrack || !audioTrack.enabled, source, mid: transceivers.find(transceiver => transceiver.sender?.track?.kind === 'audio' && transceiver.sender?.track?.id === audioTrack?.id)?.mid});
@@ -3129,7 +3126,7 @@ class RoomSession {
 		let transceivers = config.pc?.getTransceivers();
 		let transceiver = null;
 		if(source) {
-			transceiver = transceivers?.find(t => t.sender && t.sender.track && t.receiver.track.kind === "audio" && (config.streamMap[this.id][source] || []).includes(t.sender.track.id));
+			transceiver = transceivers?.find(t => t.sender && t.sender.track && t.receiver.track.kind === "audio" && (config.streamMap[this.id]?.[source] || []).includes(t.sender.track.id));
 		}
 		else {
 			transceiver = transceivers?.find(t => t.sender && t.sender.track && t.receiver.track.kind === "audio" && (mid ? t.mid === mid : true));
@@ -3139,7 +3136,7 @@ class RoomSession {
 		}
 
 		this.isMuted = [];
-		for(const source of Object.keys(config.streamMap[this.id])) {
+		for(const source of Object.keys(config.streamMap[this.id]??{})) {
 			const audioTrack = config.stream?.getAudioTracks()?.find(track => config.streamMap[this.id][source].includes(track.id));
 			const audioTransceiver = transceivers?.find(transceiver => transceiver.sender.track && transceiver.sender.track.kind === 'audio' && transceiver.sender.track.id === audioTrack?.id);
 			const videoTrack = config.stream?.getVideoTracks()?.find(track => config.streamMap[this.id][source].includes(track.id));
@@ -3166,7 +3163,7 @@ class RoomSession {
 		let transceivers = config.pc?.getTransceivers();
 		let transceiver = null;
 		if(source) {
-			transceiver = transceivers?.find(t => t.sender && t.sender.track && t.receiver.track.kind === "video" && (config.streamMap[this.id][source] || []).includes(t.sender.track.id));
+			transceiver = transceivers?.find(t => t.sender && t.sender.track && t.receiver.track.kind === "video" && (config.streamMap[this.id]?.[source] || []).includes(t.sender.track.id));
 		}
 		else {
 			transceiver = transceivers?.find(t => t.sender && t.sender.track && t.receiver.track.kind === "video" && (mid ? t.mid === mid : true));
@@ -3175,7 +3172,7 @@ class RoomSession {
 			transceiver.sender.track.enabled = value !== null ? !!value : !transceiver.sender.track.enabled;
 		}
 		this.isMuted = [];
-		for(const source of Object.keys(config.streamMap[this.id])) {
+		for(const source of Object.keys(config.streamMap[this.id]??{})) {
 			const audioTrack = config.stream?.getAudioTracks()?.find(track => config.streamMap[this.id][source].includes(track.id));
 			const audioTransceiver = transceivers?.find(transceiver => transceiver.sender.track && transceiver.sender.track.kind === 'audio' && transceiver.sender.track.id === audioTrack?.id);
 			const videoTrack = config.stream?.getVideoTracks()?.find(track => config.streamMap[this.id][source].includes(track.id));
@@ -3298,7 +3295,7 @@ class RoomSession {
 		let config = handle.webrtcStuff;
 		let descriptions = [];
 		let transceivers = config.pc.getTransceivers();
-		Object.keys(config.streamMap[this.id]).forEach(source => {
+		Object.keys(config.streamMap[this.id]??{}).forEach(source => {
 			const simulcastConfigForSource = this.#findSimulcastConfig(source, this.simulcastSettings);
 			config.streamMap[this.id][source].forEach(trackId => {
 				let t = transceivers.find(transceiver => transceiver.sender.track && transceiver.sender.track.id === trackId)