@webex/calling 3.12.0-task-refactor.1 → 3.12.0-webex-services-ready.1

package/dist/CallingClient/calling/call.js

@@ -25,7 +25,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/he
 var _internalMediaCore = require("@webex/internal-media-core");
 var _xstate = require("xstate");
 var _uuid = require("uuid");
-var _webMediaEffects = require("@webex/web-media-effects");
+var _mediaHelpers = require("@webex/media-helpers");
 var _internalPluginMetrics = require("@webex/internal-plugin-metrics");
 var _types = require("../../Errors/types");
 var _Utils = require("../../common/Utils");
@@ -41,6 +41,7 @@ var _CallerId = require("./CallerId");
 var _types5 = require("../../Metrics/types");
 var _Metrics = require("../../Metrics");
 var _constants2 = require("../../common/constants");
+var _request = require("../utils/request");
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -92,10 +93,193 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
     // Used in WxCC calls
     (0, _defineProperty2.default)(_this, "serviceIndicator", void 0);
     (0, _defineProperty2.default)(_this, "mediaNegotiationCompleted", void 0);
+    (0, _defineProperty2.default)(_this, "connectPending", void 0);
     (0, _defineProperty2.default)(_this, "receivedRoapOKSeq", void 0);
     (0, _defineProperty2.default)(_this, "localAudioStream", void 0);
     (0, _defineProperty2.default)(_this, "rtcMetrics", void 0);
     (0, _defineProperty2.default)(_this, "callKeepaliveRetryCount", 0);
