@opentok/client 2.20.4 → 2.20.5

package/dist/js/opentok.js

@@ -1,11 +1,11 @@
 /**
- * @license OpenTok.js 2.20.4 06efe7d04
+ * @license OpenTok.js 2.20.5 674ea5899
  *
  * Copyright (c) 2010-2021 TokBox, Inc.
  * Subject to the applicable Software Development Kit (SDK) License Agreement:
  * https://tokbox.com/support/sdk_license
  *
- * Date: Sat, 30 Oct 2021 01:17:59 GMT
+ * Date: Thu, 18 Nov 2021 21:49:19 GMT
  */
 
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -6378,7 +6378,7 @@ const _require = __webpack_require__(138),
 /** @type builtInConfig */
 
 
-const builtInConfig = cloneDeep({"version":"v2.20.4","buildHash":"06efe7d04","minimumVersion":{"firefox":52,"chrome":49},"debug":"false","websiteURL":"http://www.tokbox.com","configURL":"https://config.opentok.com","ipWhitelistConfigURL":"","cdnURL":"https://static.opentok.com","loggingURL":"https://hlg.tokbox.com/prod","apiURL":"https://anvil.opentok.com"});
+const builtInConfig = cloneDeep({"version":"v2.20.5","buildHash":"674ea5899","minimumVersion":{"firefox":52,"chrome":49},"debug":"false","websiteURL":"http://www.tokbox.com","configURL":"https://config.opentok.com","ipWhitelistConfigURL":"","cdnURL":"https://static.opentok.com","loggingURL":"https://hlg.tokbox.com/prod","apiURL":"https://anvil.opentok.com"});
 const whitelistAllowedRuntimeProperties = pick(['apiURL', 'assetURL', 'cdnURL', 'sessionInfoOverrides', 'loggingURL']);
 const liveConfigMap = {
   apiUrl: 'apiURL',
@@ -9951,7 +9951,6 @@ module.exports = function PeerConnectionFactory(deps) {
             value = newValue;
 
             if (value && !api.iceConnectionStateIsConnected()) {
-              api.clearFailedTimeout();
               api.generateOffer();
             } else {
               logging.debug('iceRestart is going to wait until we disconnect and then restart ice');
@@ -10134,6 +10133,12 @@ module.exports = function PeerConnectionFactory(deps) {
           logging.debug('iceconnectionstatechange', _peerConnection.iceConnectionState);
 
           if (_peerConnection.iceConnectionState === 'connected') {
+            // Now that the iceConnectionState is connected, let's make sure the transitionToFailedTimeOut
+            // is cleared ASAP to avoid triggering an iceConnectionStateChange event to failed.
+            if (_previousIceState === 'disconnected') {
+              api.clearFailedTimeout();
+            }
+
             api.emit('iceConnected');
 
             _iceRestartNeeded.set(false);
@@ -16530,7 +16535,7 @@ module.exports = function PublisherFactory(_ref) {
     this._removeSubscriber = subscriberId => {
       const isAdaptiveEnabled = this.session.sessionInfo.isAdaptiveEnabled;
 
-      if (isAdaptiveEnabled) {
+      if (isAdaptiveEnabled && activeSourceStreamId === 'P2P') {
         this._.startRelayedToRoutedTransition();
       }
 
@@ -17885,6 +17890,8 @@ module.exports = function PublisherFactory(_ref) {
         });
       };
 
+      const isAdaptiveEnabled = this.session.sessionInfo.isAdaptiveEnabled;
+
       switch (type) {
         case 'unsubscribe':
           this._removeSubscriber(subscriberId);
@@ -17893,6 +17900,12 @@ module.exports = function PublisherFactory(_ref) {
 
         default:
           if (!futurePeerConnection) {
+            if (isAdaptiveEnabled && getP2pPeerConnection()) {
+              // In the case Rumor sends two generateOffers for the P2P leg,
+              // we need to ignore the second one.
+              return;
+            }
+
             addPeerConnection();
           } else {
             futurePeerConnection.then(peerConnection => peerConnection.processMessage(type, message));
@@ -19245,18 +19258,10 @@ module.exports = function PublisherFactory(_ref) {
           return _regenerator.default.wrap(function _callee24$(_context24) {
             while (1) switch (_context24.prev = _context24.next) {
               case 0:
-                if (!(activeSourceStreamId === 'MANTIS')) {
-                  _context24.next = 2;
-                  break;
-                }
-
-                return _context24.abrupt("return");
-
-              case 2:
                 logRelayedToRoutedTransition('Attempt');
 
                 if (_this.session) {
-                  _context24.next = 6;
+                  _context24.next = 4;
                   break;
                 }
 
@@ -19265,9 +19270,9 @@ module.exports = function PublisherFactory(_ref) {
                 });
                 return _context24.abrupt("return");
 
-              case 6:
+              case 4:
                 if (_this.streamId) {
-                  _context24.next = 9;
+                  _context24.next = 7;
                   break;
                 }
 
@@ -19276,18 +19281,18 @@ module.exports = function PublisherFactory(_ref) {
                 });
                 return _context24.abrupt("return");
 
-              case 9:
+              case 7:
                 _this.session._.streamDestroy(_this.streamId, 'P2P');
 
-                _context24.next = 12;
+                _context24.next = 10;
                 return _restartSendingRtpToMantis();
 
-              case 12:
+              case 10:
                 logRelayedToRoutedTransition('Success');
 
                 _this.trigger('streamDestroyForP2PComplete');
 
-              case 14:
+              case 12:
               case "end":
                 return _context24.stop();
             }
@@ -30587,38 +30592,46 @@ module.exports = function SubscriberFactory(_temp) {
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              if (webRTCStream) {
+                _context2.next = 2;
+                break;
+              }
+
+              return _context2.abrupt("return");
+
+            case 2:
               videoContainerOptions = {
                 error: onVideoError,
                 audioVolume: _audioVolume
               };
-              _context2.prev = 1;
-              _context2.next = 4;
+              _context2.prev = 3;
+              _context2.next = 6;
               return _widgetView.bindVideo(webRTCStream, videoContainerOptions);
 
-            case 4:
-              _context2.next = 12;
+            case 6:
+              _context2.next = 14;
               break;
 
-            case 6:
-              _context2.prev = 6;
-              _context2.t0 = _context2["catch"](1);
+            case 8:
+              _context2.prev = 8;
+              _context2.t0 = _context2["catch"](3);
 
               if (!(_context2.t0 instanceof CancellationError || _state.isDestroyed())) {
-                _context2.next = 10;
+                _context2.next = 12;
                 break;
               }
 
               return _context2.abrupt("return");
 
-            case 10:
+            case 12:
               onVideoError(_context2.t0);
               throw _context2.t0;
 
-            case 12:
+            case 14:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[1, 6]]);
+        }, _callee2, null, [[3, 8]]);
       }));
 
       return function bindWebRTCStream(_x2) {
@@ -33196,34 +33209,14 @@ module.exports = function SubscriberFactory(_temp) {
                 return _context18.abrupt("return");
 
               case 2:
-                if (!(_activeSourceStreamId === 'MANTIS')) {
-                  _context18.next = 4;
-                  break;
-                }
-
-                return _context18.abrupt("return");
-
-              case 4:
                 logRelayedToRoutedTransition('Attempt');
-
-                if (_state.isSubscribing()) {
-                  _context18.next = 8;
-                  break;
-                }
-
-                logRelayedToRoutedTransition('Failure', {
-                  reason: 'Subscriber is not subscribing'
-                });
-                return _context18.abrupt("return");
-
-              case 8:
                 webRTCStream = webRTCStreams.MANTIS;
                 _webRTCStream = webRTCStream; // bind mantis stream
 
-                _context18.next = 12;
+                _context18.next = 7;
                 return bindWebRTCStream(webRTCStream);
 
-              case 12:
+              case 7:
                 // Keep the loading spinner hidden so that the transition looks transparent.
                 _widgetView.loading(false); // remove and close p2p connection
 
@@ -33232,16 +33225,16 @@ module.exports = function SubscriberFactory(_temp) {
                 _activeSourceStreamId = 'MANTIS'; // remove webRTCStream
 
                 removeWebRTCStream('P2P');
-                _context18.next = 18;
+                _context18.next = 13;
                 return getCurrentPeerConnection();
 
-              case 18:
+              case 13:
                 peerConnection = _context18.sent;
                 // Create audioLevelSampler for the current peer connection
                 createAudioLevelSampler(peerConnection);
                 logRelayedToRoutedTransition('Success');
 
-              case 21:
+              case 16:
               case "end":
                 return _context18.stop();
             }