@webex/plugin-meetings 3.3.1-next.29 → 3.3.1-next.30

package/dist/breakouts/breakout.js

@@ -209,7 +209,7 @@ var Breakout = _webexCore.WebexPlugin.extend({
       sessionId: this.sessionId
     });
   },
-  version: "3.3.1-next.29"
+  version: "3.3.1-next.30"
 });
 var _default = exports.default = Breakout;
 //# sourceMappingURL=breakout.js.map

package/dist/breakouts/index.js

@@ -1046,7 +1046,7 @@ var Breakouts = _webexCore.WebexPlugin.extend({
       this.trigger(_constants.BREAKOUTS.EVENTS.ASK_RETURN_TO_MAIN);
     }
   },
-  version: "3.3.1-next.29"
+  version: "3.3.1-next.30"
 });
 var _default = exports.default = Breakouts;
 //# sourceMappingURL=index.js.map

package/dist/interpretation/index.js

@@ -373,7 +373,7 @@ var SimultaneousInterpretation = _webexCore.WebexPlugin.extend({
       throw error;
     });
   },
-  version: "3.3.1-next.29"
+  version: "3.3.1-next.30"
 });
 var _default = exports.default = SimultaneousInterpretation;
 //# sourceMappingURL=index.js.map

package/dist/interpretation/siLanguage.js

@@ -18,7 +18,7 @@ var SILanguage = _webexCore.WebexPlugin.extend({
     languageCode: 'number',
     languageName: 'string'
   },
-  version: "3.3.1-next.29"
+  version: "3.3.1-next.30"
 });
 var _default = exports.default = SILanguage;
 //# sourceMappingURL=siLanguage.js.map

package/dist/meeting/index.js

@@ -3605,6 +3605,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
           correlation_id: _this19.correlationId,
           locus_id: _this19.locusId
         });
+        _loggerProxy.default.logger.info('Meeting:index#setUpLocusInfoSelfListener --> MEDIA_INACTIVITY received, reconnecting...');
         _this19.reconnect();
       });
 
