@webex/plugin-meetings 3.8.0-next.46 → 3.8.0-next.47

package/dist/breakouts/breakout.js

@@ -209,7 +209,7 @@ var Breakout = _webexCore.WebexPlugin.extend({
       sessionId: this.sessionId
     });
   },
-  version: "3.8.0-next.46"
+  version: "3.8.0-next.47"
 });
 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.8.0-next.46"
+  version: "3.8.0-next.47"
 });
 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.8.0-next.46"
+  version: "3.8.0-next.47"
 });
 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.8.0-next.46"
+  version: "3.8.0-next.47"
 });
 var _default = exports.default = SILanguage;
 //# sourceMappingURL=siLanguage.js.map

package/dist/meeting/index.js

@@ -23,7 +23,6 @@ var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/pr
 var _map = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/map"));
 var _isNan = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/number/is-nan"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
-var _get = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/reflect/get"));
 var _weakMap = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/weak-map"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/asyncToGenerator"));
@@ -617,10 +616,10 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
     /**
      * Handles ROAP_FAILURE event from the webrtc media connection
      *
-     * @param {Error} error
+     * @param {Error} roapError
      * @returns {void}
      */
-    (0, _defineProperty3.default)((0, _assertThisInitialized2.default)(_this), "handleRoapFailure", function (error) {
+    (0, _defineProperty3.default)((0, _assertThisInitialized2.default)(_this), "handleRoapFailure", function (roapError) {
       // eslint-disable-next-line @typescript-eslint/no-shadow
       var sendBehavioralMetric = function sendBehavioralMetric(metricName, error, correlationId) {
         var _error$cause;
@@ -635,6 +634,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
         };
         _metrics.default.sendBehavioralMetric(metricName, data, metadata);
       };
+      var error = _util2.default.markErrorAsHandledBySdk(roapError);
       if (error instanceof _internalMediaCore.Errors.SdpOfferCreationError) {
         sendBehavioralMetric(_constants2.default.PEERCONNECTION_FAILURE, error, _this.correlationId);
 
@@ -680,7 +680,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
         if (_this.deferSDPAnswer) {
           clearTimeout(_this.sdpResponseTimer);
           _this.sdpResponseTimer = undefined;
-          _this.deferSDPAnswer.reject();
+          _this.deferSDPAnswer.reject(error);
         }
       } else if (error instanceof _internalMediaCore.Errors.SdpError) {
         // this covers also the case of Errors.IceGatheringError which extends Errors.SdpError
@@ -803,7 +803,8 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
               }
             }), {
               logText: "".concat(LOG_HEADER, " Roap Offer")
-            }).catch(function (error) {
+            }).catch(function (originalError) {
+              var error = _util2.default.markErrorAsHandledBySdk(originalError);
               var multistreamNotSupported = error instanceof _multistreamNotSupportedError.default;
 
               // @ts-ignore
@@ -6273,15 +6274,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
                   file: 'meeting/index',
                   function: 'join'
                 }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this36);
-                var proxyError = new Proxy(error, {
-                  // eslint-disable-next-line require-jsdoc
-                  get: function get(target, prop) {
-                    if (prop === 'handledBySdk') {
-                      return true;
-                    }
-                    return (0, _get.default)(target, prop);
-                  }
-                });
+                var proxyError = _util2.default.markErrorAsHandledBySdk(error);
                 joinFailed(proxyError);
                 _this36.deferJoin = undefined;
                 return _promise.default.reject(proxyError);
