@reactoo/watchtogether-sdk-js 2.8.9 → 2.8.11

package/package.json

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

package/src/models/asset.js

@@ -114,14 +114,14 @@ let asset =  function() {
 
 		createHighlightAsset: (id, title, roomIds, highlight = {}) => {
 			return this.__privates.auth.__client
-				.then(client => client.apis.asset.publishAsset({id}, {requestBody: {assetType: 'highlight',...(roomIds ? {roomIds} : {}), title, highlight}}));
+				.then(client => client.apis.asset.publishAsset({id}, {requestBody: {assetType: 'highlight',...(roomIds ? {roomIds} : {}), title, customAttributes: {highlight}}}));
 	    },
 
 		createHighlightAssetWithThumbnail: (file, id, title, roomIds, highlight = {}, initiationData = null) => {
 			return this.__privates.auth.__client
 				.then(client => Promise.all([client, initiationData ? Promise.resolve(initiationData) : client.apis.asset.initiateAssetUpload({id: id || generateUUID()})]))
 				.then(([client, response]) => Promise.all([client, client.http({url: response.data.signedUrl, method: response.data.httpMethod, headers: {"Content-Type":file.type}, body:file}), response.data.id]))
-				.then(([client, response, idn]) => Promise.all([client.apis.asset.publishAsset({id:idn}, {requestBody: {assetType: 'highlight', title: title, ...(roomIds ? {roomIds} : {}), highlight}}), idn]))
+				.then(([client, response, idn]) => Promise.all([client.apis.asset.publishAsset({id:idn}, {requestBody: {assetType: 'highlight', title: title, ...(roomIds ? {roomIds} : {}), customAttributes: {highlight}}}), idn]))
 				;
 		},
     }

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

