@webex/plugin-meetings 3.12.0-next.78 → 3.12.0-next.79

package/dist/aiEnableRequest/index.js

@@ -191,7 +191,7 @@ var AIEnableRequest = _webexCore.WebexPlugin.extend({
       method: _constants.HTTP_VERBS.PUT
     });
   },
-  version: "3.12.0-next.78"
+  version: "3.12.0-next.79"
 });
 var _default = exports.default = AIEnableRequest;
 //# sourceMappingURL=index.js.map

package/dist/breakouts/breakout.js

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

package/dist/breakouts/index.js

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

package/dist/interpretation/index.js

@@ -381,7 +381,7 @@ var SimultaneousInterpretation = _webexCore.WebexPlugin.extend({
       throw error;
     });
   },
-  version: "3.12.0-next.78"
+  version: "3.12.0-next.79"
 });
 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.12.0-next.78"
+  version: "3.12.0-next.79"
 });
 var _default = exports.default = SILanguage;
 //# sourceMappingURL=siLanguage.js.map

package/dist/meeting/index.js

@@ -111,6 +111,7 @@ var DEFAULT_ICE_PHASE_CALLBACK = function DEFAULT_ICE_PHASE_CALLBACK() {
   return 'JOIN_MEETING_FINAL';
 };
 var LLM_HEALTHCHECK_TIMER_MS = 3 * 60 * 1000;
+var JOIN_WITH_MEDIA_RETRY_MAX_COUNT = 2;
 var logRequest = function logRequest(request, _ref) {
   var _ref$logText = _ref.logText,
     logText = _ref$logText === void 0 ? '' : _ref$logText;
@@ -2514,12 +2515,12 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
     /**
      * Information needed for a retry of a call to joinWithMedia
      * @instance
-     * @type {{isRetry: boolean; prevJoinResponse?: any}}
+     * @type {{retryCount: number; prevJoinResponse?: any}}
      * @private
      * @memberof Meeting
      */
     _this.joinWithMediaRetryInfo = {
-      isRetry: false,
+      retryCount: 0,
       prevJoinResponse: undefined
     };
 
@@ -6198,10 +6199,12 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
           _options$joinOptions,
           joinOptions,
           _this$joinWithMediaRe,
-          isRetry,
+          retryCount,
           prevJoinResponse,
+          prevError,
           joined,
           joinResponse,
+          shouldJoin,
           turnServerInfo,
           turnDiscoverySkippedReason,
           forceTurnDiscovery,
@@ -6214,6 +6217,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
           shouldRetry,
           _error2,
           _error3,
+          firstError,
           _args17 = arguments,
           _t10,
           _t11;
@@ -6222,7 +6226,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
             case 0:
               options = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : {};
               mediaOptions = options.mediaOptions, _options$joinOptions = options.joinOptions, joinOptions = _options$joinOptions === void 0 ? {} : _options$joinOptions;
-              _this$joinWithMediaRe = this.joinWithMediaRetryInfo, isRetry = _this$joinWithMediaRe.isRetry, prevJoinResponse = _this$joinWithMediaRe.prevJoinResponse;
+              _this$joinWithMediaRe = this.joinWithMediaRetryInfo, retryCount = _this$joinWithMediaRe.retryCount, prevJoinResponse = _this$joinWithMediaRe.prevJoinResponse, prevError = _this$joinWithMediaRe.prevError;
               if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.allowMediaInLobby) {
                 _context17.next = 1;
                 break;
@@ -6244,33 +6248,38 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
               }
               throw new _internalMediaCore.Errors.WebrtcApiNotAvailableError('RTCPeerConnection API is not available in this environment');
             case 2:
-              _context17.prev = 2;
+              shouldJoin = !joinResponse ||
+              // first try, when the join response is empty
+              prevError && prevError instanceof _webexErrors.UserNotJoinedError ||
+              // last try failed with UserNotJoinedError
+              _util2.default.isUserInLeftState(this.locusInfo); // locus dropped the connection before we can re-try addMedia
+              _context17.prev = 3;
               forceTurnDiscovery = false;
