@reactoo/watchtogether-sdk-js 2.8.53 → 2.8.55

package/package.json

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

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

@@ -1220,7 +1220,9 @@ class RoomSession {
 						this.disconnect().catch(()=>{});
 					}
 				}
-				this.emit('error', e)
+				else {
+					this.emit('error', e)
+				}
 			});
 	}
 
@@ -1921,13 +1923,17 @@ class RoomSession {
 						});
 				}
 				else {
+
+					this.emit('reclaimingConnection', {state: true, status: null});
 					this.#send({"janus": "claim"})
 						.then(json => {
 							this.sessionId = json["session_id"] ? json["session_id"] : json.data["id"];
 							this.#startKeepAlive();
+							this.emit('reclaimingConnection', {state: false, status: 'success'});
 							resolve(json);
 						})
 						.catch(error => {
+							this.emit('reclaimingConnection', {state: false, status: 'failed', error});
 							reject({type: 'error', id: 17, message: 'reconnection error', data: error})
 						})
 						.finally(() => {
@@ -1939,6 +1945,7 @@ class RoomSession {
 			this.ws.onerror = (e) => {
 				this.isEstablishingConnection = false
 				this._abortController.signal.removeEventListener('abort', abortConnect);
+				this.emit('reclaimingConnection', {state: false, status: 'failed', error: e});
 				reject({type: 'error', id: 18, message: 'ws connection error', data: e});
 			}
 
@@ -1982,14 +1989,17 @@ class RoomSession {
 				});
 		}
 		else {
+			this.emit('reclaimingConnection', {state: true, status: null});
 			return this.#send({"janus": "claim"})
 				.then(json => {
 					this.sessionId = json["session_id"] ? json["session_id"] : json.data["id"];
 					this.#startKeepAlive();
 					this.#longPoll();
+					this.emit('reclaimingConnection', {state: false, status: 'success'});
 					return this;
 				})
 				.catch(error => {
+					this.emit('reclaimingConnection', {state: false, status: 'failed', error});
 					return Promise.reject({type: 'error', id: 21, message: 'reconnection error', data: error})
 				})
 				.finally(() => {
@@ -2029,27 +2039,15 @@ class RoomSession {
 
 	async #reconnect() {
 
-		if (this.isConnecting) {
+		if (this.isEstablishingConnection) {
 			return Promise.reject({type: 'warning', id: 22, message: 'connection already in progress'});
 		}
 
-		this.isConnecting = true;
-
 		if(this.useWebsockets) {
-			try {
-				await this.#webSocketConnection(true)
-			}
-			finally {
-				this.isConnecting = false;
-			}
+			await this.#webSocketConnection(true)
 		}
 		else {
-			try {
-				await this.#httpConnection(true)
-			}
-			finally {
-				this.isConnecting = false;
-			}
+			await this.#httpConnection(true)
 		}
 	}
 
@@ -2655,6 +2653,7 @@ class RoomSession {
 
 		if (this.handleId === handleId) {
 			this._log('Performing local ICE restart');
+			this.emit('iceRestart', {state: true, origin: 'local', status: null});
 			const hasAudio = !!(config.stream && config.stream.getAudioTracks().length > 0);
 			const hasVideo = !!(config.stream && config.stream.getVideoTracks().length > 0);
 			this.#createAO('offer', handleId, true )
@@ -2669,11 +2668,13 @@ class RoomSession {
 				})
 				.then(r => {
 					config.isIceRestarting = false;
-					this._log('ICE restart success');
+					this._log('Local ICE restart success');
+					this.emit('iceRestart', {state: false, origin: 'local', status: 'success'});
 				})
 				.catch((e) => {
 					config.isIceRestarting = false;
-
+					this._log('Local ICE restart failed', e);
+					this.emit('iceRestart', {state: false, origin: 'local', status: 'failed', error: e});
 					if(this.isSupposeToBeConnected) {
 						this.emit('restartConnection');
 						wait(10000).then(() => {
@@ -2686,19 +2687,21 @@ class RoomSession {
 					else if(!this.isDisconnecting) {
 						this.disconnect().catch(()=>{});
 					}
-
-
 				});
 		} else {
 			this._log('Performing remote ICE restart', handleId);
+			this.emit('iceRestart', {state: true, origin: 'remote', status: null});
 			return this.sendMessage(handleId, {
 				body: {"request": "configure", "restart": true}
 			}, false, false, 5).then(() => {
 			}).then(() => {
 				config.isIceRestarting = false;
-				this._log('ICE restart success');
-			}).catch(() => {
+				this.emit('iceRestart', {state: false, origin: 'remote', status: 'success'});
+				this._log('Remote ICE restart success');
+			}).catch((e) => {
 				config.isIceRestarting = false;
+				this.emit('iceRestart', {state: false, origin: 'remote', status: 'failed', error: e});
+				this._log('Remote ICE restart failed');
 			});
 		}
 	}