@webex/calling 3.10.0-next.2 → 3.10.0-next.21

package/dist/CallingClient/calling/call.js

@@ -12,16 +12,15 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createCall = exports.Call = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/assign"));
+var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/assertThisInitialized"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/getPrototypeOf"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
 var _internalMediaCore = require("@webex/internal-media-core");
 var _xstate = require("xstate");
@@ -44,132 +43,240 @@ var _Metrics = require("../../Metrics");
 var _constants2 = require("../../common/constants");
 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 _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = _Reflect$construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, 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)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /* eslint-disable tsdoc/syntax */ /* eslint-disable no-param-reassign */
 /**
  *
  */
 var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
-  (0, _inherits2.default)(Call, _Eventing);
-  var _super = _createSuper(Call);
   /**
    * @ignore
    */
   function Call(activeUrl, webex, direction, deviceId, lineId, deleteCb, indicator, destination) {
     var _this;
     (0, _classCallCheck2.default)(this, Call);
-    _this = _super.call(this);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sdkConnector", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "webex", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "destination", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "direction", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "callId", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "correlationId", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "deviceId", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "lineId", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "disconnectReason", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "callStateMachine", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mediaStateMachine", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "seq", void 0);
+    _this = _callSuper(this, Call);
+    (0, _defineProperty2.default)(_this, "sdkConnector", void 0);
+    (0, _defineProperty2.default)(_this, "webex", void 0);
+    (0, _defineProperty2.default)(_this, "destination", void 0);
+    (0, _defineProperty2.default)(_this, "direction", void 0);
+    (0, _defineProperty2.default)(_this, "callId", void 0);
+    (0, _defineProperty2.default)(_this, "correlationId", void 0);
+    (0, _defineProperty2.default)(_this, "deviceId", void 0);
+    (0, _defineProperty2.default)(_this, "lineId", void 0);
+    (0, _defineProperty2.default)(_this, "disconnectReason", void 0);
+    (0, _defineProperty2.default)(_this, "callStateMachine", void 0);
+    (0, _defineProperty2.default)(_this, "mediaStateMachine", void 0);
+    (0, _defineProperty2.default)(_this, "seq", void 0);
     // TODO: remove later
     /* TODO: Need to change the type from any to RoapMediaConnection  */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mediaConnection", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "earlyMedia", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "connected", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mediaInactivity", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "callerInfo", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "localRoapMessage", void 0);
+    (0, _defineProperty2.default)(_this, "mediaConnection", void 0);
+    (0, _defineProperty2.default)(_this, "earlyMedia", void 0);
+    (0, _defineProperty2.default)(_this, "connected", void 0);
+    (0, _defineProperty2.default)(_this, "mediaInactivity", void 0);
+    (0, _defineProperty2.default)(_this, "callerInfo", void 0);
+    (0, _defineProperty2.default)(_this, "localRoapMessage", void 0);
     // Use it for new offer
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mobiusUrl", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "remoteRoapMessage", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "deleteCb", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "callerId", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sessionTimer", void 0);
+    (0, _defineProperty2.default)(_this, "mobiusUrl", void 0);
+    (0, _defineProperty2.default)(_this, "remoteRoapMessage", void 0);
+    (0, _defineProperty2.default)(_this, "deleteCb", void 0);
+    (0, _defineProperty2.default)(_this, "callerId", void 0);
+    (0, _defineProperty2.default)(_this, "sessionTimer", void 0);
     /* Used to wait for final responses for supplementary services */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "supplementaryServicesTimer", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "muted", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "held", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "metricManager", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "broadworksCorrelationInfo", void 0);
+    (0, _defineProperty2.default)(_this, "supplementaryServicesTimer", void 0);
+    (0, _defineProperty2.default)(_this, "muted", void 0);
+    (0, _defineProperty2.default)(_this, "held", void 0);
+    (0, _defineProperty2.default)(_this, "metricManager", void 0);
+    (0, _defineProperty2.default)(_this, "broadworksCorrelationInfo", void 0);
     // Used in WxCC calls
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "serviceIndicator", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mediaNegotiationCompleted", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "receivedRoapOKSeq", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "localAudioStream", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "rtcMetrics", void 0);
+    (0, _defineProperty2.default)(_this, "serviceIndicator", void 0);
+    (0, _defineProperty2.default)(_this, "mediaNegotiationCompleted", 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, "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), {
+          file: _constants.CALL_FILE,
+          method: 'keepaliveRetryCallback'
+        });
+        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) {
+            case 0:
+              _context.prev = 0;
+              _context.next = 1;
+              return _this.postStatus();
+            case 1:
+              _this.scheduleCallKeepaliveInterval();
+              _context.next = 3;
+              break;
+            case 2:
+              _context.prev = 2;
+              _t = _context["catch"](0);
+              _context.next = 3;
+              return _this.handleCallKeepaliveError(_t);
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, 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 error, abort;
+        return _regenerator.default.wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              error = err;
+              /* We are clearing the timer here as all are error scenarios. Only scenario where
+               * timer reset won't be required is 503 with retry after. But that case will
+               * be handled automatically as Mobius will also reset timer when we post status
+               * in retry-after scenario.
+               */
+              /* istanbul ignore next */
+              if (_this.sessionTimer) {
+                clearInterval(_this.sessionTimer);
+              }
+              _context2.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;
+              if (abort) {
+                _this.sendCallStateMachineEvt({
+                  type: 'E_SEND_CALL_DISCONNECT'
+                });
+                _this.emit(_types3.CALL_EVENT_KEYS.DISCONNECT, _this.getCorrelationId());
+                _this.callKeepaliveRetryCount = 0;
+              }
+              _context2.next = 2;
+              return (0, _Utils.uploadLogs)({
+                correlationId: _this.correlationId,
+                callId: _this.callId,
+                broadworksCorrelationInfo: _this.broadworksCorrelationInfo
+              });
+            case 2:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
+    (0, _defineProperty2.default)(_this, "scheduleCallKeepaliveInterval", function () {
+      var loggerContext = {
+        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) {
+            case 0:
+              _context3.prev = 0;
+              _context3.next = 1;
+              return _this.postStatus();
+            case 1:
+              res = _context3.sent;
+              _Logger.default.info("Session refresh successful", loggerContext);
+              _context3.next = 3;
+              break;
+            case 2:
+              _context3.prev = 2;
+              _t2 = _context3["catch"](0);
+              _context3.next = 3;
+              return _this.handleCallKeepaliveError(_t2);
+            case 3:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, null, [[0, 2]]);
+      })), _constants.DEFAULT_SESSION_TIMER);
+    });
     /**
      * Media failed, so collect a stats report from webrtc
      * send a webrtc telemetry dump to the configured server using the internal media core check metrics configured callback
      * @param {String} callFrom - the function calling this function, optional.
      * @returns {Promise<void>}
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "forceSendStatsReport", /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(_ref) {
-        var callFrom, loggerContext, errorInfo, errorStatus;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+    (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) {
             case 0:
-              callFrom = _ref.callFrom;
+              callFrom = _ref4.callFrom;
               loggerContext = {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.FORCE_SEND_STATS_REPORT
               };
-              _context.prev = 2;
-              _context.next = 5;
+              _context4.prev = 1;
+              _context4.next = 2;
               return _this.mediaConnection.forceRtcMetricsSend();
-            case 5:
+            case 2:
               _Logger.default.info("Successfully uploaded available webrtc telemetry statistics", loggerContext);
               _Logger.default.info("callFrom: ".concat(callFrom), loggerContext);
-              _context.next = 18;
+              _context4.next = 5;
               break;
-            case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](2);
-              errorInfo = _context.t0;
-              _context.next = 14;
+            case 3:
+              _context4.prev = 3;
+              _t3 = _context4["catch"](1);
+              errorInfo = _t3;
+              _context4.next = 4;
               return (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-            case 14:
-              errorStatus = _context.sent;
+            case 4:
+              errorStatus = _context4.sent;
               _Logger.default.error("Failed to upload webrtc telemetry statistics. ".concat((0, _stringify.default)(errorStatus)), loggerContext);
-              _context.next = 18;
+              _context4.next = 5;
               return (0, _Utils.uploadLogs)({
                 correlationId: _this.correlationId,
                 callId: _this.callId,
                 broadworksCorrelationInfo: _this.broadworksCorrelationInfo
               });
-            case 18:
+            case 5:
             case "end":
-              return _context.stop();
+              return _context4.stop();
           }
-        }, _callee, null, [[2, 9]]);
+        }, _callee4, null, [[1, 3]]);
       }));
-      return function (_x) {
-        return _ref2.apply(this, arguments);
+      return function (_x2) {
+        return _ref5.apply(this, arguments);
       };
     }());
     /**
      *
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getDirection", function () {
+    (0, _defineProperty2.default)(_this, "getDirection", function () {
       return _this.direction;
     });
     /**
      *
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getCallId", function () {
+    (0, _defineProperty2.default)(_this, "getCallId", function () {
       return _this.callId;
     });
     /**
      *
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getCorrelationId", function () {
+    (0, _defineProperty2.default)(_this, "getCorrelationId", function () {
       return _this.correlationId;
     });
     /**
      * @param callId -.
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setCallId", function (callId) {
+    (0, _defineProperty2.default)(_this, "setCallId", function (callId) {
       _this.callId = callId;
       _this.rtcMetrics.updateCallId(callId);
       _Logger.default.info("Setting callId : ".concat(_this.callId, " for correlationId: ").concat(_this.correlationId), {
@@ -184,7 +291,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
      *
      * @returns Reason.
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getDisconnectReason", function () {
+    (0, _defineProperty2.default)(_this, "getDisconnectReason", function () {
       return _this.disconnectReason;
     });
     /**
@@ -192,11 +299,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
      *
      * @param roapMessage
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "post", /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(roapMessage) {
+    (0, _defineProperty2.default)(_this, "post", /*#__PURE__*/function () {
+      var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(roapMessage) {
         var basePayload;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regenerator.default.wrap(function (_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               basePayload = {
                 device: {
@@ -208,7 +315,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   mediaId: (0, _uuid.v4)()
                 }
               };
-              return _context2.abrupt("return", _this.webex.request({
+              return _context5.abrupt("return", _this.webex.request({
                 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,
@@ -220,28 +327,28 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   }
                 }) : basePayload
               }));
-            case 2:
+            case 1:
             case "end":
-              return _context2.stop();
+              return _context5.stop();
           }
-        }, _callee2);
+        }, _callee5);
       }));