-              if (joinResponse) {
-                _context17.next = 7;
+              if (!shouldJoin) {
+                _context17.next = 8;
                 break;
               }
-              _context17.next = 3;
+              _context17.next = 4;
               return this.roap.generateTurnDiscoveryRequestMessage(this, true);
-            case 3:
+            case 4:
               turnDiscoveryRequest = _context17.sent;
               turnDiscoverySkippedReason = turnDiscoveryRequest.turnDiscoverySkippedReason;
               joinOptions.roapMessage = turnDiscoveryRequest.roapMessage;
               _loggerProxy.default.logger.info('Meeting:index#joinWithMedia ---> calling join with joinOptions, ', joinOptions);
-              _context17.next = 4;
+              _context17.next = 5;
               return this.join(joinOptions);
-            case 4:
+            case 5:
               joinResponse = _context17.sent;
               joined = true;
 
               // if we sent out TURN discovery Roap message with join, process the TURN discovery response
               if (!joinOptions.roapMessage) {
-                _context17.next = 6;
+                _context17.next = 7;
                 break;
               }
-              _context17.next = 5;
+              _context17.next = 6;
               return this.roap.handleTurnDiscoveryHttpResponse(this, joinResponse);
-            case 5:
+            case 6:
               _yield$this$roap$hand = _context17.sent;
               turnServerInfo = _yield$this$roap$hand.turnServerInfo;
               turnDiscoverySkippedReason = _yield$this$roap$hand.turnDiscoverySkippedReason;
@@ -6279,23 +6288,24 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
               if (turnServerInfo === undefined) {
                 this.roap.abortTurnDiscovery();
               }
-            case 6:
-              _context17.next = 8;
-              break;
             case 7:
+              _context17.next = 9;
+              break;
+            case 8:
               // 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 8:
-              _context17.next = 9;
+            case 9:
+              _context17.next = 10;
               return this.addMediaInternal(function () {
-                return _this30.joinWithMediaRetryInfo.isRetry ? 'JOIN_MEETING_FINAL' : 'JOIN_MEETING_RETRY';
+                // callback is not called when UserNotJoinedError is thrown
+                return _this30.joinWithMediaRetryInfo.retryCount >= 1 ? 'JOIN_MEETING_FINAL' : 'JOIN_MEETING_RETRY';
               }, turnServerInfo, forceTurnDiscovery, mediaOptions);
-            case 9:
+            case 10:
               mediaResponse = _context17.sent;
               this.joinWithMediaRetryInfo = {
-                isRetry: false,
+                retryCount: 0,
                 prevJoinResponse: undefined
               };
               return _context17.abrupt("return", {
@@ -6303,14 +6313,14 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 media: mediaResponse,
                 multistreamEnabled: this.isMultistream
               });
-            case 10:
-              _context17.prev = 10;
-              _t10 = _context17["catch"](2);
+            case 11:
+              _context17.prev = 11;
+              _t10 = _context17["catch"](3);
               _loggerProxy.default.logger.error('Meeting:index#joinWithMedia --> ', _t10);
               this.roap.abortTurnDiscovery();
 
-              // if this was the first attempt, let's do a retry
-              shouldRetry = !isRetry;
+              // let's do a retry
+              shouldRetry = retryCount < 1 || _t10 instanceof _webexErrors.UserNotJoinedError && retryCount < JOIN_WITH_MEDIA_RETRY_MAX_COUNT;
               if (_internalPluginMetrics.CallDiagnosticUtils.isSdpOfferCreationError(_t10) || _internalPluginMetrics.CallDiagnosticUtils.isWebrtcApiNotAvailableError(_t10)) {
                 // errors related to offer creation (for example missing H264 codec) will happen again no matter how many times we try,
                 // so there is no point doing a retry
@@ -6330,26 +6340,26 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 });
               }
 
-              // we only want to call leave if join was successful and this was a retry or we won't be doing any more retries
-              if (!(joined && (isRetry || !shouldRetry))) {
-                _context17.next = 14;
+              // we only want to call leave if join was successful, and we won't be doing any more retries
+              if (!(joined && !shouldRetry)) {
+                _context17.next = 15;
                 break;
               }
-              _context17.prev = 11;
-              _context17.next = 12;
+              _context17.prev = 12;
+              _context17.next = 13;
               return this.leave({
                 resourceId: joinOptions === null || joinOptions === void 0 ? void 0 : joinOptions.resourceId,
                 reason: 'joinWithMedia failure'
               });
-            case 12:
-              _context17.next = 14;
-              break;
             case 13:
-              _context17.prev = 13;
-              _t11 = _context17["catch"](11);
+              _context17.next = 15;
+              break;
+            case 14:
+              _context17.prev = 14;
+              _t11 = _context17["catch"](12);
               _loggerProxy.default.logger.error('Meeting:index#joinWithMedia --> leave error', _t11);
               leaveError = _t11;
-            case 14:
+            case 15:
               _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(),
@@ -6357,29 +6367,36 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 reason: _t10.message,
                 stack: _t10.stack,
                 leaveErrorReason: (_leaveError = leaveError) === null || _leaveError === void 0 ? void 0 : _leaveError.message,
-                isRetry: isRetry
+                isRetry: retryCount > 0
               }, {
                 type: _t10.name
               });
               if (!shouldRetry) {
-                _context17.next = 15;
+                _context17.next = 16;
                 break;
               }
               _loggerProxy.default.logger.warn('Meeting:index#joinWithMedia --> retrying call to joinWithMedia');
-              this.joinWithMediaRetryInfo.isRetry = true;
+              this.joinWithMediaRetryInfo.retryCount = retryCount + 1;
               this.joinWithMediaRetryInfo.prevJoinResponse = joinResponse;
+              this.joinWithMediaRetryInfo.prevError = _t10;
+              if (!this.joinWithMediaRetryInfo.firstError) {
+                this.joinWithMediaRetryInfo.firstError = _t10;
+              }
               return _context17.abrupt("return", this.joinWithMedia(options));
