@reactoo/watchtogether-sdk-js 2.7.92-beta.0 → 2.7.92

package/dist/watchtogether-sdk.js

@@ -9869,11 +9869,19 @@ class RoomSession {
     this.apisecret = null;
     this.handleId = null;
     this.ws = null;
+
+    // helper flags
+
     this.isSupposeToBeConnected = false;
     this.isRestarting = false;
     this.isConnecting = false;
     this.isDisconnecting = false;
     this.isConnected = false;
+
+    // we added this because joined event that enables "isConnected" happened after we fired publish (long polling)
+    // as a result publish was rejected due to isConnected flag being false
+    // im' not sure what relies on current event based isConnected flag so i've added a new one that is set after join promise resolves
+    this.isPossibleToPublish = false;
     this.isPublished = false;
     this.isStreaming = false;
     this.isMuted = [];
@@ -10121,7 +10129,6 @@ class RoomSession {
           if (json['janus'] === 'error') {
             var _json$error;
             if ((json === null || json === void 0 ? void 0 : (_json$error = json.error) === null || _json$error === void 0 ? void 0 : _json$error.code) == 403) {
-              console.log(1);
               this.disconnect(true);
             }
             reject({
@@ -10204,7 +10211,6 @@ class RoomSession {
       this._retries++;
       if (this._retries > this._maxRetries) {
         if (this.sessiontype === 'reactooroom') {
-          console.log(2);
           this.disconnect(true);
         } else if (this.sessiontype === 'streaming') {
           this.stopStream();
@@ -10233,7 +10239,6 @@ class RoomSession {
       }, 3000 * this._retries);
     } else {
       if (this.sessiontype === 'reactooroom') {
-        console.log(3);
         this.disconnect(true);
       } else if (this.sessiontype === 'streaming') {
         this.stopStream();
@@ -10366,6 +10371,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', {
@@ -10501,7 +10507,6 @@ class RoomSession {
             this._removeParticipant(this.handleId);
             if (msg['reason'] === 'kicked') {
               this.emit('kicked');
-              console.log(4);
               this.disconnect().catch(() => {});
             }
           } else if (leaving) {
@@ -10977,6 +10982,7 @@ class RoomSession {
       }
     }, dontWait).finally(() => {
       this.isConnected = false;
+      this.isPossibleToPublish = false;
       this.emit('joined', false);
     }) : Promise.resolve();
   }
@@ -10989,6 +10995,7 @@ class RoomSession {
         message: 'connection establishment already in progress'
       });
     }
+    this.isPossibleToPublish = false;
     this.isConnecting = true;
     this.emit('joining', true);
     if (this.ws) {
@@ -11035,6 +11042,7 @@ class RoomSession {
             this._enableStatsWatch();
             this._enableSubstreamAutoSelect();
             this.isConnecting = false;
+            this.isPossibleToPublish = true;
             this.emit('joining', false);
             resolve(this);
           }).catch(error => {
@@ -11085,6 +11093,23 @@ class RoomSession {
   }
   _httpConnection() {
     let reclaim = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 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"
@@ -11101,6 +11126,7 @@ class RoomSession {
         this._enableSubstreamAutoSelect();
         this._longPoll();
         this.isConnecting = false;
+        this.isPossibleToPublish = true;
         this.emit('joining', false);
         return Promise.resolve(this);
       }).catch(error => {
@@ -11201,6 +11227,7 @@ class RoomSession {
       return Promise.resolve();
     }
     (_this$_abortControlle = this._abortController) === null || _this$_abortControlle === void 0 ? void 0 : (_this$_abortControlle2 = _this$_abortControlle.abort) === null || _this$_abortControlle2 === void 0 ? void 0 : _this$_abortControlle2.call(_this$_abortControlle);
+    this.isPossibleToPublish = false;
     this.isDisconnecting = true;
     this._stopKeepAlive();
     this._disableStatsWatch();
@@ -11321,6 +11348,7 @@ class RoomSession {
     (_this$_abortControlle3 = this._abortController) === null || _this$_abortControlle3 === void 0 ? void 0 : (_this$_abortControlle4 = _this$_abortControlle3.abort) === null || _this$_abortControlle4 === void 0 ? void 0 : _this$_abortControlle4.call(_this$_abortControlle3);
     this._stopKeepAlive();
     let isStreaming = this.isStreaming;
+    this.isPossibleToPublish = false;
     this.isDisconnecting = true;
     return this._removeParticipant(this.handleId).finally(() => {
       this.sendMessage(this.handleId, {
@@ -11346,7 +11374,6 @@ class RoomSession {
   }
   destroy() {
     if (this.sessiontype === 'reactooroom') {
-      console.log(5);
       return this.disconnect().then(() => {
         this.clear();
         return true;
@@ -12377,8 +12404,7 @@ class RoomSession {
     var _stream$getVideoTrack, _stream$getAudioTrack, _config$stream4, _config$stream4$getAu, _config$stream5, _config$stream5$getVi, _stream$getAudioTrack2, _stream$getVideoTrack2;
     let stream = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     let source = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'camera0';
-    console.log(this.isDisconnecting, this.isConnected);
-    if (this.isDisconnecting || !this.isConnected) {
+    if (!this.isPossibleToPublish) {
       return Promise.reject({
         type: 'warning',
         id: 18,