-      return function (_x2) {
-        return _ref3.apply(this, arguments);
+      return function (_x3) {
+        return _ref6.apply(this, arguments);
       };
     }());
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onEffectEnabled", function () {
+    (0, _defineProperty2.default)(_this, "onEffectEnabled", function () {
       _this.metricManager.submitBNRMetric(_types5.METRIC_EVENT.BNR_ENABLED, _types5.METRIC_TYPE.BEHAVIORAL, _this.callId, _this.correlationId);
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onEffectDisabled", function () {
+    (0, _defineProperty2.default)(_this, "onEffectDisabled", function () {
       _this.metricManager.submitBNRMetric(_types5.METRIC_EVENT.BNR_DISABLED, _types5.METRIC_TYPE.BEHAVIORAL, _this.callId, _this.correlationId);
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateTrack", function (audioTrack) {
+    (0, _defineProperty2.default)(_this, "updateTrack", function (audioTrack) {
       _this.mediaConnection.updateLocalTracks({
         audio: audioTrack
       });
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "registerEffectListener", function (addedEffect) {
+    (0, _defineProperty2.default)(_this, "registerEffectListener", function (addedEffect) {
       if (_this.localAudioStream) {
         var effect = _this.localAudioStream.getEffectByKind(_constants.NOISE_REDUCTION_EFFECT);
         if (effect === addedEffect) {
@@ -253,13 +360,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
     /**
      *
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getCallerInfo", function () {
+    (0, _defineProperty2.default)(_this, "getCallerInfo", function () {
       return _this.callerInfo;
     });
     /**
      *
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "end", function () {
+    (0, _defineProperty2.default)(_this, "end", function () {
       _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE), {
         file: _constants.CALL_FILE,
         method: _constants.METHODS.END
@@ -271,7 +378,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
     /**
      *
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "doHoldResume", function () {
+    (0, _defineProperty2.default)(_this, "doHoldResume", function () {
       if (_this.held) {
         _this.sendCallStateMachineEvt({
           type: 'E_CALL_RESUME'
@@ -293,7 +400,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
      * call.mute(localAudioStream, 'system_mute')
      * ```
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mute", function (localAudioStream, muteType) {
+    (0, _defineProperty2.default)(_this, "mute", function (localAudioStream, muteType) {
       _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(muteType || 'user mute'), {
         file: _constants.CALL_FILE,
         method: _constants.METHODS.MUTE
@@ -329,7 +436,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
      *
      * @param newAudioStream - The new audio stream to be used in the call.
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateMedia", function (newAudioStream) {
+    (0, _defineProperty2.default)(_this, "updateMedia", function (newAudioStream) {
       var localAudioTrack = newAudioStream.outputStream.getAudioTracks()[0];
       if (!localAudioTrack) {
         _Logger.default.warn("Did not find a local track while updating media for call ".concat(_this.getCorrelationId(), ". Will not update media"), {
@@ -1080,7 +1187,8 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
    * @param event - Call Events.
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  (0, _createClass2.default)(Call, [{
+  (0, _inherits2.default)(Call, _Eventing);
+  return (0, _createClass2.default)(Call, [{
     key: "isMuted",
     value:
     /**
@@ -1135,22 +1243,22 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingCallSetup",
     value: (function () {
-      var _handleOutgoingCallSetup = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(event) {
+      var _handleOutgoingCallSetup = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(event) {
         var _this2 = this;
-        var message, response, errData;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        var message, response, errData, _t4;
+        return _regenerator.default.wrap(function (_context6) {
+          while (1) switch (_context6.prev = _context6.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;
-              _context3.prev = 2;
-              _context3.next = 5;
+              _context6.prev = 1;
+              _context6.next = 2;
               return this.post(message);
-            case 5:
-              response = _context3.sent;
+            case 2:
+              response = _context6.sent;
               _Logger.default.info("Response: ".concat((0, _stringify.default)(response)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_SETUP
@@ -1164,16 +1272,16 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 file: _constants.CALL_FILE,
                 method: this.handleOutgoingCallSetup.name
               });
-              _context3.next = 19;
+              _context6.next = 4;
               break;
-            case 12:
-              _context3.prev = 12;
-              _context3.t0 = _context3["catch"](2);
-              _Logger.default.error("Failed to setup the call: ".concat((0, _stringify.default)(_context3.t0)), {
+            case 3:
+              _context6.prev = 3;
+              _t4 = _context6["catch"](1);
+              _Logger.default.error("Failed to setup the call: ".concat((0, _stringify.default)(_t4)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_SETUP
               });
-              errData = _context3.t0;
+              errData = _t4;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this2.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, error);
                 _this2.submitCallErrorMetric(error);
@@ -1187,19 +1295,19 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_OUTGOING_CALL_SETUP, _constants.CALL_FILE);
-              _context3.next = 19;
+              _context6.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 19:
+            case 4:
             case "end":
-              return _context3.stop();
+              return _context6.stop();
           }
-        }, _callee3, this, [[2, 12]]);
+        }, _callee6, this, [[1, 3]]);
       }));
-      function handleOutgoingCallSetup(_x3) {
+      function handleOutgoingCallSetup(_x4) {
         return _handleOutgoingCallSetup.apply(this, arguments);
       }
       return handleOutgoingCallSetup;
@@ -1214,21 +1322,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleCallHold",
     value: (function () {
-      var _handleCallHold = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(event) {
+      var _handleCallHold = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8(event) {
         var _this3 = this;
-        var response, errData;
-        return _regenerator.default.wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        var response, errData, _t5;
+        return _regenerator.default.wrap(function (_context8) {
+          while (1) switch (_context8.prev = _context8.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
               });
-              _context5.prev = 1;
-              _context5.next = 4;
+              _context8.prev = 1;
+              _context8.next = 2;
               return this.postSSRequest(undefined, _types3.SUPPLEMENTARY_SERVICES.HOLD);
-            case 4:
-              response = _context5.sent;
+            case 2:
+              response = _context8.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_CALL_HOLD
@@ -1239,10 +1347,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 _callee4() {
+                this.supplementaryServicesTimer = setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7() {
                   var errorContext, callError;
-                  return _regenerator.default.wrap(function _callee4$(_context4) {
-                    while (1) switch (_context4.prev = _context4.next) {
+                  return _regenerator.default.wrap(function (_context7) {
+                    while (1) switch (_context7.prev = _context7.next) {
                       case 0:
                         errorContext = {
                           file: _constants.CALL_FILE,
@@ -1255,23 +1363,23 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                         callError = (0, _CallError.createCallError)('An error occurred while placing the call on hold. Wait a moment and try again.', errorContext, _types.ERROR_TYPE.TIMEOUT, _this3.getCorrelationId(), _types.ERROR_LAYER.CALL_CONTROL);
                         _this3.emit(_types3.CALL_EVENT_KEYS.HOLD_ERROR, callError);
                         _this3.submitCallErrorMetric(callError);
-                      case 5:
+                      case 1:
                       case "end":
-                        return _context4.stop();
+                        return _context7.stop();
                     }
-                  }, _callee4);
+                  }, _callee7);
                 })), _constants.SUPPLEMENTARY_SERVICES_TIMEOUT);
               }
-              _context5.next = 16;
+              _context8.next = 4;
               break;
-            case 9:
-              _context5.prev = 9;
-              _context5.t0 = _context5["catch"](1);
-              _Logger.default.error("Failed to put the call on hold: ".concat((0, _stringify.default)(_context5.t0)), {
+            case 3:
+              _context8.prev = 3;
+              _t5 = _context8["catch"](1);
+              _Logger.default.error("Failed to put the call on hold: ".concat((0, _stringify.default)(_t5)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_CALL_HOLD
               });
-              errData = _context5.t0;
+              errData = _t5;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this3.emit(_types3.CALL_EVENT_KEYS.HOLD_ERROR, error);
                 _this3.submitCallErrorMetric(error);
@@ -1285,19 +1393,19 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_CALL_HOLD, _constants.CALL_FILE);
-              _context5.next = 16;
+              _context8.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 16:
+            case 4:
             case "end":
-              return _context5.stop();
+              return _context8.stop();
           }
-        }, _callee5, this, [[1, 9]]);
+        }, _callee8, this, [[1, 3]]);
       }));
-      function handleCallHold(_x4) {
+      function handleCallHold(_x5) {
         return _handleCallHold.apply(this, arguments);
       }
       return handleCallHold;
@@ -1312,21 +1420,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleCallResume",
     value: (function () {
-      var _handleCallResume = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7(event) {
+      var _handleCallResume = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee0(event) {
         var _this4 = this;
-        var response, errData;
-        return _regenerator.default.wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        var response, errData, _t6;
+        return _regenerator.default.wrap(function (_context0) {
+          while (1) switch (_context0.prev = _context0.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
               });
-              _context7.prev = 1;
-              _context7.next = 4;
+              _context0.prev = 1;
+              _context0.next = 2;
               return this.postSSRequest(undefined, _types3.SUPPLEMENTARY_SERVICES.RESUME);
-            case 4:
-              response = _context7.sent;
+            case 2:
+              response = _context0.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_CALL_RESUME
@@ -1337,10 +1445,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 _callee6() {
+                this.supplementaryServicesTimer = setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9() {
                   var errorContext, callError;
-                  return _regenerator.default.wrap(function _callee6$(_context6) {
-                    while (1) switch (_context6.prev = _context6.next) {
+                  return _regenerator.default.wrap(function (_context9) {
+                    while (1) switch (_context9.prev = _context9.next) {
                       case 0:
                         errorContext = {
                           file: _constants.CALL_FILE,
@@ -1353,23 +1461,23 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                         callError = (0, _CallError.createCallError)('An error occurred while resuming the call. Wait a moment and try again.', errorContext, _types.ERROR_TYPE.TIMEOUT, _this4.getCorrelationId(), _types.ERROR_LAYER.CALL_CONTROL);
                         _this4.emit(_types3.CALL_EVENT_KEYS.RESUME_ERROR, callError);
                         _this4.submitCallErrorMetric(callError);
-                      case 5:
+                      case 1:
                       case "end":
-                        return _context6.stop();
+                        return _context9.stop();
                     }
-                  }, _callee6);
+                  }, _callee9);
                 })), _constants.SUPPLEMENTARY_SERVICES_TIMEOUT);
               }
-              _context7.next = 16;
+              _context0.next = 4;
               break;
-            case 9:
-              _context7.prev = 9;
-              _context7.t0 = _context7["catch"](1);
-              _Logger.default.error("Failed to resume the call: ".concat((0, _stringify.default)(_context7.t0)), {
+            case 3:
+              _context0.prev = 3;
+              _t6 = _context0["catch"](1);
+              _Logger.default.error("Failed to resume the call: ".concat((0, _stringify.default)(_t6)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_CALL_RESUME
               });
-              errData = _context7.t0;
+              errData = _t6;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this4.emit(_types3.CALL_EVENT_KEYS.RESUME_ERROR, error);
                 _this4.submitCallErrorMetric(error);
@@ -1383,19 +1491,19 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_CALL_RESUME, _constants.CALL_FILE);
-              _context7.next = 16;
+              _context0.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 16:
+            case 4:
             case "end":
-              return _context7.stop();
+              return _context0.stop();
           }
-        }, _callee7, this, [[1, 9]]);
+        }, _callee0, this, [[1, 3]]);
       }));
-      function handleCallResume(_x5) {
+      function handleCallResume(_x6) {
         return _handleCallResume.apply(this, arguments);
       }
       return handleCallResume;
@@ -1484,35 +1592,35 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingCallAlerting",
     value: (function () {
-      var _handleOutgoingCallAlerting = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8(event) {
+      var _handleOutgoingCallAlerting = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1(event) {
         var _this5 = this;
-        var res, errData;
-        return _regenerator.default.wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        var res, 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_OUTGOING_CALL_ALERTING
               });
-              _context8.prev = 1;
-              _context8.next = 4;
+              _context1.prev = 1;
+              _context1.next = 2;
               return this.patch(_types4.MobiusCallState.ALERTING);
-            case 4:
-              res = _context8.sent;
+            case 2:
+              res = _context1.sent;
               _Logger.default.log("PATCH response: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_ALERTING
               });
-              _context8.next = 15;
+              _context1.next = 4;
               break;
-            case 8:
-              _context8.prev = 8;
-              _context8.t0 = _context8["catch"](1);
-              _Logger.default.error("Failed to signal call progression: ".concat((0, _stringify.default)(_context8.t0)), {
+            case 3:
+              _context1.prev = 3;
+              _t7 = _context1["catch"](1);
+              _Logger.default.error("Failed to signal call progression: ".concat((0, _stringify.default)(_t7)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_ALERTING
               });
-              errData = _context8.t0;
+              errData = _t7;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this5.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, error);
                 _this5.submitCallErrorMetric(error);
@@ -1526,19 +1634,19 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_OUTGOING_CALL_ALERTING, _constants.CALL_FILE);
-              _context8.next = 15;
+              _context1.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 15:
+            case 4:
             case "end":
-              return _context8.stop();
+              return _context1.stop();
           }
-        }, _callee8, this, [[1, 8]]);
+        }, _callee1, this, [[1, 3]]);
       }));
-      function handleOutgoingCallAlerting(_x6) {
+      function handleOutgoingCallAlerting(_x7) {
         return _handleOutgoingCallAlerting.apply(this, arguments);
       }
       return handleOutgoingCallAlerting;
@@ -1579,11 +1687,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingCallConnect",
     value: (function () {
-      var _handleOutgoingCallConnect = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9(event) {
+      var _handleOutgoingCallConnect = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10(event) {
         var _this6 = this;
-        var res, errData;
-        return _regenerator.default.wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.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,
@@ -1592,38 +1700,38 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
 
               /* We should have received an Offer by now */
               if (this.remoteRoapMessage) {
-                _context9.next = 4;
+                _context10.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 _context9.abrupt("return");
-            case 4:
-              _context9.prev = 4;
+              return _context10.abrupt("return");
+            case 1:
+              _context10.prev = 1;
               /* Start Offer/Answer as we might have buffered the offer by now */
               this.mediaConnection.roapMessageReceived(this.remoteRoapMessage);
 
               /* send call_connect PATCH */
-              _context9.next = 8;
+              _context10.next = 2;
               return this.patch(_types4.MobiusCallState.CONNECTED);
-            case 8:
-              res = _context9.sent;
+            case 2:
+              res = _context10.sent;
               _Logger.default.log("PATCH response: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_CONNECT
               });
-              _context9.next = 19;
+              _context10.next = 4;
               break;
-            case 12:
-              _context9.prev = 12;
-              _context9.t0 = _context9["catch"](4);
-              _Logger.default.error("Failed to connect the call: ".concat((0, _stringify.default)(_context9.t0)), {
+            case 3:
+              _context10.prev = 3;
+              _t8 = _context10["catch"](1);
+              _Logger.default.error("Failed to connect the call: ".concat((0, _stringify.default)(_t8)), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_CONNECT
               });
-              errData = _context9.t0;
+              errData = _t8;
               (0, _Utils.handleCallErrors)(function (error) {
                 _this6.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, error);
                 _this6.submitCallErrorMetric(error);
@@ -1637,19 +1745,19 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_OUTGOING_CALL_CONNECT, _constants.CALL_FILE);
-              _context9.next = 19;
+              _context10.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 19:
+            case 4:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this, [[4, 12]]);
+        }, _callee10, this, [[1, 3]]);
       }));
-      function handleOutgoingCallConnect(_x7) {
+      function handleOutgoingCallConnect(_x8) {
         return _handleOutgoingCallConnect.apply(this, arguments);
       }
       return handleOutgoingCallConnect;
@@ -1664,40 +1772,41 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleIncomingCallDisconnect",
     value: (function () {
-      var _handleIncomingCallDisconnect = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee0(event) {
-        var response;
-        return _regenerator.default.wrap(function _callee0$(_context0) {
-          while (1) switch (_context0.prev = _context0.next) {
+      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) {
             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
+                method: _constants.METHODS.HANDLE_INCOMING_CALL_DISCONNECT
               });
+              this.emit(_types3.CALL_EVENT_KEYS.DISCONNECT, this.correlationId);
               this.setDisconnectReason();
-              _context0.prev = 2;
-              _context0.next = 5;
+              _context11.prev = 1;
+              _context11.next = 2;
               return this.delete();
-            case 5:
-              response = _context0.sent;
+            case 2:
+              response = _context11.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), {
                 file: _constants.CALL_FILE,
-                method: _constants.METHODS.HANDLE_OUTGOING_CALL_DISCONNECT
+                method: _constants.METHODS.HANDLE_INCOMING_CALL_DISCONNECT
               });
-              _context0.next = 13;
+              _context11.next = 4;
               break;
-            case 9:
-              _context0.prev = 9;
-              _context0.t0 = _context0["catch"](2);
-              _Logger.default.warn("Failed to delete the call: ".concat((0, _stringify.default)(_context0.t0)), {
+            case 3:
+              _context11.prev = 3;
+              _t9 = _context11["catch"](1);
+              _Logger.default.warn("Failed to delete the call: ".concat((0, _stringify.default)(_t9)), {
                 file: _constants.CALL_FILE,
-                method: _constants.METHODS.HANDLE_OUTGOING_CALL_DISCONNECT
+                method: _constants.METHODS.HANDLE_INCOMING_CALL_DISCONNECT
               });
               (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 13:
+            case 4:
               this.deleteCb(this.correlationId);
 
               /* Clear the stream listeners */
@@ -1722,14 +1831,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               this.sendCallStateMachineEvt({
                 type: 'E_CALL_CLEARED'
               });
-              this.emit(_types3.CALL_EVENT_KEYS.DISCONNECT, this.correlationId);
-            case 20:
+            case 5:
             case "end":
-              return _context0.stop();
+              return _context11.stop();
           }
-        }, _callee0, this, [[2, 9]]);
+        }, _callee11, this, [[1, 3]]);
       }));
-      function handleIncomingCallDisconnect(_x8) {
+      function handleIncomingCallDisconnect(_x9) {
         return _handleIncomingCallDisconnect.apply(this, arguments);
       }
       return handleIncomingCallDisconnect;
@@ -1744,21 +1852,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingCallDisconnect",
     value: (function () {
-      var _handleOutgoingCallDisconnect = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1(event) {
-        var response;
-        return _regenerator.default.wrap(function _callee1$(_context1) {
-          while (1) switch (_context1.prev = _context1.next) {
+      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) {
             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();
-              _context1.prev = 2;
-              _context1.next = 5;
+              _context12.prev = 1;
+              _context12.next = 2;
               return this.delete();
-            case 5:
-              response = _context1.sent;
+            case 2:
+              response = _context12.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_DISCONNECT
@@ -1767,11 +1875,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_DISCONNECT
               });
-              _context1.next = 14;
+              _context12.next = 4;
               break;
-            case 10:
-              _context1.prev = 10;
-              _context1.t0 = _context1["catch"](2);
+            case 3:
+              _context12.prev = 3;
+              _t0 = _context12["catch"](1);
               _Logger.default.warn('Failed to delete the call', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_CALL_DISCONNECT
@@ -1781,7 +1889,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 14:
+            case 4:
               this.deleteCb(this.correlationId);
 
               /* Clear the stream listeners */
@@ -1806,101 +1914,38 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               this.sendCallStateMachineEvt({
                 type: 'E_CALL_CLEARED'
               });
-            case 20:
+            case 5:
             case "end":
-              return _context1.stop();
+              return _context12.stop();
           }
-        }, _callee1, this, [[2, 10]]);
+        }, _callee12, this, [[1, 3]]);
       }));
-      function handleOutgoingCallDisconnect(_x9) {
+      function handleOutgoingCallDisconnect(_x0) {
         return _handleOutgoingCallDisconnect.apply(this, arguments);
       }
       return handleOutgoingCallDisconnect;
-    }()
+    }())
+  }, {
+    key: "handleCallEstablished",
+    value:
     /**
      * Handle Call Established - Roap related negotiations.
      *
      * @param event - Call Events.
      */
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    )
-  }, {
-    key: "handleCallEstablished",
-    value: function handleCallEstablished(event) {
-      var _this7 = this;
-      _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
+    function handleCallEstablished(event) {
+      var loggerContext = {
         file: _constants.CALL_FILE,
         method: _constants.METHODS.HANDLE_CALL_ESTABLISHED
-      });
+      };
+      _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), loggerContext);
       this.emit(_types3.CALL_EVENT_KEYS.ESTABLISHED, this.correlationId);
 
       /* Reset Early dialog parameters */
       this.earlyMedia = false;
       this.connected = true;
