@reactoo/watchtogether-sdk-js 2.6.49 → 2.6.51

package/package.json

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

package/src/modules/wt-room.js

@@ -487,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"]);
@@ -499,6 +499,7 @@ class RoomSession {
 		} else if (type === "event") {
 			//none universal
 		} else if (type === 'timeout') {
+			this._log('WebSockets Gateway timeout', json);
 			this.ws.close(3504, "Gateway timeout");
 		} else if (type === 'success' || type === 'error') {
 			// we're capturing those elsewhere
@@ -706,6 +707,7 @@ class RoomSession {
 
 				if (jsep !== undefined && jsep !== null) {
 
+					console.log(msg)
 					if (this.sessiontype === 'reactooroom') {
 						this._webrtcPeer(this.handleId, jsep)
 							.catch(err => {
@@ -904,6 +906,7 @@ class RoomSession {
 					dtmfSender: null,
 					trickle: true,
 					iceDone: false,
+					isIceRestarting: false
 				};
 
 				if (handleId === this.handleId) {
@@ -954,6 +957,7 @@ class RoomSession {
 					dtmfSender: null,
 					trickle: true,
 					iceDone: false,
+					isIceRestarting: false
 				}
 			};
 			this._participants.push(handle);
@@ -1678,10 +1682,6 @@ class RoomSession {
 				return Promise.resolve(null);
 			}
 
-			if(config.pc.signalingState === 'stable') {
-				//TODO
-			}
-
 			return config.pc.setRemoteDescription(jsep)
 				.then(() => {
 					config.remoteSdp = jsep.sdp;
@@ -1715,6 +1715,14 @@ class RoomSession {
 			return;
 		}
 		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);
@@ -1730,9 +1738,11 @@ class RoomSession {
 					}, 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 {
@@ -1740,7 +1750,12 @@ class RoomSession {
 			return this.sendMessage(handleId, {
 				body: {"request": "configure", "restart": true}
 			}, false, false, 5).then(() => {
-			}).catch(() => {});
+			}).then(() => {
+				config.isIceRestarting = false;
+				this._log('ICE restart success');
+			}).catch(() => {
+				config.isIceRestarting = false;
+			});
 		}
 
 	}
@@ -1880,6 +1895,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]})