@opentok/client 2.27.5 → 2.27.6

package/dist/js/opentok.js

@@ -1,11 +1,11 @@
 /**
- * @license OpenTok.js 2.27.5 3cc5fc6
+ * @license OpenTok.js 2.27.6 cf306f8
  *
  * Copyright (c) 2010-2024 TokBox, Inc.
  * Subject to the applicable Software Development Kit (SDK) License Agreement:
  * https://www.vonage.com/legal/communications-apis/terms-of-use/
  *
- * Date: Thu, 16 May 2024 22:31:56 GMT
+ * Date: Wed, 05 Jun 2024 14:03:04 GMT
  */
 
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -7922,7 +7922,7 @@ const logging = (0, _log.default)('StaticConfig');
 */
 
 /** @type builtInConfig */
-const builtInConfig = (0, _cloneDeep.default)({"version":"v2.27.5","buildHash":"3cc5fc6","minimumVersion":{"firefox":52,"chrome":49},"debug":false,"websiteURL":"http://www.tokbox.com","configURL":"https://config.opentok.com","ipWhitelistConfigURL":"","cdnURL":"","loggingURL":"https://hlg.tokbox.com/prod","apiURL":"https://anvil.opentok.com"});
+const builtInConfig = (0, _cloneDeep.default)({"version":"v2.27.6","buildHash":"cf306f8","minimumVersion":{"firefox":52,"chrome":49},"debug":false,"websiteURL":"http://www.tokbox.com","configURL":"https://config.opentok.com","ipWhitelistConfigURL":"","cdnURL":"","loggingURL":"https://hlg.tokbox.com/prod","apiURL":"https://anvil.opentok.com"});
 const whitelistAllowedRuntimeProperties = (0, _pick.default)(['apiURL', 'assetURL', 'cdnURL', 'sessionInfoOverrides', 'loggingURL']);
 const liveConfigMap = {
   apiUrl: 'apiURL',
@@ -9699,33 +9699,40 @@ function PeerConnectionFactory(deps) {
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.next = 2;
+              if (api.iceConnectionStateIsConnected()) {
+                _context4.next = 3;
+                break;
+              }
+              api.once('iceConnected', () => api.startDecryption(connectionId, transceiver));
+              return _context4.abrupt("return");
+            case 3:
+              _context4.next = 5;
               return extractSenderId({
                 sessionId,
                 connectionId
               });
-            case 2:
+            case 5:
               senderId = _context4.sent;
               receiver = transceiver.receiver;
-              _context4.next = 6;
-              return getOrCreateSFrameReceiverClient(connectionId);
-            case 6:
+              _context4.next = 9;
+              return getOrCreateSFrameReceiverClient(senderId);
+            case 9:
               sFrameReceiverClient = _context4.sent;
-              _context4.prev = 7;
-              _context4.next = 10;
+              _context4.prev = 10;
+              _context4.next = 13;
               return sFrameReceiverClient == null ? void 0 : sFrameReceiverClient.decrypt(senderId, receiver);
-            case 10:
-              _context4.next = 15;
+            case 13:
+              _context4.next = 18;
               break;
-            case 12:
-              _context4.prev = 12;
-              _context4.t0 = _context4["catch"](7);
-              logging.error(_context4.t0);
             case 15:
+              _context4.prev = 15;
+              _context4.t0 = _context4["catch"](10);
+              logging.error(_context4.t0);
+            case 18:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, null, [[7, 12]]);
+        }, _callee4, null, [[10, 15]]);
       }));
       return function (_x3, _x4) {
         return _ref6.apply(this, arguments);
@@ -9733,24 +9740,16 @@ function PeerConnectionFactory(deps) {
     }();
     _readyToCompleteOffer.resolve();
     const getOrCreateSFrameReceiverClient = /*#__PURE__*/function () {
-      var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(connectionId) {
-        var sFrameSenderId;
+      var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(sFrameSenderId) {
         return _regenerator.default.wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context6.next = 2;
-              return extractSenderId({
-                sessionId,
-                connectionId
-              });
-            case 2:
-              sFrameSenderId = _context6.sent;
               if (!asyncSFrameReceiverClients[sFrameSenderId]) {
-                _context6.next = 5;
+                _context6.next = 2;
                 break;
               }
               return _context6.abrupt("return", asyncSFrameReceiverClients[sFrameSenderId]);
-            case 5:
+            case 2:
               asyncSFrameReceiverClients[sFrameSenderId] = new Promise( /*#__PURE__*/function () {
                 var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(resolve) {
                   var sharedKey, sFrameReceiverClient;
@@ -9794,7 +9793,7 @@ function PeerConnectionFactory(deps) {
                 };
               }());
               return _context6.abrupt("return", asyncSFrameReceiverClients[sFrameSenderId]);
-            case 7:
+            case 4:
             case "end":
               return _context6.stop();
           }
@@ -16904,7 +16903,6 @@ function PublisherFactory(_ref) {
     }
     /** @type {WidgetView|null} */
     let widgetView;
-    let lastRequestedStreamId;
     let webRTCStream;
     let publishStartTime;
     let microphone;
@@ -16932,17 +16930,18 @@ function PublisherFactory(_ref) {
     /** @type IntervalRunnerDefault | undefined */
     let connectivityAttemptPinger;
 
-    // previousSession mimics the publisher.session variable except it's never set to null
+    // _session mimics the publisher.session variable except it's never set to null
     // this allows analytics to refer to it in cases where we disconnect/destroy
     // and go to log analytics and publisher.session has been set to null
-    let previousSession;
+    let _session;
     const _options = options,
       _enableSenderStats = _options._enableSenderStats;
-    const getLastSession = () => this.session || previousSession || {
+    const getSession = () => this.session || _session || {
       isConnected() {
         return false;
       }
     };
+    const getStreamId = () => this.streamId || '';
     const streamChannels = [];
     const mediaProcessor = new MediaProcessor();
     const amrAudioTrackProcessor = new _amrAudioTrackProcessor.default();
@@ -16966,8 +16965,8 @@ function PublisherFactory(_ref) {
     });
     function getCommonAnalyticsFields() {
       return {
-        connectionId: getLastSession().isConnected() ? getLastSession().connection.connectionId : null,
-        streamId: lastRequestedStreamId,
+        connectionId: getSession().isConnected() ? getSession().connection.connectionId : null,
+        streamId: getStreamId(),
         widgetType: 'Publisher'
       };
     }
@@ -17278,7 +17277,7 @@ function PublisherFactory(_ref) {
         peerId,
         widgetType: 'Publisher',
         connectionId: this.session && this.session.isConnected() ? this.session.connection.connectionId : null,
-        streamId: lastRequestedStreamId,
+        streamId: this.streamId,
         width: widgetView.width,
         height: widgetView.height,
         audioTrack: webRTCStream && webRTCStream.getAudioTracks().length > 0,
@@ -17558,7 +17557,6 @@ function PublisherFactory(_ref) {
       // Disconnect immediately, rather than wait for the WebSocket to
       // reply to our destroyStream message.
       this.disconnect();
-      this.session = null;
 
       // We're back to being a stand-alone publisher again.
       if (!state.isDestroyed()) {
@@ -18031,6 +18029,7 @@ function PublisherFactory(_ref) {
       this.stream = null;
       loaded = false;
       this.session = null;
+      this.streamId = null;
       if (!state.isDestroyed()) {
         state.set('NotPublishing');
       }
@@ -20501,15 +20500,22 @@ function PublisherFactory(_ref) {
         }))();
       },
       publishToSession: (session, analyticsReplacement) => {
+        // Check if it is already publishing, i.e. 'PublishingToSession' or 'Publishing'
+        //  - 'PublishingToSession' is the state we are establishing the Publisher with Rumor.
+        //  - 'Publishing' is the state of publishing to the platform.
+        const isAlreadyPublishing = state.current === 'PublishingToSession' || state.isPublishing();
+        if (isAlreadyPublishing) {
+          logging.warn(`This publisher is already publishing to the session. If you want to
+             republish, please unpublish first.`);
+          return Promise.resolve();
+        }
         if (analyticsReplacement) {
           analytics = analyticsReplacement;
         }
         // Add session property to Publisher
-        previousSession = session;
         this.session = session;
-        const requestedStreamId = (0, _uuid.default)();
-        lastRequestedStreamId = requestedStreamId;
-        this.streamId = requestedStreamId;
+        _session = session;
+        this.streamId = (0, _uuid.default)();
         logConnectivityEvent('Attempt', {
           dataChannels: properties.channels,
           properties: (0, _whitelistPublisherProperties.default)(properties)
@@ -20647,8 +20653,6 @@ function PublisherFactory(_ref) {
               type: 'audio',
               active: properties.publishAudio
             }));
-          }
-          if (didRequestAudio && hasAudioTrack) {
             streamChannels.push(new StreamChannel({
               id: 'caption1',
               type: 'data',
@@ -20684,7 +20688,7 @@ function PublisherFactory(_ref) {
           const streamId = maybeStream.streamId,
             message = maybeStream.message;
           logging.debug('publishToSession: rumor stream id created:', streamId, '(this is different from stream#created, which requires media to actually be ' + 'flowing for mantis sessions)');
-          if (streamId !== requestedStreamId) {
+          if (streamId !== this.streamId) {
             throw new Error('streamId response does not match request');
           }
           this.streamId = streamId;
@@ -20730,14 +20734,13 @@ function PublisherFactory(_ref) {
           const err = new Error(createErrorFromReason());
           this.trigger('publishComplete', otError(reason === 'mediaStopped' ? Errors.MEDIA_ENDED : Errors.CANCEL, err));
         }
-        this.session = null;
         logAnalyticsEvent('unpublish', 'Success');
         this._.streamDestroyed(reason);
         return this;
       },
       unpublishStreamFromSession: (stream, session, reason) => {
-        if (!lastRequestedStreamId || stream.id !== lastRequestedStreamId) {
-          logging.warn(`The publisher ${guid} is trying to destroy a stream ${stream.id} that is not attached to it (it has ${lastRequestedStreamId || 'no stream'} attached to it)`);
+        if (stream.id !== this.streamId) {
+          logging.warn(`The publisher ${guid} is trying to destroy a stream ${stream.id} that is not attached to it`);
           return this;
         }
         return this._.unpublishFromSession(session, reason);
@@ -65021,7 +65024,7 @@ function SessionFactory(deps) {
     * @method #publish
     * @memberOf Session
     */
-    this.publish = function (publisher, properties, completionHandler) {
+    this.publish = (publisher, properties, completionHandler) => {
       if (typeof publisher === 'function') {
         completionHandler = publisher;
         publisher = undefined;
@@ -65059,11 +65062,15 @@ function SessionFactory(deps) {
         return null;
       }
 
-      // If the user has passed in an ID of a element then we create a new publisher.
-      if (!publisher || typeof publisher === 'string' || OTHelpers.isElementNode(publisher)) {
-        // Initiate a new Publisher with the new session credentials
-        publisher = initPublisher(publisher, properties);
-      } else if (publisher instanceof Publisher) {
+      // If the user has passed in an ID or an element then we create a new publisher.
+      const shouldInitPublisher = !publisher || typeof publisher === 'string' || OTHelpers.isElementNode(publisher);
+      // If publisher is an instance of Publisher we use that Publisher.
+      const shouldUsePublisher = publisher instanceof Publisher;
+      if (!shouldInitPublisher && !shouldUsePublisher) {
+        dispatchOTError(otError(errors.INVALID_PARAMETER, new Error('Session.publish :: First parameter passed in is neither a ' + 'string nor an instance of the Publisher'), ExceptionCodes.UNABLE_TO_PUBLISH), completionHandler);
+        return undefined;
+      }
+      if (shouldUsePublisher) {
         // If the publisher already has a session attached to it we can
         if ('session' in publisher && publisher.session && 'sessionId' in publisher.session) {
           // send a warning message that we can't publish again.
@@ -65072,26 +65079,23 @@ function SessionFactory(deps) {
           } else {
             _logging.warn(`Cannot publish ${publisher.guid()} publisher already attached to ${publisher.session.sessionId}. Please call session.unpublish(publisher) first.`);
           }
+          completionHandler(null, publisher);
+          return publisher;
         }
-      } else {
-        dispatchOTError(otError(errors.INVALID_PARAMETER, new Error('Session.publish :: First parameter passed in is neither a ' + 'string nor an instance of the Publisher'), ExceptionCodes.UNABLE_TO_PUBLISH), completionHandler);
-        return undefined;
+      } else if (shouldInitPublisher) {
+        // Initiate a new Publisher with the new session credentials
+        publisher = initPublisher(publisher, properties);
       }
       if (_muteOnEntry) {
         publisher._.forceMuteAudio();
       }
 
       // Add publisher reference to the session
-      publisher._.publishToSession(this, analytics).catch(err => {
+      publisher._.publishToSession(this, analytics).then(() => completionHandler(null, publisher), err => {
         err.message = `Session.publish :: ${err.message}`;
         _logging.error(err.code, err.message);
-        throw err;
-      }).then(() => publisher).then(function () {
-        for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-          args[_key3] = arguments[_key3];
-        }
-        return completionHandler(null, ...args);
-      }, err => completionHandler(err));
+        completionHandler(err);
+      });
 
       // return the embed publisher
       return publisher;
@@ -66223,8 +66227,8 @@ function SessionFactory(deps) {
           _completion(error);
           return;
         }
-        for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-          args[_key4 - 1] = arguments[_key4];
+        for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
+          args[_key3 - 1] = arguments[_key3];
         }
         _completion(error, ...args);
       }, this.logEvent);
@@ -66336,8 +66340,8 @@ function SessionFactory(deps) {
         if (err) {
           dispatchOTError(otError(errors.INVALID_PARAMETER, new Error(invalidParameterErrorMsg), ExceptionCodes.INVALID_PARAMETER), completionHandler);
         } else if (completionHandler && (0, _isFunction.default)(completionHandler)) {
-          for (var _len5 = arguments.length, args = new Array(_len5 > 1 ? _len5 - 1 : 0), _key5 = 1; _key5 < _len5; _key5++) {
-            args[_key5 - 1] = arguments[_key5];
+          for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
+            args[_key4 - 1] = arguments[_key4];
           }
           completionHandler(err, ...args);
         }