@webex/calling 3.8.0 → 3.8.1-next.2

package/dist/CallingClient/registration/register.js

@@ -23,16 +23,16 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/he
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
 var _uuid = require("uuid");
-var _types = require("../../Errors/types");
+var _constants = require("../../common/constants");
 var _common = require("../../common");
-var _types2 = require("../../Metrics/types");
+var _types = require("../../Metrics/types");
 var _Metrics = require("../../Metrics");
 var _calling = require("../calling");
 var _Logger = _interopRequireDefault(require("../../Logger"));
 var _SDKConnector = _interopRequireDefault(require("../../SDKConnector"));
-var _types3 = require("../../common/types");
-var _constants = require("../constants");
-var _types4 = require("../line/types");
+var _types2 = require("../../common/types");
+var _constants2 = require("../constants");
+var _types3 = require("../line/types");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && o[_Symbol$iterator] || o["@@iterator"]; if (!it) { if (_Array$isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -69,20 +69,22 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "jwe", void 0);
     (0, _defineProperty2.default)(this, "isCCFlow", false);
     (0, _defineProperty2.default)(this, "failoverImmediately", false);
+    (0, _defineProperty2.default)(this, "retryAfter", void 0);
+    (0, _defineProperty2.default)(this, "scheduled429Retry", false);
     this.jwe = jwe;
     this.sdkConnector = _SDKConnector.default;
     this.serviceData = serviceData;
-    this.isCCFlow = serviceData.indicator === _types3.ServiceIndicator.CONTACT_CENTER;
+    this.isCCFlow = serviceData.indicator === _types2.ServiceIndicator.CONTACT_CENTER;
     if (!this.sdkConnector.getWebex()) {
       _SDKConnector.default.setWebex(webex);
     }
     this.webex = this.sdkConnector.getWebex();
     this.userId = this.webex.internal.device.userId;
-    this.registrationStatus = _types3.RegistrationStatus.IDLE;
+    this.registrationStatus = _types2.RegistrationStatus.IDLE;
     this.failback429RetryAttempts = 0;
-    _Logger.default.setLogger(logLevel, _constants.REGISTRATION_FILE);
-    this.rehomingIntervalMin = _constants.DEFAULT_REHOMING_INTERVAL_MIN;
-    this.rehomingIntervalMax = _constants.DEFAULT_REHOMING_INTERVAL_MAX;
+    _Logger.default.setLogger(logLevel, _constants2.REGISTRATION_FILE);
+    this.rehomingIntervalMin = _constants2.DEFAULT_REHOMING_INTERVAL_MIN;
+    this.rehomingIntervalMax = _constants2.DEFAULT_REHOMING_INTERVAL_MAX;
     this.mutex = mutex;
     this.callManager = (0, _calling.getCallManager)(this.webex, serviceData.indicator);
     this.metricManager = (0, _Metrics.getMetricManager)(this.webex, serviceData.indicator);
@@ -98,9 +100,9 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "setActiveMobiusUrl",
     value: function setActiveMobiusUrl(url) {
-      _Logger.default.info("ActiveMobiusUrl: ".concat(url), {
-        method: 'setActiveMobiusUrl',
-        file: _constants.REGISTRATION_FILE
+      _Logger.default.info("".concat(_constants.METHOD_START_MESSAGE, " with ").concat(url), {
+        method: _constants2.METHODS.UPDATE_ACTIVE_MOBIUS,
+        file: _constants2.REGISTRATION_FILE
       });
       this.activeMobiusUrl = url;
       this.callManager.updateActiveMobius(url);
@@ -108,6 +110,10 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "setMobiusServers",
     value: function setMobiusServers(primaryMobiusUris, backupMobiusUris) {
+      _Logger.default.log(_constants.METHOD_START_MESSAGE, {
+        method: _constants2.METHODS.SET_MOBIUS_SERVERS,
+        file: _constants2.REGISTRATION_FILE
+      });
       this.primaryMobiusUris = primaryMobiusUris;
       this.backupMobiusUris = backupMobiusUris;
     }
@@ -125,9 +131,9 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
             case 0:
               return _context.abrupt("return", this.webex.request({
                 uri: "".concat(url, "/status"),
-                method: _types3.HTTP_METHODS.POST,
-                headers: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants.CISCO_DEVICE_URL, this.webex.internal.device.url), _constants.SPARK_USER_AGENT, _constants.CALLING_USER_AGENT),
-                service: _types3.ALLOWED_SERVICES.MOBIUS
+                method: _types2.HTTP_METHODS.POST,
+                headers: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants2.CISCO_DEVICE_URL, this.webex.internal.device.url), _constants2.SPARK_USER_AGENT, _constants2.CALLING_USER_AGENT),
+                service: _types2.ALLOWED_SERVICES.MOBIUS
               }));
             case 1:
             case "end":
@@ -156,21 +162,21 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
             case 0:
               _context2.prev = 0;
               _context2.t0 = fetch;
-              _context2.t1 = "".concat(url).concat(_constants.DEVICES_ENDPOINT_RESOURCE, "/").concat(deviceId);
-              _context2.t2 = _types3.HTTP_METHODS.DELETE;
+              _context2.t1 = "".concat(url).concat(_constants2.DEVICES_ENDPOINT_RESOURCE, "/").concat(deviceId);
+              _context2.t2 = _types2.HTTP_METHODS.DELETE;
               _context2.t3 = _defineProperty2.default;
               _context2.t4 = _defineProperty2.default;
               _context2.t5 = _defineProperty2.default;
-              _context2.t6 = (0, _defineProperty2.default)({}, _constants.CISCO_DEVICE_URL, deviceUrl);
+              _context2.t6 = (0, _defineProperty2.default)({}, _constants2.CISCO_DEVICE_URL, deviceUrl);
               _context2.next = 10;
               return this.webex.credentials.getUserToken();
             case 10:
               _context2.t7 = _context2.sent;
               _context2.t8 = (0, _context2.t5)(_context2.t6, "Authorization", _context2.t7);
-              _context2.t9 = "".concat(_constants.WEBEX_WEB_CLIENT, "_").concat((0, _uuid.v4)());
+              _context2.t9 = "".concat(_constants2.WEBEX_WEB_CLIENT, "_").concat((0, _uuid.v4)());
               _context2.t10 = (0, _context2.t4)(_context2.t8, "trackingId", _context2.t9);