@@ -6869,7 +6862,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "waitForMediaConnectionConnected",
     value: (function () {
       var _waitForMediaConnectionConnected = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee24() {
-        var iceConnected, _this$mediaProperties8, _this$mediaProperties9, _this$mediaProperties10, _this$mediaProperties11, _this$mediaProperties12, _this$mediaProperties13, _this$mediaProperties14;
+        var iceConnected, handledBySdk, _this$mediaProperties8, _this$mediaProperties9, _this$mediaProperties10, _this$mediaProperties11, _this$mediaProperties12, _this$mediaProperties13, _this$mediaProperties14, caError, timedOutError;
         return _regenerator.default.wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -6877,59 +6870,61 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
               _context24.next = 3;
               return this.mediaProperties.waitForMediaConnectionConnected();
             case 3:
-              _context24.next = 30;
+              _context24.next = 27;
               break;
             case 5:
               _context24.prev = 5;
               _context24.t0 = _context24["catch"](0);
               iceConnected = _context24.t0.iceConnected;
+              handledBySdk = false;
               if (this.hasMediaConnectionConnectedAtLeastOnce) {
-                _context24.next = 29;
+                _context24.next = 24;
                 break;
               }
-              _context24.t1 = this.webex.internal.newMetrics;
-              _context24.t2 = !this.turnServerUsed;
-              _context24.t3 = this.addMediaData.icePhaseCallback();
-              _context24.t4 = this.webex.internal.newMetrics.callDiagnosticMetrics;
-              _context24.t5 = _internalPluginMetrics.CallDiagnosticUtils;
-              _context24.t6 = ((_this$mediaProperties8 = this.mediaProperties.webrtcMediaConnection) === null || _this$mediaProperties8 === void 0 ? void 0 : (_this$mediaProperties9 = _this$mediaProperties8.multistreamConnection) === null || _this$mediaProperties9 === void 0 ? void 0 : (_this$mediaProperties10 = _this$mediaProperties9.pc) === null || _this$mediaProperties10 === void 0 ? void 0 : (_this$mediaProperties11 = _this$mediaProperties10.pc) === null || _this$mediaProperties11 === void 0 ? void 0 : _this$mediaProperties11.signalingState) || ((_this$mediaProperties12 = this.mediaProperties.webrtcMediaConnection) === null || _this$mediaProperties12 === void 0 ? void 0 : (_this$mediaProperties13 = _this$mediaProperties12.mediaConnection) === null || _this$mediaProperties13 === void 0 ? void 0 : (_this$mediaProperties14 = _this$mediaProperties13.pc) === null || _this$mediaProperties14 === void 0 ? void 0 : _this$mediaProperties14.signalingState) || 'unknown';
-              _context24.t7 = iceConnected;
-              _context24.t8 = this.turnServerUsed;
-              _context24.next = 19;
+              _context24.t1 = this.webex.internal.newMetrics.callDiagnosticMetrics;
+              _context24.t2 = _internalPluginMetrics.CallDiagnosticUtils;
+              _context24.t3 = ((_this$mediaProperties8 = this.mediaProperties.webrtcMediaConnection) === null || _this$mediaProperties8 === void 0 ? void 0 : (_this$mediaProperties9 = _this$mediaProperties8.multistreamConnection) === null || _this$mediaProperties9 === void 0 ? void 0 : (_this$mediaProperties10 = _this$mediaProperties9.pc) === null || _this$mediaProperties10 === void 0 ? void 0 : (_this$mediaProperties11 = _this$mediaProperties10.pc) === null || _this$mediaProperties11 === void 0 ? void 0 : _this$mediaProperties11.signalingState) || ((_this$mediaProperties12 = this.mediaProperties.webrtcMediaConnection) === null || _this$mediaProperties12 === void 0 ? void 0 : (_this$mediaProperties13 = _this$mediaProperties12.mediaConnection) === null || _this$mediaProperties13 === void 0 ? void 0 : (_this$mediaProperties14 = _this$mediaProperties13.pc) === null || _this$mediaProperties14 === void 0 ? void 0 : _this$mediaProperties14.signalingState) || 'unknown';
+              _context24.t4 = iceConnected;
+              _context24.t5 = this.turnServerUsed;
+              _context24.next = 17;
               return this.webex.meetings.reachability.isWebexMediaBackendUnreachable().catch(function () {
                 return false;
               });
-            case 19:
-              _context24.t9 = _context24.sent;
-              _context24.t10 = {
-                signalingState: _context24.t6,
-                iceConnected: _context24.t7,
-                turnServerUsed: _context24.t8,
-                unreachable: _context24.t9
-              };
-              _context24.t11 = _context24.t5.generateClientErrorCodeForIceFailure.call(_context24.t5, _context24.t10);
-              _context24.t12 = {
-                clientErrorCode: _context24.t11
-              };
-              _context24.t13 = _context24.t4.getErrorPayloadForClientErrorCode.call(_context24.t4, _context24.t12);
-              _context24.t14 = [_context24.t13];
-              _context24.t15 = {
-                canProceed: _context24.t2,
-                icePhase: _context24.t3,
-                errors: _context24.t14
+            case 17:
+              _context24.t6 = _context24.sent;
+              _context24.t7 = {
+                signalingState: _context24.t3,
+                iceConnected: _context24.t4,
+                turnServerUsed: _context24.t5,
+                unreachable: _context24.t6
               };
-              _context24.t16 = {
-                meetingId: this.id
+              _context24.t8 = _context24.t2.generateClientErrorCodeForIceFailure.call(_context24.t2, _context24.t7);
+              _context24.t9 = {
+                clientErrorCode: _context24.t8
               };
-              _context24.t17 = {
+              caError = _context24.t1.getErrorPayloadForClientErrorCode.call(_context24.t1, _context24.t9);
+              // Only send CA event for join flow if we haven't successfully connected media yet
+              // @ts-ignore
+              this.webex.internal.newMetrics.submitClientEvent({
                 name: 'client.ice.end',
-                payload: _context24.t15,
-                options: _context24.t16
-              };
-              _context24.t1.submitClientEvent.call(_context24.t1, _context24.t17);
-            case 29:
-              throw new Error("Timed out waiting for media connection to be connected, correlationId=".concat(this.correlationId));
-            case 30:
+                payload: {
+                  canProceed: !this.turnServerUsed,
+                  // If we haven't done turn tls retry yet we will proceed with join attempt
+                  icePhase: this.addMediaData.icePhaseCallback(),
+                  errors: [caError]
+                },
+                options: {
+                  meetingId: this.id
+                }
+              });
+              handledBySdk = true;
+            case 24:
+              timedOutError = new Error("Timed out waiting for media connection to be connected, correlationId=".concat(this.correlationId));
+              if (handledBySdk) {
+                timedOutError = _util2.default.markErrorAsHandledBySdk(timedOutError);
+              }
+              throw timedOutError;
+            case 27:
             case "end":
               return _context24.stop();
           }
@@ -6998,6 +6993,9 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
               deferSDPAnswer = this.deferSDPAnswer;
               this.sdpResponseTimer = setTimeout(function () {
                 _loggerProxy.default.logger.warn("".concat(LOG_HEADER, " timeout! no REMOTE SDP ANSWER received within ").concat(_constants.ROAP_OFFER_ANSWER_EXCHANGE_TIMEOUT / 1000, " seconds"));
+                var timeoutError = new Error('Timeout waiting for SDP answer');
+                var timeoutErrorProxy = _util2.default.markErrorAsHandledBySdk(timeoutError);
+
                 // @ts-ignore
                 _this43.webex.internal.newMetrics.submitClientEvent({
                   name: 'client.media-engine.remote-sdp-received',
@@ -7011,7 +7009,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
                   },
                   options: {
                     meetingId: _this43.id,
-                    rawError: new Error('Timeout waiting for SDP answer')
+                    rawError: timeoutErrorProxy
                   }
                 });
                 deferSDPAnswer.reject(new Error('Timed out waiting for REMOTE SDP ANSWER'));
@@ -7137,7 +7135,7 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "handleWaitForMediaConnectionConnectedError",
     value: (function () {
       var _handleWaitForMediaConnectionConnectedError = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee28(error, remoteMediaManagerConfig, bundlePolicy) {
-        var LOG_HEADER;
+        var LOG_HEADER, addMediaFailedError;
         return _regenerator.default.wrap(function _callee28$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
@@ -7150,12 +7148,16 @@ var Meeting = exports.default = /*#__PURE__*/function (_StatelessWebexPlugin) {
               _context28.next = 5;
               return this.retryWithForcedTurnDiscovery(remoteMediaManagerConfig, bundlePolicy);
             case 5:
-              _context28.next = 9;
+              _context28.next = 11;
               break;
             case 7:
               _loggerProxy.default.logger.error("".concat(LOG_HEADER, " error waiting for media to connect using UDP, TCP and TURN-TLS"), error);
-              throw new _webexErrors.AddMediaFailed();
-            case 9:
+              addMediaFailedError = new _webexErrors.AddMediaFailed(); // @ts-ignore - handledBySdk is added by a proxy
+              if (error.handledBySdk) {
+                addMediaFailedError = _util2.default.markErrorAsHandledBySdk(addMediaFailedError);
+              }
+              throw addMediaFailedError;
+            case 11:
             case "end":
               return _context28.stop();
           }