@reactoo/watchtogether-sdk-js 2.8.52 → 2.8.53

package/package.json

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

package/src/models/room-session.js

@@ -61,6 +61,10 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 		___.__parseDataMessageEvents(data);
 	})
 
+	room.on('restartConnection', () => {
+		___.restart();
+	})
+
 	room.on('error', (e) => {
 		if(e?.type === 'error') {
 			___.disconnect();
@@ -161,6 +165,10 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 		//TODO: refactor restart method
 		restart: function ({isObserver = false, reactooRoomId = null} = {}) {
 
+			if(room.isRestarting) {
+				return Promise.resolve(0);
+			}
+
 			emitter.emit('reconnecting', true);
 			room.isRestarting = true;
 
@@ -192,7 +200,7 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 				.catch((error) => {
 					room.isRestarting = false;
 					emitter.emit('reconnecting', false);
-					emitter.emit('error', {type: 'error', id: 26, message: 'reconnecting failed', data: error});
+					emitter.emit('error', {type: 'error', id: 53, message: 'reconnecting failed', data: error});
 					return Promise.reject(0);
 				});
 

package/src/modules/wt-iot2.js

@@ -280,6 +280,7 @@ class Iot {
                     event === 'record_stop' ||
                     event === 'record_configured' ||
                     event === 'record_livestream_available' ||
+					event === 'record_livestream_viewercount' ||
                     event === 'record_livestream_kick' ||
                     event === 'user_update_displayname' ||
                     event === 'user_update_avatar' ||

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

@@ -1014,7 +1014,9 @@ class RoomSession {
 			.catch(e => {
 
 				if(e?.code === 403) {
-					this.disconnect();
+					if(!this.isDisconnecting) {
+						this.disconnect().catch(()=>{});
+					}
 				}
 
 				return Promise.reject({error: e, requestData});
@@ -1064,7 +1066,9 @@ class RoomSession {
 					cleanup();
 					if (json['janus'] === 'error') {
 						if (json?.error?.code == 403) {
-							this.disconnect();
+							if(!this.isDisconnecting) {
+								this.disconnect().catch(()=>{});
+							}
 						}
 						reject({type: 'error', id: 5, message: 'send failed', data: json, requestData});
 					} else {
@@ -1202,7 +1206,19 @@ class RoomSession {
 		this.#reconnect()
 			.catch(e => {
 				if(e.type !== 'warning') {
-					this.disconnect().catch(() => {});
+
+					if(this.isSupposeToBeConnected) {
+						this.emit('restartConnection');
+						wait(10000).then(() => {
+							if(!this.isConnected && !this.isRestarting && this.isSupposeToBeConnected) {
+								this.disconnect().catch(()=>{});
+								this.emit('error', {type: 'error', id: 52, message: 'Could not re-establish connection, disconnecting' , originalError: e});
+							}
+						})
+					}
+					else if(!this.isDisconnecting) {
+						this.disconnect().catch(()=>{});
+					}
 				}
 				this.emit('error', e)
 			});
@@ -1300,7 +1316,7 @@ class RoomSession {
 		} else if (type === "hangup") {
 			this._log('hangup on', handle.handleId, handle.handleId === this.handleId, json);
 			if(this.#getHandle(handle.handleId)) {
-				this.#cleanupHandle(handle.handleId, true).catch(() => {});
+				this.#cleanupHandle(handle.handleId, false).catch(() => {});
 			}
 		} else if (type === "detached") {
 			this._log('detached on', handle.handleId, handle.handleId === this.handleId, json);
@@ -1402,7 +1418,9 @@ class RoomSession {
 
 						if (msg['reason'] === 'kicked') {
 							this.emit('kicked');
-							this.disconnect().catch(() => {});
+							if(!this.isDisconnecting) {
+								this.disconnect().catch(()=>{});
+							}
 						}
 					} else if (leaving) {
 
@@ -1418,7 +1436,7 @@ class RoomSession {
 
 					if (unpublished === 'ok') {
 						this._log('unpublished', this.#publisherHandle?.handleId, 'this is us');
-						this.#cleanupHandle(this.#publisherHandle?.handleId, true).catch(() => {});
+						this.#cleanupHandle(this.#publisherHandle?.handleId, false).catch(() => {});
 
 					} else if (unpublished) {
 						this._log('unpublished', unpublished);
@@ -1736,6 +1754,9 @@ class RoomSession {
 
 		if(this.#publisherHandle && handleId === this.#publisherHandle?.handleId) {
 			this.#emitLocalFeedUpdate({feedRemoval: true});
+			this.isPublished = false;
+			this.emit('publishing', false);
+			this.emit('published', false);
 		}
 		else if(this.#subscriberHandle && handleId === this.#subscriberHandle.handleId) {
 			[...this.#getCachedAttendeeIds()].forEach(id => {
@@ -1832,6 +1853,8 @@ class RoomSession {
 		return this.#subscriberJoinPromise;
 	}
 
+	// not used
+
 	async #leaveRoom(dontWait = false) {
 		return this.isConnected
 			? this.sendMessage(this.#publisherHandle?.handleId, {body: {"request": "leave"}}, dontWait)
@@ -2110,7 +2133,9 @@ class RoomSession {
 
 		} catch (error) {
 			if(error?.type !== 'warning') {
-				this.disconnect().catch(() => {});
+				if(!this.isDisconnecting) {
+					this.disconnect().catch(()=>{});
+				}
 			}
 			this.emit('error', error);
 		} finally {
@@ -2134,7 +2159,6 @@ class RoomSession {
 		this._abortController?.abort?.();
 		this.isDisconnecting = true;
 		this.#stopKeepAlive();
-		let isConnected = this.isConnected;
 
 		if(this.#publisherHandle) {
 			this.#emitLocalFeedUpdate({feedRemoval: true});
@@ -2194,12 +2218,10 @@ class RoomSession {
 		this.display = null;
 		this.userId = null;
 
-		this.isPublished = false;
+		const isConnected = this.isConnected;
 		this.isConnecting = false;
 		this.isConnected = false;
 		this.isDisconnecting = false;
-		this.emit('publishing', false);
-		this.emit('published', false);
 		this.emit('joining', false);
 		this.emit('joined', false);
 		this.emit('disconnect', isConnected);
@@ -2633,8 +2655,8 @@ class RoomSession {
 
 		if (this.handleId === handleId) {
 			this._log('Performing local ICE restart');
-			let hasAudio = !!(config.stream && config.stream.getAudioTracks().length > 0);
-			let hasVideo = !!(config.stream && config.stream.getVideoTracks().length > 0);
+			const hasAudio = !!(config.stream && config.stream.getAudioTracks().length > 0);
+			const hasVideo = !!(config.stream && config.stream.getVideoTracks().length > 0);
 			this.#createAO('offer', handleId, true )
 				.then((jsep) => {
 					if (!jsep) {
@@ -2651,7 +2673,21 @@ class RoomSession {
 				})
 				.catch((e) => {
 					config.isIceRestarting = false;
-					this.emit('error', {type: 'error', id: 28, message: 'iceRestart failed', data: e});
+
+					if(this.isSupposeToBeConnected) {
+						this.emit('restartConnection');
+						wait(10000).then(() => {
+							if(!this.isConnected && !this.isRestarting && this.isSupposeToBeConnected) {
+								this.disconnect().catch(()=>{});
+								this.emit('error', {type: 'error', id: 28,message: 'Could not re-establish connection, disconnecting', originalError: e});
+							}
+						})
+					}
+					else if(!this.isDisconnecting) {
+						this.disconnect().catch(()=>{});
+					}
+
+
 				});
 		} else {
 			this._log('Performing remote ICE restart', handleId);