-
-      /* Session timers need to be reset at all offer/answer exchanges */
-      if (this.sessionTimer) {
-        _Logger.default.log('Resetting session timer', {
-          file: _constants.CALL_FILE,
-          method: _constants.METHODS.HANDLE_CALL_ESTABLISHED
-        });
-        clearInterval(this.sessionTimer);
-      }
-      this.sessionTimer = setInterval(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10() {
-        var res, error;
-        return _regenerator.default.wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
-            case 0:
-              _context10.prev = 0;
-              _context10.next = 3;
-              return _this7.postStatus();
-            case 3:
-              res = _context10.sent;
-              _Logger.default.info("Session refresh successful", {
-                file: _constants.CALL_FILE,
-                method: _constants.METHODS.HANDLE_CALL_ESTABLISHED
-              });
-              _context10.next = 14;
-              break;
-            case 7:
-              _context10.prev = 7;
-              _context10.t0 = _context10["catch"](0);
-              error = _context10.t0;
-              /* We are clearing the timer here as all are error scenarios. Only scenario where
-               * timer reset won't be required is 503 with retry after. But that case will
-               * be handled automatically as Mobius will also reset timer when we post status
-               * in retry-after scenario.
-               */
-              /* istanbul ignore next */
-              if (_this7.sessionTimer) {
-                clearInterval(_this7.sessionTimer);
-              }
-              (0, _Utils.handleCallErrors)(function (callError) {
-                _this7.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, callError);
-                _this7.submitCallErrorMetric(callError);
-              }, _types.ERROR_LAYER.CALL_CONTROL, function (interval) {
-                setTimeout(function () {
-                  /* We first post the status and then recursively call the handler which
-                   * starts the timer again
-                   */
-                  _this7.postStatus();
-                  _this7.sendCallStateMachineEvt({
-                    type: 'E_CALL_ESTABLISHED'
-                  });
-                }, interval * 1000);
-              }, _this7.getCorrelationId(), error, _this7.handleCallEstablished.name, _constants.CALL_FILE);
-              _context10.next = 14;
-              return (0, _Utils.uploadLogs)({
-                correlationId: _this7.correlationId,
-                callId: _this7.callId,
-                broadworksCorrelationInfo: _this7.broadworksCorrelationInfo
-              });
-            case 14:
-            case "end":
-              return _context10.stop();
-          }
-        }, _callee10, null, [[0, 7]]);
-      })), _constants.DEFAULT_SESSION_TIMER);
+      this.scheduleCallKeepaliveInterval();
     }
 
     /**
@@ -1911,10 +1956,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleUnknownState",
     value: (function () {
-      var _handleUnknownState = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11(event) {
-        var eventData, response;
-        return _regenerator.default.wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      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) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
@@ -1935,21 +1980,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
                */