+    (0, _defineProperty2.default)(_this, "apiRequest", void 0);
+    (0, _defineProperty2.default)(_this, "handleMediaRoapEvent", /*#__PURE__*/function () {
+      var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(event) {
+        var _event$roapMessage, _event$roapMessage2;
+        var mediaOk, sdpVideoPortZero, _t;
+        return _regenerator.default.wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _Logger.default.info("ROAP message to send (rcv from MEDIA-SDK) :\n          \n type:  ".concat((_event$roapMessage = event.roapMessage) === null || _event$roapMessage === void 0 ? void 0 : _event$roapMessage.messageType, ", seq: ").concat(event.roapMessage.seq, " , version: ").concat(event.roapMessage.version), {
+                file: _constants.CALL_FILE,
+                method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
+              });
+              _Logger.default.info("SDP message to send : \n ".concat((_event$roapMessage2 = event.roapMessage) === null || _event$roapMessage2 === void 0 ? void 0 : _event$roapMessage2.sdp), {
+                file: _constants.CALL_FILE,
+                method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
+              });
+              _t = event.roapMessage.messageType;
+              _context.next = _t === _types4.RoapScenario.OK ? 1 : _t === _types4.RoapScenario.OFFER ? 2 : _t === _types4.RoapScenario.ANSWER ? 4 : _t === _types4.RoapScenario.ERROR ? 6 : _t === _types4.RoapScenario.OFFER_RESPONSE ? 7 : 9;
+              break;
+            case 1:
+              mediaOk = {
+                received: false,
+                message: event.roapMessage
+              };
+              _this.sendMediaStateMachineEvt({
+                type: 'E_ROAP_OK',
+                data: mediaOk
+              });
+              return _context.abrupt("continue", 9);
+            case 2:
+              if (event.roapMessage.sdp) {
+                _context.next = 3;
+                break;
+              }
+              _Logger.default.warn('Received OFFER without SDP from media SDK', {
+                file: _constants.CALL_FILE,
+                method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
+              });
+              return _context.abrupt("continue", 9);
+            case 3:
+              // TODO: Remove these after the Media-Core adds the fix
+              // Check if at least one IPv6 "c=" line is present
+              _Logger.default.info("before modifying sdp: ".concat(event.roapMessage.sdp), {
+                file: _constants.CALL_FILE,
+                method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
+              });
+              event.roapMessage.sdp = (0, _Utils.modifySdpForIPv4)(event.roapMessage.sdp);
+              sdpVideoPortZero = event.roapMessage.sdp.replace(/^m=(video) (?:\d+) /gim, 'm=$1 0 ');
+              _Logger.default.info("after modification sdp: ".concat(sdpVideoPortZero), {
+                file: _constants.CALL_FILE,
+                method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
+              });
+              event.roapMessage.sdp = sdpVideoPortZero;
+              _this.localRoapMessage = event.roapMessage;
+              _this.sendCallStateMachineEvt({
+                type: 'E_SEND_CALL_SETUP',
+                data: event.roapMessage
+              });
+              return _context.abrupt("continue", 9);
+            case 4:
+              if (event.roapMessage.sdp) {
+                _context.next = 5;
+                break;
+              }
+              _Logger.default.warn('Received OFFER without SDP from media SDK', {
+                file: _constants.CALL_FILE,
+                method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
+              });
+              return _context.abrupt("continue", 9);
+            case 5:
+              event.roapMessage.sdp = (0, _Utils.modifySdpForIPv4)(event.roapMessage.sdp);
+              _this.localRoapMessage = event.roapMessage;
+              if (_this.connectPending) {
+                _this.sendCallStateMachineEvt({
+                  type: 'E_SEND_CALL_CONNECT'
+                });
+              }
+              _this.sendMediaStateMachineEvt({
+                type: 'E_SEND_ROAP_ANSWER',
+                data: event.roapMessage
+              });
+              return _context.abrupt("continue", 9);
+            case 6:
+              _this.sendMediaStateMachineEvt({
+                type: 'E_ROAP_ERROR',
+                data: event.roapMessage
+              });
+              return _context.abrupt("continue", 9);
+            case 7:
+              if (event.roapMessage.sdp) {
+                _context.next = 8;
+                break;
+              }
+              _Logger.default.warn('Received OFFER without SDP from media SDK', {
+                file: _constants.CALL_FILE,
+                method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
+              });
+              return _context.abrupt("continue", 9);
+            case 8:
+              event.roapMessage.sdp = (0, _Utils.modifySdpForIPv4)(event.roapMessage.sdp);
+              _this.localRoapMessage = event.roapMessage;
+              if (_this.connectPending) {
+                _this.sendCallStateMachineEvt({
+                  type: 'E_SEND_CALL_CONNECT'
+                });
+              }
+              _this.sendMediaStateMachineEvt({
+                type: 'E_SEND_ROAP_OFFER',
+                data: event.roapMessage
+              });
+              return _context.abrupt("continue", 9);
+            case 9:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (0, _defineProperty2.default)(_this, "handleRemoteTrackAdded", function (event) {
+      if (event.type === _types3.MEDIA_CONNECTION_EVENT_KEYS.MEDIA_TYPE_AUDIO) {
+        _this.emit(_types3.CALL_EVENT_KEYS.REMOTE_MEDIA, event.track);
+      }
+    });
+    (0, _defineProperty2.default)(_this, "handleIceGatheringStateChanged", function (event) {
+      var iceGatheringState = Call.getPeerConnectionStateFromEvent(event, 'iceGatheringState');
+      _Logger.default.info("ICE gathering state changed to: ".concat(iceGatheringState), {
+        file: _constants.CALL_FILE,
+        method: _constants.METHODS.MEDIA_ICE_EVENTS_LISTENER
+      });
+      _this.metricManager.submitMediaMetric(_types5.METRIC_EVENT.MEDIA, _types5.MEDIA_CONNECTION_ACTION.ICE_GATHERING_STATE_CHANGED, _types5.METRIC_TYPE.BEHAVIORAL, _this.callId, _this.correlationId, undefined, undefined, iceGatheringState);
+    });
+    (0, _defineProperty2.default)(_this, "handlePeerConnectionStateChanged", function (event) {
+      var connectionState = Call.getPeerConnectionStateFromEvent(event, 'connectionState');
+      _Logger.default.info("Peer connection state changed to: ".concat(connectionState), {
+        file: _constants.CALL_FILE,
+        method: _constants.METHODS.MEDIA_ICE_EVENTS_LISTENER
+      });
+      _this.metricManager.submitMediaMetric(_types5.METRIC_EVENT.MEDIA, _types5.MEDIA_CONNECTION_ACTION.PEER_CONNECTION_STATE_CHANGED, _types5.METRIC_TYPE.BEHAVIORAL, _this.callId, _this.correlationId, undefined, undefined, connectionState);
+    });
+    (0, _defineProperty2.default)(_this, "handleIceConnectionStateChanged", function (event) {
+      var iceConnectionState = Call.getPeerConnectionStateFromEvent(event, 'iceConnectionState');
+      _Logger.default.info("ICE connection state changed to: ".concat(iceConnectionState), {
+        file: _constants.CALL_FILE,
+        method: _constants.METHODS.MEDIA_ICE_EVENTS_LISTENER
+      });
+      _this.metricManager.submitMediaMetric(_types5.METRIC_EVENT.MEDIA, _types5.MEDIA_CONNECTION_ACTION.ICE_CONNECTION_STATE_CHANGED, _types5.METRIC_TYPE.BEHAVIORAL, _this.callId, _this.correlationId, undefined, undefined, iceConnectionState);
+    });
+    (0, _defineProperty2.default)(_this, "handleIceCandidateError", function (event) {
+      var _event$address, _event$port;
+      var iceErrorPayload = {
+        address: (_event$address = event.address) !== null && _event$address !== void 0 ? _event$address : null,
+        errorCode: event.errorCode,
+        errorText: event.errorText,
+        port: (_event$port = event.port) !== null && _event$port !== void 0 ? _event$port : null,
+        url: event.url
+      };
+      _Logger.default.warn("ICE candidate error occurred: ".concat((0, _stringify.default)(iceErrorPayload)), {
+        file: _constants.CALL_FILE,
+        method: _constants.METHODS.MEDIA_ICE_EVENTS_LISTENER
+      });
+      var callError = (0, _CallError.createCallError)("ICE candidate error occurred: ".concat((0, _stringify.default)(iceErrorPayload)), {
+        file: _constants.CALL_FILE,
+        method: _constants.METHODS.MEDIA_ICE_EVENTS_LISTENER
+      }, _types.ERROR_TYPE.CALL_ERROR, _this.correlationId, _types.ERROR_LAYER.MEDIA);
+      _this.metricManager.submitMediaMetric(_types5.METRIC_EVENT.MEDIA_ERROR, _types5.MEDIA_CONNECTION_ACTION.ICE_CANDIDATE_ERROR, _types5.METRIC_TYPE.BEHAVIORAL, _this.callId, _this.correlationId, undefined, undefined, undefined, callError);
+    });
+    (0, _defineProperty2.default)(_this, "handleRoapFailure", function (error) {
+      var failureMessage = error.message || 'Unknown ROAP failure received from media SDK';
+      _Logger.default.warn("ROAP failure occurred: ".concat(failureMessage), {
+        file: _constants.CALL_FILE,
+        method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
+      });
+      var callError = (0, _CallError.createCallError)("ROAP failure occurred: ".concat(failureMessage), {
+        file: _constants.CALL_FILE,
+        method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
+      }, _types.ERROR_TYPE.CALL_ERROR, _this.correlationId, _types.ERROR_LAYER.MEDIA);
+      _this.metricManager.submitMediaMetric(_types5.METRIC_EVENT.MEDIA_ERROR, _types5.MEDIA_CONNECTION_ACTION.ROAP_FAILURE, _types5.METRIC_TYPE.BEHAVIORAL, _this.callId, _this.correlationId, undefined, undefined, undefined, callError);
+    });
     (0, _defineProperty2.default)(_this, "callKeepaliveRetryCallback", function (interval) {
       if (_this.callKeepaliveRetryCount === _constants.MAX_CALL_KEEPALIVE_RETRY_COUNT) {
         _Logger.default.warn("Max keepalive retry attempts reached. Aborting call keepalive for callId: ".concat(_this.callId), {
@@ -105,35 +289,35 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
         return;
       }
       _this.callKeepaliveRetryCount += 1;
-      setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _t;
-        return _regenerator.default.wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
+      setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var _t2;
+        return _regenerator.default.wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context.prev = 0;
-              _context.next = 1;
+              _context2.prev = 0;
+              _context2.next = 1;
               return _this.postStatus();
             case 1:
               _this.scheduleCallKeepaliveInterval();
-              _context.next = 3;
+              _context2.next = 3;
               break;
             case 2:
-              _context.prev = 2;
-              _t = _context["catch"](0);
-              _context.next = 3;
-              return _this.handleCallKeepaliveError(_t);
+              _context2.prev = 2;
+              _t2 = _context2["catch"](0);
+              _context2.next = 3;
+              return _this.handleCallKeepaliveError(_t2);
             case 3:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, null, [[0, 2]]);
+        }, _callee2, null, [[0, 2]]);
       })), interval * 1000);
     });
     (0, _defineProperty2.default)(_this, "handleCallKeepaliveError", /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(err) {
+      var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(err) {
         var error, abort;
-        return _regenerator.default.wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regenerator.default.wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               error = err;
               /* We are clearing the timer here as all are error scenarios. Only scenario where
@@ -145,13 +329,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               if (_this.sessionTimer) {
                 clearInterval(_this.sessionTimer);
               }
-              _context2.next = 1;
+              _context3.next = 1;
               return (0, _Utils.handleCallErrors)(function (callError) {
                 _this.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, callError);
                 _this.submitCallErrorMetric(callError);
               }, _types.ERROR_LAYER.CALL_CONTROL, _this.callKeepaliveRetryCallback, _this.getCorrelationId(), error, 'handleCallEstablished', _constants.CALL_FILE);
             case 1:
-              abort = _context2.sent;
+              abort = _context3.sent;
               if (abort) {
                 _this.sendCallStateMachineEvt({
                   type: 'E_SEND_CALL_DISCONNECT'
@@ -159,7 +343,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 _this.emit(_types3.CALL_EVENT_KEYS.DISCONNECT, _this.getCorrelationId());
                 _this.callKeepaliveRetryCount = 0;
               }
-              _context2.next = 2;
+              _context3.next = 2;
               return (0, _Utils.uploadLogs)({
                 correlationId: _this.correlationId,
                 callId: _this.callId,
@@ -167,12 +351,12 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 2:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2);
+        }, _callee3);
       }));
-      return function (_x) {
-        return _ref2.apply(this, arguments);
+      return function (_x2) {
+        return _ref3.apply(this, arguments);
       };
     }());
     (0, _defineProperty2.default)(_this, "scheduleCallKeepaliveInterval", function () {
@@ -180,29 +364,30 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
         file: _constants.CALL_FILE,
         method: 'scheduleCallKeepaliveInterval'
       };
-      _this.sessionTimer = setInterval(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var res, _t2;
-        return _regenerator.default.wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      clearInterval(_this.sessionTimer);
+      _this.sessionTimer = setInterval(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4() {
+        var res, _t3;
+        return _regenerator.default.wrap(function (_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.prev = 0;
-              _context3.next = 1;
+              _context4.prev = 0;
+              _context4.next = 1;
               return _this.postStatus();
             case 1:
-              res = _context3.sent;
+              res = _context4.sent;
               _Logger.default.info("Session refresh successful", loggerContext);
-              _context3.next = 3;
+              _context4.next = 3;
               break;
             case 2:
-              _context3.prev = 2;
-              _t2 = _context3["catch"](0);
-              _context3.next = 3;
-              return _this.handleCallKeepaliveError(_t2);
+              _context4.prev = 2;
+              _t3 = _context4["catch"](0);
+              _context4.next = 3;
+              return _this.handleCallKeepaliveError(_t3);
             case 3:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, null, [[0, 2]]);
+        }, _callee4, null, [[0, 2]]);
       })), _constants.DEFAULT_SESSION_TIMER);
     });
     /**
@@ -212,34 +397,34 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
      * @returns {Promise<void>}
      */
     (0, _defineProperty2.default)(_this, "forceSendStatsReport", /*#__PURE__*/function () {
-      var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4(_ref4) {
-        var callFrom, loggerContext, errorInfo, errorStatus, _t3;
-        return _regenerator.default.wrap(function (_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(_ref5) {
+        var callFrom, loggerContext, errorInfo, errorStatus, _t4;
+        return _regenerator.default.wrap(function (_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              callFrom = _ref4.callFrom;
+              callFrom = _ref5.callFrom;
               loggerContext = {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.FORCE_SEND_STATS_REPORT
               };
-              _context4.prev = 1;
-              _context4.next = 2;
+              _context5.prev = 1;
+              _context5.next = 2;
               return _this.mediaConnection.forceRtcMetricsSend();
             case 2:
               _Logger.default.info("Successfully uploaded available webrtc telemetry statistics", loggerContext);
               _Logger.default.info("callFrom: ".concat(callFrom), loggerContext);
-              _context4.next = 5;
+              _context5.next = 5;
               break;
             case 3:
-              _context4.prev = 3;
-              _t3 = _context4["catch"](1);
-              errorInfo = _t3;
-              _context4.next = 4;
+              _context5.prev = 3;
+              _t4 = _context5["catch"](1);
+              errorInfo = _t4;
+              _context5.next = 4;
               return (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
             case 4:
-              errorStatus = _context4.sent;
+              errorStatus = _context5.sent;
               _Logger.default.error("Failed to upload webrtc telemetry statistics. ".concat((0, _stringify.default)(errorStatus)), loggerContext);
-              _context4.next = 5;
+              _context5.next = 5;
               return (0, _Utils.uploadLogs)({
                 correlationId: _this.correlationId,
                 callId: _this.callId,
@@ -247,12 +432,12 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 5:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, null, [[1, 3]]);
+        }, _callee5, null, [[1, 3]]);
       }));
-      return function (_x2) {
-        return _ref5.apply(this, arguments);
+      return function (_x3) {
+        return _ref6.apply(this, arguments);
       };
     }());
     /**
@@ -300,10 +485,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
      * @param roapMessage
      */
     (0, _defineProperty2.default)(_this, "post", /*#__PURE__*/function () {
-      var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(roapMessage) {
+      var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(roapMessage) {
         var basePayload;
-        return _regenerator.default.wrap(function (_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regenerator.default.wrap(function (_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               basePayload = {
                 device: {
@@ -315,7 +500,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   mediaId: (0, _uuid.v4)()
                 }
               };
-              return _context5.abrupt("return", _this.webex.request({
+              return _context6.abrupt("return", _this.apiRequest.makeRequest({
                 uri: "".concat(_this.mobiusUrl).concat(_constants.DEVICES_ENDPOINT_RESOURCE, "/").concat(_this.deviceId, "/").concat(_constants.CALL_ENDPOINT_RESOURCE),
                 method: _types2.HTTP_METHODS.POST,
                 service: _types2.ALLOWED_SERVICES.MOBIUS,
@@ -329,12 +514,12 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               }));
             case 1:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5);
+        }, _callee6);
       }));
-      return function (_x3) {
-        return _ref6.apply(this, arguments);
+      return function (_x4) {
+        return _ref7.apply(this, arguments);
       };
     }());
     (0, _defineProperty2.default)(_this, "onEffectEnabled", function () {
@@ -352,8 +537,8 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
       if (_this.localAudioStream) {
         var effect = _this.localAudioStream.getEffectByKind(_constants.NOISE_REDUCTION_EFFECT);
         if (effect === addedEffect) {
-          effect.on(_webMediaEffects.EffectEvent.Enabled, _this.onEffectEnabled);
-          effect.on(_webMediaEffects.EffectEvent.Disabled, _this.onEffectDisabled);
+          effect.on(_mediaHelpers.EffectEvent.Enabled, _this.onEffectEnabled);
+          effect.on(_mediaHelpers.EffectEvent.Disabled, _this.onEffectDisabled);
         }
       }
     });
@@ -484,6 +669,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
     _this.mobiusUrl = activeUrl;
     _this.receivedRoapOKSeq = 0;
     _this.mediaNegotiationCompleted = false;
+    _this.connectPending = false;
     _Logger.default.info("Webex Calling Url:- ".concat(_this.mobiusUrl), {
       file: _constants.CALL_FILE,
       method: _constants.METHODS.CONSTRUCTOR
@@ -505,6 +691,9 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
     _this.rtcMetrics = new _internalPluginMetrics.RtcMetrics(_this.webex, {
       callId: _this.callId
     }, _this.correlationId);
+    _this.apiRequest = _request.APIRequest.getInstance({
+      webex: _this.webex
+    });
     var callMachine = (0, _xstate.createMachine)({
       schema: {
         context: {},
@@ -689,6 +878,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
             }
           },
           on: {
+            E_SEND_CALL_CONNECT: {
+              cond: function cond() {
+                return _this.connectPending;
+              },
+              target: 'S_SEND_CALL_CONNECT',
+              actions: ['outgoingCallConnect']
+            },
             E_CALL_ESTABLISHED: {
               target: 'S_CALL_ESTABLISHED',
               actions: ['callEstablished']
@@ -1243,22 +1439,22 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingCallSetup",
     value: (function () {
-      var _handleOutgoingCallSetup = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(event) {
+      var _handleOutgoingCallSetup = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7(event) {
         var _this2 = this;
-        var message, response, errData, _t4;
-        return _regenerator.default.wrap(function (_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        var message, response, errData, _t5;
+        return _regenerator.default.wrap(function (_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_SETUP
               });
               message = event.data;
-              _context6.prev = 1;
-              _context6.next = 2;
+              _context7.prev = 1;
+              _context7.next = 2;
               return this.post(message);
             case 2:
-              response = _context6.sent;
+              response = _context7.sent;
               _Logger.default.info("Response: ".concat((0, _stringify.default)(response)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_SETUP
@@ -1272,16 +1468,16 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 file: _constants.CALL_FILE,
                 method: this.handleOutgoingCallSetup.name
               });
-              _context6.next = 4;
+              _context7.next = 4;
               break;
             case 3:
-              _context6.prev = 3;
-              _t4 = _context6["catch"](1);
-              _Logger.default.error("Failed to setup the call: ".concat((0, _stringify.default)(_t4)), {
+              _context7.prev = 3;
+              _t5 = _context7["catch"](1);
+              _Logger.default.error("Failed to setup the call: ".concat((0, _stringify.default)(_t5)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_SETUP
               });
-              errData = _t4;
+              errData = _t5;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this2.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, error);
                 _this2.submitCallErrorMetric(error);
@@ -1295,7 +1491,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_OUTGOING_CALL_SETUP, _constants.CALL_FILE);
-              _context6.next = 4;
+              _context7.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
@@ -1303,11 +1499,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 4:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this, [[1, 3]]);
+        }, _callee7, this, [[1, 3]]);
       }));
-      function handleOutgoingCallSetup(_x4) {
+      function handleOutgoingCallSetup(_x5) {
         return _handleOutgoingCallSetup.apply(this, arguments);
       }
       return handleOutgoingCallSetup;
@@ -1322,21 +1518,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleCallHold",
     value: (function () {
-      var _handleCallHold = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8(event) {
+      var _handleCallHold = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9(event) {
         var _this3 = this;
-        var response, errData, _t5;
-        return _regenerator.default.wrap(function (_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        var response, errData, _t6;
+        return _regenerator.default.wrap(function (_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_CALL_HOLD
               });
-              _context8.prev = 1;
-              _context8.next = 2;
+              _context9.prev = 1;
+              _context9.next = 2;
               return this.postSSRequest(undefined, _types3.SUPPLEMENTARY_SERVICES.HOLD);
             case 2:
-              response = _context8.sent;
+              response = _context9.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_CALL_HOLD
@@ -1347,10 +1543,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                *  received from Mobius and forwarded towards calling client
                */
               if (this.isHeld() === false) {
-                this.supplementaryServicesTimer = setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7() {
+                this.supplementaryServicesTimer = setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8() {
                   var errorContext, callError;
-                  return _regenerator.default.wrap(function (_context7) {
-                    while (1) switch (_context7.prev = _context7.next) {
+                  return _regenerator.default.wrap(function (_context8) {
+                    while (1) switch (_context8.prev = _context8.next) {
                       case 0:
                         errorContext = {
                           file: _constants.CALL_FILE,
@@ -1365,21 +1561,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                         _this3.submitCallErrorMetric(callError);
                       case 1:
                       case "end":
-                        return _context7.stop();
+                        return _context8.stop();
                     }
-                  }, _callee7);
+                  }, _callee8);
                 })), _constants.SUPPLEMENTARY_SERVICES_TIMEOUT);
               }
-              _context8.next = 4;
+              _context9.next = 4;
               break;
             case 3:
-              _context8.prev = 3;
-              _t5 = _context8["catch"](1);
-              _Logger.default.error("Failed to put the call on hold: ".concat((0, _stringify.default)(_t5)), {
+              _context9.prev = 3;
+              _t6 = _context9["catch"](1);
+              _Logger.default.error("Failed to put the call on hold: ".concat((0, _stringify.default)(_t6)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_CALL_HOLD
               });
-              errData = _t5;
+              errData = _t6;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this3.emit(_types3.CALL_EVENT_KEYS.HOLD_ERROR, error);
                 _this3.submitCallErrorMetric(error);
@@ -1393,7 +1589,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_CALL_HOLD, _constants.CALL_FILE);
-              _context8.next = 4;
+              _context9.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
@@ -1401,11 +1597,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 4:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this, [[1, 3]]);
+        }, _callee9, this, [[1, 3]]);
       }));
-      function handleCallHold(_x5) {
+      function handleCallHold(_x6) {
         return _handleCallHold.apply(this, arguments);
       }
       return handleCallHold;
@@ -1420,21 +1616,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleCallResume",
     value: (function () {
-      var _handleCallResume = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee0(event) {
+      var _handleCallResume = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1(event) {
         var _this4 = this;
-        var response, errData, _t6;
-        return _regenerator.default.wrap(function (_context0) {
-          while (1) switch (_context0.prev = _context0.next) {
+        var response, errData, _t7;
+        return _regenerator.default.wrap(function (_context1) {
+          while (1) switch (_context1.prev = _context1.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_CALL_RESUME
               });
-              _context0.prev = 1;
-              _context0.next = 2;
+              _context1.prev = 1;
+              _context1.next = 2;
               return this.postSSRequest(undefined, _types3.SUPPLEMENTARY_SERVICES.RESUME);
             case 2:
-              response = _context0.sent;
+              response = _context1.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_CALL_RESUME
@@ -1445,10 +1641,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                *  received from Mobius on resuming the call and forwarded towards calling client
                */
               if (this.isHeld() === true) {
-                this.supplementaryServicesTimer = setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9() {
+                this.supplementaryServicesTimer = setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee0() {
                   var errorContext, callError;
-                  return _regenerator.default.wrap(function (_context9) {
-                    while (1) switch (_context9.prev = _context9.next) {
+                  return _regenerator.default.wrap(function (_context0) {
+                    while (1) switch (_context0.prev = _context0.next) {
                       case 0:
                         errorContext = {
                           file: _constants.CALL_FILE,
@@ -1463,21 +1659,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                         _this4.submitCallErrorMetric(callError);
                       case 1:
                       case "end":
-                        return _context9.stop();
+                        return _context0.stop();
                     }
-                  }, _callee9);
+                  }, _callee0);
                 })), _constants.SUPPLEMENTARY_SERVICES_TIMEOUT);
               }
-              _context0.next = 4;
+              _context1.next = 4;
               break;
             case 3:
-              _context0.prev = 3;
-              _t6 = _context0["catch"](1);
-              _Logger.default.error("Failed to resume the call: ".concat((0, _stringify.default)(_t6)), {
+              _context1.prev = 3;
+              _t7 = _context1["catch"](1);
+              _Logger.default.error("Failed to resume the call: ".concat((0, _stringify.default)(_t7)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_CALL_RESUME
               });
-              errData = _t6;
+              errData = _t7;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this4.emit(_types3.CALL_EVENT_KEYS.RESUME_ERROR, error);
                 _this4.submitCallErrorMetric(error);
@@ -1491,7 +1687,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_CALL_RESUME, _constants.CALL_FILE);
-              _context0.next = 4;
+              _context1.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
@@ -1499,11 +1695,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 4:
             case "end":
-              return _context0.stop();
+              return _context1.stop();
           }
-        }, _callee0, this, [[1, 3]]);
+        }, _callee1, this, [[1, 3]]);
       }));
-      function handleCallResume(_x6) {
+      function handleCallResume(_x7) {
         return _handleCallResume.apply(this, arguments);
       }
       return handleCallResume;
@@ -1592,35 +1788,35 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingCallAlerting",
     value: (function () {
-      var _handleOutgoingCallAlerting = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1(event) {
+      var _handleOutgoingCallAlerting = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10(event) {
         var _this5 = this;
-        var res, errData, _t7;
-        return _regenerator.default.wrap(function (_context1) {
-          while (1) switch (_context1.prev = _context1.next) {
+        var res, errData, _t8;
+        return _regenerator.default.wrap(function (_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_ALERTING
               });
-              _context1.prev = 1;
-              _context1.next = 2;
+              _context10.prev = 1;
+              _context10.next = 2;
               return this.patch(_types4.MobiusCallState.ALERTING);
             case 2:
-              res = _context1.sent;
+              res = _context10.sent;
               _Logger.default.log("PATCH response: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_ALERTING
               });
-              _context1.next = 4;
+              _context10.next = 4;
               break;
             case 3:
-              _context1.prev = 3;
-              _t7 = _context1["catch"](1);
-              _Logger.default.error("Failed to signal call progression: ".concat((0, _stringify.default)(_t7)), {
+              _context10.prev = 3;
+              _t8 = _context10["catch"](1);
+              _Logger.default.error("Failed to signal call progression: ".concat((0, _stringify.default)(_t8)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_ALERTING
               });
-              errData = _t7;
+              errData = _t8;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this5.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, error);
                 _this5.submitCallErrorMetric(error);
@@ -1634,7 +1830,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_OUTGOING_CALL_ALERTING, _constants.CALL_FILE);
-              _context1.next = 4;
+              _context10.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
@@ -1642,11 +1838,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 4:
             case "end":
-              return _context1.stop();
+              return _context10.stop();
           }
-        }, _callee1, this, [[1, 3]]);
+        }, _callee10, this, [[1, 3]]);
       }));
-      function handleOutgoingCallAlerting(_x7) {
+      function handleOutgoingCallAlerting(_x8) {
         return _handleOutgoingCallAlerting.apply(this, arguments);
       }
       return handleOutgoingCallAlerting;
@@ -1687,12 +1883,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingCallConnect",
     value: (function () {
-      var _handleOutgoingCallConnect = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10(event) {
+      var _handleOutgoingCallConnect = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11(event) {
         var _this6 = this;
-        var res, errData, _t8;
-        return _regenerator.default.wrap(function (_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        var res, errData, _t9;
+        return _regenerator.default.wrap(function (_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
+              this.connectPending = false;
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_CONNECT
@@ -1700,38 +1897,39 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
 
               /* We should have received an Offer by now */
               if (this.remoteRoapMessage) {
-                _context10.next = 1;
+                _context11.next = 1;
                 break;
               }
               _Logger.default.warn('Offer not yet received from remote end... Exiting', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_CONNECT
               });
-              return _context10.abrupt("return");
+              this.connectPending = true;
+              return _context11.abrupt("return");
             case 1:
-              _context10.prev = 1;
+              _context11.prev = 1;
               /* Start Offer/Answer as we might have buffered the offer by now */
               this.mediaConnection.roapMessageReceived(this.remoteRoapMessage);
 
               /* send call_connect PATCH */
-              _context10.next = 2;
+              _context11.next = 2;
               return this.patch(_types4.MobiusCallState.CONNECTED);
             case 2:
-              res = _context10.sent;
+              res = _context11.sent;
               _Logger.default.log("PATCH response: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_CONNECT
               });
-              _context10.next = 4;
+              _context11.next = 4;
               break;
             case 3:
-              _context10.prev = 3;
-              _t8 = _context10["catch"](1);
-              _Logger.default.error("Failed to connect the call: ".concat((0, _stringify.default)(_t8)), {
+              _context11.prev = 3;
+              _t9 = _context11["catch"](1);
+              _Logger.default.error("Failed to connect the call: ".concat((0, _stringify.default)(_t9)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_CONNECT
               });
-              errData = _t8;
+              errData = _t9;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this6.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, error);
                 _this6.submitCallErrorMetric(error);
@@ -1745,7 +1943,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_OUTGOING_CALL_CONNECT, _constants.CALL_FILE);
-              _context10.next = 4;
+              _context11.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
@@ -1753,11 +1951,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 4:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this, [[1, 3]]);
+        }, _callee11, this, [[1, 3]]);
       }));
-      function handleOutgoingCallConnect(_x8) {
+      function handleOutgoingCallConnect(_x9) {
         return _handleOutgoingCallConnect.apply(this, arguments);
       }
       return handleOutgoingCallConnect;
@@ -1772,10 +1970,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleIncomingCallDisconnect",
     value: (function () {
-      var _handleIncomingCallDisconnect = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11(event) {
-        var response, _t9;
-        return _regenerator.default.wrap(function (_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _handleIncomingCallDisconnect = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12(event) {
+        var response, _t0;
+        return _regenerator.default.wrap(function (_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
@@ -1783,21 +1981,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
               this.emit(_types3.CALL_EVENT_KEYS.DISCONNECT, this.correlationId);
               this.setDisconnectReason();
-              _context11.prev = 1;
-              _context11.next = 2;
+              _context12.prev = 1;
+              _context12.next = 2;
               return this.delete();
             case 2:
-              response = _context11.sent;
+              response = _context12.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_INCOMING_CALL_DISCONNECT
               });
-              _context11.next = 4;
+              _context12.next = 4;
               break;
             case 3:
-              _context11.prev = 3;
-              _t9 = _context11["catch"](1);
-              _Logger.default.warn("Failed to delete the call: ".concat((0, _stringify.default)(_t9)), {
+              _context12.prev = 3;
+              _t0 = _context12["catch"](1);
+              _Logger.default.warn("Failed to delete the call: ".concat((0, _stringify.default)(_t0)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_INCOMING_CALL_DISCONNECT
               });
@@ -1819,10 +2017,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
 
               /* istanbul ignore else */
               if (this.mediaConnection) {
+                this.unregisterMediaConnectionListeners();
                 this.mediaConnection.close();
                 _Logger.default.info('Closing media channel', {
                   file: _constants.CALL_FILE,
-                  method: _constants.METHODS.HANDLE_OUTGOING_CALL_DISCONNECT
+                  method: _constants.METHODS.HANDLE_INCOMING_CALL_DISCONNECT
                 });
               }
               this.sendMediaStateMachineEvt({
@@ -1833,11 +2032,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 5:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this, [[1, 3]]);
+        }, _callee12, this, [[1, 3]]);
       }));
-      function handleIncomingCallDisconnect(_x9) {
+      function handleIncomingCallDisconnect(_x0) {
         return _handleIncomingCallDisconnect.apply(this, arguments);
       }
       return handleIncomingCallDisconnect;
@@ -1852,21 +2051,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingCallDisconnect",
     value: (function () {
-      var _handleOutgoingCallDisconnect = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12(event) {
-        var response, _t0;
-        return _regenerator.default.wrap(function (_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _handleOutgoingCallDisconnect = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13(event) {
+        var response, _t1;
+        return _regenerator.default.wrap(function (_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_DISCONNECT
               });
               this.setDisconnectReason();
-              _context12.prev = 1;
-              _context12.next = 2;
+              _context13.prev = 1;
+              _context13.next = 2;
               return this.delete();
             case 2:
-              response = _context12.sent;
+              response = _context13.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_DISCONNECT
@@ -1875,11 +2074,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_DISCONNECT
               });
-              _context12.next = 4;
+              _context13.next = 4;
               break;
             case 3:
-              _context12.prev = 3;
-              _t0 = _context12["catch"](1);
+              _context13.prev = 3;
+              _t1 = _context13["catch"](1);
               _Logger.default.warn('Failed to delete the call', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_DISCONNECT
@@ -1902,6 +2101,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
 
               /* istanbul ignore else */
               if (this.mediaConnection) {
+                this.unregisterMediaConnectionListeners();
                 this.mediaConnection.close();
                 _Logger.default.info('Closing media channel', {
                   file: _constants.CALL_FILE,
@@ -1916,11 +2116,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 5:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this, [[1, 3]]);
+        }, _callee13, this, [[1, 3]]);
       }));
-      function handleOutgoingCallDisconnect(_x0) {
+      function handleOutgoingCallDisconnect(_x1) {
         return _handleOutgoingCallDisconnect.apply(this, arguments);
       }
       return handleOutgoingCallDisconnect;
@@ -1956,10 +2156,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleUnknownState",
     value: (function () {
-      var _handleUnknownState = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13(event) {
-        var eventData, response, _t1;
-        return _regenerator.default.wrap(function (_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _handleUnknownState = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14(event) {
+        var eventData, response, _t10;
+        return _regenerator.default.wrap(function (_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
@@ -1980,21 +2180,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               /* We need to clear the call at Mobius too. For delete failure
                * error handling is not required
                */
-              _context13.prev = 1;
+              _context14.prev = 1;
               this.setDisconnectReason();
-              _context13.next = 2;
+              _context14.next = 2;
               return this.delete();
             case 2:
-              response = _context13.sent;
+              response = _context14.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_UNKNOWN_STATE
               });
-              _context13.next = 4;
+              _context14.next = 4;
               break;
             case 3:
-              _context13.prev = 3;
-              _t1 = _context13["catch"](1);
+              _context14.prev = 3;
+              _t10 = _context14["catch"](1);
               _Logger.default.warn('Failed to delete the call', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_UNKNOWN_STATE
@@ -2010,6 +2210,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 clearInterval(this.sessionTimer);
               }
               if (this.mediaConnection) {
+                this.unregisterMediaConnectionListeners();
                 this.mediaConnection.close();
                 _Logger.default.info('Closing media channel', {
                   file: _constants.CALL_FILE,
@@ -2024,11 +2225,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 5:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this, [[1, 3]]);
+        }, _callee14, this, [[1, 3]]);
       }));
-      function handleUnknownState(_x1) {
+      function handleUnknownState(_x10) {
         return _handleUnknownState.apply(this, arguments);
       }
       return handleUnknownState;
@@ -2097,27 +2298,27 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleRoapEstablished",
     value: (function () {
-      var _handleRoapEstablished = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14(context, event) {
+      var _handleRoapEstablished = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15(context, event) {
         var _this8 = this;
-        var _ref9, received, message, res, errData, _t10;
-        return _regenerator.default.wrap(function (_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        var _ref0, received, message, res, errData, _t11;
+        return _regenerator.default.wrap(function (_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ESTABLISHED
               });
-              _ref9 = event.data, received = _ref9.received, message = _ref9.message;
+              _ref0 = event.data, received = _ref0.received, message = _ref0.message;
               this.receivedRoapOKSeq = message.seq;
               if (received) {
-                _context14.next = 5;
+                _context15.next = 5;
                 break;
               }
               _Logger.default.info('Sending Media Ok to the remote End', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ESTABLISHED
               });
-              _context14.prev = 1;
+              _context15.prev = 1;
               if (this.callStateMachine.state.value === 'S_RECV_CALL_PROGRESS' || this.callStateMachine.state.value === 'S_SEND_CALL_SETUP') {
                 _Logger.default.info('Media negotiation completed before call connect. Setting media negotiation completed flag.', {
                   file: _constants.CALL_FILE,
@@ -2126,10 +2327,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 this.mediaNegotiationCompleted = true;
               }
               message.seq = this.seq;
-              _context14.next = 2;
+              _context15.next = 2;
               return this.postMedia(message);
             case 2:
-              res = _context14.sent;
+              res = _context15.sent;
               _Logger.default.log("Response code: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ESTABLISHED
@@ -2140,16 +2341,16 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   type: 'E_CALL_ESTABLISHED'
                 });
               }
-              _context14.next = 4;
+              _context15.next = 4;
               break;
             case 3:
-              _context14.prev = 3;
-              _t10 = _context14["catch"](1);
+              _context15.prev = 3;
+              _t11 = _context15["catch"](1);
               _Logger.default.warn('Failed to process MediaOk request', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ESTABLISHED
               });
-              errData = _t10;
+              errData = _t11;
               (0, _Utils.handleCallErrors)(this.getEmitterCallback(errData), _types.ERROR_LAYER.MEDIA, function (interval) {
                 /* Start retry if only it is a midcall case */
                 /* istanbul ignore else */
@@ -2162,14 +2363,14 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   }, interval * 1000);
                 }
               }, this.getCorrelationId(), errData, this.handleRoapEstablished.name, _constants.CALL_FILE);
-              _context14.next = 4;
+              _context15.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
             case 4:
-              _context14.next = 6;
+              _context15.next = 6;
               break;
             case 5:
               _Logger.default.info('Notifying internal-media-core about ROAP OK message', {
@@ -2203,11 +2404,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               }
             case 6:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14, this, [[1, 3]]);
+        }, _callee15, this, [[1, 3]]);
       }));
-      function handleRoapEstablished(_x10, _x11) {
+      function handleRoapEstablished(_x11, _x12) {
         return _handleRoapEstablished.apply(this, arguments);
       }
       return handleRoapEstablished;
@@ -2222,11 +2423,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleRoapError",
     value: (function () {
-      var _handleRoapError = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15(context, event) {
+      var _handleRoapError = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee16(context, event) {
         var _this9 = this;
-        var message, res, errData, _t11;
-        return _regenerator.default.wrap(function (_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        var message, res, errData, _t12;
+        return _regenerator.default.wrap(function (_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
@@ -2237,28 +2438,28 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               message = event.data;
               /* istanbul ignore else */
               if (!(message && message.messageType === 'ERROR')) {
-                _context15.next = 4;
+                _context16.next = 4;
                 break;
               }
-              _context15.prev = 1;
-              _context15.next = 2;
+              _context16.prev = 1;
+              _context16.next = 2;
               return this.postMedia(message);
             case 2:
-              res = _context15.sent;
+              res = _context16.sent;
               _Logger.default.info("Response code: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ERROR
               });
-              _context15.next = 4;
+              _context16.next = 4;
               break;
             case 3:
-              _context15.prev = 3;
-              _t11 = _context15["catch"](1);
+              _context16.prev = 3;
+              _t12 = _context16["catch"](1);
               _Logger.default.warn('Failed to communicate ROAP error to Webex Calling', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ERROR
               });
-              errData = _t11;
+              errData = _t12;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this9.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, error);
                 _this9.submitCallErrorMetric(error);
@@ -2268,7 +2469,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, this.handleRoapError.name, _constants.CALL_FILE);
-              _context15.next = 4;
+              _context16.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
@@ -2291,11 +2492,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               }
             case 5:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15, this, [[1, 3]]);
+        }, _callee16, this, [[1, 3]]);
       }));
-      function handleRoapError(_x12, _x13) {
+      function handleRoapError(_x13, _x14) {
         return _handleRoapError.apply(this, arguments);
       }
       return handleRoapError;
@@ -2310,11 +2511,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingRoapOffer",
     value: (function () {
-      var _handleOutgoingRoapOffer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee16(context, event) {
+      var _handleOutgoingRoapOffer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17(context, event) {
         var _this0 = this;
-        var message, res, errData, _t12;
-        return _regenerator.default.wrap(function (_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        var message, res, errData, _t13;
+        return _regenerator.default.wrap(function (_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
@@ -2322,7 +2523,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
               message = event.data;
               if (message !== null && message !== void 0 && message.sdp) {
-                _context16.next = 1;
+                _context17.next = 1;
                 break;
               }
               _Logger.default.info('Initializing Offer...', {
@@ -2330,27 +2531,27 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_OFFER
               });
               this.mediaConnection.initiateOffer();
-              return _context16.abrupt("return");
+              return _context17.abrupt("return");
             case 1:
-              _context16.prev = 1;
-              _context16.next = 2;
+              _context17.prev = 1;
+              _context17.next = 2;
               return this.postMedia(message);
             case 2:
-              res = _context16.sent;
+              res = _context17.sent;
               _Logger.default.log("Response code: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_OFFER
               });
-              _context16.next = 4;
+              _context17.next = 4;
               break;
             case 3:
-              _context16.prev = 3;
-              _t12 = _context16["catch"](1);
-              _Logger.default.warn('Failed to process MediaOk request', {
+              _context17.prev = 3;
+              _t13 = _context17["catch"](1);
+              _Logger.default.warn('Failed to send MediaOffer request', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_OFFER
               });
-              errData = _t12;
+              errData = _t13;
               (0, _Utils.handleCallErrors)(this.getEmitterCallback(errData), _types.ERROR_LAYER.MEDIA, function (interval) {
                 /* Start retry if only it is a midcall case */
                 if (_this0.connected) {
@@ -2362,7 +2563,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   }, interval * 1000);
                 }
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_OUTGOING_ROAP_OFFER, _constants.CALL_FILE);
-              _context16.next = 4;
+              _context17.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
@@ -2370,11 +2571,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 4:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, this, [[1, 3]]);
+        }, _callee17, this, [[1, 3]]);
       }));
-      function handleOutgoingRoapOffer(_x14, _x15) {
+      function handleOutgoingRoapOffer(_x15, _x16) {
         return _handleOutgoingRoapOffer.apply(this, arguments);
       }
       return handleOutgoingRoapOffer;
@@ -2389,37 +2590,37 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingRoapAnswer",
     value: (function () {
-      var _handleOutgoingRoapAnswer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17(context, event) {
+      var _handleOutgoingRoapAnswer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee18(context, event) {
         var _this1 = this;
-        var message, res, errData, _t13;
-        return _regenerator.default.wrap(function (_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        var message, res, errData, _t14;
+        return _regenerator.default.wrap(function (_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_ANSWER
               });
               message = event.data;
-              _context17.prev = 1;
+              _context18.prev = 1;
               message.seq = this.seq;
-              _context17.next = 2;
+              _context18.next = 2;
               return this.postMedia(message);
             case 2:
-              res = _context17.sent;
+              res = _context18.sent;
               _Logger.default.log("Response code: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_ANSWER
               });
-              _context17.next = 4;
+              _context18.next = 4;
               break;
             case 3:
-              _context17.prev = 3;
-              _t13 = _context17["catch"](1);
+              _context18.prev = 3;
+              _t14 = _context18["catch"](1);
               _Logger.default.warn('Failed to send MediaAnswer request', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_ANSWER
               });
-              errData = _t13;
+              errData = _t14;
               (0, _Utils.handleCallErrors)(this.getEmitterCallback(errData), _types.ERROR_LAYER.MEDIA, function (interval) {
                 /* Start retry if only it is a midcall case */
                 if (_this1.connected) {
@@ -2431,7 +2632,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   }, interval * 1000);
                 }
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_OUTGOING_ROAP_ANSWER, _constants.CALL_FILE);
-              _context17.next = 4;
+              _context18.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
@@ -2439,11 +2640,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 4:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17, this, [[1, 3]]);
+        }, _callee18, this, [[1, 3]]);
       }));
-      function handleOutgoingRoapAnswer(_x16, _x17) {
+      function handleOutgoingRoapAnswer(_x17, _x18) {
         return _handleOutgoingRoapAnswer.apply(this, arguments);
       }
       return handleOutgoingRoapAnswer;
@@ -2603,10 +2804,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
      * @param localAudioStream - The local audio stream for the call.
      */
     function () {
-      var _answer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee18(localAudioStream) {
+      var _answer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee19(localAudioStream) {
         var localAudioTrack;
-        return _regenerator.default.wrap(function (_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regenerator.default.wrap(function (_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with stream"), {
                 file: _constants.CALL_FILE,
@@ -2615,7 +2816,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               this.localAudioStream = localAudioStream;
               localAudioTrack = localAudioStream.outputStream.getAudioTracks()[0];
               if (localAudioTrack) {
-                _context18.next = 1;
+                _context19.next = 1;
                 break;
               }
               _Logger.default.warn("Did not find a local track while answering the call ".concat(this.getCorrelationId()), {
@@ -2626,13 +2827,14 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               this.sendCallStateMachineEvt({
                 type: 'E_SEND_CALL_DISCONNECT'
               });
-              return _context18.abrupt("return");
+              return _context19.abrupt("return");
             case 1:
               localAudioTrack.enabled = true;
               if (!this.mediaConnection) {
                 this.initMediaConnection(localAudioTrack);
                 this.mediaRoapEventsListener();
                 this.mediaTrackListener();
+                this.mediaIceEventsListener();
                 this.registerListeners(localAudioStream);
               }
               if (this.callStateMachine.state.value === 'S_SEND_CALL_PROGRESS') {
@@ -2647,11 +2849,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               }
             case 2:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee18, this);
+        }, _callee19, this);
       }));
-      function answer(_x18) {
+      function answer(_x19) {
         return _answer.apply(this, arguments);
       }
       return answer;
@@ -2664,10 +2866,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "dial",
     value: (function () {
-      var _dial = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee19(localAudioStream) {
+      var _dial = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee20(localAudioStream) {
         var localAudioTrack;
-        return _regenerator.default.wrap(function (_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regenerator.default.wrap(function (_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with stream"), {
                 file: _constants.CALL_FILE,
@@ -2676,7 +2878,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               this.localAudioStream = localAudioStream;
               localAudioTrack = localAudioStream.outputStream.getAudioTracks()[0];
               if (localAudioTrack) {
-                _context19.next = 1;
+                _context20.next = 1;
                 break;
               }
               _Logger.default.warn("Did not find a local track while dialing the call ".concat(this.getCorrelationId()), {
@@ -2685,13 +2887,14 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
               this.deleteCb(this.getCorrelationId());
               this.emit(_types3.CALL_EVENT_KEYS.DISCONNECT, this.getCorrelationId());
-              return _context19.abrupt("return");
+              return _context20.abrupt("return");
             case 1:
               localAudioTrack.enabled = true;
               if (!this.mediaConnection) {
                 this.initMediaConnection(localAudioTrack);
                 this.mediaRoapEventsListener();
                 this.mediaTrackListener();
+                this.mediaIceEventsListener();
                 this.registerListeners(localAudioStream);
               }
               if (this.mediaStateMachine.state.value === 'S_ROAP_IDLE') {
@@ -2706,11 +2909,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               }
             case 2:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
-        }, _callee19, this);
+        }, _callee20, this);
       }));
-      function dial(_x19) {
+      function dial(_x20) {
         return _dial.apply(this, arguments);
       }
       return dial;
@@ -2724,17 +2927,15 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
      * @param state -.
      */
     function () {
-      var _patch = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee20(state) {
-        return _regenerator.default.wrap(function (_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _patch = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee21(state) {
+        return _regenerator.default.wrap(function (_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               _Logger.default.info("Send a PATCH for ".concat(state, " to Webex Calling"), {
                 file: _constants.CALL_FILE,
                 method: 'patch'
               });
-              return _context20.abrupt("return", this.webex.request({
-                // Sample uri: http://localhost/api/v1/calling/web/devices/{deviceid}/calls/{callid}
-
+              return _context21.abrupt("return", this.apiRequest.makeRequest({
                 uri: "".concat(this.mobiusUrl).concat(_constants.DEVICES_ENDPOINT_RESOURCE, "/").concat(this.deviceId, "/").concat(_constants.CALLS_ENDPOINT_RESOURCE, "/").concat(this.callId),
                 method: _types2.HTTP_METHODS.PATCH,
                 service: _types2.ALLOWED_SERVICES.MOBIUS,
@@ -2751,11 +2952,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               }));
             case 1:
             case "end":
-              return _context20.stop();
+              return _context21.stop();
           }
-        }, _callee20, this);
+        }, _callee21, this);
       }));
-      function patch(_x20) {
+      function patch(_x21) {
         return _patch.apply(this, arguments);
       }
       return patch;
@@ -2770,10 +2971,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "postSSRequest",
     value: (function () {
-      var _postSSRequest = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee21(context, type) {
-        var request, transferContext, _t14;
-        return _regenerator.default.wrap(function (_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _postSSRequest = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee22(context, type) {
+        var request, transferContext, _t15;
+        return _regenerator.default.wrap(function (_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               request = {
                 uri: "".concat(this.mobiusUrl).concat(_constants2.SERVICES_ENDPOINT),
@@ -2788,15 +2989,15 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   callId: this.callId
                 }
               };
-              _t14 = type;
-              _context21.next = _t14 === _types3.SUPPLEMENTARY_SERVICES.HOLD ? 1 : _t14 === _types3.SUPPLEMENTARY_SERVICES.RESUME ? 2 : _t14 === _types3.SUPPLEMENTARY_SERVICES.TRANSFER ? 3 : 4;
+              _t15 = type;
+              _context22.next = _t15 === _types3.SUPPLEMENTARY_SERVICES.HOLD ? 1 : _t15 === _types3.SUPPLEMENTARY_SERVICES.RESUME ? 2 : _t15 === _types3.SUPPLEMENTARY_SERVICES.TRANSFER ? 3 : 4;
               break;
             case 1:
               request.uri = "".concat(request.uri, "/").concat(_constants.CALL_HOLD_SERVICE, "/").concat(_constants.HOLD_ENDPOINT);
-              return _context21.abrupt("continue", 5);
+              return _context22.abrupt("continue", 5);
             case 2:
               request.uri = "".concat(request.uri, "/").concat(_constants.CALL_HOLD_SERVICE, "/").concat(_constants.RESUME_ENDPOINT);
-              return _context21.abrupt("continue", 5);
+              return _context22.abrupt("continue", 5);
             case 3:
               request.uri = "".concat(request.uri, "/").concat(_constants.CALL_TRANSFER_SERVICE, "/").concat(_constants.TRANSFER_ENDPOINT);
               transferContext = context;
@@ -2815,21 +3016,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   transferType: _types4.TransferType.CONSULT
                 });
               }
-              return _context21.abrupt("continue", 5);
+              return _context22.abrupt("continue", 5);
             case 4:
               _Logger.default.warn("Unknown type for PUT request: ".concat(type), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.POST_SS_REQUEST
               });
             case 5:
-              return _context21.abrupt("return", this.webex.request(request));
+              return _context22.abrupt("return", this.apiRequest.makeRequest(request));
             case 6:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
-        }, _callee21, this);
+        }, _callee22, this);
       }));
-      function postSSRequest(_x21, _x22) {
+      function postSSRequest(_x22, _x23) {
         return _postSSRequest.apply(this, arguments);
       }
       return postSSRequest;
@@ -2841,11 +3042,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "postStatus",
     value: (function () {
-      var _postStatus = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee22() {
-        return _regenerator.default.wrap(function (_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _postStatus = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee23() {
+        return _regenerator.default.wrap(function (_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              return _context22.abrupt("return", this.webex.request({
+              return _context23.abrupt("return", this.apiRequest.makeRequest({
                 uri: "".concat(this.mobiusUrl).concat(_constants.DEVICES_ENDPOINT_RESOURCE, "/").concat(this.deviceId, "/").concat(_constants.CALLS_ENDPOINT_RESOURCE, "/").concat(this.callId, "/").concat(_constants.CALL_STATUS_RESOURCE),
                 method: _types2.HTTP_METHODS.POST,
                 service: _types2.ALLOWED_SERVICES.MOBIUS,
@@ -2860,9 +3061,9 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               }));
             case 1:
             case "end":
-              return _context22.stop();
+              return _context23.stop();
           }
-        }, _callee22, this);
+        }, _callee23, this);
       }));
       function postStatus() {
         return _postStatus.apply(this, arguments);
@@ -2881,14 +3082,14 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "completeTransfer",
     value: (function () {
-      var _completeTransfer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee23(transferType, transferCallId, transferTarget) {
+      var _completeTransfer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee24(transferType, transferCallId, transferTarget) {
         var _this11 = this;
-        var context, errData, _context23, _errData, _t15, _t16;
-        return _regenerator.default.wrap(function (_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        var context, errData, _context24, _errData, _t16, _t17;
+        return _regenerator.default.wrap(function (_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               if (!(transferType === _types4.TransferType.BLIND && transferTarget)) {
-                _context24.next = 5;
+                _context25.next = 5;
                 break;
               }
               /* blind transfer */
@@ -2901,8 +3102,8 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 transferorCallId: this.getCallId(),
                 destination: transferTarget
               };
-              _context24.prev = 1;
-              _context24.next = 2;
+              _context25.prev = 1;
+              _context25.next = 2;
               return this.postSSRequest(context, _types3.SUPPLEMENTARY_SERVICES.TRANSFER);
             case 2:
               _Logger.default.info("Blind Transfer completed for correlationId ".concat(this.getCorrelationId()), {
@@ -2910,16 +3111,16 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 method: _constants.METHODS.COMPLETE_TRANSFER
               });
               this.metricManager.submitCallMetric(_types5.METRIC_EVENT.CALL, _types5.TRANSFER_ACTION.BLIND, _types5.METRIC_TYPE.BEHAVIORAL, this.getCallId(), this.getCorrelationId(), undefined);
-              _context24.next = 4;
+              _context25.next = 4;
               break;
             case 3:
-              _context24.prev = 3;
-              _t15 = _context24["catch"](1);
+              _context25.prev = 3;
+              _t16 = _context25["catch"](1);
               _Logger.default.warn("Blind Transfer failed for correlationId ".concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.COMPLETE_TRANSFER
               });
-              errData = _t15;
+              errData = _t16;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this11.emit(_types3.CALL_EVENT_KEYS.TRANSFER_ERROR, error);
                 _this11.submitCallErrorMetric(error, _types5.TRANSFER_ACTION.BLIND);
@@ -2929,18 +3130,18 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.COMPLETE_TRANSFER, _constants.CALL_FILE);
-              _context24.next = 4;
+              _context25.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
             case 4:
-              _context24.next = 11;
+              _context25.next = 11;
               break;
             case 5:
               if (!(transferType === _types4.TransferType.CONSULT && transferCallId)) {
-                _context24.next = 10;
+                _context25.next = 10;
                 break;
               }
               /* Consult transfer */
@@ -2949,29 +3150,29 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.COMPLETE_TRANSFER
               });
-              _context23 = {
+              _context24 = {
                 transferorCallId: this.getCallId(),
                 transferToCallId: transferCallId
               };
-              _context24.prev = 6;
-              _context24.next = 7;
-              return this.postSSRequest(_context23, _types3.SUPPLEMENTARY_SERVICES.TRANSFER);
+              _context25.prev = 6;
+              _context25.next = 7;
+              return this.postSSRequest(_context24, _types3.SUPPLEMENTARY_SERVICES.TRANSFER);
             case 7:
               _Logger.default.info("Consult Transfer completed for correlationId ".concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.COMPLETE_TRANSFER
               });
               this.metricManager.submitCallMetric(_types5.METRIC_EVENT.CALL, _types5.TRANSFER_ACTION.CONSULT, _types5.METRIC_TYPE.BEHAVIORAL, this.getCallId(), this.getCorrelationId(), undefined);
-              _context24.next = 9;
+              _context25.next = 9;
               break;
             case 8:
-              _context24.prev = 8;
-              _t16 = _context24["catch"](6);
+              _context25.prev = 8;
+              _t17 = _context25["catch"](6);
               _Logger.default.warn("Consult Transfer failed for correlationId ".concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.COMPLETE_TRANSFER
               });
-              _errData = _t16;
+              _errData = _t17;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this11.emit(_types3.CALL_EVENT_KEYS.TRANSFER_ERROR, error);
                 _this11.submitCallErrorMetric(error, _types5.TRANSFER_ACTION.CONSULT);
@@ -2981,14 +3182,14 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), _errData, _constants.METHODS.COMPLETE_TRANSFER, _constants.CALL_FILE);
-              _context24.next = 9;
+              _context25.next = 9;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
             case 9:
-              _context24.next = 11;
+              _context25.next = 11;
               break;
             case 10:
               _Logger.default.warn("Invalid information received, transfer failed for correlationId: ".concat(this.getCorrelationId()), {
@@ -2997,11 +3198,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
             case 11:
             case "end":
-              return _context24.stop();
+              return _context25.stop();
           }
-        }, _callee23, this, [[1, 3], [6, 8]]);
+        }, _callee24, this, [[1, 3], [6, 8]]);
       }));
-      function completeTransfer(_x23, _x24, _x25) {
+      function completeTransfer(_x24, _x25, _x26) {
         return _completeTransfer.apply(this, arguments);
       }
       return completeTransfer;
@@ -3013,32 +3214,32 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "getCallStats",
     value: (function () {
-      var _getCallStats = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee24() {
-        var stats, _t17;
-        return _regenerator.default.wrap(function (_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+      var _getCallStats = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee25() {
+        var stats, _t18;
+        return _regenerator.default.wrap(function (_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              _context25.prev = 0;
-              _context25.next = 1;
+              _context26.prev = 0;
+              _context26.next = 1;
               return this.mediaConnection.getStats();
             case 1:
-              stats = _context25.sent;
-              _context25.next = 3;
+              stats = _context26.sent;
+              _context26.next = 3;
               break;
             case 2:
-              _context25.prev = 2;
-              _t17 = _context25["catch"](0);
+              _context26.prev = 2;
+              _t18 = _context26["catch"](0);
               _Logger.default.warn('Stats collection failed, using dummy stats', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.GET_CALL_STATS
               });
             case 3:
-              return _context25.abrupt("return", (0, _Utils.parseMediaQualityStatistics)(stats));
+              return _context26.abrupt("return", (0, _Utils.parseMediaQualityStatistics)(stats));
             case 4:
             case "end":
-              return _context25.stop();
+              return _context26.stop();
           }
-        }, _callee24, this, [[0, 2]]);
+        }, _callee25, this, [[0, 2]]);
       }));
       function getCallStats() {
         return _getCallStats.apply(this, arguments);
@@ -3054,15 +3255,15 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "postMedia",
     value: (function () {
-      var _postMedia = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee25(roapMessage) {
-        return _regenerator.default.wrap(function (_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+      var _postMedia = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee26(roapMessage) {
+        return _regenerator.default.wrap(function (_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               _Logger.default.log('Posting message to Webex Calling', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.POST_MEDIA
               });
-              return _context26.abrupt("return", this.webex.request({
+              return _context27.abrupt("return", this.apiRequest.makeRequest({
                 uri: "".concat(this.mobiusUrl).concat(_constants.DEVICES_ENDPOINT_RESOURCE, "/").concat(this.deviceId, "/").concat(_constants.CALLS_ENDPOINT_RESOURCE, "/").concat(this.callId, "/").concat(_constants.MEDIA_ENDPOINT_RESOURCE),
                 method: _types2.HTTP_METHODS.POST,
                 service: _types2.ALLOWED_SERVICES.MOBIUS,
@@ -3081,11 +3282,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               }));
             case 1:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
-      function postMedia(_x26) {
+      function postMedia(_x27) {
         return _postMedia.apply(this, arguments);
       }
       return postMedia;
@@ -3098,90 +3299,8 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "mediaRoapEventsListener",
     value: function mediaRoapEventsListener() {
-      var _this12 = this;
-      this.mediaConnection.on(_internalMediaCore.MediaConnectionEventNames.ROAP_MESSAGE_TO_SEND,
-      /*#__PURE__*/
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      function () {
-        var _ref0 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee26(event) {
-          var _event$roapMessage, _event$roapMessage2;
-          var mediaOk, sdpVideoPortZero, _t18;
-          return _regenerator.default.wrap(function (_context27) {
-            while (1) switch (_context27.prev = _context27.next) {
-              case 0:
-                _Logger.default.info("ROAP message to send (rcv from MEDIA-SDK) :\n          \n type:  ".concat((_event$roapMessage = event.roapMessage) === null || _event$roapMessage === void 0 ? void 0 : _event$roapMessage.messageType, ", seq: ").concat(event.roapMessage.seq, " , version: ").concat(event.roapMessage.version), {
-                  file: _constants.CALL_FILE,
-                  method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
-                });
-                _Logger.default.info("SDP message to send : \n ".concat((_event$roapMessage2 = event.roapMessage) === null || _event$roapMessage2 === void 0 ? void 0 : _event$roapMessage2.sdp), {
-                  file: _constants.CALL_FILE,
-                  method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
-                });
-                _t18 = event.roapMessage.messageType;
-                _context27.next = _t18 === _types4.RoapScenario.OK ? 1 : _t18 === _types4.RoapScenario.OFFER ? 2 : _t18 === _types4.RoapScenario.ANSWER ? 3 : _t18 === _types4.RoapScenario.ERROR ? 4 : _t18 === _types4.RoapScenario.OFFER_RESPONSE ? 5 : 6;
-                break;
-              case 1:
-                mediaOk = {
-                  received: false,
-                  message: event.roapMessage
-                };
-                _this12.sendMediaStateMachineEvt({
-                  type: 'E_ROAP_OK',
-                  data: mediaOk
-                });
-                return _context27.abrupt("continue", 6);
-              case 2:
-                // TODO: Remove these after the Media-Core adds the fix
-                // Check if at least one IPv6 "c=" line is present
-                _Logger.default.info("before modifying sdp: ".concat(event.roapMessage.sdp), {
-                  file: _constants.CALL_FILE,
-                  method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
-                });
-                event.roapMessage.sdp = (0, _Utils.modifySdpForIPv4)(event.roapMessage.sdp);
-                sdpVideoPortZero = event.roapMessage.sdp.replace(/^m=(video) (?:\d+) /gim, 'm=$1 0 ');
-                _Logger.default.info("after modification sdp: ".concat(sdpVideoPortZero), {
-                  file: _constants.CALL_FILE,
-                  method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
-                });
-                event.roapMessage.sdp = sdpVideoPortZero;
-                _this12.localRoapMessage = event.roapMessage;
-                _this12.sendCallStateMachineEvt({
-                  type: 'E_SEND_CALL_SETUP',
-                  data: event.roapMessage
-                });
-                return _context27.abrupt("continue", 6);
-              case 3:
-                event.roapMessage.sdp = (0, _Utils.modifySdpForIPv4)(event.roapMessage.sdp);
-                _this12.localRoapMessage = event.roapMessage;
-                _this12.sendMediaStateMachineEvt({
-                  type: 'E_SEND_ROAP_ANSWER',
-                  data: event.roapMessage
-                });
-                return _context27.abrupt("continue", 6);
-              case 4:
-                _this12.sendMediaStateMachineEvt({
-                  type: 'E_ROAP_ERROR',
-                  data: event.roapMessage
-                });
-                return _context27.abrupt("continue", 6);
-              case 5:
-                event.roapMessage.sdp = (0, _Utils.modifySdpForIPv4)(event.roapMessage.sdp);
-                _this12.localRoapMessage = event.roapMessage;
-                _this12.sendMediaStateMachineEvt({
-                  type: 'E_SEND_ROAP_OFFER',
-                  data: event.roapMessage
-                });
-                return _context27.abrupt("continue", 6);
-              case 6:
-              case "end":
-                return _context27.stop();
-            }
-          }, _callee26);
-        }));
-        return function (_x27) {
-          return _ref0.apply(this, arguments);
-        };
-      }());
+      this.mediaConnection.on(_internalMediaCore.MediaConnectionEventNames.ROAP_MESSAGE_TO_SEND, this.handleMediaRoapEvent);
+      this.mediaConnection.on(_internalMediaCore.MediaConnectionEventNames.ROAP_FAILURE, this.handleRoapFailure);
     }
 
     /* istanbul ignore next */
@@ -3191,13 +3310,34 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "mediaTrackListener",
     value: function mediaTrackListener() {
-      var _this13 = this;
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      this.mediaConnection.on(_internalMediaCore.MediaConnectionEventNames.REMOTE_TRACK_ADDED, function (e) {
-        if (e.type === _types3.MEDIA_CONNECTION_EVENT_KEYS.MEDIA_TYPE_AUDIO) {
-          _this13.emit(_types3.CALL_EVENT_KEYS.REMOTE_MEDIA, e.track);
-        }
-      });
+      this.mediaConnection.on(_internalMediaCore.MediaConnectionEventNames.REMOTE_TRACK_ADDED, this.handleRemoteTrackAdded);
+    }
+
+    /* istanbul ignore next */
+    /**
+     * Setup listeners for ICE-related media connection events.
+     */
+  }, {
+    key: "mediaIceEventsListener",
+    value: function mediaIceEventsListener() {
+      this.mediaConnection.on(_internalMediaCore.MediaConnectionEventNames.ICE_GATHERING_STATE_CHANGED, this.handleIceGatheringStateChanged);
+      this.mediaConnection.on(_internalMediaCore.MediaConnectionEventNames.PEER_CONNECTION_STATE_CHANGED, this.handlePeerConnectionStateChanged);
+      this.mediaConnection.on(_internalMediaCore.MediaConnectionEventNames.ICE_CONNECTION_STATE_CHANGED, this.handleIceConnectionStateChanged);
+      this.mediaConnection.on(_internalMediaCore.MediaConnectionEventNames.ICE_CANDIDATE_ERROR, this.handleIceCandidateError);
+    }
+  }, {
+    key: "unregisterMediaConnectionListeners",
+    value: function unregisterMediaConnectionListeners() {
+      if (!this.mediaConnection || typeof this.mediaConnection.off !== 'function') {
+        return;
+      }
+      this.mediaConnection.off(_internalMediaCore.MediaConnectionEventNames.ROAP_MESSAGE_TO_SEND, this.handleMediaRoapEvent);
+      this.mediaConnection.off(_internalMediaCore.MediaConnectionEventNames.ROAP_FAILURE, this.handleRoapFailure);
+      this.mediaConnection.off(_internalMediaCore.MediaConnectionEventNames.REMOTE_TRACK_ADDED, this.handleRemoteTrackAdded);
+      this.mediaConnection.off(_internalMediaCore.MediaConnectionEventNames.ICE_GATHERING_STATE_CHANGED, this.handleIceGatheringStateChanged);
+      this.mediaConnection.off(_internalMediaCore.MediaConnectionEventNames.PEER_CONNECTION_STATE_CHANGED, this.handlePeerConnectionStateChanged);
+      this.mediaConnection.off(_internalMediaCore.MediaConnectionEventNames.ICE_CONNECTION_STATE_CHANGED, this.handleIceConnectionStateChanged);
+      this.mediaConnection.off(_internalMediaCore.MediaConnectionEventNames.ICE_CANDIDATE_ERROR, this.handleIceCandidateError);
     }
   }, {
     key: "unregisterListeners",
@@ -3205,8 +3345,8 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
       if (this.localAudioStream) {
         var effect = this.localAudioStream.getEffectByKind(_constants.NOISE_REDUCTION_EFFECT);
         if (effect) {
-          effect.off(_webMediaEffects.EffectEvent.Enabled, this.onEffectEnabled);
-          effect.off(_webMediaEffects.EffectEvent.Disabled, this.onEffectDisabled);
+          effect.off(_mediaHelpers.EffectEvent.Enabled, this.onEffectEnabled);
+          effect.off(_mediaHelpers.EffectEvent.Disabled, this.onEffectDisabled);
         }
         this.localAudioStream.off(_internalMediaCore.LocalStreamEventNames.EffectAdded, this.registerEffectListener);
         this.localAudioStream.off(_internalMediaCore.LocalStreamEventNames.OutputTrackChange, this.updateTrack);
@@ -3219,8 +3359,8 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
       localAudioStream.on(_internalMediaCore.LocalStreamEventNames.EffectAdded, this.registerEffectListener);
       var effect = localAudioStream.getEffectByKind(_constants.NOISE_REDUCTION_EFFECT);
       if (effect) {
-        effect.on(_webMediaEffects.EffectEvent.Enabled, this.onEffectEnabled);
-        effect.on(_webMediaEffects.EffectEvent.Disabled, this.onEffectDisabled);
+        effect.on(_mediaHelpers.EffectEvent.Enabled, this.onEffectEnabled);
+        effect.on(_mediaHelpers.EffectEvent.Disabled, this.onEffectDisabled);
         if (effect.isEnabled) {
           this.onEffectEnabled();
         }
@@ -3238,7 +3378,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               return this.getCallStats();
             case 1:
               disconnectMetrics = _context28.sent;
-              return _context28.abrupt("return", this.webex.request({
+              return _context28.abrupt("return", this.apiRequest.makeRequest({
                 uri: "".concat(this.mobiusUrl).concat(_constants.DEVICES_ENDPOINT_RESOURCE, "/").concat(this.deviceId, "/").concat(_constants.CALLS_ENDPOINT_RESOURCE, "/").concat(this.callId),
                 method: _types2.HTTP_METHODS.DELETE,
                 service: _types2.ALLOWED_SERVICES.MOBIUS,
@@ -3277,7 +3417,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
         this.metricManager.submitCallMetric(_types5.METRIC_EVENT.CALL_ERROR, transferMetricAction || this.callStateMachine.state.value.toString(), _types5.METRIC_TYPE.BEHAVIORAL, this.callId, this.correlationId, error);
       } else {
         var _this$remoteRoapMessa2;
-        this.metricManager.submitMediaMetric(_types5.METRIC_EVENT.MEDIA_ERROR, this.mediaStateMachine.state.value.toString(), _types5.METRIC_TYPE.BEHAVIORAL, this.callId, this.correlationId, this.localRoapMessage.sdp, (_this$remoteRoapMessa2 = this.remoteRoapMessage) === null || _this$remoteRoapMessa2 === void 0 ? void 0 : _this$remoteRoapMessa2.sdp, error);
+        this.metricManager.submitMediaMetric(_types5.METRIC_EVENT.MEDIA_ERROR, this.mediaStateMachine.state.value.toString(), _types5.METRIC_TYPE.BEHAVIORAL, this.callId, this.correlationId, this.localRoapMessage.sdp, (_this$remoteRoapMessa2 = this.remoteRoapMessage) === null || _this$remoteRoapMessa2 === void 0 ? void 0 : _this$remoteRoapMessa2.sdp, undefined, error);
       }
     }
 
@@ -3466,6 +3606,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
       }
       return handleTimeout;
     }())
+  }], [{
+    key: "getPeerConnectionStateFromEvent",
+    value: function getPeerConnectionStateFromEvent(event, preferredKey) {
+      return event[preferredKey] || event.state || 'unknown';
+    }
   }]);
 }(_impl.Eventing);
 /**