-              _context2.t11 = _constants.SPARK_USER_AGENT;
-              _context2.t12 = _constants.CALLING_USER_AGENT;
+              _context2.t11 = _constants2.SPARK_USER_AGENT;
+              _context2.t12 = _constants2.CALLING_USER_AGENT;
               _context2.t13 = (0, _context2.t3)(_context2.t10, _context2.t11, _context2.t12);
               _context2.t14 = {
                 method: _context2.t2,
@@ -185,10 +191,13 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
             case 23:
               _context2.prev = 23;
               _context2.t15 = _context2["catch"](0);
-              _Logger.default.warn("Delete failed with Mobius", {});
+              _Logger.default.warn("Delete failed with Mobius ".concat(_context2.t15), {
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.METHODS.DEREGISTER
+              });
             case 26:
-              this.setStatus(_types3.RegistrationStatus.INACTIVE);
-              this.lineEmitter(_types4.LINE_EVENTS.UNREGISTERED);
+              this.setStatus(_types2.RegistrationStatus.INACTIVE);
+              this.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
               return _context2.abrupt("return", (_response = response) === null || _response === void 0 ? void 0 : _response.json());
             case 29:
             case "end":
@@ -223,10 +232,10 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               };
               return _context3.abrupt("return", this.webex.request({
                 uri: "".concat(url, "device"),
-                method: _types3.HTTP_METHODS.POST,
-                headers: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants.CISCO_DEVICE_URL, deviceInfo.clientDeviceUri), _constants.SPARK_USER_AGENT, _constants.CALLING_USER_AGENT),
+                method: _types2.HTTP_METHODS.POST,
+                headers: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants2.CISCO_DEVICE_URL, deviceInfo.clientDeviceUri), _constants2.SPARK_USER_AGENT, _constants2.CALLING_USER_AGENT),
                 body: deviceInfo,
-                service: _types3.ALLOWED_SERVICES.MOBIUS
+                service: _types2.ALLOWED_SERVICES.MOBIUS
               }));
             case 2:
             case "end":
@@ -275,54 +284,61 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
       return restorePreviousRegistration;
     }()
     /**
-     * When a failback request is rejected with 429, it means the
-     * request did not even land on primary mobius to know if it
-     * can handle this device registration now, in such cases this
-     * method is called to retry sooner than the rehoming timer value.
+     *
      */
     )
   }, {
-    key: "scheduleFailback429Retry",
+    key: "handle429Retry",
     value: (function () {
-      var _scheduleFailback429Retry = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+      var _handle429Retry = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(retryAfter, caller) {
         var interval, abort;
         return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              if (!(this.failback429RetryAttempts >= _constants.REG_FAILBACK_429_MAX_RETRIES)) {
-                _context5.next = 2;
+              if (!(caller === _constants2.FAILBACK_UTIL)) {
+                _context5.next = 17;
+                break;
+              }
+              if (!(this.failback429RetryAttempts >= _constants2.REG_FAILBACK_429_MAX_RETRIES)) {
+                _context5.next = 3;
                 break;
               }
               return _context5.abrupt("return");
-            case 2:
+            case 3:
               this.clearFailbackTimer();
               this.failback429RetryAttempts += 1;
               _Logger.default.log("Received 429 while rehoming, 429 retry count : ".concat(this.failback429RetryAttempts), {
-                file: _constants.REGISTRATION_FILE,
-                method: _constants.FAILBACK_429_RETRY_UTIL
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.REG_429_RETRY_UTIL
               });
               interval = this.getRegRetryInterval(this.failback429RetryAttempts);
               this.startFailbackTimer(interval);
-              _context5.next = 9;
-              return this.restorePreviousRegistration(_constants.FAILBACK_429_RETRY_UTIL);
-            case 9:
+              this.scheduled429Retry = true;
+              _context5.next = 11;
+              return this.restorePreviousRegistration(_constants2.REG_429_RETRY_UTIL);
+            case 11:
               abort = _context5.sent;
               if (!(!abort && !this.isDeviceRegistered())) {
-                _context5.next = 13;
+                _context5.next = 15;
                 break;
               }
-              _context5.next = 13;
-              return this.restartRegistration(_constants.FAILBACK_429_RETRY_UTIL);
-            case 13:
+              _context5.next = 15;
+              return this.restartRegistration(_constants2.REG_429_RETRY_UTIL);
+            case 15:
+              _context5.next = 18;
+              break;
+            case 17:
+              this.retryAfter = retryAfter;
+            case 18:
             case "end":
               return _context5.stop();
           }
         }, _callee5, this);
       }));
