@reactoo/watchtogether-sdk-js 2.6.48 → 2.6.50

package/package.json

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

package/src/modules/wt-room.js

@@ -2,7 +2,7 @@
 
 import adapter from 'webrtc-adapter';
 import emitter from './wt-emitter';
-import {decodeJanusDisplay, generateUUID} from "./wt-utils";
+import {decodeJanusDisplay, generateUUID, wait} from "./wt-utils";
 
 class Room {
 
@@ -305,12 +305,12 @@ class RoomSession {
 		}
 	}
 
-	sendMessage(handleId, message = {body: 'Example Body'}, dontWait = false, dontResolveOnAck = false) {
+	sendMessage(handleId, message = {body: 'Example Body'}, dontWait = false, dontResolveOnAck = false, retry = 0) {
 		return this._send({
 			"janus": "message",
 			"handle_id": handleId,
 			...message
-		}, dontWait, dontResolveOnAck)
+		}, dontWait, dontResolveOnAck, retry)
 			.then(json => {
 				if (json && json["janus"] === "success") {
 					let plugindata = json["plugindata"] || {};
@@ -328,19 +328,17 @@ class RoomSession {
 			})
 	}
 
-	_send(request = {}, ignoreResponse = false, dontResolveOnAck = false) {
+	_send(request = {}, ignoreResponse = false, dontResolveOnAck = false, retry = 0) {
+
 		let transaction = RoomSession.randomString(12);
 		let requestData = {
 			...request,
 			transaction,
 			token: this.token, ...((this.sessionId && {'session_id': this.sessionId}) || {})
 		};
-
 		this._log(requestData);
-
-		return new Promise((resolve, reject) => {
+		const op = () => new Promise((resolve, reject) => {
 			let messageTimeoutId = null;
-
 			let abortResponse = () => {
 				this._abortController.signal.removeEventListener('abort', abortResponse);
 				clearTimeout(messageTimeoutId);
@@ -371,18 +369,14 @@ class RoomSession {
 					this.ws.send(JSON.stringify(requestData));
 				}
 				resolve();
-
 			} 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);
 						reject({type: 'warning', id: 3, message: 'send timeout', data: requestData});
-					}, 10000);
-
+					}, 5000);
 					this._abortController.signal.addEventListener('abort', abortResponse);
 					this.ws.send(JSON.stringify(requestData));
 				} else {
@@ -390,6 +384,21 @@ class RoomSession {
 				}
 			}
 		})
