@reactoo/watchtogether-sdk-js 2.7.91 → 2.7.92-beta.1

package/package.json

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

package/src/modules/wt-room.js

@@ -259,6 +259,7 @@ class RoomSession {
 		this.isConnecting = false;
 		this.isDisconnecting = false;
 		this.isConnected = false;
+		this.isPossibleToPublish = false; // we added this because joined event happened after we fired publish, im' not sure what relies on current event based isConnected flag so i've added a new one
 		this.isPublished = false;
 		this.isStreaming = false;
 		this.isMuted = [];
@@ -805,6 +806,7 @@ class RoomSession {
 					this.id = msg["id"];
 					this.privateId = msg["private_id"];
 					this.isConnected = true;
+					this.isPossibleToPublish = true;
 					this._log('We have successfully joined Room');
 					this.emit('joined', true, this.constructId);
 					this.emit('addLocalParticipant', {
@@ -1438,6 +1440,7 @@ class RoomSession {
 			? this.sendMessage(this.handleId, {body: {"request": "leave"}}, dontWait)
 				.finally(() => {
 					this.isConnected = false;
+					this.isPossibleToPublish = false;
 					this.emit('joined', false);
 				})
 			: Promise.resolve();
@@ -1448,7 +1451,7 @@ class RoomSession {
 		if (this.isConnecting) {
 			return Promise.reject({type: 'warning', id: 16, message: 'connection establishment already in progress'});
 		}
-
+		this.isPossibleToPublish = false;
 		this.isConnecting = true;
 		this.emit('joining', true);
 
@@ -1502,6 +1505,7 @@ class RoomSession {
 							this._enableStatsWatch();
 							this._enableSubstreamAutoSelect();
 							this.isConnecting = false;
+							this.isPossibleToPublish = true;
 							this.emit('joining', false);
 							resolve(this);
 						})
@@ -1545,6 +1549,22 @@ class RoomSession {
 	}
 
 	_httpConnection(reclaim = false) {
+
+		if (this.isConnecting) {
+			return Promise.reject({type: 'warning', id: 16, message: 'connection establishment already in progress'});
+		}
+		this.isPossibleToPublish = false;
+		this.isConnecting = true;
+		this.emit('joining', true);
+
+		if (this.ws) {
+			this._wipeListeners();
+			if (this.ws.readyState === 1) {
+				this.ws.close();
+			}
+		}
+		this._stopKeepAlive();
+
 		if(!reclaim) {
 			return this._send({"janus": "create"})
 				.then(json => {
@@ -1564,6 +1584,7 @@ class RoomSession {
 					this._enableSubstreamAutoSelect();
 					this._longPoll();
 					this.isConnecting = false;
+					this.isPossibleToPublish = true;
 					this.emit('joining', false);
 					return Promise.resolve(this);
 				})
@@ -1672,6 +1693,7 @@ class RoomSession {
 		}
 
 		this._abortController?.abort?.();
+		this.isPossibleToPublish = false;
 		this.isDisconnecting = true;
 		this._stopKeepAlive();
 		this._disableStatsWatch();
@@ -1785,6 +1807,7 @@ class RoomSession {
 		this._stopKeepAlive();
 
 		let isStreaming = this.isStreaming;
+		this.isPossibleToPublish = false;
 		this.isDisconnecting = true;
 		return this._removeParticipant(this.handleId)
 			.finally(() => {
@@ -2911,7 +2934,7 @@ class RoomSession {
 
 	publishLocal(stream = null, source = 'camera0') {
 
-		if(this.isDisconnecting || !this.isConnected) {
+		if(!this.isPossibleToPublish) {
 			return Promise.reject({
 				type: 'warning',
 				id: 18,