-      function scheduleFailback429Retry() {
-        return _scheduleFailback429Retry.apply(this, arguments);
+      function handle429Retry(_x7, _x8) {
+        return _handle429Retry.apply(this, arguments);
       }
-      return scheduleFailback429Retry;
+      return handle429Retry;
     }()
     /**
      * Calculates and returns a random interval value using input argument
@@ -335,7 +351,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     key: "getRegRetryInterval",
     value: function getRegRetryInterval() {
       var attempt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
-      return _constants.BASE_REG_RETRY_TIMER_VAL_IN_SEC + Math.pow(_constants.BASE_REG_TIMER_MFACTOR, attempt) + Math.floor((Math.random() * (_constants.REG_RANDOM_T_FACTOR_UPPER_LIMIT - _constants.SEC_TO_MSEC_MFACTOR + 1) + _constants.SEC_TO_MSEC_MFACTOR) / _constants.SEC_TO_MSEC_MFACTOR);
+      return _constants2.BASE_REG_RETRY_TIMER_VAL_IN_SEC + Math.pow(_constants2.BASE_REG_TIMER_MFACTOR, attempt) + Math.floor((Math.random() * (_constants2.REG_RANDOM_T_FACTOR_UPPER_LIMIT - _constants2.SEC_TO_MSEC_MFACTOR + 1) + _constants2.SEC_TO_MSEC_MFACTOR) / _constants2.SEC_TO_MSEC_MFACTOR);
     }
 
     /**
@@ -365,20 +381,26 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               attempt = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : 1;
               timeElapsed = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : 0;
               loggerContext = {
-                file: _constants.REGISTRATION_FILE,
-                method: this.startFailoverTimer.name
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.FAILOVER_UTIL
               };
               interval = this.getRegRetryInterval(attempt);
-              TIMER_THRESHOLD = this.isCCFlow ? _constants.REG_TRY_BACKUP_TIMER_VAL_FOR_CC_IN_SEC : _constants.REG_TRY_BACKUP_TIMER_VAL_IN_SEC;
+              TIMER_THRESHOLD = this.isCCFlow ? _constants2.REG_TRY_BACKUP_TIMER_VAL_FOR_CC_IN_SEC : _constants2.REG_TRY_BACKUP_TIMER_VAL_IN_SEC;
               if (timeElapsed + interval > TIMER_THRESHOLD) {
                 excessVal = timeElapsed + interval - TIMER_THRESHOLD;
                 interval -= excessVal;
               }
-              if (!(interval > _constants.BASE_REG_RETRY_TIMER_VAL_IN_SEC && !this.failoverImmediately)) {
-                _context10.next = 12;
+              if (this.retryAfter != null && interval < this.retryAfter) {
+                this.failoverImmediately = this.retryAfter + timeElapsed > TIMER_THRESHOLD;
+              }
+              if (!(interval > _constants2.BASE_REG_RETRY_TIMER_VAL_IN_SEC && !this.failoverImmediately)) {
+                _context10.next = 14;
                 break;
               }
               scheduledTime = Math.floor((0, _now.default)() / 1000);
+              if (this.retryAfter != null) {
+                interval = Math.max(interval, this.retryAfter);
+              }
               setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
                 return _regenerator.default.wrap(function _callee7$(_context7) {
                   while (1) switch (_context7.prev = _context7.next) {
@@ -390,7 +412,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                           while (1) switch (_context6.prev = _context6.next) {
                             case 0:
                               _context6.next = 2;
-                              return _this.attemptRegistrationWithServers(_this.startFailoverTimer.name);
+                              return _this.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL);
                             case 2:
                               abort = _context6.sent;
                               currentTime = Math.floor((0, _now.default)() / 1000);
@@ -411,23 +433,26 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                       return _context7.stop();
                   }
                 }, _callee7);
-              })), interval * _constants.SEC_TO_MSEC_MFACTOR);
+              })), interval * _constants2.SEC_TO_MSEC_MFACTOR);
               _Logger.default.log("Scheduled retry with primary in ".concat(interval, " seconds, number of attempts : ").concat(attempt), loggerContext);
-              _context10.next = 22;
+              _context10.next = 26;
               break;
-            case 12:
+            case 14:
               if (!this.backupMobiusUris.length) {
-                _context10.next = 21;
+                _context10.next = 23;
                 break;
               }
-              _Logger.default.log('Failing over to backup servers.', loggerContext);
+              _Logger.default.info('Failing over to backup servers.', loggerContext);
               this.failoverImmediately = false;
-              _context10.next = 17;
-              return this.attemptRegistrationWithServers(this.startFailoverTimer.name, this.backupMobiusUris);
-            case 17:
+              _context10.next = 19;
+              return this.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL, this.backupMobiusUris);
+            case 19:
               abort = _context10.sent;
               if (!abort && !this.isDeviceRegistered()) {
                 interval = this.getRegRetryInterval();
+                if (this.retryAfter != null && this.retryAfter < _constants2.RETRY_TIMER_UPPER_LIMIT) {
+                  interval = interval < this.retryAfter ? this.retryAfter : interval;
+                }
                 setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
                   return _regenerator.default.wrap(function _callee9$(_context9) {
                     while (1) switch (_context9.prev = _context9.next) {
@@ -438,15 +463,20 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                             while (1) switch (_context8.prev = _context8.next) {
                               case 0:
                                 _context8.next = 2;
-                                return _this.attemptRegistrationWithServers(_this.startFailoverTimer.name, _this.backupMobiusUris);
+                                return _this.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL, _this.backupMobiusUris);
                               case 2:
                                 abort = _context8.sent;
-                                if (!abort && !_this.isDeviceRegistered()) {
-                                  (0, _common.emitFinalFailure)(function (clientError) {
-                                    _this.lineEmitter(_types4.LINE_EVENTS.ERROR, undefined, clientError);
-                                  }, loggerContext);
+                                if (!(!abort && !_this.isDeviceRegistered())) {
+                                  _context8.next = 7;
+                                  break;
                                 }
-                              case 4:
+                                _context8.next = 6;
+                                return (0, _common.uploadLogs)();
+                              case 6:
+                                (0, _common.emitFinalFailure)(function (clientError) {
+                                  _this.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
+                                }, loggerContext);
+                              case 7:
                               case "end":
                                 return _context8.stop();
                             }
@@ -457,16 +487,19 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                         return _context9.stop();
                     }
                   }, _callee9);
-                })), interval * _constants.SEC_TO_MSEC_MFACTOR);
+                })), interval * _constants2.SEC_TO_MSEC_MFACTOR);
                 _Logger.default.log("Scheduled retry with backup servers in ".concat(interval, " seconds."), loggerContext);
               }
-              _context10.next = 22;
+              _context10.next = 26;
               break;
-            case 21:
+            case 23:
+              _context10.next = 25;
+              return (0, _common.uploadLogs)();
+            case 25:
               (0, _common.emitFinalFailure)(function (clientError) {
-                _this.lineEmitter(_types4.LINE_EVENTS.ERROR, undefined, clientError);
+                _this.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
               }, loggerContext);
-            case 22:
+            case 26:
             case "end":
               return _context10.stop();
           }
@@ -520,7 +553,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
         if (!this.failbackTimer) {
           this.failback429RetryAttempts = 0;
           var intervalInMinutes = this.getFailbackInterval();
-          this.startFailbackTimer(intervalInMinutes * _constants.MINUTES_TO_SEC_MFACTOR);
+          this.startFailbackTimer(intervalInMinutes * _constants2.MINUTES_TO_SEC_MFACTOR);
         }
       } else {
         this.failback429RetryAttempts = 0;
@@ -546,9 +579,9 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               return _context11.stop();
           }
         }, _callee11);
-      })), intervalInSeconds * _constants.SEC_TO_MSEC_MFACTOR);
+      })), intervalInSeconds * _constants2.SEC_TO_MSEC_MFACTOR);
       _Logger.default.log("Failback scheduled after ".concat(intervalInSeconds, " seconds."), {
-        file: _constants.REGISTRATION_FILE,
+        file: _constants2.REGISTRATION_FILE,
         method: this.startFailbackTimer.name
       });
     }
@@ -572,62 +605,64 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                   while (1) switch (_context12.prev = _context12.next) {
                     case 0:
                       if (!_this3.isFailbackRequired()) {
-                        _context12.next = 27;
+                        _context12.next = 28;
                         break;
                       }
                       if (!((0, _keys.default)(_this3.callManager.getActiveCalls()).length === 0)) {
-                        _context12.next = 24;
+                        _context12.next = 25;
                         break;
                       }
                       _Logger.default.info("Attempting failback to primary.", {
-                        file: _constants.REGISTRATION_FILE,
+                        file: _constants2.REGISTRATION_FILE,
                         method: _this3.executeFailback.name
                       });
                       _context12.next = 5;
                       return _this3.deregister();
                     case 5:
                       _context12.next = 7;
-                      return _this3.attemptRegistrationWithServers(_constants.FAILBACK_UTIL);
+                      return _this3.attemptRegistrationWithServers(_constants2.FAILBACK_UTIL);
                     case 7:
                       abort = _context12.sent;
-                      if (!(!abort && !_this3.isDeviceRegistered())) {
-                        _context12.next = 22;
+                      if (!(_this3.scheduled429Retry || abort || _this3.isDeviceRegistered())) {
+                        _context12.next = 10;
                         break;
                       }
-                      _context12.next = 11;
-                      return _this3.restorePreviousRegistration(_constants.FAILBACK_UTIL);
-                    case 11:
+                      return _context12.abrupt("return");
+                    case 10:
+                      _context12.next = 12;
+                      return _this3.restorePreviousRegistration(_constants2.FAILBACK_UTIL);
+                    case 12:
                       abortNew = _context12.sent;
                       if (!abortNew) {
-                        _context12.next = 15;
+                        _context12.next = 16;
                         break;
                       }
                       _this3.clearFailbackTimer();
                       return _context12.abrupt("return");
-                    case 15:
+                    case 16:
                       if (_this3.isDeviceRegistered()) {
-                        _context12.next = 20;
+                        _context12.next = 21;
                         break;
                       }
-                      _context12.next = 18;
+                      _context12.next = 19;
                       return _this3.restartRegistration(_this3.executeFailback.name);
-                    case 18:
-                      _context12.next = 22;
+                    case 19:
+                      _context12.next = 23;
                       break;
-                    case 20:
+                    case 21:
                       _this3.failbackTimer = undefined;
                       _this3.initiateFailback();
-                    case 22:
-                      _context12.next = 27;
+                    case 23:
+                      _context12.next = 28;
                       break;
-                    case 24:
+                    case 25:
                       _Logger.default.info('Active calls present, deferring failback to next cycle.', {
-                        file: _constants.REGISTRATION_FILE,
+                        file: _constants2.REGISTRATION_FILE,
                         method: _this3.executeFailback.name
                       });
                       _this3.failbackTimer = undefined;
                       _this3.initiateFailback();
-                    case 27:
+                    case 28:
                     case "end":
                       return _context12.stop();
                   }
@@ -655,8 +690,8 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     key: "setIntervalValues",
     value: function setIntervalValues(deviceInfo) {
       if (this.primaryMobiusUris.indexOf(this.activeMobiusUrl) !== -1) {
-        this.rehomingIntervalMin = deviceInfo !== null && deviceInfo !== void 0 && deviceInfo.rehomingIntervalMin ? deviceInfo.rehomingIntervalMin : _constants.DEFAULT_REHOMING_INTERVAL_MIN;
-        this.rehomingIntervalMax = deviceInfo !== null && deviceInfo !== void 0 && deviceInfo.rehomingIntervalMax ? deviceInfo.rehomingIntervalMax : _constants.DEFAULT_REHOMING_INTERVAL_MAX;
+        this.rehomingIntervalMin = deviceInfo !== null && deviceInfo !== void 0 && deviceInfo.rehomingIntervalMin ? deviceInfo.rehomingIntervalMin : _constants2.DEFAULT_REHOMING_INTERVAL_MIN;
+        this.rehomingIntervalMax = deviceInfo !== null && deviceInfo !== void 0 && deviceInfo.rehomingIntervalMax ? deviceInfo.rehomingIntervalMax : _constants2.DEFAULT_REHOMING_INTERVAL_MAX;
       }
     }
 
@@ -679,7 +714,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "isDeviceRegistered",
     value: function isDeviceRegistered() {
-      return this.registrationStatus === _types3.RegistrationStatus.ACTIVE;
+      return this.registrationStatus === _types2.RegistrationStatus.ACTIVE;
     }
   }, {
     key: "getStatus",
@@ -727,7 +762,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
           }
         }, _callee14, this);
       }));
-      function restartRegistration(_x7) {
+      function restartRegistration(_x9) {
         return _restartRegistration.apply(this, arguments);
       }
       return restartRegistration;
@@ -746,7 +781,11 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
         return _regenerator.default.wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _context16.next = 2;
+              _Logger.default.info(_constants.METHOD_START_MESSAGE, {
+                method: _constants2.METHODS.HANDLE_CONNECTION_RESTORATION,
+                file: _constants2.REGISTRATION_FILE
+              });
+              _context16.next = 3;
               return this.mutex.runExclusive( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15() {
                 var abort;
                 return _regenerator.default.wrap(function _callee15$(_context15) {
@@ -756,8 +795,8 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                         _context15.next = 14;
                         break;
                       }
-                      _Logger.default.info('Mercury connection is up again, re-registering with Webex Calling if needed', {
-                        file: _constants.REGISTRATION_FILE,
+                      _Logger.default.log('Mercury connection is up again, re-registering with Webex Calling if needed', {
+                        file: _constants2.REGISTRATION_FILE,
                         method: _this4.handleConnectionRestoration.name
                       });
                       _this4.clearKeepaliveTimer();
@@ -790,15 +829,15 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                   }
                 }, _callee15);
               })));
-            case 2:
-              return _context16.abrupt("return", retry);
             case 3:
+              return _context16.abrupt("return", retry);
+            case 4:
             case "end":
               return _context16.stop();
           }
         }, _callee16, this);
       }));
-      function handleConnectionRestoration(_x8) {
+      function handleConnectionRestoration(_x10) {
         return _handleConnectionRestoration.apply(this, arguments);
       }
       return handleConnectionRestoration;
@@ -820,7 +859,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
             while (1) switch (_context17.prev = _context17.next) {
               case 0:
                 logContext = {
-                  file: _constants.REGISTRATION_FILE,
+                  file: _constants2.REGISTRATION_FILE,
                   method: caller
                 };
                 if (_this5.isRegRetry()) {
@@ -847,11 +886,11 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                 }
                 return _context17.abrupt("return", finalError);
               case 14:
-                _this5.lineEmitter(_types4.LINE_EVENTS.UNREGISTERED);
+                _this5.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
                 _context17.next = 18;
                 break;
               case 17:
-                _this5.lineEmitter(_types4.LINE_EVENTS.UNREGISTERED);
+                _this5.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
               case 18:
                 return _context17.abrupt("return", false);
               case 19:
@@ -860,7 +899,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
             }
           }, _callee17);
         }));
-        return function (_x9, _x10) {
+        return function (_x11, _x12) {
           return _ref8.apply(this, arguments);
         };
       }();
@@ -883,7 +922,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                 break;
               }
               _context18.next = 3;
-              return this.attemptRegistrationWithServers(this.triggerRegistration.name, this.primaryMobiusUris);
+              return this.attemptRegistrationWithServers(_constants2.REGISTRATION_UTIL, this.primaryMobiusUris);
             case 3:
               abort = _context18.sent;
               if (!(!this.isDeviceRegistered() && !abort)) {
@@ -921,137 +960,148 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
           abort,
           _iterator,
           _step,
-          url,
-          _this$deviceInfo$devi,
-          resp,
-          body,
-          error,
-          _args19 = arguments;
-        return _regenerator.default.wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+          _loop,
+          _ret,
+          _args20 = arguments;
+        return _regenerator.default.wrap(function _callee19$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              servers = _args19.length > 1 && _args19[1] !== undefined ? _args19[1] : this.primaryMobiusUris;
+              servers = _args20.length > 1 && _args20[1] !== undefined ? _args20[1] : this.primaryMobiusUris;
               abort = false;
+              this.retryAfter = undefined;
               if (!this.failoverImmediately) {
-                _context19.next = 4;
+                _context20.next = 5;
                 break;
               }
-              return _context19.abrupt("return", abort);
-            case 4:
+              return _context20.abrupt("return", abort);
+            case 5:
               if (!this.isDeviceRegistered()) {
-                _context19.next = 7;
+                _context20.next = 8;
                 break;
               }
-              _Logger.default.log("[".concat(caller, "] : Device already registered with : ").concat(this.activeMobiusUrl), {
-                file: _constants.REGISTRATION_FILE,
-                method: this.attemptRegistrationWithServers.name
+              _Logger.default.info("[".concat(caller, "] : Device already registered with : ").concat(this.activeMobiusUrl), {
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.REGISTER_UTIL
               });
-              return _context19.abrupt("return", abort);
-            case 7:
+              return _context20.abrupt("return", abort);
+            case 8:
               _iterator = _createForOfIteratorHelper(servers);
-              _context19.prev = 8;
+              _context20.prev = 9;
+              _loop = /*#__PURE__*/_regenerator.default.mark(function _loop() {
+                var _this6$backupMobiusUr;
+                var url, serverType, _this6$deviceInfo$dev, _resp$headers$trackin, _resp$headers, _this6$deviceInfo$dev2, resp, body;
+                return _regenerator.default.wrap(function _loop$(_context19) {
+                  while (1) switch (_context19.prev = _context19.next) {
+                    case 0:
+                      url = _step.value;
+                      serverType = _this6.primaryMobiusUris.includes(url) && 'PRIMARY' || ((_this6$backupMobiusUr = _this6.backupMobiusUris) === null || _this6$backupMobiusUr === void 0 ? void 0 : _this6$backupMobiusUr.includes(url)) && 'BACKUP' || 'UNKNOWN';
+                      _context19.prev = 2;
+                      abort = false;
+                      _this6.registrationStatus = _types2.RegistrationStatus.INACTIVE;
+                      _this6.lineEmitter(_types3.LINE_EVENTS.CONNECTING);
+                      _Logger.default.info("[".concat(caller, "] : Mobius url to contact: ").concat(url), {
+                        file: _constants2.REGISTRATION_FILE,
+                        method: _constants2.REGISTER_UTIL
+                      });
+                      // eslint-disable-next-line no-await-in-loop
+                      _context19.next = 9;
+                      return _this6.postRegistration(url);
+                    case 9:
+                      resp = _context19.sent;
+                      _this6.deviceInfo = resp.body;
+                      _this6.registrationStatus = _types2.RegistrationStatus.ACTIVE;
+                      _this6.lineEmitter(_types3.LINE_EVENTS.REGISTERED, resp.body);
+                      _Logger.default.log("Registration successful for deviceId: ".concat((_this6$deviceInfo$dev = _this6.deviceInfo.device) === null || _this6$deviceInfo$dev === void 0 ? void 0 : _this6$deviceInfo$dev.deviceId, " userId: ").concat(_this6.userId), {
+                        file: _constants2.REGISTRATION_FILE,
+                        method: _constants2.METHODS.REGISTER
+                      });
+                      _this6.setActiveMobiusUrl(url);
+                      _this6.setIntervalValues(_this6.deviceInfo);
+                      _this6.metricManager.setDeviceInfo(_this6.deviceInfo);
+                      _this6.metricManager.submitRegistrationMetric(_types.METRIC_EVENT.REGISTRATION, _types.REG_ACTION.REGISTER, _types.METRIC_TYPE.BEHAVIORAL, caller, serverType, (_resp$headers$trackin = (_resp$headers = resp.headers) === null || _resp$headers === void 0 ? void 0 : _resp$headers.trackingid) !== null && _resp$headers$trackin !== void 0 ? _resp$headers$trackin : '', undefined, undefined);
+                      _this6.startKeepaliveTimer((_this6$deviceInfo$dev2 = _this6.deviceInfo.device) === null || _this6$deviceInfo$dev2 === void 0 ? void 0 : _this6$deviceInfo$dev2.uri, _this6.deviceInfo.keepaliveInterval, serverType);
+                      _this6.initiateFailback();
+                      return _context19.abrupt("return", 0);
+                    case 23:
+                      _context19.prev = 23;
+                      _context19.t0 = _context19["catch"](2);
+                      body = _context19.t0; // eslint-disable-next-line no-await-in-loop, @typescript-eslint/no-unused-vars
+                      _context19.next = 28;
+                      return (0, _common.handleRegistrationErrors)(body, function (clientError, finalError) {
+                        var _body$headers$trackin, _body$headers;
+                        if (finalError) {
+                          _this6.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
+                        } else {
+                          _this6.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
+                        }
+                        _this6.metricManager.submitRegistrationMetric(_types.METRIC_EVENT.REGISTRATION_ERROR, _types.REG_ACTION.REGISTER, _types.METRIC_TYPE.BEHAVIORAL, caller, serverType, (_body$headers$trackin = (_body$headers = body.headers) === null || _body$headers === void 0 ? void 0 : _body$headers.trackingid) !== null && _body$headers$trackin !== void 0 ? _body$headers$trackin : '', undefined, clientError);
+                      }, {
+                        method: caller,
+                        file: _constants2.REGISTRATION_FILE
+                      }, function (retryAfter, retryCaller) {
+                        return _this6.handle429Retry(retryAfter, retryCaller);
+                      }, _this6.restoreRegistrationCallBack());
+                    case 28:
+                      abort = _context19.sent;
+                      if (!(_this6.registrationStatus === _types2.RegistrationStatus.ACTIVE)) {
+                        _context19.next = 32;
+                        break;
+                      }
+                      _Logger.default.info("[".concat(caller, "] : Device is already restored, active mobius url: ").concat(_this6.activeMobiusUrl), {
+                        file: _constants2.REGISTRATION_FILE,
+                        method: _this6.attemptRegistrationWithServers.name
+                      });
+                      return _context19.abrupt("return", 0);
+                    case 32:
+                      if (!abort) {
+                        _context19.next = 35;
+                        break;
+                      }
+                      _this6.setStatus(_types2.RegistrationStatus.INACTIVE);
+                      return _context19.abrupt("return", 0);
+                    case 35:
+                    case "end":
+                      return _context19.stop();
+                  }
+                }, _loop, null, [[2, 23]]);
+              });
               _iterator.s();