+
+		return op().catch(e => {
+			if (e.id === 17) {
+				return Promise.reject(e);
+			}
+			else if(e.id === 29 && retry > 0) {
+				return wait(5000).then(() => this._send(request, ignoreResponse, dontResolveOnAck, retry - 1));
+			}
+			else if(retry > 0) {
+				return this._send(request, ignoreResponse, dontResolveOnAck, retry - 1);
+			}
+			else {
+				return Promise.reject(e);
+			}
+		})
 	}
 
 	_connectionClosed() {
@@ -478,10 +487,10 @@ class RoomSession {
 		} else if (type === "webrtcup") {
 			//none universal
 		} else if (type === "hangup") {
-			this._log('hangup on', handle.handleId);
+			this._log('hangup on', handle.handleId, handle.handleId === this.handleId, json);
 			this._removeParticipant(handle.handleId, null, false);
 		} else if (type === "detached") {
-			this._log('detached on', handle.handleId);
+			this._log('detached on', handle.handleId, handle.handleId === this.handleId, json);
 			this._removeParticipant(handle.handleId, null, true);
 		} else if (type === "media") {
 			this._log('Media event:', handle.handleId, json["type"], json["receiving"], json["mid"]);
@@ -490,6 +499,7 @@ class RoomSession {
 		} else if (type === "event") {
 			//none universal
 		} else if (type === 'timeout') {
+			this._log('ws timeout', json);
 			this.ws.close(3504, "Gateway timeout");
 		} else if (type === 'success' || type === 'error') {
 			// we're capturing those elsewhere
@@ -697,6 +707,7 @@ class RoomSession {
 
 				if (jsep !== undefined && jsep !== null) {
 
+					console.log(msg)
 					if (this.sessiontype === 'reactooroom') {
 						this._webrtcPeer(this.handleId, jsep)
 							.catch(err => {
@@ -895,6 +906,7 @@ class RoomSession {
 					dtmfSender: null,
 					trickle: true,
 					iceDone: false,
+					isIceRestarting: false
 				};
 
 				if (handleId === this.handleId) {
@@ -945,6 +957,7 @@ class RoomSession {
 					dtmfSender: null,
 					trickle: true,
 					iceDone: false,
+					isIceRestarting: false
 				}
 			};
 			this._participants.push(handle);
@@ -1070,7 +1083,6 @@ class RoomSession {
 					.then(json => {
 						this.sessionId = json["session_id"] ? json["session_id"] : json.data["id"];
 						this._startKeepAlive();
-						this._participants.map(p => this._iceRestart(p.handleId))
 						this.isReclaiming = false;
 						this.emit('joining', false);
 						this._retries = 0;
@@ -1361,7 +1373,7 @@ class RoomSession {
 			"janus": "trickle",
 			"candidate": candidate,
 			"handle_id": handleId
-		})
+		}, false, false, 5)
 	}
 
 	_webrtc(handleId, enableOntrack = false) {
@@ -1429,6 +1441,7 @@ class RoomSession {
 			};
 			config.pc.oniceconnectionstatechange = () => {
 				if (config.pc.iceConnectionState === 'failed') {
+					this._log('iceConnectionState failed');
 					this._iceRestart(handleId);
 				}
 				this.emit('iceState', [handleId, handleId === this.handleId, config.pc.iceConnectionState]);
@@ -1707,6 +1720,13 @@ class RoomSession {
 		}
 		var config = handle.webrtcStuff;
 
+		// Already restarting;
+		if (config.isIceRestarting) {
+			return;
+		}
+
+		config.isIceRestarting = true;
+
 		if (this.handleId === handleId) {
 			this._log('Performing local ICE restart');
 			let hasAudio = !!(config.stream && config.stream.getAudioTracks().length > 0);
@@ -1719,20 +1739,27 @@ class RoomSession {
 					return this.sendMessage(handleId, {
 						body: {"request": "configure", "audio": hasAudio, "video": hasVideo, "data": true, ...(this.recordingFilename ? {filename: this.recordingFilename} : {})},
 						jsep
-					});
+					}, false, false, 5);
 				})
 				.then(r => {
+					config.isIceRestarting = false;
 					this._log('ICE restart success');
 				})
 				.catch((e) => {
+					config.isIceRestarting = false;
 					this.emit('error', {type: 'warning', id: 28, message: 'iceRestart failed', data: e});
 				});
 		} else {
 			this._log('Performing remote ICE restart', handleId);
 			return this.sendMessage(handleId, {
 				body: {"request": "configure", "restart": true}
+			}, false, false, 5).then(() => {
 			}).then(() => {
-			}).catch(() => {});
+				config.isIceRestarting = false;
+				this._log('ICE restart success');
+			}).catch(() => {
+				config.isIceRestarting = false;
+			});
 		}
 
 	}
@@ -1872,6 +1899,13 @@ class RoomSession {
 					"sdp": response.sdp
 				};
 
+				if(response.e2ee)
+					jsep.e2ee = true;
+				if(response.rid_order === "hml" || response.rid_order === "lmh")
+					jsep.rid_order = response.rid_order;
+				if(response.force_relay)
+					jsep.force_relay = true;
+
 				return _p.then(() => jsep)
 			}, (e) => {
 				return Promise.reject({type: 'warning', id: 25, message: methodName, data: [handleId, e]})