@@ -234,6 +234,7 @@ class RoomSession {
 		this.enableDtx = false;
 		this.simulcast = false;
 
+
 		this.defaultSimulcastSettings = {
 			"default" : {
 				mode: "controlled", // controlled, manual, browserControlled
@@ -274,6 +275,7 @@ class RoomSession {
 		this.sessionId = null;
 		this.apisecret = null;
 		this.ws = null;
+		this.wsOpen = false;
 
 		// helper flags
 
@@ -291,6 +293,7 @@ class RoomSession {
 		this.requestMuteStatusTimeout = 100;
 		this._statsInterval = 3000;
 		this._statsIntervalId = null;
+		this._sendMessageWebsocketTimeout = 30000;
 		this._sendMessageTimeout = 10000;
 		this._keepAlivePeriod = 25000;
 		this._longPollTimeout = 60000;
@@ -502,6 +505,7 @@ class RoomSession {
 				id,
 				userId,
 				role,
+				mid,
 				fullUserId: display,
 				constructId: this.constructId,
 				track: track,
@@ -541,6 +545,7 @@ class RoomSession {
 				role,
 				fullUserId: display,
 				constructId: this.constructId,
+				mid: null,
 				track: null,
 				source: null,
 				adding: false,
@@ -957,21 +962,36 @@ class RoomSession {
 		};
 		this._log(requestData);
 		const op = () => new Promise((resolve, reject) => {
+
 			let messageTimeoutId = null;
-			let abortResponse = () => {
-				this._abortController.signal.removeEventListener('abort', abortResponse);
+
+			let cleanup = () => {
 				clearTimeout(messageTimeoutId);
+				this._abortController.signal.removeEventListener('abort', abortResponse);
 				this.ws.removeEventListener('message', parseResponse);
+			};
+
+			let abortResponse = () => {
+				cleanup();
 				reject({type: 'warning', id: 4, message: 'connection cancelled'})
 			};
 
+			// we may get multiple responses from parallel requests, so we need to make sure we only resolve the one we sent
+
 			let parseResponse = (event) => {
-				let json = JSON.parse(event.data);
+				let json;
+				try {
+					json = JSON.parse(event.data);
+				}
+				catch (e) {}
+
+				if(!json) {
+					return;
+				}
+
 				let r_transaction = json['transaction'];
 				if (r_transaction === transaction && (!dontResolveOnAck || json['janus'] !== 'ack')) {
-					clearTimeout(messageTimeoutId);
-					this._abortController.signal.removeEventListener('abort', abortResponse);
-					this.ws.removeEventListener('message', parseResponse);
+					cleanup();
 					if (json['janus'] === 'error') {
 						if (json?.error?.code == 403) {
 							this.disconnect();
@@ -988,17 +1008,23 @@ class RoomSession {
 					this.ws.send(JSON.stringify(requestData));
 				}
 				resolve();
-			} else {
+			}
+			else {
 				if (this.ws && this.ws.readyState === 1) {
+
 					this.ws.addEventListener('message', parseResponse);
+
 					messageTimeoutId = setTimeout(() => {
-						this.ws.removeEventListener('message', parseResponse);
-						this._abortController.signal.removeEventListener('abort', abortResponse);
+						cleanup();
 						reject({type: 'warning', id: 6, message: 'send timeout', data: requestData});
 					}, this._sendMessageTimeout);
+
 					this._abortController.signal.addEventListener('abort', abortResponse);
+
 					this.ws.send(JSON.stringify(requestData));
-				} else {
+				}
+				else {
+					cleanup();
 					reject({type: 'warning', id: 7, message: 'No connection to WebSockets', data: requestData});
 				}
 			}
@@ -1008,11 +1034,52 @@ class RoomSession {
 			if (e.id === 4 ) {
 				return Promise.reject(e);
 			}
-			else if(e.id === 7 && retry > 0) {
-				return wait(this._sendMessageTimeout).then(() => this.#send(request, ignoreResponse, dontResolveOnAck, retry - 1));
+			else if(e.id === 7 && this.isSupposeToBeConnected) {
+
+				return new Promise((resolve, reject) => {
+
+					let establishConnectionTimeoutId = null;
+
+					const cleanup = () => {
+						clearTimeout(establishConnectionTimeoutId);
+						this._abortController.signal.removeEventListener('abort', abort);
+						this.off('webSocketsConnectionOpened', connection);
+					};
+
+					const connection = () => {
+						cleanup();
+						resolve(this.#sendWebsockets(request, ignoreResponse, dontResolveOnAck, retry - 1));
+					};
+					const timeout = () => {
+						cleanup();
+						reject({type: 'warning', id: 46, message: 'WebSocket connection did not open during wait period', data: requestData});
+					};
+					const abort = () => {
+						cleanup();
+						reject({type: 'warning', id: 47, message: 'WebSocket connection was aborted', data: requestData});
+					};
+
+
+					if(this.wsOpen) {
+
+						this._log('Retrying failed WebSocket request', requestData);
+
+						resolve(this.#sendWebsockets(request, ignoreResponse, dontResolveOnAck, retry - 1));
+					}
+					else {
+
+						this._log('Waiting for WebSocket connection to open before sending request', requestData);
+
+						this._abortController.signal.addEventListener('abort', abort);
+						establishConnectionTimeoutId = setTimeout(timeout, this._sendMessageWebsocketTimeout);
+						this.once('webSocketsConnectionOpened', connection);
+					}
+
+				})
+
 			}
-			else if(retry > 0) {
-				return this.#send(request, ignoreResponse, dontResolveOnAck, retry - 1);
+			else if(retry > 0 && this.isSupposeToBeConnected) {
+				return this.#sendWebsockets(request, ignoreResponse, dontResolveOnAck, retry - 1);
 			}
 			else {
 				return Promise.reject(e);
@@ -1055,6 +1122,9 @@ class RoomSession {
 
 	#connectionClosed() {
 
+		this.wsOpen = false;
+		this.emit('webSocketsConnectionClosed');
+
 		if (!this.isConnected || this.isConnecting || this.isDisconnecting) {
 			return;
 		}
@@ -1133,7 +1203,12 @@ class RoomSession {
 		if (type === "trickle") {
 			let candidate = json["candidate"];
 			let config = handle.webrtcStuff;
-			if (config.pc && config.remoteSdp) {
+			if (config.pc &&
+				config.remoteSdp &&
+				!config.isIceRestarting &&
+				config.pc.iceConnectionState !== 'closed' &&
+				config.pc.iceConnectionState !== 'failed' &&
+				config.pc.iceConnectionState !== 'disconnected') {
 
 				if (!candidate || candidate.completed === true) {
 					config.pc.addIceCandidate(null).catch((e) => {
@@ -1731,6 +1806,10 @@ class RoomSession {
 			this.ws.addEventListener('message', this.__handleWsEventsBoundFn);
 
 			this.ws.onopen = () => {
+
+				this.wsOpen = true;
+				this.emit('webSocketsConnectionOpened');
+
 				this._abortController.signal.removeEventListener('abort', abortConnect);
 				if(!reclaim) {
 					this.#send({"janus": "create"})
@@ -1895,8 +1974,6 @@ class RoomSession {
 		enableDtx = false
 	) {
 
-		this.isSupposeToBeConnected = true;
-
 		if (this.isConnecting) {
 			this.emit('error',  {type: 'warning', id: 23, message: 'connection already in progress'});
 			return
@@ -1906,6 +1983,8 @@ class RoomSession {
 			await this.disconnect();
 		}
 
+		this.isSupposeToBeConnected = true;
+
 		this._abortController = new AbortController();
 
 		this.sessionId = null;
@@ -2025,6 +2104,7 @@ class RoomSession {
 		this.userId = null;
 
 		this.isPublished = false;
+		this.isConnecting = false;
 		this.isConnected = false;
 		this.isDisconnecting = false;
 		this.emit('publishing', false);
@@ -2199,6 +2279,7 @@ class RoomSession {
 				}
 				this.emit('iceState', [handleId, handleId === this.#publisherHandle?.handleId, config.pc.iceConnectionState]);
 			};
+
 			config.pc.onicecandidate = (event) => {
 				if (event.candidate == null || (adapter.browserDetails.browser === 'edge' && event.candidate.candidate.indexOf('endOfCandidates') > 0)) {
 					config.iceDone = true;
@@ -2451,8 +2532,8 @@ class RoomSession {
 
 		config.isIceRestarting = true;
 
-		// removing this so we can cache ice candidates again
-		config.remoteSdp = null;
+		// // removing this so we can cache ice candidates again
+		// config.remoteSdp = null;
 
 		if (this.handleId === handleId) {
 			this._log('Performing local ICE restart');
@@ -2646,6 +2727,9 @@ class RoomSession {
 	}
 	
 	#publishRemote(handleId, jsep) {
+
+		console.log('picaaaa');
+
 		let handle = this.#getHandle(handleId);
 		if (!handle) {
 			return Promise.reject({
@@ -2794,7 +2878,7 @@ class RoomSession {
 		let existingTracks = [...(config.streamMap?.[this.id]?.[source] || [])];
 
 		if(stream?.getTracks().length) {
-			if(!config.streamMap[this.id]) {
+			if(!config.streamMap?.[this.id]) {
 				config.streamMap[this.id] = {};
 			}
 			config.streamMap[this.id][source] = stream?.getTracks()?.map(track => track.id) || [];
@@ -2814,8 +2898,8 @@ class RoomSession {
 			} catch (e) {
 				this._log(e);
 			}
-			config.stream.removeTrack(oldAudioStream);
-			config?.tracks.splice(oldAudioStreamIndex, 1);
+			config?.stream?.removeTrack(oldAudioStream);
+			config?.tracks?.splice(oldAudioStreamIndex, 1);
 		}
 
 		// remove old video track related to this source