-            case 10:
+            case 12:
               if ((_step = _iterator.n()).done) {
-                _context19.next = 55;
-                break;
-              }
-              url = _step.value;
-              _context19.prev = 12;
-              abort = false;
-              this.registrationStatus = _types3.RegistrationStatus.INACTIVE;
-              this.lineEmitter(_types4.LINE_EVENTS.CONNECTING);
-              _Logger.default.log("[".concat(caller, "] : Mobius url to contact: ").concat(url), {
-                file: _constants.REGISTRATION_FILE,
-                method: this.attemptRegistrationWithServers.name
-              });
-              // eslint-disable-next-line no-await-in-loop
-              _context19.next = 19;
-              return this.postRegistration(url);
-            case 19:
-              resp = _context19.sent;
-              this.deviceInfo = resp.body;
-              this.registrationStatus = _types3.RegistrationStatus.ACTIVE;
-              this.lineEmitter(_types4.LINE_EVENTS.REGISTERED, resp.body);
-              this.setActiveMobiusUrl(url);
-              this.setIntervalValues(this.deviceInfo);
-              this.metricManager.setDeviceInfo(this.deviceInfo);
-              this.metricManager.submitRegistrationMetric(_types2.METRIC_EVENT.REGISTRATION, _types2.REG_ACTION.REGISTER, _types2.METRIC_TYPE.BEHAVIORAL, undefined);
-              this.startKeepaliveTimer((_this$deviceInfo$devi = this.deviceInfo.device) === null || _this$deviceInfo$devi === void 0 ? void 0 : _this$deviceInfo$devi.uri, this.deviceInfo.keepaliveInterval);
-              this.initiateFailback();
-              return _context19.abrupt("break", 55);
-            case 32:
-              _context19.prev = 32;
-              _context19.t0 = _context19["catch"](12);
-              body = _context19.t0; // eslint-disable-next-line no-await-in-loop, @typescript-eslint/no-unused-vars
-              _context19.next = 37;
-              return (0, _common.handleRegistrationErrors)(body, function (clientError, finalError) {
-                if (finalError) {
-                  _this6.lineEmitter(_types4.LINE_EVENTS.ERROR, undefined, clientError);
-                } else {
-                  _this6.lineEmitter(_types4.LINE_EVENTS.UNREGISTERED);
-                }
-                _this6.metricManager.submitRegistrationMetric(_types2.METRIC_EVENT.REGISTRATION_ERROR, _types2.REG_ACTION.REGISTER, _types2.METRIC_TYPE.BEHAVIORAL, clientError);
-              }, {
-                method: this.attemptRegistrationWithServers.name,
-                file: _constants.REGISTRATION_FILE
-              }, this.restoreRegistrationCallBack());
-            case 37:
-              abort = _context19.sent;
-              if (!(this.registrationStatus === _types3.RegistrationStatus.ACTIVE)) {
-                _context19.next = 41;
+                _context20.next = 19;
                 break;
               }