-              _context11.prev = 3;
+              _context13.prev = 1;
               this.setDisconnectReason();
-              _context11.next = 7;
+              _context13.next = 2;
               return this.delete();
-            case 7:
-              response = _context11.sent;
+            case 2:
+              response = _context13.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_UNKNOWN_STATE
               });
-              _context11.next = 15;
+              _context13.next = 4;
               break;
-            case 11:
-              _context11.prev = 11;
-              _context11.t0 = _context11["catch"](3);
+            case 3:
+              _context13.prev = 3;
+              _t1 = _context13["catch"](1);
               _Logger.default.warn('Failed to delete the call', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_UNKNOWN_STATE
@@ -1959,7 +2004,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 15:
+            case 4:
               this.deleteCb(this.correlationId);
               if (this.sessionTimer) {
                 clearInterval(this.sessionTimer);
@@ -1977,13 +2022,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               this.sendCallStateMachineEvt({
                 type: 'E_CALL_CLEARED'
               });
-            case 20:
+            case 5:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
-        }, _callee11, this, [[3, 11]]);
+        }, _callee13, this, [[1, 3]]);
       }));
-      function handleUnknownState(_x0) {
+      function handleUnknownState(_x1) {
         return _handleUnknownState.apply(this, arguments);
       }
       return handleUnknownState;
@@ -2001,36 +2046,36 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "getEmitterCallback",
     value: function getEmitterCallback(errData) {
-      var _this8 = this;
+      var _this7 = this;
       return function (error) {
-        switch (_this8.callStateMachine.state.value) {
+        switch (_this7.callStateMachine.state.value) {
           case 'S_CALL_HOLD':
-            _this8.emit(_types3.CALL_EVENT_KEYS.HOLD_ERROR, error);
-            if (_this8.supplementaryServicesTimer) {
-              clearTimeout(_this8.supplementaryServicesTimer);
-              _this8.supplementaryServicesTimer = undefined;
+            _this7.emit(_types3.CALL_EVENT_KEYS.HOLD_ERROR, error);
+            if (_this7.supplementaryServicesTimer) {
+              clearTimeout(_this7.supplementaryServicesTimer);
+              _this7.supplementaryServicesTimer = undefined;
             }
-            _this8.submitCallErrorMetric(error);
-            _this8.sendCallStateMachineEvt({
+            _this7.submitCallErrorMetric(error);
+            _this7.sendCallStateMachineEvt({
               type: 'E_CALL_ESTABLISHED',
               data: errData
             });
             return;
           case 'S_CALL_RESUME':
-            _this8.emit(_types3.CALL_EVENT_KEYS.RESUME_ERROR, error);
-            _this8.submitCallErrorMetric(error);
-            _this8.sendCallStateMachineEvt({
+            _this7.emit(_types3.CALL_EVENT_KEYS.RESUME_ERROR, error);
+            _this7.submitCallErrorMetric(error);
+            _this7.sendCallStateMachineEvt({
               type: 'E_CALL_ESTABLISHED',
               data: errData
             });
             return;
           default:
-            _this8.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, error);
-            _this8.submitCallErrorMetric(error);
+            _this7.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, error);
+            _this7.submitCallErrorMetric(error);
             /* Disconnect call if it's not a midcall case */
             /* istanbul ignore else */
-            if (!_this8.connected) {
-              _this8.sendMediaStateMachineEvt({
+            if (!_this7.connected) {
+              _this7.sendMediaStateMachineEvt({
                 type: 'E_ROAP_ERROR',
                 data: errData
               });
@@ -2052,27 +2097,27 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleRoapEstablished",
     value: (function () {
-      var _handleRoapEstablished = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12(context, event) {
-        var _this9 = this;
-        var _ref7, received, message, res, errData;
-        return _regenerator.default.wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _handleRoapEstablished = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14(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) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ESTABLISHED
               });
-              _ref7 = event.data, received = _ref7.received, message = _ref7.message;
+              _ref9 = event.data, received = _ref9.received, message = _ref9.message;
               this.receivedRoapOKSeq = message.seq;
               if (received) {
-                _context12.next = 24;
+                _context14.next = 5;
                 break;
               }
               _Logger.default.info('Sending Media Ok to the remote End', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ESTABLISHED
               });
-              _context12.prev = 5;
+              _context14.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,
@@ -2081,10 +2126,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 this.mediaNegotiationCompleted = true;
               }
               message.seq = this.seq;
-              _context12.next = 10;
+              _context14.next = 2;
               return this.postMedia(message);
-            case 10:
-              res = _context12.sent;
+            case 2:
+              res = _context14.sent;
               _Logger.default.log("Response code: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ESTABLISHED
@@ -2095,38 +2140,38 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   type: 'E_CALL_ESTABLISHED'
                 });
               }
-              _context12.next = 22;
+              _context14.next = 4;
               break;
-            case 15:
-              _context12.prev = 15;
-              _context12.t0 = _context12["catch"](5);
+            case 3:
+              _context14.prev = 3;
+              _t10 = _context14["catch"](1);
               _Logger.default.warn('Failed to process MediaOk request', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ESTABLISHED
               });
-              errData = _context12.t0;
+              errData = _t10;
               (0, _Utils.handleCallErrors)(this.getEmitterCallback(errData), _types.ERROR_LAYER.MEDIA, function (interval) {
                 /* Start retry if only it is a midcall case */
                 /* istanbul ignore else */
-                if (_this9.connected) {
+                if (_this8.connected) {
                   setTimeout(function () {
-                    _this9.sendMediaStateMachineEvt({
+                    _this8.sendMediaStateMachineEvt({
                       type: 'E_ROAP_OK',
                       data: event.data
                     });
                   }, interval * 1000);
                 }
               }, this.getCorrelationId(), errData, this.handleRoapEstablished.name, _constants.CALL_FILE);
-              _context12.next = 22;
+              _context14.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 22:
-              _context12.next = 29;
+            case 4:
+              _context14.next = 6;
               break;
-            case 24:
+            case 5:
               _Logger.default.info('Notifying internal-media-core about ROAP OK message', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ESTABLISHED
@@ -2156,13 +2201,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   });
                 }
               }
-            case 29:
+            case 6:
             case "end":
-              return _context12.stop();
+              return _context14.stop();
           }
-        }, _callee12, this, [[5, 15]]);
+        }, _callee14, this, [[1, 3]]);
       }));
