@reactoo/watchtogether-sdk-js 2.8.40 → 2.8.42

package/dist/watchtogether-sdk.js

@@ -55500,7 +55500,10 @@ function _removeFromSubscribeMap(id, mid) {
 }
 // will subscribe to all relevant participants
 async function _updateSubscriptions() {
-  // no subscriber handle, we create one and subscribe to relevant participants
+  // added sanity check
+  await _assertClassBrand(_RoomSession_brand, this, _availablePublishersSanityCheck).call(this);
+
+  // no subscription yet, we create one and subscribe to relevant participants
 
   if (!_classPrivateFieldGet(_subscriberJoinPromise, this)) {
     await _assertClassBrand(_RoomSession_brand, this, _joinAsSubscriber).call(this, this.roomId, this.pin, this.userId);
@@ -55659,15 +55662,63 @@ function _updateAvailablePublishersTrackData(newPublishers, removedPublisher) {
     }
   }
 }
+async function _availablePublishersSanityCheck() {
+  var _classPrivateFieldGet28, _classPrivateFieldGet29;
+  const list = await this.sendMessage(this.handleId, {
+    body: {
+      request: 'listparticipants',
+      room: this.roomId
+    }
+  });
+  const participants = list.participants || [];
+  const availablePublishers = [...(((_classPrivateFieldGet28 = _classPrivateFieldGet(_subscriberHandle, this)) === null || _classPrivateFieldGet28 === void 0 ? void 0 : (_classPrivateFieldGet29 = _classPrivateFieldGet28.webrtcStuff) === null || _classPrivateFieldGet29 === void 0 ? void 0 : _classPrivateFieldGet29.availablePublishers) ?? [])];
+  availablePublishers.forEach(publisher => {
+    const checkedParticipant = participants.find(p => p.id === publisher.id);
+    if (!checkedParticipant) {
+      // this publisher is not in the list, we need to remove it
+      this._log('Sanity check - Removing publisher', publisher.id, 'from availablePublishers');
+      _assertClassBrand(_RoomSession_brand, this, _updateAvailablePublishersTrackData).call(this, [], publisher.id);
+      _assertClassBrand(_RoomSession_brand, this, _emitRemoteFeedUpdate).call(this, null, {
+        feedRemoval: true,
+        attendee: {
+          id: publisher.id
+        }
+      });
+      _assertClassBrand(_RoomSession_brand, this, _removeAttendeeFromCache).call(this, publisher.id);
+      this.emit('error', {
+        type: 'warning',
+        id: 50,
+        message: 'sanity check - removing publisher from availablePublishers',
+        data: publisher.id
+      });
+    } else if (checkedParticipant.publisher === false) {
+      // this publisher is not in the list, we need to remove it
+      this._log('Sanity check - Removing publisher', publisher.id, 'from availablePublishers');
+      _assertClassBrand(_RoomSession_brand, this, _updateAvailablePublishersTrackData).call(this, [], publisher.id);
+      _assertClassBrand(_RoomSession_brand, this, _emitRemoteFeedUpdate).call(this, null, {
+        feedRemoval: true,
+        attendee: {
+          id: publisher.id
+        }
+      });
+      this.emit('error', {
+        type: 'warning',
+        id: 51,
+        message: 'sanity check - removing publisher from availablePublishers',
+        data: publisher.id
+      });
+    }
+  });
+}
 function _getTransceiverDataByMid(mid) {
   return _classPrivateFieldGet(_subscriberHandle, this).webrtcStuff.transceiverMap.find(t => t.mid === mid);
 }
 // this is done
 // feed_id === id of participant
 function _updateTransceiverMap(handleId) {
-  var _classPrivateFieldGet28;
+  var _classPrivateFieldGet30;
   let streams = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  this._log('Updating current transceiver map', 'Is me: ' + handleId === ((_classPrivateFieldGet28 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet28 === void 0 ? void 0 : _classPrivateFieldGet28.handleId), handleId, streams);
+  this._log('Updating current transceiver map', 'Is me: ' + handleId === ((_classPrivateFieldGet30 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet30 === void 0 ? void 0 : _classPrivateFieldGet30.handleId), handleId, streams);
   let handle = _assertClassBrand(_RoomSession_brand, this, _getHandle).call(this, handleId);
   if (!handle) {
     this.emit('error', {
@@ -56005,7 +56056,7 @@ function _stopKeepAlive() {
   clearTimeout(this._keepAliveId);
 }
 function _handleWsEvents(event) {
-  var _classPrivateFieldGet29;
+  var _classPrivateFieldGet31;
   let skipPoll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   // we have a response from long poll, that means we need to run it again
   if (!this.useWebsockets && !skipPoll) {
@@ -56076,7 +56127,7 @@ function _handleWsEvents(event) {
 
   // LOCAL
 
-  if (sender === ((_classPrivateFieldGet29 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet29 === void 0 ? void 0 : _classPrivateFieldGet29.handleId)) {
+  if (sender === ((_classPrivateFieldGet31 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet31 === void 0 ? void 0 : _classPrivateFieldGet31.handleId)) {
     if (type === "event") {
       var plugindata = json["plugindata"] || {};
       var msg = plugindata["data"] || {};
@@ -56136,8 +56187,8 @@ function _handleWsEvents(event) {
           this._log(e);
         });
         if (leaving === 'ok') {
-          var _classPrivateFieldGet30;
-          this._log('leaving', (_classPrivateFieldGet30 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet30 === void 0 ? void 0 : _classPrivateFieldGet30.handleId, 'this is us');
+          var _classPrivateFieldGet32;
+          this._log('leaving', (_classPrivateFieldGet32 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet32 === void 0 ? void 0 : _classPrivateFieldGet32.handleId, 'this is us');
           _assertClassBrand(_RoomSession_brand, this, _emitLocalFeedUpdate).call(this, {
             feedRemoval: true
           });
@@ -56160,9 +56211,9 @@ function _handleWsEvents(event) {
           _assertClassBrand(_RoomSession_brand, this, _removeAttendeeFromCache).call(this, leaving);
         }
         if (unpublished === 'ok') {
-          var _classPrivateFieldGet31, _classPrivateFieldGet32;
-          this._log('unpublished', (_classPrivateFieldGet31 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet31 === void 0 ? void 0 : _classPrivateFieldGet31.handleId, 'this is us');
-          _assertClassBrand(_RoomSession_brand, this, _cleanupHandle).call(this, (_classPrivateFieldGet32 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet32 === void 0 ? void 0 : _classPrivateFieldGet32.handleId, true).catch(() => {});
+          var _classPrivateFieldGet33, _classPrivateFieldGet34;
+          this._log('unpublished', (_classPrivateFieldGet33 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet33 === void 0 ? void 0 : _classPrivateFieldGet33.handleId, 'this is us');
+          _assertClassBrand(_RoomSession_brand, this, _cleanupHandle).call(this, (_classPrivateFieldGet34 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet34 === void 0 ? void 0 : _classPrivateFieldGet34.handleId, true).catch(() => {});
         } else if (unpublished) {
           this._log('unpublished', unpublished);
           _assertClassBrand(_RoomSession_brand, this, _updateAvailablePublishersTrackData).call(this, [], unpublished);
@@ -56178,6 +56229,13 @@ function _handleWsEvents(event) {
           _assertClassBrand(_RoomSession_brand, this, _updateSubscriptions).call(this).catch(e => {
             this._log(e);
           });
+          _assertClassBrand(_RoomSession_brand, this, _emitRemoteFeedUpdate).call(this, null, {
+            feedRemoval: true,
+            attendee: {
+              id: leaving
+            }
+          });
+          _assertClassBrand(_RoomSession_brand, this, _removeAttendeeFromCache).call(this, leaving);
         }
         if (joining) {
           _assertClassBrand(_RoomSession_brand, this, _cacheAttendee).call(this, joining);
@@ -56195,8 +56253,8 @@ function _handleWsEvents(event) {
         }
       }
       if (jsep !== undefined && jsep !== null) {
-        var _classPrivateFieldGet33;
-        _assertClassBrand(_RoomSession_brand, this, _webrtcPeer).call(this, (_classPrivateFieldGet33 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet33 === void 0 ? void 0 : _classPrivateFieldGet33.handleId, jsep).catch(err => {
+        var _classPrivateFieldGet35;
+        _assertClassBrand(_RoomSession_brand, this, _webrtcPeer).call(this, (_classPrivateFieldGet35 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet35 === void 0 ? void 0 : _classPrivateFieldGet35.handleId, jsep).catch(err => {
           this.emit('error', err);
         });
       }
@@ -56206,8 +56264,8 @@ function _handleWsEvents(event) {
       }
       this._log('Configuring bitrate: ' + this.initialBitrate);
       if (this.initialBitrate > 0) {
-        var _classPrivateFieldGet34;
-        this.sendMessage((_classPrivateFieldGet34 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet34 === void 0 ? void 0 : _classPrivateFieldGet34.handleId, {
+        var _classPrivateFieldGet36;
+        this.sendMessage((_classPrivateFieldGet36 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet36 === void 0 ? void 0 : _classPrivateFieldGet36.handleId, {
           "body": {
             "request": "configure",
             "bitrate": this.initialBitrate
@@ -56361,7 +56419,7 @@ async function _destroyHandle(handleId) {
   if (handleId) {
     let handle = _assertClassBrand(_RoomSession_brand, this, _getHandle).call(this, handleId);
     if (handle) {
-      var _classPrivateFieldGet35, _classPrivateFieldGet36;
+      var _classPrivateFieldGet37, _classPrivateFieldGet38;
       await _assertClassBrand(_RoomSession_brand, this, _cleanupHandle).call(this, handleId);
       if (detachRequest) {
         await _assertClassBrand(_RoomSession_brand, this, _send).call(this, {
@@ -56369,16 +56427,16 @@ async function _destroyHandle(handleId) {
           "handle_id": handleId
         }, true);
       }
-      if (handleId === ((_classPrivateFieldGet35 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet35 === void 0 ? void 0 : _classPrivateFieldGet35.handleId)) {
+      if (handleId === ((_classPrivateFieldGet37 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet37 === void 0 ? void 0 : _classPrivateFieldGet37.handleId)) {
         _classPrivateFieldSet(_publisherHandle, this, null);
-      } else if (handleId === ((_classPrivateFieldGet36 = _classPrivateFieldGet(_subscriberHandle, this)) === null || _classPrivateFieldGet36 === void 0 ? void 0 : _classPrivateFieldGet36.handleId)) {
+      } else if (handleId === ((_classPrivateFieldGet38 = _classPrivateFieldGet(_subscriberHandle, this)) === null || _classPrivateFieldGet38 === void 0 ? void 0 : _classPrivateFieldGet38.handleId)) {
         _classPrivateFieldSet(_subscriberHandle, this, null);
       }
     }
   }
 }
 async function _cleanupHandle(handleId) {
-  var _classPrivateFieldGet37;
+  var _classPrivateFieldGet39;
   let hangupRequest = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   let handle = _assertClassBrand(_RoomSession_brand, this, _getHandle).call(this, handleId);
   if (hangupRequest) {
@@ -56462,7 +56520,7 @@ async function _cleanupHandle(handleId) {
     qualityHistory: new Map(),
     lastSwitchTime: new Map()
   };
-  if (_classPrivateFieldGet(_publisherHandle, this) && handleId === ((_classPrivateFieldGet37 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet37 === void 0 ? void 0 : _classPrivateFieldGet37.handleId)) {
+  if (_classPrivateFieldGet(_publisherHandle, this) && handleId === ((_classPrivateFieldGet39 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet39 === void 0 ? void 0 : _classPrivateFieldGet39.handleId)) {
     _assertClassBrand(_RoomSession_brand, this, _emitLocalFeedUpdate).call(this, {
       feedRemoval: true
     });
@@ -56479,8 +56537,8 @@ async function _cleanupHandle(handleId) {
   }
 }
 async function _joinAsPublisher(roomId, pin, userId, display) {
-  var _classPrivateFieldGet38;
-  return this.sendMessage((_classPrivateFieldGet38 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet38 === void 0 ? void 0 : _classPrivateFieldGet38.handleId, {
+  var _classPrivateFieldGet40;
+  return this.sendMessage((_classPrivateFieldGet40 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet40 === void 0 ? void 0 : _classPrivateFieldGet40.handleId, {
     body: {
       "request": "join",
       "room": roomId,
@@ -56559,9 +56617,9 @@ async function _joinAsSubscriber(roomId, pin, userId) {
   return _classPrivateFieldGet(_subscriberJoinPromise, this);
 }
 async function _leaveRoom() {
-  var _classPrivateFieldGet39;
+  var _classPrivateFieldGet41;
   let dontWait = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  return this.isConnected ? this.sendMessage((_classPrivateFieldGet39 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet39 === void 0 ? void 0 : _classPrivateFieldGet39.handleId, {
+  return this.isConnected ? this.sendMessage((_classPrivateFieldGet41 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet41 === void 0 ? void 0 : _classPrivateFieldGet41.handleId, {
     body: {
       "request": "leave"
     }
@@ -56778,14 +56836,14 @@ function _enableDebug2() {
   this._log = console.log.bind(console);
 }
 function _getHandle(handleId) {
-  var _classPrivateFieldGet40, _classPrivateFieldGet41;
+  var _classPrivateFieldGet42, _classPrivateFieldGet43;
   let rfid = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   let userId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   let fullUserId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-  if (handleId === ((_classPrivateFieldGet40 = _classPrivateFieldGet(_subscriberHandle, this)) === null || _classPrivateFieldGet40 === void 0 ? void 0 : _classPrivateFieldGet40.handleId)) {
+  if (handleId === ((_classPrivateFieldGet42 = _classPrivateFieldGet(_subscriberHandle, this)) === null || _classPrivateFieldGet42 === void 0 ? void 0 : _classPrivateFieldGet42.handleId)) {
     return _classPrivateFieldGet(_subscriberHandle, this);
   }
-  if (handleId === ((_classPrivateFieldGet41 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet41 === void 0 ? void 0 : _classPrivateFieldGet41.handleId)) {
+  if (handleId === ((_classPrivateFieldGet43 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet43 === void 0 ? void 0 : _classPrivateFieldGet43.handleId)) {
     return _classPrivateFieldGet(_publisherHandle, this);
   }
   return null;
@@ -56896,20 +56954,20 @@ function _webrtc(handleId) {
       };
     }
     config.pc.onconnectionstatechange = () => {
-      var _classPrivateFieldGet42;
+      var _classPrivateFieldGet44;
       if (config.pc.connectionState === 'failed') {
         this._log('onconnectionstatechange: connectionState === failed');
         _assertClassBrand(_RoomSession_brand, this, _iceRestart).call(this, handleId);
       }
-      this.emit('connectionState', [handleId, handleId === ((_classPrivateFieldGet42 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet42 === void 0 ? void 0 : _classPrivateFieldGet42.handleId), config.pc.connectionState]);
+      this.emit('connectionState', [handleId, handleId === ((_classPrivateFieldGet44 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet44 === void 0 ? void 0 : _classPrivateFieldGet44.handleId), config.pc.connectionState]);
     };
     config.pc.oniceconnectionstatechange = () => {
-      var _classPrivateFieldGet43;
+      var _classPrivateFieldGet45;
       if (config.pc.iceConnectionState === 'failed') {
         this._log('oniceconnectionstatechange: iceConnectionState === failed');
         _assertClassBrand(_RoomSession_brand, this, _iceRestart).call(this, handleId);
       }
-      this.emit('iceState', [handleId, handleId === ((_classPrivateFieldGet43 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet43 === void 0 ? void 0 : _classPrivateFieldGet43.handleId), config.pc.iceConnectionState]);
+      this.emit('iceState', [handleId, handleId === ((_classPrivateFieldGet45 = _classPrivateFieldGet(_publisherHandle, this)) === null || _classPrivateFieldGet45 === void 0 ? void 0 : _classPrivateFieldGet45.handleId), config.pc.iceConnectionState]);
     };
     config.pc.onicecandidate = event => {
       if (event.candidate == null || webrtc_adapter__WEBPACK_IMPORTED_MODULE_0__["default"].browserDetails.browser === 'edge' && event.candidate.candidate.indexOf('endOfCandidates') > 0) {