-            case 15:
+            case 16:
+              firstError = this.joinWithMediaRetryInfo.firstError;
               this.joinWithMediaRetryInfo = {
-                isRetry: false,
-                prevJoinResponse: undefined
+                retryCount: 0,
+                prevJoinResponse: undefined,
+                firstError: undefined,
+                prevError: undefined
               };
-              throw _t10;
-            case 16:
+              throw firstError !== null && firstError !== void 0 ? firstError : _t10;
+            case 17:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, this, [[2, 10], [11, 13]]);
+        }, _callee17, this, [[3, 11], [12, 14]]);
       }));
       function joinWithMedia() {
         return _joinWithMedia.apply(this, arguments);
@@ -8682,7 +8699,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 numTransports: numTransports,
                 isMultistream: this.isMultistream,
                 retriedWithTurnServer: this.addMediaData.retriedWithTurnServer,
-                isJoinWithMediaRetry: this.joinWithMediaRetryInfo.isRetry
+                isJoinWithMediaRetry: this.joinWithMediaRetryInfo.retryCount > 0
               }, reachabilityMetrics), iceCandidateErrors), {}, {
                 iceCandidatesCount: this.iceCandidatesCount
               }));
@@ -8732,7 +8749,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 turnServerUsed: this.turnServerUsed,
                 retriedWithTurnServer: this.addMediaData.retriedWithTurnServer,
                 isMultistream: this.isMultistream,
-                isJoinWithMediaRetry: this.joinWithMediaRetryInfo.isRetry,
+                isJoinWithMediaRetry: this.joinWithMediaRetryInfo.retryCount > 0,
                 signalingState: ((_this$mediaProperties14 = this.mediaProperties.webrtcMediaConnection) === null || _this$mediaProperties14 === void 0 ? void 0 : (_this$mediaProperties15 = _this$mediaProperties14.multistreamConnection) === null || _this$mediaProperties15 === void 0 ? void 0 : (_this$mediaProperties16 = _this$mediaProperties15.pc) === null || _this$mediaProperties16 === void 0 ? void 0 : (_this$mediaProperties17 = _this$mediaProperties16.pc) === null || _this$mediaProperties17 === void 0 ? void 0 : _this$mediaProperties17.signalingState) || ((_this$mediaProperties18 = this.mediaProperties.webrtcMediaConnection) === null || _this$mediaProperties18 === void 0 ? void 0 : (_this$mediaProperties19 = _this$mediaProperties18.mediaConnection) === null || _this$mediaProperties19 === void 0 ? void 0 : (_this$mediaProperties20 = _this$mediaProperties19.pc) === null || _this$mediaProperties20 === void 0 ? void 0 : _this$mediaProperties20.signalingState) || 'unknown',
                 connectionState: ((_this$mediaProperties21 = this.mediaProperties.webrtcMediaConnection) === null || _this$mediaProperties21 === void 0 ? void 0 : (_this$mediaProperties22 = _this$mediaProperties21.multistreamConnection) === null || _this$mediaProperties22 === void 0 ? void 0 : (_this$mediaProperties23 = _this$mediaProperties22.pc) === null || _this$mediaProperties23 === void 0 ? void 0 : (_this$mediaProperties24 = _this$mediaProperties23.pc) === null || _this$mediaProperties24 === void 0 ? void 0 : _this$mediaProperties24.connectionState) || ((_this$mediaProperties25 = this.mediaProperties.webrtcMediaConnection) === null || _this$mediaProperties25 === void 0 ? void 0 : (_this$mediaProperties26 = _this$mediaProperties25.mediaConnection) === null || _this$mediaProperties26 === void 0 ? void 0 : (_this$mediaProperties27 = _this$mediaProperties26.pc) === null || _this$mediaProperties27 === void 0 ? void 0 : _this$mediaProperties27.connectionState) || 'unknown',
                 iceConnectionState: ((_this$mediaProperties28 = this.mediaProperties.webrtcMediaConnection) === null || _this$mediaProperties28 === void 0 ? void 0 : (_this$mediaProperties29 = _this$mediaProperties28.multistreamConnection) === null || _this$mediaProperties29 === void 0 ? void 0 : (_this$mediaProperties30 = _this$mediaProperties29.pc) === null || _this$mediaProperties30 === void 0 ? void 0 : (_this$mediaProperties31 = _this$mediaProperties30.pc) === null || _this$mediaProperties31 === void 0 ? void 0 : _this$mediaProperties31.iceConnectionState) || ((_this$mediaProperties32 = this.mediaProperties.webrtcMediaConnection) === null || _this$mediaProperties32 === void 0 ? void 0 : (_this$mediaProperties33 = _this$mediaProperties32.mediaConnection) === null || _this$mediaProperties33 === void 0 ? void 0 : (_this$mediaProperties34 = _this$mediaProperties33.pc) === null || _this$mediaProperties34 === void 0 ? void 0 : _this$mediaProperties34.iceConnectionState) || 'unknown'