-      function handleRoapEstablished(_x1, _x10) {
+      function handleRoapEstablished(_x10, _x11) {
         return _handleRoapEstablished.apply(this, arguments);
       }
       return handleRoapEstablished;
@@ -2177,11 +2222,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleRoapError",
     value: (function () {
-      var _handleRoapError = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13(context, event) {
-        var _this0 = this;
-        var message, res, errData;
-        return _regenerator.default.wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _handleRoapError = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15(context, event) {
+        var _this9 = this;
+        var 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,
@@ -2191,45 +2236,45 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               /* if we receive ROAP_ERROR from internal-media-core , we post it to Mobius */
               message = event.data;
               /* istanbul ignore else */
-              if (!message) {
-                _context13.next = 17;
+              if (!(message && message.messageType === 'ERROR')) {
+                _context15.next = 4;
                 break;
               }
-              _context13.prev = 3;
-              _context13.next = 6;
+              _context15.prev = 1;
+              _context15.next = 2;
               return this.postMedia(message);
-            case 6:
-              res = _context13.sent;
+            case 2:
+              res = _context15.sent;
               _Logger.default.info("Response code: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ERROR
               });
-              _context13.next = 17;
+              _context15.next = 4;
               break;
-            case 10:
-              _context13.prev = 10;
-              _context13.t0 = _context13["catch"](3);
+            case 3:
+              _context15.prev = 3;
+              _t11 = _context15["catch"](1);
               _Logger.default.warn('Failed to communicate ROAP error to Webex Calling', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_ROAP_ERROR
               });
-              errData = _context13.t0;
+              errData = _t11;
               (0, _Utils.handleCallErrors)(function (error) {
-                _this0.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, error);
-                _this0.submitCallErrorMetric(error);
+                _this9.emit(_types3.CALL_EVENT_KEYS.CALL_ERROR, error);
+                _this9.submitCallErrorMetric(error);
               }, _types.ERROR_LAYER.MEDIA,
               // eslint-disable-next-line @typescript-eslint/no-unused-vars
               /* istanbul ignore next */
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, this.handleRoapError.name, _constants.CALL_FILE);
-              _context13.next = 17;
+              _context15.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 17:
+            case 4:
               /* Only disconnect calls that are not yet connected yet */
 
               if (!this.connected) {
@@ -2244,13 +2289,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   }
                 });
               }
-            case 18:
+            case 5:
             case "end":
-              return _context13.stop();
+              return _context15.stop();
           }
-        }, _callee13, this, [[3, 10]]);
+        }, _callee15, this, [[1, 3]]);
       }));
-      function handleRoapError(_x11, _x12) {
+      function handleRoapError(_x12, _x13) {
         return _handleRoapError.apply(this, arguments);
       }
       return handleRoapError;
@@ -2265,11 +2310,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingRoapOffer",
     value: (function () {
-      var _handleOutgoingRoapOffer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14(context, event) {
-        var _this1 = this;
-        var message, res, errData;
-        return _regenerator.default.wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+      var _handleOutgoingRoapOffer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee16(context, event) {
+        var _this0 = this;
+        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,
@@ -2277,7 +2322,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
               message = event.data;
               if (message !== null && message !== void 0 && message.sdp) {
-                _context14.next = 6;
+                _context16.next = 1;
                 break;
               }
               _Logger.default.info('Initializing Offer...', {
@@ -2285,51 +2330,51 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_OFFER
               });
               this.mediaConnection.initiateOffer();
-              return _context14.abrupt("return");
-            case 6:
-              _context14.prev = 6;
-              _context14.next = 9;
+              return _context16.abrupt("return");
+            case 1:
+              _context16.prev = 1;
+              _context16.next = 2;
               return this.postMedia(message);
-            case 9:
-              res = _context14.sent;
+            case 2:
+              res = _context16.sent;
               _Logger.default.log("Response code: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_OFFER
               });
-              _context14.next = 20;
+              _context16.next = 4;
               break;
-            case 13:
-              _context14.prev = 13;
-              _context14.t0 = _context14["catch"](6);
+            case 3:
+              _context16.prev = 3;
+              _t12 = _context16["catch"](1);
               _Logger.default.warn('Failed to process MediaOk request', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_OFFER
               });
-              errData = _context14.t0;
+              errData = _t12;
               (0, _Utils.handleCallErrors)(this.getEmitterCallback(errData), _types.ERROR_LAYER.MEDIA, function (interval) {
                 /* Start retry if only it is a midcall case */
-                if (_this1.connected) {
+                if (_this0.connected) {
                   setTimeout(function () {
-                    _this1.sendMediaStateMachineEvt({
+                    _this0.sendMediaStateMachineEvt({
                       type: 'E_SEND_ROAP_OFFER',
                       data: event.data
                     });
                   }, interval * 1000);
                 }
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_OUTGOING_ROAP_OFFER, _constants.CALL_FILE);
-              _context14.next = 20;
+              _context16.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 20:
+            case 4:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
-        }, _callee14, this, [[6, 13]]);
+        }, _callee16, this, [[1, 3]]);
       }));