@@ -4674,7 +4675,6 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "closePeerConnections",
     value: function closePeerConnections() {
-      this.locusMediaRequest = undefined;
       if (this.mediaProperties.webrtcMediaConnection) {
         if (this.remoteMediaManager) {
           this.remoteMediaManager.stop();
@@ -4979,6 +4979,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
           joinResponse,
           turnServerInfo,
           turnDiscoverySkippedReason,
+          forceTurnDiscovery,
           turnDiscoveryRequest,
           _yield$this$roap$hand,
           mediaResponse,
@@ -5004,34 +5005,36 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
               joined = false;
               joinResponse = prevJoinResponse;
               _context15.prev = 9;
-              _context15.next = 12;
+              forceTurnDiscovery = false;
+              if (joinResponse) {
+                _context15.next = 36;
+                break;
+              }
+              _context15.next = 14;
               return this.webex.meetings.reachability.getReachabilityResults();
-            case 12:
+            case 14:
               joinOptions.reachability = _context15.sent;
-              _context15.next = 15;
+              _context15.next = 17;
               return this.roap.generateTurnDiscoveryRequestMessage(this, true);
-            case 15:
+            case 17:
               turnDiscoveryRequest = _context15.sent;
               turnDiscoverySkippedReason = turnDiscoveryRequest.turnDiscoverySkippedReason;
               joinOptions.roapMessage = turnDiscoveryRequest.roapMessage;
-              if (joinResponse) {
-                _context15.next = 23;
-                break;
-              }
               _loggerProxy.default.logger.info('Meeting:index#joinWithMedia ---> calling join with joinOptions, ', joinOptions);
-              _context15.next = 22;
+              _context15.next = 23;
               return this.join(joinOptions);
-            case 22:
-              joinResponse = _context15.sent;
             case 23:
+              joinResponse = _context15.sent;
               joined = true;
+
+              // if we sent out TURN discovery Roap message with join, process the TURN discovery response
               if (!joinOptions.roapMessage) {
-                _context15.next = 33;
+                _context15.next = 34;
                 break;
               }
-              _context15.next = 27;
+              _context15.next = 28;
               return this.roap.handleTurnDiscoveryHttpResponse(this, joinResponse);
-            case 27:
+            case 28:
               _yield$this$roap$hand = _context15.sent;
               turnServerInfo = _yield$this$roap$hand.turnServerInfo;
               turnDiscoverySkippedReason = _yield$this$roap$hand.turnDiscoverySkippedReason;
@@ -5040,10 +5043,18 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
               if (turnServerInfo === undefined) {
                 this.roap.abortTurnDiscovery();
               }
-            case 33:
-              _context15.next = 35;
-              return this.addMedia(mediaOptions, turnServerInfo);
-            case 35:
+            case 34:
+              _context15.next = 38;
+              break;
+            case 36:
+              // This is a retry, when join succeeded but addMedia failed, so we'll just call addMedia() again,
+              // but we need to ensure that it also does a new TURN discovery
+              forceTurnDiscovery = true;
+              joined = true;
+            case 38:
+              _context15.next = 40;
+              return this.addMedia(mediaOptions, turnServerInfo, forceTurnDiscovery);
+            case 40:
               mediaResponse = _context15.sent;
               this.joinWithMediaRetryInfo = {
                 isRetry: false,
@@ -5053,30 +5064,30 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 join: joinResponse,
                 media: mediaResponse
               });
-            case 40:
-              _context15.prev = 40;
+            case 45:
+              _context15.prev = 45;
               _context15.t0 = _context15["catch"](9);
               _loggerProxy.default.logger.error('Meeting:index#joinWithMedia --> ', _context15.t0);
               this.roap.abortTurnDiscovery();
               if (!(joined && isRetry)) {
-                _context15.next = 54;
+                _context15.next = 59;
                 break;
               }
-              _context15.prev = 45;
-              _context15.next = 48;
+              _context15.prev = 50;
+              _context15.next = 53;
               return this.leave({
                 resourceId: joinOptions === null || joinOptions === void 0 ? void 0 : joinOptions.resourceId,
                 reason: 'joinWithMedia failure'
               });
-            case 48:
-              _context15.next = 54;
+            case 53:
+              _context15.next = 59;
               break;
-            case 50:
-              _context15.prev = 50;
-              _context15.t1 = _context15["catch"](45);
+            case 55:
+              _context15.prev = 55;
+              _context15.t1 = _context15["catch"](50);
               _loggerProxy.default.logger.error('Meeting:index#joinWithMedia --> leave error', _context15.t1);
               leaveError = _context15.t1;
-            case 54:
+            case 59:
               _metrics.default.sendBehavioralMetric(_constants2.default.JOIN_WITH_MEDIA_FAILURE, {
                 correlation_id: this.correlationId,
                 locus_id: (_this$locusUrl = this.locusUrl) === null || _this$locusUrl === void 0 ? void 0 : _this$locusUrl.split('/').pop(),
@@ -5097,24 +5108,24 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 shouldRetry = false;
               }
               if (!shouldRetry) {
-                _context15.next = 62;
+                _context15.next = 67;
                 break;
               }
               _loggerProxy.default.logger.warn('Meeting:index#joinWithMedia --> retrying call to joinWithMedia');
               this.joinWithMediaRetryInfo.isRetry = true;
               this.joinWithMediaRetryInfo.prevJoinResponse = joinResponse;
               return _context15.abrupt("return", this.joinWithMedia(options));
-            case 62:
+            case 67:
               this.joinWithMediaRetryInfo = {
                 isRetry: false,
                 prevJoinResponse: undefined
               };
               throw _context15.t0;
-            case 64:
+            case 69:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[9, 40], [45, 50]]);
+        }, _callee15, this, [[9, 45], [50, 55]]);
       }));
       function joinWithMedia() {
         return _joinWithMedia.apply(this, arguments);
@@ -5545,6 +5556,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
             case 51:
               return _context18.abrupt("return", _util2.default.joinMeetingOptions(this, options).then(function (join) {
                 _this31.meetingFiniteStateMachine.join();
+                _this31.setupLocusMediaRequest();
                 _loggerProxy.default.logger.log('Meeting:index#join --> Success');
                 _metrics.default.sendBehavioralMetric(_constants2.default.JOIN_SUCCESS, {
                   correlation_id: _this31.correlationId
@@ -6510,12 +6522,13 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "establishMediaConnection",
     value: (function () {
       var _establishMediaConnection = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee29(remoteMediaManagerConfig, bundlePolicy, isForced, turnServerInfo) {
+        var _this$locusMediaReque;
         var LOG_HEADER, isReconnecting, _yield$this$doTurnDis, mc;
         return _regenerator.default.wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
               LOG_HEADER = 'Meeting:index#addMedia():establishMediaConnection -->';
-              isReconnecting = this.isMoveToInProgress || this.retriedWithTurnServer; // We are forcing turn discovery if the case is moveTo and a turn server was used already
+              isReconnecting = this.isMoveToInProgress || !!((_this$locusMediaReque = this.locusMediaRequest) !== null && _this$locusMediaReque !== void 0 && _this$locusMediaReque.isConfluenceCreated()); // We are forcing turn discovery if the case is moveTo and a turn server was used already
               if (this.isMoveToInProgress && this.turnServerUsed) {
                 isForced = true;
               }
@@ -6673,23 +6686,53 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
       }
       return cleanUpBeforeRetryWithTurnServer;
     }()
+    /**
+     * Creates an instance of LocusMediaRequest for this meeting - it is needed for doing any calls
+     * to Locus /media API (these are used for sending Roap messages and updating audio/video mute status).
+     *
+     * @returns {void}
+     */
+    )
+  }, {
+    key: "setupLocusMediaRequest",
+    value: function setupLocusMediaRequest() {
+      var _this$webex$meetings$2, _this$webex$meetings$3;
+      this.locusMediaRequest = new _locusMediaRequest.LocusMediaRequest({
+        correlationId: this.correlationId,
+        meetingId: this.id,
+        device: {
+          url: this.deviceUrl,
+          // @ts-ignore
+          deviceType: this.config.deviceType,
+          // @ts-ignore
+          countryCode: (_this$webex$meetings$2 = this.webex.meetings.geoHintInfo) === null || _this$webex$meetings$2 === void 0 ? void 0 : _this$webex$meetings$2.countryCode,
+          // @ts-ignore
+          regionCode: (_this$webex$meetings$3 = this.webex.meetings.geoHintInfo) === null || _this$webex$meetings$3 === void 0 ? void 0 : _this$webex$meetings$3.regionCode
+        },
+        preferTranscoding: !this.isMultistream
+      }, {
+        // @ts-ignore
+        parent: this.webex
+      });
+    }
+
     /**
      * Creates a media connection to the server. Media connection is required for sending or receiving any audio/video.
      *
      * @param {AddMediaOptions} options
      * @param {TurnServerInfo} turnServerInfo - TURN server information (used only internally by the SDK)
+     * @param {boolean} forceTurnDiscovery - if true, TURN discovery will be done (used only internally by the SDK)
      * @returns {Promise<void>}
      * @public
      * @memberof Meeting
      */
-    )
   }, {
     key: "addMedia",
     value: (function () {
       var _addMedia = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee32() {
-        var _this$webex$meetings$2, _this$webex$meetings$3;
         var options,
           turnServerInfo,
+          forceTurnDiscovery,
           LOG_HEADER,
           localStreams,
           _options$audioEnabled,
@@ -6740,33 +6783,34 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
             case 0:
               options = _args32.length > 0 && _args32[0] !== undefined ? _args32[0] : {};
               turnServerInfo = _args32.length > 1 && _args32[1] !== undefined ? _args32[1] : undefined;
+              forceTurnDiscovery = _args32.length > 2 && _args32[2] !== undefined ? _args32[2] : false;
               this.retriedWithTurnServer = false;
               this.hasMediaConnectionConnectedAtLeastOnce = false;
               LOG_HEADER = 'Meeting:index#addMedia -->';
-              _loggerProxy.default.logger.info("".concat(LOG_HEADER, " called with: ").concat((0, _stringify.default)(options), ", ").concat((0, _stringify.default)(turnServerInfo)));
+              _loggerProxy.default.logger.info("".concat(LOG_HEADER, " called with: options=").concat((0, _stringify.default)(options), ", turnServerInfo=").concat((0, _stringify.default)(turnServerInfo), ", forceTurnDiscovery=").concat(forceTurnDiscovery));
               if (!(options.allowMediaInLobby !== true && this.meetingState !== _constants.FULL_STATE.ACTIVE)) {
-                _context32.next = 8;
+                _context32.next = 9;
                 break;
               }
               throw new _webexErrors.MeetingNotActiveError();
-            case 8:
+            case 9:
               if (!_util2.default.isUserInLeftState(this.locusInfo)) {
-                _context32.next = 10;
+                _context32.next = 11;
                 break;
               }
               throw new _webexErrors.UserNotJoinedError();
-            case 10:
+            case 11:
               localStreams = options.localStreams, _options$audioEnabled = options.audioEnabled, audioEnabled = _options$audioEnabled === void 0 ? true : _options$audioEnabled, _options$videoEnabled = options.videoEnabled, videoEnabled = _options$videoEnabled === void 0 ? true : _options$videoEnabled, _options$shareAudioEn = options.shareAudioEnabled, shareAudioEnabled = _options$shareAudioEn === void 0 ? true : _options$shareAudioEn, _options$shareVideoEn = options.shareVideoEnabled, shareVideoEnabled = _options$shareVideoEn === void 0 ? true : _options$shareVideoEn, remoteMediaManagerConfig = options.remoteMediaManagerConfig, bundlePolicy = options.bundlePolicy;
               this.allowMediaInLobby = options === null || options === void 0 ? void 0 : options.allowMediaInLobby;
 
               // If the user is unjoined or guest waiting in lobby dont allow the user to addMedia
               // @ts-ignore - isUserUnadmitted coming from SelfUtil
               if (!(this.isUserUnadmitted && !this.wirelessShare && !this.allowMediaInLobby)) {
-                _context32.next = 14;
+                _context32.next = 15;
                 break;
               }
               throw new _webexErrors.UserInLobbyError();
-            case 14:
+            case 15:
               // @ts-ignore
               this.webex.internal.newMetrics.submitClientEvent({
                 name: 'client.media.capabilities',
@@ -6803,23 +6847,6 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 receiveVideo: videoEnabled,
                 receiveShare: shareAudioEnabled || shareVideoEnabled
               });
-              this.locusMediaRequest = new _locusMediaRequest.LocusMediaRequest({
-                correlationId: this.correlationId,
-                meetingId: this.id,
-                device: {
-                  url: this.deviceUrl,
-                  // @ts-ignore
-                  deviceType: this.config.deviceType,
-                  // @ts-ignore
-                  countryCode: (_this$webex$meetings$2 = this.webex.meetings.geoHintInfo) === null || _this$webex$meetings$2 === void 0 ? void 0 : _this$webex$meetings$2.countryCode,
-                  // @ts-ignore
-                  regionCode: (_this$webex$meetings$3 = this.webex.meetings.geoHintInfo) === null || _this$webex$meetings$3 === void 0 ? void 0 : _this$webex$meetings$3.regionCode
-                },
-                preferTranscoding: !this.isMultistream
-              }, {
-                // @ts-ignore
-                parent: this.webex
-              });
               this.audio = (0, _muteState.createMuteState)(_constants.AUDIO, this, audioEnabled);
               this.video = (0, _muteState.createMuteState)(_constants.VIDEO, this, videoEnabled);
               _context32.prev = 19;
@@ -6829,7 +6856,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
               this.setMercuryListener();
               this.createStatsAnalyzer();
               _context32.next = 26;
-              return this.establishMediaConnection(remoteMediaManagerConfig, bundlePolicy, false, turnServerInfo);
+              return this.establishMediaConnection(remoteMediaManagerConfig, bundlePolicy, forceTurnDiscovery, turnServerInfo);
             case 26:
               if (!(audioEnabled || videoEnabled)) {
                 _context32.next = 31;