-              _Logger.default.info("[".concat(caller, "] : Device is already restored, active mobius url: ").concat(this.activeMobiusUrl), {
-                file: _constants.REGISTRATION_FILE,
-                method: this.attemptRegistrationWithServers.name
-              });
-              return _context19.abrupt("break", 55);
-            case 41:
-              if (!abort) {
-                _context19.next = 46;
+              return _context20.delegateYield(_loop(), "t0", 14);
+            case 14:
+              _ret = _context20.t0;
+              if (!(_ret === 0)) {
+                _context20.next = 17;
                 break;
               }
-              this.setStatus(_types3.RegistrationStatus.INACTIVE);
-              return _context19.abrupt("break", 55);
-            case 46:
-              if (!(caller === this.executeFailback.name)) {
-                _context19.next = 53;
-                break;
-              }
-              error = body.statusCode;
-              if (!(error === _types.ERROR_CODE.TOO_MANY_REQUESTS)) {
-                _context19.next = 53;
-                break;
-              }
-              _context19.next = 51;
-              return this.scheduleFailback429Retry();
-            case 51:
-              abort = true;
-              return _context19.abrupt("break", 55);
-            case 53:
-              _context19.next = 10;
+              return _context20.abrupt("break", 19);
+            case 17:
+              _context20.next = 12;
               break;
-            case 55:
-              _context19.next = 60;
+            case 19:
+              _context20.next = 24;
               break;
-            case 57:
-              _context19.prev = 57;
-              _context19.t1 = _context19["catch"](8);
-              _iterator.e(_context19.t1);
-            case 60:
-              _context19.prev = 60;
+            case 21:
+              _context20.prev = 21;
+              _context20.t1 = _context20["catch"](9);
+              _iterator.e(_context20.t1);
+            case 24:
+              _context20.prev = 24;
               _iterator.f();
-              return _context19.finish(60);
-            case 63:
-              return _context19.abrupt("return", abort);
-            case 64:
+              return _context20.finish(24);
+            case 27:
+              return _context20.abrupt("return", abort);
+            case 28:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
-        }, _callee19, this, [[8, 57, 60, 63], [12, 32]]);
+        }, _callee19, this, [[9, 21, 24, 27]]);
       }));