-      function handleOutgoingRoapOffer(_x13, _x14) {
+      function handleOutgoingRoapOffer(_x14, _x15) {
         return _handleOutgoingRoapOffer.apply(this, arguments);
       }
       return handleOutgoingRoapOffer;
@@ -2344,61 +2389,61 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleOutgoingRoapAnswer",
     value: (function () {
-      var _handleOutgoingRoapAnswer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15(context, event) {
-        var _this10 = this;
-        var message, res, errData;
-        return _regenerator.default.wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _handleOutgoingRoapAnswer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17(context, event) {
+        var _this1 = this;
+        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,
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_ANSWER
               });
               message = event.data;
-              _context15.prev = 2;
+              _context17.prev = 1;
               message.seq = this.seq;
-              _context15.next = 6;
+              _context17.next = 2;
               return this.postMedia(message);
-            case 6:
-              res = _context15.sent;
+            case 2:
+              res = _context17.sent;
               _Logger.default.log("Response code: ".concat(res.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_ANSWER
               });
-              _context15.next = 17;
+              _context17.next = 4;
               break;
-            case 10:
-              _context15.prev = 10;
-              _context15.t0 = _context15["catch"](2);
+            case 3:
+              _context17.prev = 3;
+              _t13 = _context17["catch"](1);
               _Logger.default.warn('Failed to send MediaAnswer request', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_OUTGOING_ROAP_ANSWER
               });
-              errData = _context15.t0;
+              errData = _t13;
               (0, _Utils.handleCallErrors)(this.getEmitterCallback(errData), _types.ERROR_LAYER.MEDIA, function (interval) {
                 /* Start retry if only it is a midcall case */
-                if (_this10.connected) {
+                if (_this1.connected) {
                   setTimeout(function () {
-                    _this10.sendMediaStateMachineEvt({
+                    _this1.sendMediaStateMachineEvt({
                       type: 'E_SEND_ROAP_ANSWER',
                       data: event.data
                     });
                   }, interval * 1000);
                 }
               }, this.getCorrelationId(), errData, _constants.METHODS.HANDLE_OUTGOING_ROAP_ANSWER, _constants.CALL_FILE);
-              _context15.next = 17;
+              _context17.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 17:
+            case 4:
             case "end":
-              return _context15.stop();
+              return _context17.stop();
           }
-        }, _callee15, this, [[2, 10]]);
+        }, _callee17, this, [[1, 3]]);
       }));
-      function handleOutgoingRoapAnswer(_x15, _x16) {
+      function handleOutgoingRoapAnswer(_x16, _x17) {
         return _handleOutgoingRoapAnswer.apply(this, arguments);
       }
       return handleOutgoingRoapAnswer;
@@ -2480,7 +2525,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
      * @param settings.debugId - String.
      */
     function initMediaConnection(localAudioTrack, debugId) {
-      var _this11 = this;
+      var _this10 = this;
       var mediaConnection = new _internalMediaCore.RoapMediaConnection({
         skipInactiveTransceivers: true,
         iceServers: [],
@@ -2500,11 +2545,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
           screenShareVideo: 'inactive'
         }
       }, debugId || "WebexCallSDK-".concat(this.correlationId), function (data) {
-        return _this11.rtcMetrics.addMetrics(data);
+        return _this10.rtcMetrics.addMetrics(data);
       }, function () {
-        return _this11.rtcMetrics.closeMetrics();
+        return _this10.rtcMetrics.closeMetrics();
       }, function () {
-        return _this11.rtcMetrics.sendMetricsInQueue();
+        return _this10.rtcMetrics.sendMetricsInQueue();
       });
       this.mediaConnection = mediaConnection;
     }
@@ -2558,10 +2603,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 _callee16(localAudioStream) {
+      var _answer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee18(localAudioStream) {
         var localAudioTrack;
-        return _regenerator.default.wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regenerator.default.wrap(function (_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               _Logger.default.info("".concat(_constants2.METHOD_START_MESSAGE, " with stream"), {
                 file: _constants.CALL_FILE,
@@ -2570,7 +2615,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               this.localAudioStream = localAudioStream;
               localAudioTrack = localAudioStream.outputStream.getAudioTracks()[0];
               if (localAudioTrack) {
-                _context16.next = 8;
+                _context18.next = 1;
                 break;
               }
               _Logger.default.warn("Did not find a local track while answering the call ".concat(this.getCorrelationId()), {
@@ -2581,8 +2626,8 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               this.sendCallStateMachineEvt({
                 type: 'E_SEND_CALL_DISCONNECT'
               });
-              return _context16.abrupt("return");
-            case 8:
+              return _context18.abrupt("return");
+            case 1:
               localAudioTrack.enabled = true;
               if (!this.mediaConnection) {
                 this.initMediaConnection(localAudioTrack);
@@ -2600,13 +2645,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   method: _constants.METHODS.ANSWER
                 });
               }
-            case 11:
+            case 2:
             case "end":
-              return _context16.stop();
+              return _context18.stop();
           }
-        }, _callee16, this);
+        }, _callee18, this);
       }));
-      function answer(_x17) {
+      function answer(_x18) {
         return _answer.apply(this, arguments);
       }
       return answer;
@@ -2619,10 +2664,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "dial",
     value: (function () {
-      var _dial = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17(localAudioStream) {
+      var _dial = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee19(localAudioStream) {
         var localAudioTrack;
-        return _regenerator.default.wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.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,
@@ -2631,7 +2676,7 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               this.localAudioStream = localAudioStream;
               localAudioTrack = localAudioStream.outputStream.getAudioTracks()[0];
               if (localAudioTrack) {
-                _context17.next = 8;
+                _context19.next = 1;
                 break;
               }
               _Logger.default.warn("Did not find a local track while dialing the call ".concat(this.getCorrelationId()), {
@@ -2640,8 +2685,8 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
               this.deleteCb(this.getCorrelationId());
               this.emit(_types3.CALL_EVENT_KEYS.DISCONNECT, this.getCorrelationId());
-              return _context17.abrupt("return");
-            case 8:
+              return _context19.abrupt("return");
+            case 1:
               localAudioTrack.enabled = true;
               if (!this.mediaConnection) {
                 this.initMediaConnection(localAudioTrack);
@@ -2659,13 +2704,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   method: _constants.METHODS.DIAL
                 });
               }
-            case 11:
+            case 2:
             case "end":
-              return _context17.stop();
+              return _context19.stop();
           }
-        }, _callee17, this);
+        }, _callee19, this);
       }));
-      function dial(_x18) {
+      function dial(_x19) {
         return _dial.apply(this, arguments);
       }
       return dial;
@@ -2679,15 +2724,15 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
      * @param state -.
      */
     function () {
-      var _patch = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee18(state) {
-        return _regenerator.default.wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+      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) {
             case 0:
               _Logger.default.info("Send a PATCH for ".concat(state, " to Webex Calling"), {
                 file: _constants.CALL_FILE,
                 method: 'patch'
               });
-              return _context18.abrupt("return", this.webex.request({
+              return _context20.abrupt("return", this.webex.request({
                 // Sample uri: http://localhost/api/v1/calling/web/devices/{deviceid}/calls/{callid}
 
                 uri: "".concat(this.mobiusUrl).concat(_constants.DEVICES_ENDPOINT_RESOURCE, "/").concat(this.deviceId, "/").concat(_constants.CALLS_ENDPOINT_RESOURCE, "/").concat(this.callId),
@@ -2704,13 +2749,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   inbandMedia: false // setting false for now
                 }
               }));
-            case 2:
+            case 1:
             case "end":
-              return _context18.stop();
+              return _context20.stop();
           }
-        }, _callee18, this);
+        }, _callee20, this);
       }));
