@reactoo/watchtogether-sdk-js 2.6.47 → 2.6.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.6.47",
+  "version": "2.6.49",
   "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() {
@@ -1070,7 +1079,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 +1369,7 @@ class RoomSession {
 			"janus": "trickle",
 			"candidate": candidate,
 			"handle_id": handleId
-		})
+		}, false, false, 5)
 	}
 
 	_webrtc(handleId, enableOntrack = false) {
@@ -1429,6 +1437,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]);
@@ -1669,6 +1678,10 @@ class RoomSession {
 				return Promise.resolve(null);
 			}
 
+			if(config.pc.signalingState === 'stable') {
+				//TODO
+			}
+
 			return config.pc.setRemoteDescription(jsep)
 				.then(() => {
 					config.remoteSdp = jsep.sdp;
@@ -1686,6 +1699,9 @@ class RoomSession {
 					}
 					// Done
 					return true;
+				})
+				.catch((e) => {
+					return Promise.reject({type: 'warning', id: 32, message: 'rtc peer', data: [handleId, e]});
 				});
 		} else {
 			return Promise.reject({type: 'warning', id: 22, message: 'rtc peer', data: [handleId, 'invalid jsep']});
@@ -1699,12 +1715,6 @@ class RoomSession {
 			return;
 		}
 		var config = handle.webrtcStuff;
-
-		if(config.pc.signalingState === 'stable') {
-			this._log('ICE restart not needed');
-			return;
-		}
-
 		if (this.handleId === handleId) {
 			this._log('Performing local ICE restart');
 			let hasAudio = !!(config.stream && config.stream.getAudioTracks().length > 0);
@@ -1717,7 +1727,7 @@ 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 => {
 					this._log('ICE restart success');
@@ -1729,7 +1739,7 @@ class RoomSession {
 			this._log('Performing remote ICE restart', handleId);
 			return this.sendMessage(handleId, {
 				body: {"request": "configure", "restart": true}
-			}).then(() => {
+			}, false, false, 5).then(() => {
 			}).catch(() => {});
 		}