-      function attemptRegistrationWithServers(_x11) {
+      function attemptRegistrationWithServers(_x13) {
         return _attemptRegistrationWithServers.apply(this, arguments);
       }
       return attemptRegistrationWithServers;
@@ -1063,89 +1113,90 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     )
   }, {
     key: "startKeepaliveTimer",
-    value: function startKeepaliveTimer(url, interval) {
+    value: function startKeepaliveTimer(url, interval, serverType) {
       var _this7 = this;
       var keepAliveRetryCount = 0;
       this.clearKeepaliveTimer();
       var RETRY_COUNT_THRESHOLD = this.isCCFlow ? 4 : 5;
       this.keepaliveTimer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21() {
         var logContext;
-        return _regenerator.default.wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regenerator.default.wrap(function _callee21$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               logContext = {
-                file: _constants.REGISTRATION_FILE,
-                method: _this7.startKeepaliveTimer.name
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.KEEPALIVE_UTIL
               };
-              _context21.next = 3;
+              _context22.next = 3;
               return _this7.mutex.runExclusive( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20() {
                 var res, error, abort;
-                return _regenerator.default.wrap(function _callee20$(_context20) {
-                  while (1) switch (_context20.prev = _context20.next) {
+                return _regenerator.default.wrap(function _callee20$(_context21) {
+                  while (1) switch (_context21.prev = _context21.next) {
                     case 0:
                       if (!(_this7.isDeviceRegistered() && keepAliveRetryCount < RETRY_COUNT_THRESHOLD)) {
-                        _context20.next = 30;
+                        _context21.next = 30;
                         break;
                       }
-                      _context20.prev = 1;
-                      _context20.next = 4;
+                      _context21.prev = 1;
+                      _context21.next = 4;
                       return _this7.postKeepAlive(url);
                     case 4:
-                      res = _context20.sent;
-                      _Logger.default.info("Sent Keepalive, status: ".concat(res.statusCode), logContext);
+                      res = _context21.sent;
+                      _Logger.default.log("Sent Keepalive, status: ".concat(res.statusCode), logContext);
                       if (keepAliveRetryCount > 0) {
-                        _this7.lineEmitter(_types4.LINE_EVENTS.RECONNECTED);
+                        _this7.lineEmitter(_types3.LINE_EVENTS.RECONNECTED);
                       }
                       keepAliveRetryCount = 0;
-                      _context20.next = 30;
+                      _context21.next = 30;
                       break;
                     case 10:
-                      _context20.prev = 10;
-                      _context20.t0 = _context20["catch"](1);
+                      _context21.prev = 10;
+                      _context21.t0 = _context21["catch"](1);
                       keepAliveRetryCount += 1;
-                      error = _context20.t0;
+                      error = _context21.t0;
                       _Logger.default.warn("Keep-alive missed ".concat(keepAliveRetryCount, " times. Status -> ").concat(error.statusCode, " "), logContext);
-                      _context20.next = 17;
+                      _context21.next = 17;
                       return (0, _common.handleRegistrationErrors)(error, function (clientError, finalError) {
+                        var _error$headers$tracki, _error$headers;
                         if (finalError) {
-                          _this7.lineEmitter(_types4.LINE_EVENTS.ERROR, undefined, clientError);
+                          _this7.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
                         }
-                        _this7.metricManager.submitRegistrationMetric(_types2.METRIC_EVENT.REGISTRATION, _types2.REG_ACTION.KEEPALIVE_FAILURE, _types2.METRIC_TYPE.BEHAVIORAL, clientError);
+                        _this7.metricManager.submitRegistrationMetric(_types.METRIC_EVENT.REGISTRATION, _types.REG_ACTION.KEEPALIVE_FAILURE, _types.METRIC_TYPE.BEHAVIORAL, _constants2.KEEPALIVE_UTIL, serverType, (_error$headers$tracki = (_error$headers = error.headers) === null || _error$headers === void 0 ? void 0 : _error$headers.trackingid) !== null && _error$headers$tracki !== void 0 ? _error$headers$tracki : '', keepAliveRetryCount, clientError);
                       }, {
-                        method: _this7.startKeepaliveTimer.name,
-                        file: _constants.REGISTRATION_FILE
+                        method: _constants2.KEEPALIVE_UTIL,
+                        file: _constants2.REGISTRATION_FILE
                       });
                     case 17:
-                      abort = _context20.sent;
+                      abort = _context21.sent;
                       if (!(abort || keepAliveRetryCount >= RETRY_COUNT_THRESHOLD)) {
-                        _context20.next = 29;
+                        _context21.next = 29;
                         break;
                       }
                       _this7.failoverImmediately = _this7.isCCFlow;
-                      _this7.setStatus(_types3.RegistrationStatus.INACTIVE);
+                      _this7.setStatus(_types2.RegistrationStatus.INACTIVE);
                       _this7.clearKeepaliveTimer();
                       _this7.clearFailbackTimer();
-                      _this7.lineEmitter(_types4.LINE_EVENTS.UNREGISTERED);
+                      _this7.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
                       if (abort) {
-                        _context20.next = 27;
+                        _context21.next = 27;
                         break;
                       }
-                      _context20.next = 27;
-                      return _this7.reconnectOnFailure(_this7.startKeepaliveTimer.name);
+                      _context21.next = 27;
+                      return _this7.reconnectOnFailure(_constants2.KEEPALIVE_UTIL);
                     case 27:
-                      _context20.next = 30;
+                      _context21.next = 30;
                       break;
                     case 29:
-                      _this7.lineEmitter(_types4.LINE_EVENTS.RECONNECTING);
+                      _this7.lineEmitter(_types3.LINE_EVENTS.RECONNECTING);
                     case 30:
                     case "end":
-                      return _context20.stop();
+                      return _context21.stop();
                   }
                 }, _callee20, null, [[1, 10]]);
               })));
             case 3:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
         }, _callee21);
       })), interval * 1000);