-      function patch(_x19) {
+      function patch(_x20) {
         return _patch.apply(this, arguments);
       }
       return patch;
@@ -2725,10 +2770,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "postSSRequest",
     value: (function () {
-      var _postSSRequest = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee19(context, type) {
-        var request, transferContext;
-        return _regenerator.default.wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+      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) {
             case 0:
               request = {
                 uri: "".concat(this.mobiusUrl).concat(_constants2.SERVICES_ENDPOINT),
@@ -2743,16 +2788,16 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   callId: this.callId
                 }
               };
-              _context19.t0 = type;
-              _context19.next = _context19.t0 === _types3.SUPPLEMENTARY_SERVICES.HOLD ? 4 : _context19.t0 === _types3.SUPPLEMENTARY_SERVICES.RESUME ? 6 : _context19.t0 === _types3.SUPPLEMENTARY_SERVICES.TRANSFER ? 8 : 12;
+              _t14 = type;
+              _context21.next = _t14 === _types3.SUPPLEMENTARY_SERVICES.HOLD ? 1 : _t14 === _types3.SUPPLEMENTARY_SERVICES.RESUME ? 2 : _t14 === _types3.SUPPLEMENTARY_SERVICES.TRANSFER ? 3 : 4;
               break;
-            case 4:
+            case 1:
               request.uri = "".concat(request.uri, "/").concat(_constants.CALL_HOLD_SERVICE, "/").concat(_constants.HOLD_ENDPOINT);
-              return _context19.abrupt("break", 13);
-            case 6:
+              return _context21.abrupt("continue", 5);
+            case 2:
               request.uri = "".concat(request.uri, "/").concat(_constants.CALL_HOLD_SERVICE, "/").concat(_constants.RESUME_ENDPOINT);
-              return _context19.abrupt("break", 13);
-            case 8:
+              return _context21.abrupt("continue", 5);
+            case 3:
               request.uri = "".concat(request.uri, "/").concat(_constants.CALL_TRANSFER_SERVICE, "/").concat(_constants.TRANSFER_ENDPOINT);
               transferContext = context;
               if (transferContext.destination) {
@@ -2770,21 +2815,21 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   transferType: _types4.TransferType.CONSULT
                 });
               }
-              return _context19.abrupt("break", 13);
-            case 12:
+              return _context21.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 13:
-              return _context19.abrupt("return", this.webex.request(request));
-            case 14:
+            case 5:
+              return _context21.abrupt("return", this.webex.request(request));
+            case 6:
             case "end":
-              return _context19.stop();
+              return _context21.stop();
           }
-        }, _callee19, this);
+        }, _callee21, this);
       }));
-      function postSSRequest(_x20, _x21) {
+      function postSSRequest(_x21, _x22) {
         return _postSSRequest.apply(this, arguments);
       }
       return postSSRequest;
@@ -2796,11 +2841,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "postStatus",
     value: (function () {
-      var _postStatus = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee20() {
-        return _regenerator.default.wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _postStatus = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee22() {
+        return _regenerator.default.wrap(function (_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              return _context20.abrupt("return", this.webex.request({
+              return _context22.abrupt("return", this.webex.request({
                 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,
@@ -2815,9 +2860,9 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               }));
             case 1:
             case "end":
-              return _context20.stop();
+              return _context22.stop();
           }
-        }, _callee20, this);
+        }, _callee22, this);
       }));
       function postStatus() {
         return _postStatus.apply(this, arguments);
@@ -2836,14 +2881,14 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "completeTransfer",
     value: (function () {
-      var _completeTransfer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee21(transferType, transferCallId, transferTarget) {
-        var _this12 = this;
-        var context, errData, _context21, _errData;
-        return _regenerator.default.wrap(function _callee21$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _completeTransfer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee23(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) {
             case 0:
               if (!(transferType === _types4.TransferType.BLIND && transferTarget)) {
-                _context22.next = 19;
+                _context24.next = 5;
                 break;
               }
               /* blind transfer */
@@ -2856,46 +2901,46 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 transferorCallId: this.getCallId(),
                 destination: transferTarget
               };
-              _context22.prev = 3;
-              _context22.next = 6;
+              _context24.prev = 1;
+              _context24.next = 2;
               return this.postSSRequest(context, _types3.SUPPLEMENTARY_SERVICES.TRANSFER);
-            case 6:
+            case 2:
               _Logger.default.info("Blind 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.BLIND, _types5.METRIC_TYPE.BEHAVIORAL, this.getCallId(), this.getCorrelationId(), undefined);
-              _context22.next = 17;
+              _context24.next = 4;
               break;
-            case 10:
-              _context22.prev = 10;
-              _context22.t0 = _context22["catch"](3);
+            case 3:
+              _context24.prev = 3;
+              _t15 = _context24["catch"](1);
               _Logger.default.warn("Blind Transfer failed for correlationId ".concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.COMPLETE_TRANSFER
               });
-              errData = _context22.t0;
+              errData = _t15;
               (0, _Utils.handleCallErrors)(function (error) {
-                _this12.emit(_types3.CALL_EVENT_KEYS.TRANSFER_ERROR, error);
-                _this12.submitCallErrorMetric(error, _types5.TRANSFER_ACTION.BLIND);
+                _this11.emit(_types3.CALL_EVENT_KEYS.TRANSFER_ERROR, error);
+                _this11.submitCallErrorMetric(error, _types5.TRANSFER_ACTION.BLIND);
               }, _types.ERROR_LAYER.CALL_CONTROL,
               // eslint-disable-next-line @typescript-eslint/no-unused-vars
               /* istanbul ignore next */
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), errData, _constants.METHODS.COMPLETE_TRANSFER, _constants.CALL_FILE);
-              _context22.next = 17;
+              _context24.next = 4;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 17:
-              _context22.next = 39;
+            case 4:
+              _context24.next = 11;
               break;
-            case 19:
+            case 5:
               if (!(transferType === _types4.TransferType.CONSULT && transferCallId)) {
-                _context22.next = 38;
+                _context24.next = 10;
                 break;
               }
               /* Consult transfer */
@@ -2904,59 +2949,59 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.COMPLETE_TRANSFER
               });
-              _context21 = {
+              _context23 = {
                 transferorCallId: this.getCallId(),
                 transferToCallId: transferCallId
               };
-              _context22.prev = 22;
-              _context22.next = 25;
-              return this.postSSRequest(_context21, _types3.SUPPLEMENTARY_SERVICES.TRANSFER);
-            case 25:
+              _context24.prev = 6;
+              _context24.next = 7;
+              return this.postSSRequest(_context23, _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);
-              _context22.next = 36;
+              _context24.next = 9;
               break;
-            case 29:
-              _context22.prev = 29;
-              _context22.t1 = _context22["catch"](22);
+            case 8:
+              _context24.prev = 8;
+              _t16 = _context24["catch"](6);
               _Logger.default.warn("Consult Transfer failed for correlationId ".concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.COMPLETE_TRANSFER
               });
-              _errData = _context22.t1;
+              _errData = _t16;
               (0, _Utils.handleCallErrors)(function (error) {
-                _this12.emit(_types3.CALL_EVENT_KEYS.TRANSFER_ERROR, error);
-                _this12.submitCallErrorMetric(error, _types5.TRANSFER_ACTION.CONSULT);
+                _this11.emit(_types3.CALL_EVENT_KEYS.TRANSFER_ERROR, error);
+                _this11.submitCallErrorMetric(error, _types5.TRANSFER_ACTION.CONSULT);
               }, _types.ERROR_LAYER.CALL_CONTROL,
               // eslint-disable-next-line @typescript-eslint/no-unused-vars
               /* istanbul ignore next */
               function (interval) {
                 return undefined;
               }, this.getCorrelationId(), _errData, _constants.METHODS.COMPLETE_TRANSFER, _constants.CALL_FILE);
-              _context22.next = 36;
+              _context24.next = 9;
               return (0, _Utils.uploadLogs)({
                 correlationId: this.correlationId,
                 callId: this.callId,
                 broadworksCorrelationInfo: this.broadworksCorrelationInfo
               });
-            case 36:
-              _context22.next = 39;
+            case 9:
+              _context24.next = 11;
               break;
-            case 38:
+            case 10:
               _Logger.default.warn("Invalid information received, transfer failed for correlationId: ".concat(this.getCorrelationId()), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.COMPLETE_TRANSFER
               });
-            case 39:
+            case 11:
             case "end":
-              return _context22.stop();
+              return _context24.stop();
           }
-        }, _callee21, this, [[3, 10], [22, 29]]);
+        }, _callee23, this, [[1, 3], [6, 8]]);
       }));