@@ -1171,28 +1222,35 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     key: "deregister",
     value: function () {
       var _deregister = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22() {
-        var _this$deviceInfo$devi2, _this$deviceInfo$devi3;
-        return _regenerator.default.wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        var _this$deviceInfo$devi, _this$deviceInfo$devi2;
+        return _regenerator.default.wrap(function _callee22$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              _context22.prev = 0;
-              _context22.next = 3;
-              return this.deleteRegistration(this.activeMobiusUrl, (_this$deviceInfo$devi2 = this.deviceInfo.device) === null || _this$deviceInfo$devi2 === void 0 ? void 0 : _this$deviceInfo$devi2.deviceId, (_this$deviceInfo$devi3 = this.deviceInfo.device) === null || _this$deviceInfo$devi3 === void 0 ? void 0 : _this$deviceInfo$devi3.clientDeviceUri);
+              _context23.prev = 0;
+              _context23.next = 3;
+              return this.deleteRegistration(this.activeMobiusUrl, (_this$deviceInfo$devi = this.deviceInfo.device) === null || _this$deviceInfo$devi === void 0 ? void 0 : _this$deviceInfo$devi.deviceId, (_this$deviceInfo$devi2 = this.deviceInfo.device) === null || _this$deviceInfo$devi2 === void 0 ? void 0 : _this$deviceInfo$devi2.clientDeviceUri);
             case 3:
-              _context22.next = 8;
+              _Logger.default.log('Registration successfully deregistered', {
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.METHODS.DEREGISTER
+              });
+              _context23.next = 9;
               break;
-            case 5:
-              _context22.prev = 5;
-              _context22.t0 = _context22["catch"](0);
-              _Logger.default.warn("Delete failed with Mobius", {});
-            case 8:
+            case 6:
+              _context23.prev = 6;
+              _context23.t0 = _context23["catch"](0);
+              _Logger.default.warn("Delete failed with Mobius: ".concat(_context23.t0), {
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.METHODS.DEREGISTER
+              });
+            case 9:
               this.clearKeepaliveTimer();
-              this.setStatus(_types3.RegistrationStatus.INACTIVE);
-            case 10:
+              this.setStatus(_types2.RegistrationStatus.INACTIVE);
+            case 11:
             case "end":
-              return _context22.stop();
+              return _context23.stop();
           }
-        }, _callee22, this, [[0, 5]]);
+        }, _callee22, this, [[0, 6]]);
       }));
       function deregister() {
         return _deregister.apply(this, arguments);
@@ -1200,8 +1258,8 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
       return deregister;
     }()
     /**
-     *          Indicates whether the calling client is in a mode
-     *          to retry registration.
+     * Indicates whether the calling client is in a mode
+     * to retry registration.
      */
   }, {
     key: "isRegRetry",
@@ -1231,14 +1289,14 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
         this.deviceInfo = {
           userId: restoreData.userId,
           device: restoreData.devices[0],
-          keepaliveInterval: _constants.DEFAULT_KEEPALIVE_INTERVAL,
-          rehomingIntervalMax: _constants.DEFAULT_REHOMING_INTERVAL_MAX,
-          rehomingIntervalMin: _constants.DEFAULT_REHOMING_INTERVAL_MIN
+          keepaliveInterval: _constants2.DEFAULT_KEEPALIVE_INTERVAL,
+          rehomingIntervalMax: _constants2.DEFAULT_REHOMING_INTERVAL_MAX,
+          rehomingIntervalMin: _constants2.DEFAULT_REHOMING_INTERVAL_MIN
         };
-        var stringToReplace = "".concat(_constants.DEVICES_ENDPOINT_RESOURCE, "/").concat(restoreData.devices[0].deviceId);
+        var stringToReplace = "".concat(_constants2.DEVICES_ENDPOINT_RESOURCE, "/").concat(restoreData.devices[0].deviceId);
         var uri = restoreData.devices[0].uri.replace(stringToReplace, '');
         this.setActiveMobiusUrl(uri);
-        this.registrationStatus = _types3.RegistrationStatus.ACTIVE;
+        this.registrationStatus = _types2.RegistrationStatus.ACTIVE;
         return true;
       }
       return false;
@@ -1258,44 +1316,48 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     value: (function () {
       var _reconnectOnFailure = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee23(caller) {
         var abort;
-        return _regenerator.default.wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regenerator.default.wrap(function _callee23$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
+              _Logger.default.info(_constants.METHOD_START_MESSAGE, {
+                method: _constants2.METHODS.RECONNECT_ON_FAILURE,
+                file: _constants2.REGISTRATION_FILE
+              });
               this.reconnectPending = false;
               if (this.isDeviceRegistered()) {
-                _context23.next = 13;
+                _context24.next = 14;
                 break;
               }
               if (!((0, _keys.default)(this.callManager.getActiveCalls()).length === 0)) {
-                _context23.next = 11;
+                _context24.next = 12;
                 break;
               }
-              _context23.next = 5;
+              _context24.next = 6;
               return this.restorePreviousRegistration(caller);
-            case 5:
-              abort = _context23.sent;
+            case 6:
+              abort = _context24.sent;
               if (!(!abort && !this.isDeviceRegistered())) {
-                _context23.next = 9;
+                _context24.next = 10;
                 break;
               }
-              _context23.next = 9;
+              _context24.next = 10;
               return this.restartRegistration(caller);
-            case 9:
-              _context23.next = 13;
+            case 10:
+              _context24.next = 14;
               break;
-            case 11:
+            case 12:
               this.reconnectPending = true;
               _Logger.default.info('Active call(s) present, deferred reconnect till call cleanup.', {
-                file: _constants.REGISTRATION_FILE,
-                method: this.reconnectOnFailure.name
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.METHODS.RECONNECT_ON_FAILURE
               });
-            case 13:
+            case 14:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
         }, _callee23, this);
       }));
-      function reconnectOnFailure(_x12) {
+      function reconnectOnFailure(_x14) {
         return _reconnectOnFailure.apply(this, arguments);
       }
       return reconnectOnFailure;