-      function completeTransfer(_x22, _x23, _x24) {
+      function completeTransfer(_x23, _x24, _x25) {
         return _completeTransfer.apply(this, arguments);
       }
       return completeTransfer;
@@ -2968,32 +3013,32 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "getCallStats",
     value: (function () {
-      var _getCallStats = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee22() {
-        var stats;
-        return _regenerator.default.wrap(function _callee22$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      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) {
             case 0:
-              _context23.prev = 0;
-              _context23.next = 3;
+              _context25.prev = 0;
+              _context25.next = 1;
               return this.mediaConnection.getStats();
-            case 3:
-              stats = _context23.sent;
-              _context23.next = 9;
+            case 1:
+              stats = _context25.sent;
+              _context25.next = 3;
               break;
-            case 6:
-              _context23.prev = 6;
-              _context23.t0 = _context23["catch"](0);
+            case 2:
+              _context25.prev = 2;
+              _t17 = _context25["catch"](0);
               _Logger.default.warn('Stats collection failed, using dummy stats', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.GET_CALL_STATS
               });
-            case 9:
-              return _context23.abrupt("return", (0, _Utils.parseMediaQualityStatistics)(stats));
-            case 10:
+            case 3:
+              return _context25.abrupt("return", (0, _Utils.parseMediaQualityStatistics)(stats));
+            case 4:
             case "end":
-              return _context23.stop();
+              return _context25.stop();
           }
-        }, _callee22, this, [[0, 6]]);
+        }, _callee24, this, [[0, 2]]);
       }));
       function getCallStats() {
         return _getCallStats.apply(this, arguments);
@@ -3009,15 +3054,15 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "postMedia",
     value: (function () {
-      var _postMedia = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee23(roapMessage) {
-        return _regenerator.default.wrap(function _callee23$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      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) {
             case 0:
               _Logger.default.log('Posting message to Webex Calling', {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.POST_MEDIA
               });
-              return _context24.abrupt("return", this.webex.request({
+              return _context26.abrupt("return", this.webex.request({
                 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,
@@ -3034,13 +3079,13 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   }
                 }
               }));
-            case 2:
+            case 1:
             case "end":
-              return _context24.stop();
+              return _context26.stop();
           }
-        }, _callee23, this);
+        }, _callee25, this);
       }));
-      function postMedia(_x25) {
+      function postMedia(_x26) {
         return _postMedia.apply(this, arguments);
       }
       return postMedia;
@@ -3053,16 +3098,16 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "mediaRoapEventsListener",
     value: function mediaRoapEventsListener() {
-      var _this13 = this;
+      var _this12 = this;
       this.mediaConnection.on(_internalMediaCore.MediaConnectionEventNames.ROAP_MESSAGE_TO_SEND,
       /*#__PURE__*/
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       function () {
-        var _ref8 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee24(event) {
+        var _ref0 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee26(event) {
           var _event$roapMessage, _event$roapMessage2;
-          var mediaOk, sdpVideoPortZero;
-          return _regenerator.default.wrap(function _callee24$(_context25) {
-            while (1) switch (_context25.prev = _context25.next) {
+          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,
@@ -3072,20 +3117,20 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   file: _constants.CALL_FILE,
                   method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
                 });
-                _context25.t0 = event.roapMessage.messageType;
-                _context25.next = _context25.t0 === _types4.RoapScenario.OK ? 5 : _context25.t0 === _types4.RoapScenario.OFFER ? 8 : _context25.t0 === _types4.RoapScenario.ANSWER ? 16 : _context25.t0 === _types4.RoapScenario.ERROR ? 20 : _context25.t0 === _types4.RoapScenario.OFFER_RESPONSE ? 22 : 26;
+                _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 5:
+              case 1:
                 mediaOk = {
                   received: false,
                   message: event.roapMessage
                 };
-                _this13.sendMediaStateMachineEvt({
+                _this12.sendMediaStateMachineEvt({
                   type: 'E_ROAP_OK',
                   data: mediaOk
                 });
-                return _context25.abrupt("break", 26);
-              case 8:
+                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), {
@@ -3099,42 +3144,42 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   method: _constants.METHODS.MEDIA_ROAP_EVENTS_LISTENER
                 });
                 event.roapMessage.sdp = sdpVideoPortZero;
-                _this13.localRoapMessage = event.roapMessage;
-                _this13.sendCallStateMachineEvt({
+                _this12.localRoapMessage = event.roapMessage;
+                _this12.sendCallStateMachineEvt({
                   type: 'E_SEND_CALL_SETUP',
                   data: event.roapMessage
                 });
-                return _context25.abrupt("break", 26);
-              case 16:
+                return _context27.abrupt("continue", 6);
+              case 3:
                 event.roapMessage.sdp = (0, _Utils.modifySdpForIPv4)(event.roapMessage.sdp);
-                _this13.localRoapMessage = event.roapMessage;
-                _this13.sendMediaStateMachineEvt({
+                _this12.localRoapMessage = event.roapMessage;
+                _this12.sendMediaStateMachineEvt({
                   type: 'E_SEND_ROAP_ANSWER',
                   data: event.roapMessage
                 });
-                return _context25.abrupt("break", 26);
-              case 20:
-                _this13.sendMediaStateMachineEvt({
+                return _context27.abrupt("continue", 6);
+              case 4:
+                _this12.sendMediaStateMachineEvt({
                   type: 'E_ROAP_ERROR',
                   data: event.roapMessage
                 });
-                return _context25.abrupt("break", 26);
-              case 22:
+                return _context27.abrupt("continue", 6);
+              case 5:
                 event.roapMessage.sdp = (0, _Utils.modifySdpForIPv4)(event.roapMessage.sdp);
-                _this13.localRoapMessage = event.roapMessage;
-                _this13.sendMediaStateMachineEvt({
+                _this12.localRoapMessage = event.roapMessage;
+                _this12.sendMediaStateMachineEvt({
                   type: 'E_SEND_ROAP_OFFER',
                   data: event.roapMessage
                 });
-                return _context25.abrupt("break", 26);
-              case 26:
+                return _context27.abrupt("continue", 6);
+              case 6:
               case "end":
-                return _context25.stop();
+                return _context27.stop();
             }
-          }, _callee24);
+          }, _callee26);
         }));
-        return function (_x26) {
-          return _ref8.apply(this, arguments);
+        return function (_x27) {
+          return _ref0.apply(this, arguments);
         };
       }());
     }
@@ -3146,11 +3191,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "mediaTrackListener",
     value: function mediaTrackListener() {
-      var _this14 = this;
+      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) {
-          _this14.emit(_types3.CALL_EVENT_KEYS.REMOTE_MEDIA, e.track);
+          _this13.emit(_types3.CALL_EVENT_KEYS.REMOTE_MEDIA, e.track);
         }
       });
     }
@@ -3184,16 +3229,16 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "delete",
     value: function () {
-      var _delete2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee25() {
+      var _delete2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee27() {
         var disconnectMetrics;
-        return _regenerator.default.wrap(function _callee25$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regenerator.default.wrap(function (_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              _context26.next = 2;
+              _context28.next = 1;
               return this.getCallStats();
-            case 2:
-              disconnectMetrics = _context26.sent;
-              return _context26.abrupt("return", this.webex.request({
+            case 1:
+              disconnectMetrics = _context28.sent;
+              return _context28.abrupt("return", this.webex.request({
                 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,
@@ -3209,11 +3254,11 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
                   cause: this.disconnectReason.cause
                 }
               }));
-            case 4:
+            case 2:
             case "end":
-              return _context26.stop();
+              return _context28.stop();
           }
-        }, _callee25, this);
+        }, _callee27, this);
       }));
       function _delete() {
         return _delete2.apply(this, arguments);
@@ -3391,10 +3436,10 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
   }, {
     key: "handleTimeout",
     value: (function () {
-      var _handleTimeout = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee26() {
+      var _handleTimeout = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee28() {
         var response;
-        return _regenerator.default.wrap(function _callee26$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regenerator.default.wrap(function (_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               _Logger.default.warn("Call timed out", {
                 file: _constants.CALL_FILE,
@@ -3402,19 +3447,19 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
               });
               this.deleteCb(this.getCorrelationId());
               this.emit(_types3.CALL_EVENT_KEYS.DISCONNECT, this.getCorrelationId());
-              _context27.next = 5;
+              _context29.next = 1;
               return this.delete();
-            case 5:
-              response = _context27.sent;
+            case 1:
+              response = _context29.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), {
                 file: _constants.CALL_FILE,
                 method: _constants.METHODS.HANDLE_TIMEOUT
               });
-            case 7:
+            case 2:
             case "end":
-              return _context27.stop();
+              return _context29.stop();
           }
-        }, _callee26, this);
+        }, _callee28, this);
       }));
       function handleTimeout() {
         return _handleTimeout.apply(this, arguments);
@@ -3422,7 +3467,6 @@ var Call = exports.Call = /*#__PURE__*/function (_Eventing) {
       return handleTimeout;
     }())
   }]);
-  return Call;
 }(_impl.Eventing);
 /**
  * @param activeUrl