@webex/calling 3.10.0 → 3.11.0-next.2

package/dist/CallingClient/registration/register.js

@@ -15,9 +15,10 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createRegistration = exports.Registration = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));
+var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 var _now = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/date/now"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
-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"));
@@ -93,7 +94,81 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     this.primaryMobiusUris = [];
     this.backupMobiusUris = [];
   }
-  (0, _createClass2.default)(Registration, [{
+  return (0, _createClass2.default)(Registration, [{
+    key: "getFailoverCacheKey",
+    value: function getFailoverCacheKey() {
+      return "".concat(_constants2.FAILOVER_CACHE_PREFIX, ".").concat(this.userId || 'unknown');
+    }
+  }, {
+    key: "saveFailoverState",
+    value: function saveFailoverState(failoverState) {
+      try {
+        localStorage.setItem(this.getFailoverCacheKey(), (0, _stringify.default)(failoverState));
+      } catch (error) {
+        _Logger.default.warn("Storing failover state in cache failed with error: ".concat(String(error)), {
+          file: _constants2.REGISTRATION_FILE,
+          method: 'saveFailoverState'
+        });
+      }
+    }
+  }, {
+    key: "clearFailoverState",
+    value: function clearFailoverState() {
+      try {
+        localStorage.removeItem(this.getFailoverCacheKey());
+      } catch (_unused) {
+        _Logger.default.warn('Clearing failover state from localStorage failed', {
+          file: _constants2.REGISTRATION_FILE,
+          method: 'clearFailoverState'
+        });
+      }
+    }
+  }, {
+    key: "resumeFailover",
+    value: function () {
+      var _resumeFailover = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var cachedState, failoverState, currentTime, newElapsed, _t;
+        return _regenerator.default.wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              cachedState = localStorage.getItem(this.getFailoverCacheKey());
+              failoverState = cachedState ? JSON.parse(cachedState) : undefined;
+              if (!(failoverState && !this.isDeviceRegistered())) {
+                _context.next = 2;
+                break;
+              }
+              currentTime = Math.floor((0, _now.default)() / 1000);
+              newElapsed = failoverState.timeElapsed + (currentTime - failoverState.retryScheduledTime);
+              this.clearFailoverState();
+              _context.next = 1;
+              return this.startFailoverTimer(failoverState.attempt, newElapsed);
+            case 1:
+              return _context.abrupt("return", true);
+            case 2:
+              _context.next = 4;
+              break;
+            case 3:
+              _context.prev = 3;
+              _t = _context["catch"](0);
+              _Logger.default.warn("No failover state found in cache", {
+                file: _constants2.REGISTRATION_FILE,
+                method: 'triggerRegistration'
+              });
+            case 4:
+              return _context.abrupt("return", false);
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[0, 3]]);
+      }));
+      function resumeFailover() {
+        return _resumeFailover.apply(this, arguments);
+      }
+      return resumeFailover;
+    }()
+  }, {
     key: "getActiveMobiusUrl",
     value: function getActiveMobiusUrl() {
       return this.activeMobiusUrl;
@@ -126,58 +201,51 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "deleteRegistration",
     value: (function () {
-      var _deleteRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(url, deviceId, deviceUrl) {
+      var _deleteRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(url, deviceId, deviceUrl) {
         var _response;
-        var response;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        var response, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9, _t0;
+        return _regenerator.default.wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context.prev = 0;
-              _context.t0 = fetch;
-              _context.t1 = "".concat(url).concat(_constants2.DEVICES_ENDPOINT_RESOURCE, "/").concat(deviceId);
-              _context.t2 = _types2.HTTP_METHODS.DELETE;
-              _context.t3 = _defineProperty2.default;
-              _context.t4 = _defineProperty2.default;
-              _context.t5 = _defineProperty2.default;
-              _context.t6 = (0, _defineProperty2.default)({}, _constants2.CISCO_DEVICE_URL, deviceUrl);
-              _context.next = 10;
+              _context2.prev = 0;
+              _t2 = fetch;
+              _t3 = "".concat(url).concat(_constants2.DEVICES_ENDPOINT_RESOURCE, "/").concat(deviceId);
+              _t4 = _types2.HTTP_METHODS.DELETE;
+              _t5 = _defineProperty2.default;
+              _t6 = _defineProperty2.default;
+              _t7 = _defineProperty2.default;
+              _t8 = (0, _defineProperty2.default)({}, _constants2.CISCO_DEVICE_URL, deviceUrl);
+              _context2.next = 1;
               return this.webex.credentials.getUserToken();
-            case 10:
-              _context.t7 = _context.sent;
-              _context.t8 = (0, _context.t5)(_context.t6, "Authorization", _context.t7);
-              _context.t9 = "".concat(_constants2.WEBEX_WEB_CLIENT, "_").concat((0, _uuid.v4)());
-              _context.t10 = (0, _context.t4)(_context.t8, "trackingId", _context.t9);
-              _context.t11 = _constants2.SPARK_USER_AGENT;
-              _context.t12 = _constants2.CALLING_USER_AGENT;
-              _context.t13 = (0, _context.t3)(_context.t10, _context.t11, _context.t12);
-              _context.t14 = {
-                method: _context.t2,
-                headers: _context.t13
-              };
-              _context.next = 20;
-              return (0, _context.t0)(_context.t1, _context.t14);
-            case 20:
-              response = _context.sent;
-              _context.next = 28;
+            case 1:
+              _t9 = _t5(_t6(_t7(_t8, "Authorization", _context2.sent), "trackingId", "".concat(_constants2.WEBEX_WEB_CLIENT, "_").concat((0, _uuid.v4)())), _constants2.SPARK_USER_AGENT, _constants2.CALLING_USER_AGENT);
+              _context2.next = 2;
+              return _t2(_t3, {
+                method: _t4,
+                headers: _t9
+              });
+            case 2:
+              response = _context2.sent;
+              _context2.next = 4;
               break;
-            case 23:
-              _context.prev = 23;
-              _context.t15 = _context["catch"](0);
-              _Logger.default.warn("Delete failed with Mobius ".concat(_context.t15), {
+            case 3:
+              _context2.prev = 3;
+              _t0 = _context2["catch"](0);
+              _Logger.default.warn("Delete failed with Mobius: ".concat((0, _stringify.default)(_t0)), {
                 file: _constants2.REGISTRATION_FILE,
                 method: _constants2.METHODS.DELETE_REGISTRATION
               });
-              _context.next = 28;
+              _context2.next = 4;
               return (0, _common.uploadLogs)();
-            case 28:
+            case 4:
               this.setStatus(_types2.RegistrationStatus.INACTIVE);
               this.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
-              return _context.abrupt("return", (_response = response) === null || _response === void 0 ? void 0 : _response.json());
-            case 31:
+              return _context2.abrupt("return", (_response = response) === null || _response === void 0 ? void 0 : _response.json());
+            case 5:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this, [[0, 23]]);
+        }, _callee2, this, [[0, 3]]);
       }));
       function deleteRegistration(_x, _x2, _x3) {
         return _deleteRegistration.apply(this, arguments);
@@ -192,10 +260,10 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "postRegistration",
     value: (function () {
-      var _postRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(url) {
+      var _postRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(url) {
         var deviceInfo;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regenerator.default.wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               deviceInfo = {
                 userId: this.userId,
@@ -204,18 +272,18 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                   jwe: this.jwe
                 }) : this.serviceData
               };
-              return _context2.abrupt("return", this.webex.request({
+              return _context3.abrupt("return", this.webex.request({
                 uri: "".concat(url, "device"),
                 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: _types2.ALLOWED_SERVICES.MOBIUS
               }));
-            case 2:
+            case 1:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function postRegistration(_x4) {
         return _postRegistration.apply(this, arguments);
@@ -230,27 +298,68 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "restorePreviousRegistration",
     value: (function () {
-      var _restorePreviousRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(caller) {
+      var _restorePreviousRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(caller) {
+        var _this = this;
         var abort;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regenerator.default.wrap(function (_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               abort = false;
               if (!this.activeMobiusUrl) {
-                _context3.next = 5;
+                _context5.next = 6;
                 break;
               }
-              _context3.next = 4;
+              _context5.next = 1;
               return this.attemptRegistrationWithServers(caller, [this.activeMobiusUrl]);
+            case 1:
+              abort = _context5.sent;
+              if (!this.retryAfter) {
+                _context5.next = 6;
+                break;
+              }
+              if (!(this.retryAfter < _constants2.RETRY_TIMER_UPPER_LIMIT)) {
+                _context5.next = 2;
+                break;
+              }
+              // If retry-after is less than threshold, honor it and schedule retry
+              setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4() {
+                return _regenerator.default.wrap(function (_context4) {
+                  while (1) switch (_context4.prev = _context4.next) {
+                    case 0:
+                      _context4.next = 1;
+                      return _this.restartRegistration(caller);
+                    case 1:
+                    case "end":
+                      return _context4.stop();
+                  }
+                }, _callee4);
+              })), this.retryAfter * 1000);
+              _context5.next = 5;
+              break;
+            case 2:
+              if (!(this.primaryMobiusUris.includes(this.activeMobiusUrl) && this.backupMobiusUris.length > 0)) {
+                _context5.next = 4;
+                break;
+              }
+              _context5.next = 3;
+              return this.attemptRegistrationWithServers(caller, this.backupMobiusUris);
+            case 3:
+              abort = _context5.sent;
+              _context5.next = 5;
+              break;
             case 4:
-              abort = _context3.sent;
+              // If we are using backup and got 429, restart registration
+              this.restartRegistration(caller);
             case 5:
-              return _context3.abrupt("return", abort);
+              this.retryAfter = undefined;
+              return _context5.abrupt("return", true);
             case 6:
+              return _context5.abrupt("return", abort);
+            case 7:
             case "end":
-              return _context3.stop();
+              return _context5.stop();
           }
-        }, _callee3, this);
+        }, _callee5, this);
       }));
       function restorePreviousRegistration(_x5) {
         return _restorePreviousRegistration.apply(this, arguments);
@@ -264,30 +373,30 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "handle404KeepaliveFailure",
     value: (function () {
-      var _handle404KeepaliveFailure = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4(caller) {
+      var _handle404KeepaliveFailure = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(caller) {
         var abort;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regenerator.default.wrap(function (_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               if (!(caller === _constants2.KEEPALIVE_UTIL)) {
-                _context4.next = 7;
+                _context6.next = 2;
                 break;
               }
-              _context4.next = 3;
+              _context6.next = 1;
               return this.attemptRegistrationWithServers(caller);
-            case 3:
-              abort = _context4.sent;
+            case 1:
+              abort = _context6.sent;
               if (!(!abort && !this.isDeviceRegistered())) {
-                _context4.next = 7;
+                _context6.next = 2;
                 break;
               }
-              _context4.next = 7;
+              _context6.next = 2;
               return this.startFailoverTimer();
-            case 7:
+            case 2:
             case "end":
-              return _context4.stop();
+              return _context6.stop();
           }
-        }, _callee4, this);
+        }, _callee6, this);
       }));
       function handle404KeepaliveFailure(_x6) {
         return _handle404KeepaliveFailure.apply(this, arguments);
@@ -301,22 +410,22 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "handle429Retry",
     value: (function () {
-      var _handle429Retry = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(retryAfter, caller) {
-        var _this = this;
+      var _handle429Retry = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8(retryAfter, caller) {
+        var _this2 = this;
         var interval, abort;
-        return _regenerator.default.wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regenerator.default.wrap(function (_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (!(caller === _constants2.FAILBACK_UTIL)) {
-                _context6.next = 17;
+                _context8.next = 4;
                 break;
               }
               if (!(this.failback429RetryAttempts >= _constants2.REG_FAILBACK_429_MAX_RETRIES)) {
-                _context6.next = 3;
+                _context8.next = 1;
                 break;
               }
-              return _context6.abrupt("return");
-            case 3:
+              return _context8.abrupt("return");
+            case 1:
               this.clearFailbackTimer();
               this.failback429RetryAttempts += 1;
               _Logger.default.log("Received 429 while rehoming, 429 retry count : ".concat(this.failback429RetryAttempts), {
@@ -326,26 +435,26 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               interval = this.getRegRetryInterval(this.failback429RetryAttempts);
               this.startFailbackTimer(interval);
               this.scheduled429Retry = true;
-              _context6.next = 11;
+              _context8.next = 2;
               return this.restorePreviousRegistration(_constants2.REG_429_RETRY_UTIL);
-            case 11:
-              abort = _context6.sent;
+            case 2:
+              abort = _context8.sent;
               if (!(!abort && !this.isDeviceRegistered())) {
-                _context6.next = 15;
+                _context8.next = 3;
                 break;
               }
-              _context6.next = 15;
+              _context8.next = 3;
               return this.restartRegistration(_constants2.REG_429_RETRY_UTIL);
-            case 15:
-              _context6.next = 18;
+            case 3:
+              _context8.next = 5;
               break;
-            case 17:
+            case 4:
               if (caller === _constants2.KEEPALIVE_UTIL) {
                 this.clearKeepaliveTimer();
-                setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5() {
-                  var _this$deviceInfo$devi;
-                  return _regenerator.default.wrap(function _callee5$(_context5) {
-                    while (1) switch (_context5.prev = _context5.next) {
+                setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7() {
+                  var _this2$deviceInfo$dev;
+                  return _regenerator.default.wrap(function (_context7) {
+                    while (1) switch (_context7.prev = _context7.next) {
                       case 0:
                         _Logger.default.log("Resuming keepalive after ".concat(retryAfter, " seconds"), {
                           file: _constants2.REGISTRATION_FILE,
@@ -353,22 +462,22 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                         });
 
                         // Resume the keepalive after waiting for the retry after period
-                        _context5.next = 3;
-                        return _this.startKeepaliveTimer((_this$deviceInfo$devi = _this.deviceInfo.device) === null || _this$deviceInfo$devi === void 0 ? void 0 : _this$deviceInfo$devi.uri, _this.deviceInfo.keepaliveInterval, 'UNKNOWN');
-                      case 3:
+                        _context7.next = 1;
+                        return _this2.startKeepaliveTimer((_this2$deviceInfo$dev = _this2.deviceInfo.device) === null || _this2$deviceInfo$dev === void 0 ? void 0 : _this2$deviceInfo$dev.uri, _this2.deviceInfo.keepaliveInterval, 'UNKNOWN');
+                      case 1:
                       case "end":
-                        return _context5.stop();
+                        return _context7.stop();
                     }
-                  }, _callee5);
+                  }, _callee7);
                 })), retryAfter * 1000);
               } else {
                 this.retryAfter = retryAfter;
               }
-            case 18:
+            case 5:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
-        }, _callee6, this);
+        }, _callee8, this);
       }));
       function handle429Retry(_x7, _x8) {
         return _handle429Retry.apply(this, arguments);
@@ -399,8 +508,8 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "startFailoverTimer",
     value: (function () {
-      var _startFailoverTimer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1() {
-        var _this2 = this;
+      var _startFailoverTimer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11() {
+        var _this3 = this;
         var attempt,
           timeElapsed,
           loggerContext,
@@ -409,12 +518,12 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
           excessVal,
           abort,
           scheduledTime,
-          _args1 = arguments;
-        return _regenerator.default.wrap(function _callee1$(_context1) {
-          while (1) switch (_context1.prev = _context1.next) {
+          _args11 = arguments;
+        return _regenerator.default.wrap(function (_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              attempt = _args1.length > 0 && _args1[0] !== undefined ? _args1[0] : 1;
-              timeElapsed = _args1.length > 1 && _args1[1] !== undefined ? _args1[1] : 0;
+              attempt = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : 1;
+              timeElapsed = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : 0;
               loggerContext = {
                 file: _constants2.REGISTRATION_FILE,
                 method: _constants2.FAILOVER_UTIL
@@ -429,116 +538,128 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                 this.failoverImmediately = this.retryAfter + timeElapsed > TIMER_THRESHOLD;
               }
               if (!(interval > _constants2.BASE_REG_RETRY_TIMER_VAL_IN_SEC && !this.failoverImmediately)) {
-                _context1.next = 14;
+                _context11.next = 1;
                 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 _callee8() {
-                return _regenerator.default.wrap(function _callee8$(_context8) {
-                  while (1) switch (_context8.prev = _context8.next) {
+              this.saveFailoverState({
+                attempt: attempt,
+                timeElapsed: timeElapsed,
+                retryScheduledTime: scheduledTime,
+                serverType: 'primary'
+              });
+              setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee0() {
+                return _regenerator.default.wrap(function (_context0) {
+                  while (1) switch (_context0.prev = _context0.next) {
                     case 0:
-                      _context8.next = 2;
-                      return _this2.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7() {
+                      _context0.next = 1;
+                      return _this3.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9() {
                         var currentTime;
-                        return _regenerator.default.wrap(function _callee7$(_context7) {
-                          while (1) switch (_context7.prev = _context7.next) {
+                        return _regenerator.default.wrap(function (_context9) {
+                          while (1) switch (_context9.prev = _context9.next) {
                             case 0:
-                              _context7.next = 2;
-                              return _this2.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL);
-                            case 2:
-                              abort = _context7.sent;
+                              _context9.next = 1;
+                              return _this3.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL);
+                            case 1:
+                              abort = _context9.sent;
                               currentTime = Math.floor((0, _now.default)() / 1000);
-                              if (!(!abort && !_this2.isDeviceRegistered())) {
-                                _context7.next = 7;
+                              if (!(!abort && !_this3.isDeviceRegistered())) {
+                                _context9.next = 2;
                                 break;
                               }
-                              _context7.next = 7;
-                              return _this2.startFailoverTimer(attempt + 1, timeElapsed + (currentTime - scheduledTime));
-                            case 7:
+                              _context9.next = 2;
+                              return _this3.startFailoverTimer(attempt + 1, timeElapsed + (currentTime - scheduledTime));
+                            case 2:
                             case "end":
-                              return _context7.stop();
+                              return _context9.stop();
                           }
-                        }, _callee7);
+                        }, _callee9);
                       })));
-                    case 2:
+                    case 1:
                     case "end":
-                      return _context8.stop();
+                      return _context0.stop();
                   }
-                }, _callee8);
+                }, _callee0);
               })), interval * _constants2.SEC_TO_MSEC_MFACTOR);
               _Logger.default.log("Scheduled retry with primary in ".concat(interval, " seconds, number of attempts : ").concat(attempt), loggerContext);
-              _context1.next = 26;
+              _context11.next = 5;
               break;
-            case 14:
+            case 1:
               if (!this.backupMobiusUris.length) {
-                _context1.next = 23;
+                _context11.next = 3;
                 break;
               }
+              this.saveFailoverState({
+                attempt: attempt,
+                timeElapsed: timeElapsed,
+                retryScheduledTime: Math.floor((0, _now.default)() / 1000),
+                serverType: 'backup'
+              });
               _Logger.default.info('Failing over to backup servers.', loggerContext);
               this.failoverImmediately = false;
-              _context1.next = 19;
+              _context11.next = 2;
               return this.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL, this.backupMobiusUris);
-            case 19:
-              abort = _context1.sent;
+            case 2:
+              abort = _context11.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 _callee0() {
-                  return _regenerator.default.wrap(function _callee0$(_context0) {
-                    while (1) switch (_context0.prev = _context0.next) {
+                setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10() {
+                  return _regenerator.default.wrap(function (_context10) {
+                    while (1) switch (_context10.prev = _context10.next) {
                       case 0:
-                        _context0.next = 2;
-                        return _this2.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9() {
-                          return _regenerator.default.wrap(function _callee9$(_context9) {
-                            while (1) switch (_context9.prev = _context9.next) {
+                        _context10.next = 1;
+                        return _this3.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1() {
+                          return _regenerator.default.wrap(function (_context1) {
+                            while (1) switch (_context1.prev = _context1.next) {
                               case 0:
-                                _context9.next = 2;
-                                return _this2.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL, _this2.backupMobiusUris);
-                              case 2:
-                                abort = _context9.sent;
-                                if (!(!abort && !_this2.isDeviceRegistered())) {
-                                  _context9.next = 7;
+                                _context1.next = 1;
+                                return _this3.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL, _this3.backupMobiusUris);
+                              case 1:
+                                abort = _context1.sent;
+                                if (!(!abort && !_this3.isDeviceRegistered())) {
+                                  _context1.next = 3;
                                   break;
                                 }
-                                _context9.next = 6;
+                                _context1.next = 2;
                                 return (0, _common.uploadLogs)();
-                              case 6:
+                              case 2:
                                 (0, _common.emitFinalFailure)(function (clientError) {
-                                  _this2.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
+                                  _this3.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
                                 }, loggerContext);
-                              case 7:
+                              case 3:
                               case "end":
-                                return _context9.stop();
+                                return _context1.stop();
                             }
-                          }, _callee9);
+                          }, _callee1);
                         })));
-                      case 2:
+                      case 1:
                       case "end":
-                        return _context0.stop();
+                        return _context10.stop();
                     }
-                  }, _callee0);
+                  }, _callee10);
                 })), interval * _constants2.SEC_TO_MSEC_MFACTOR);
                 _Logger.default.log("Scheduled retry with backup servers in ".concat(interval, " seconds."), loggerContext);
               }
-              _context1.next = 26;
+              _context11.next = 5;
               break;
-            case 23:
-              _context1.next = 25;
+            case 3:
+              _context11.next = 4;
               return (0, _common.uploadLogs)();
-            case 25:
+            case 4:
               (0, _common.emitFinalFailure)(function (clientError) {
-                _this2.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
+                _this3.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
               }, loggerContext);
-            case 26:
+            case 5:
             case "end":
-              return _context1.stop();
+              return _context11.stop();
           }
-        }, _callee1, this);
+        }, _callee11, this);
       }));
       function startFailoverTimer() {
         return _startFailoverTimer.apply(this, arguments);
@@ -560,34 +681,34 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "isPrimaryActive",
     value: function () {
-      var _isPrimaryActive = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10() {
-        var status, _iterator, _step, mobiusUrl, baseUri, response, _ref6, statusCode;
-        return _regenerator.default.wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _isPrimaryActive = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12() {
+        var status, _iterator, _step, mobiusUrl, baseUri, response, _ref7, statusCode, _t1, _t10;
+        return _regenerator.default.wrap(function (_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               _iterator = _createForOfIteratorHelper(this.primaryMobiusUris);
-              _context10.prev = 1;
+              _context12.prev = 1;
               _iterator.s();
-            case 3:
+            case 2:
               if ((_step = _iterator.n()).done) {
-                _context10.next = 23;
+                _context12.next = 8;
                 break;
               }
               mobiusUrl = _step.value;
-              _context10.prev = 5;
+              _context12.prev = 3;
               baseUri = mobiusUrl.replace(_constants2.URL_ENDPOINT, '/'); // eslint-disable-next-line no-await-in-loop
-              _context10.next = 9;
+              _context12.next = 4;
               return this.webex.request({
                 uri: "".concat(baseUri, "ping"),
                 method: _types2.HTTP_METHODS.GET,
                 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 9:
-              response = _context10.sent;
-              _ref6 = response, statusCode = _ref6.statusCode;
+            case 4:
+              response = _context12.sent;
+              _ref7 = response, statusCode = _ref7.statusCode;
               if (!(statusCode === 200)) {
-                _context10.next = 15;
+                _context12.next = 5;
                 break;
               }
               _Logger.default.info("Ping successful for primary Mobius: ".concat(mobiusUrl), {
@@ -595,39 +716,39 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                 method: _constants2.FAILBACK_UTIL
               });
               status = 'up';
-              return _context10.abrupt("break", 23);
-            case 15:
-              _context10.next = 21;
+              return _context12.abrupt("continue", 8);
+            case 5:
+              _context12.next = 7;
               break;
-            case 17:
-              _context10.prev = 17;
-              _context10.t0 = _context10["catch"](5);
-              _Logger.default.warn("Ping failed for primary Mobius: ".concat(mobiusUrl, " with error: ").concat(_context10.t0), {
+            case 6:
+              _context12.prev = 6;
+              _t1 = _context12["catch"](3);
+              _Logger.default.warn("Ping failed for primary Mobius: ".concat(mobiusUrl, " with error: ").concat((0, _stringify.default)(_t1)), {
                 file: _constants2.REGISTRATION_FILE,
                 method: _constants2.FAILBACK_UTIL
               });
               status = 'down';
-            case 21:
-              _context10.next = 3;
+            case 7:
+              _context12.next = 2;
               break;
-            case 23:
-              _context10.next = 28;
+            case 8:
+              _context12.next = 10;
               break;
-            case 25:
-              _context10.prev = 25;
-              _context10.t1 = _context10["catch"](1);
-              _iterator.e(_context10.t1);
-            case 28:
-              _context10.prev = 28;
+            case 9:
+              _context12.prev = 9;
+              _t10 = _context12["catch"](1);
+              _iterator.e(_t10);
+            case 10:
+              _context12.prev = 10;
               _iterator.f();
-              return _context10.finish(28);
-            case 31:
-              return _context10.abrupt("return", status === 'up');
-            case 32:
+              return _context12.finish(10);
+            case 11:
+              return _context12.abrupt("return", status === 'up');
+            case 12:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
-        }, _callee10, this, [[1, 25, 28, 31], [5, 17]]);
+        }, _callee12, this, [[1, 9, 10, 11], [3, 6]]);
       }));
       function isPrimaryActive() {
         return _isPrimaryActive.apply(this, arguments);
@@ -679,17 +800,17 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "startFailbackTimer",
     value: function startFailbackTimer(intervalInSeconds) {
-      var _this3 = this;
-      this.failbackTimer = setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11() {
-        return _regenerator.default.wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _this4 = this;
+      this.failbackTimer = setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13() {
+        return _regenerator.default.wrap(function (_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              return _context11.abrupt("return", _this3.executeFailback());
+              return _context13.abrupt("return", _this4.executeFailback());
             case 1:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
-        }, _callee11);
+        }, _callee13);
       })), intervalInSeconds * _constants2.SEC_TO_MSEC_MFACTOR);
       _Logger.default.log("Failback scheduled after ".concat(intervalInSeconds, " seconds."), {
         file: _constants2.REGISTRATION_FILE,
@@ -704,90 +825,90 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "executeFailback",
     value: (function () {
-      var _executeFailback = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13() {
-        var _this4 = this;
-        return _regenerator.default.wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _executeFailback = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15() {
+        var _this5 = this;
+        return _regenerator.default.wrap(function (_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              _context13.next = 2;
-              return this.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12() {
+              _context15.next = 1;
+              return this.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14() {
                 var primaryServerStatus, abort, abortNew;
-                return _regenerator.default.wrap(function _callee12$(_context12) {
-                  while (1) switch (_context12.prev = _context12.next) {
+                return _regenerator.default.wrap(function (_context14) {
+                  while (1) switch (_context14.prev = _context14.next) {
                     case 0:
-                      if (!_this4.isFailbackRequired()) {
-                        _context12.next = 31;
+                      if (!_this5.isFailbackRequired()) {
+                        _context14.next = 11;
                         break;
                       }
-                      _context12.next = 3;
-                      return _this4.isPrimaryActive();
-                    case 3:
-                      primaryServerStatus = _context12.sent;
-                      if (!((0, _keys.default)(_this4.callManager.getActiveCalls()).length === 0 && primaryServerStatus)) {
-                        _context12.next = 28;
+                      _context14.next = 1;
+                      return _this5.isPrimaryActive();
+                    case 1:
+                      primaryServerStatus = _context14.sent;
+                      if (!((0, _keys.default)(_this5.callManager.getActiveCalls()).length === 0 && primaryServerStatus)) {
+                        _context14.next = 10;
                         break;
                       }
                       _Logger.default.info("Attempting failback to primary.", {
                         file: _constants2.REGISTRATION_FILE,
-                        method: _this4.executeFailback.name
+                        method: _this5.executeFailback.name
                       });
-                      _context12.next = 8;
-                      return _this4.deregister();
-                    case 8:
-                      _context12.next = 10;
-                      return _this4.attemptRegistrationWithServers(_constants2.FAILBACK_UTIL);
-                    case 10:
-                      abort = _context12.sent;
-                      if (!(_this4.scheduled429Retry || abort || _this4.isDeviceRegistered())) {
-                        _context12.next = 13;
+                      _context14.next = 2;
+                      return _this5.deregister();
+                    case 2:
+                      _context14.next = 3;
+                      return _this5.attemptRegistrationWithServers(_constants2.FAILBACK_UTIL);
+                    case 3:
+                      abort = _context14.sent;
+                      if (!(_this5.scheduled429Retry || abort || _this5.isDeviceRegistered())) {
+                        _context14.next = 4;
                         break;
                       }
-                      return _context12.abrupt("return");
-                    case 13:
-                      _context12.next = 15;
-                      return _this4.restorePreviousRegistration(_constants2.FAILBACK_UTIL);
-                    case 15:
-                      abortNew = _context12.sent;
+                      return _context14.abrupt("return");
+                    case 4:
+                      _context14.next = 5;
+                      return _this5.restorePreviousRegistration(_constants2.FAILBACK_UTIL);
+                    case 5:
+                      abortNew = _context14.sent;
                       if (!abortNew) {
-                        _context12.next = 19;
+                        _context14.next = 6;
                         break;
                       }
-                      _this4.clearFailbackTimer();
-                      return _context12.abrupt("return");
-                    case 19:
-                      if (_this4.isDeviceRegistered()) {
-                        _context12.next = 24;
+                      _this5.clearFailbackTimer();
+                      return _context14.abrupt("return");
+                    case 6:
+                      if (_this5.isDeviceRegistered()) {
+                        _context14.next = 8;
                         break;
                       }
-                      _context12.next = 22;
-                      return _this4.restartRegistration(_this4.executeFailback.name);
-                    case 22:
-                      _context12.next = 26;
+                      _context14.next = 7;
+                      return _this5.restartRegistration(_this5.executeFailback.name);
+                    case 7:
+                      _context14.next = 9;
                       break;
-                    case 24:
-                      _this4.failbackTimer = undefined;
-                      _this4.initiateFailback();
-                    case 26:
-                      _context12.next = 31;
+                    case 8:
+                      _this5.failbackTimer = undefined;
+                      _this5.initiateFailback();
+                    case 9:
+                      _context14.next = 11;
                       break;
-                    case 28:
+                    case 10:
                       _Logger.default.info('Active calls present or primary Mobius is down, deferring failback to next cycle.', {
                         file: _constants2.REGISTRATION_FILE,
-                        method: _this4.executeFailback.name
+                        method: _this5.executeFailback.name
                       });
-                      _this4.failbackTimer = undefined;
-                      _this4.initiateFailback();
-                    case 31:
+                      _this5.failbackTimer = undefined;
+                      _this5.initiateFailback();
+                    case 11:
                     case "end":
-                      return _context12.stop();
+                      return _context14.stop();
                   }
-                }, _callee12);
+                }, _callee14);
               })));
-            case 2:
+            case 1:
             case "end":
-              return _context13.stop();
+              return _context15.stop();
           }
-        }, _callee13, this);
+        }, _callee15, this);
       }));
       function executeFailback() {
         return _executeFailback.apply(this, arguments);
@@ -850,10 +971,10 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "restartRegistration",
     value: (function () {
-      var _restartRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14(caller) {
+      var _restartRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee16(caller) {
         var abort;
-        return _regenerator.default.wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regenerator.default.wrap(function (_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               /*
                * Cancel any failback timer running
@@ -861,21 +982,21 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                */
               this.clearFailbackTimer();
               this.failback429RetryAttempts = 0;
-              _context14.next = 4;
+              _context16.next = 1;
               return this.attemptRegistrationWithServers(caller, this.primaryMobiusUris);
-            case 4:
-              abort = _context14.sent;
+            case 1:
+              abort = _context16.sent;
               if (!(!abort && !this.isDeviceRegistered())) {
-                _context14.next = 8;
+                _context16.next = 2;
                 break;
               }
-              _context14.next = 8;
+              _context16.next = 2;
               return this.startFailoverTimer();
-            case 8:
+            case 2:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
-        }, _callee14, this);
+        }, _callee16, this);
       }));
       function restartRegistration(_x9) {
         return _restartRegistration.apply(this, arguments);
@@ -891,66 +1012,66 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "handleConnectionRestoration",
     value: (function () {
-      var _handleConnectionRestoration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee16(retry) {
-        var _this5 = this;
-        return _regenerator.default.wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+      var _handleConnectionRestoration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee18(retry) {
+        var _this6 = this;
+        return _regenerator.default.wrap(function (_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               _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() {
+              _context18.next = 1;
+              return this.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17() {
                 var abort;
-                return _regenerator.default.wrap(function _callee15$(_context15) {
-                  while (1) switch (_context15.prev = _context15.next) {
+                return _regenerator.default.wrap(function (_context17) {
+                  while (1) switch (_context17.prev = _context17.next) {
                     case 0:
                       if (!retry) {
-                        _context15.next = 14;
+                        _context17.next = 4;
                         break;
                       }
                       _Logger.default.log('Network is up again, re-registering with Webex Calling if needed', {
                         file: _constants2.REGISTRATION_FILE,
                         method: _constants2.METHODS.HANDLE_CONNECTION_RESTORATION
                       });
-                      _this5.clearKeepaliveTimer();
-                      if (!_this5.isDeviceRegistered()) {
-                        _context15.next = 6;
+                      _this6.clearKeepaliveTimer();
+                      if (!_this6.isDeviceRegistered()) {
+                        _context17.next = 1;
                         break;
                       }
-                      _context15.next = 6;
-                      return _this5.deregister();
-                    case 6:
-                      if (!_this5.activeMobiusUrl) {
-                        _context15.next = 13;
+                      _context17.next = 1;
+                      return _this6.deregister();
+                    case 1:
+                      if (!_this6.activeMobiusUrl) {
+                        _context17.next = 3;
                         break;
                       }
-                      _context15.next = 9;
-                      return _this5.restorePreviousRegistration(_constants2.METHODS.HANDLE_CONNECTION_RESTORATION);
-                    case 9:
-                      abort = _context15.sent;
-                      if (!(!abort && !_this5.isDeviceRegistered())) {
-                        _context15.next = 13;
+                      _context17.next = 2;
+                      return _this6.restorePreviousRegistration(_constants2.METHODS.HANDLE_CONNECTION_RESTORATION);
+                    case 2:
+                      abort = _context17.sent;
+                      if (!(!abort && !_this6.isDeviceRegistered())) {
+                        _context17.next = 3;
                         break;
                       }
-                      _context15.next = 13;
-                      return _this5.restartRegistration(_constants2.METHODS.HANDLE_CONNECTION_RESTORATION);
-                    case 13:
+                      _context17.next = 3;
+                      return _this6.restartRegistration(_constants2.METHODS.HANDLE_CONNECTION_RESTORATION);
+                    case 3:
                       retry = false;
-                    case 14:
+                    case 4:
                     case "end":
-                      return _context15.stop();
+                      return _context17.stop();
                   }
-                }, _callee15);
+                }, _callee17);
               })));
-            case 3:
-              return _context16.abrupt("return", retry);
-            case 4:
+            case 1:
+              return _context18.abrupt("return", retry);
+            case 2:
             case "end":
-              return _context16.stop();
+              return _context18.stop();
           }
-        }, _callee16, this);
+        }, _callee18, this);
       }));
       function handleConnectionRestoration(_x0) {
         return _handleConnectionRestoration.apply(this, arguments);
@@ -966,56 +1087,56 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "restoreRegistrationCallBack",
     value: function restoreRegistrationCallBack() {
-      var _this6 = this;
+      var _this7 = this;
       return /*#__PURE__*/function () {
-        var _ref0 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17(restoreData, caller) {
+        var _ref1 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee19(restoreData, caller) {
           var logContext, restore, finalError;
-          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:
                 logContext = {
                   file: _constants2.REGISTRATION_FILE,
                   method: caller
                 };
-                if (_this6.isRegRetry()) {
-                  _context17.next = 17;
+                if (_this7.isRegRetry()) {
+                  _context19.next = 4;
                   break;
                 }
                 _Logger.default.info('Registration restoration in progress.', logContext);
-                restore = _this6.getExistingDevice(restoreData);
+                restore = _this7.getExistingDevice(restoreData);
                 if (!restore) {
-                  _context17.next = 14;
+                  _context19.next = 3;
                   break;
                 }
-                _this6.setRegRetry(true);
-                _context17.next = 8;
-                return _this6.deregister();
-              case 8:
-                _context17.next = 10;
-                return _this6.restorePreviousRegistration(caller);
-              case 10:
-                finalError = _context17.sent;
-                _this6.setRegRetry(false);
-                if (_this6.isDeviceRegistered()) {
+                _this7.setRegRetry(true);
+                _context19.next = 1;
+                return _this7.deregister();
+              case 1:
+                _context19.next = 2;
+                return _this7.restorePreviousRegistration(caller);
+              case 2:
+                finalError = _context19.sent;
+                _this7.setRegRetry(false);
+                if (_this7.isDeviceRegistered()) {
                   _Logger.default.info('Registration restored successfully.', logContext);
                 }
-                return _context17.abrupt("return", finalError);
-              case 14:
-                _this6.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
-                _context17.next = 18;
+                return _context19.abrupt("return", finalError);
+              case 3:
+                _this7.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
+                _context19.next = 5;
                 break;
-              case 17:
-                _this6.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
-              case 18:
-                return _context17.abrupt("return", false);
-              case 19:
+              case 4:
+                _this7.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
+              case 5:
+                return _context19.abrupt("return", false);
+              case 6:
               case "end":
-                return _context17.stop();
+                return _context19.stop();
             }
-          }, _callee17);
+          }, _callee19);
         }));
         return function (_x1, _x10) {
-          return _ref0.apply(this, arguments);
+          return _ref1.apply(this, arguments);
         };
       }();
     }
@@ -1027,30 +1148,39 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "triggerRegistration",
     value: (function () {
-      var _triggerRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee18() {
+      var _triggerRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee20() {
         var abort;
-        return _regenerator.default.wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regenerator.default.wrap(function (_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
+              _context20.next = 1;
+              return this.resumeFailover();
+            case 1:
+              if (!_context20.sent) {
+                _context20.next = 2;
+                break;
+              }
+              return _context20.abrupt("return");
+            case 2:
               if (!(this.primaryMobiusUris.length > 0)) {
-                _context18.next = 7;
+                _context20.next = 4;
                 break;
               }
-              _context18.next = 3;
+              _context20.next = 3;
               return this.attemptRegistrationWithServers(_constants2.REGISTRATION_UTIL, this.primaryMobiusUris);
             case 3:
-              abort = _context18.sent;
+              abort = _context20.sent;
               if (!(!this.isDeviceRegistered() && !abort)) {
-                _context18.next = 7;
+                _context20.next = 4;
                 break;
               }
-              _context18.next = 7;
+              _context20.next = 4;
               return this.startFailoverTimer();
-            case 7:
+            case 4:
             case "end":
-              return _context18.stop();
+              return _context20.stop();
           }
-        }, _callee18, this);
+        }, _callee20, this);
       }));
       function triggerRegistration() {
         return _triggerRegistration.apply(this, arguments);
@@ -1069,156 +1199,158 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "attemptRegistrationWithServers",
     value: (function () {
-      var _attemptRegistrationWithServers = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee19(caller) {
-        var _this7 = this;
+      var _attemptRegistrationWithServers = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee21(caller) {
+        var _this8 = this;
         var servers,
           abort,
           _iterator2,
           _step2,
           _loop,
           _ret,
-          _args20 = arguments;
-        return _regenerator.default.wrap(function _callee19$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+          _args22 = arguments,
+          _t12;
+        return _regenerator.default.wrap(function (_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              servers = _args20.length > 1 && _args20[1] !== undefined ? _args20[1] : this.primaryMobiusUris;
+              servers = _args22.length > 1 && _args22[1] !== undefined ? _args22[1] : this.primaryMobiusUris;
               abort = false;
               this.retryAfter = undefined;
               if (!this.failoverImmediately) {
-                _context20.next = 5;
+                _context22.next = 1;
                 break;
               }
-              return _context20.abrupt("return", abort);
-            case 5:
+              return _context22.abrupt("return", abort);
+            case 1:
               if (!this.isDeviceRegistered()) {
-                _context20.next = 8;
+                _context22.next = 2;
                 break;
               }
               _Logger.default.info("[".concat(caller, "] : Device already registered with : ").concat(this.activeMobiusUrl), {
                 file: _constants2.REGISTRATION_FILE,
                 method: _constants2.REGISTER_UTIL
               });
-              return _context20.abrupt("return", abort);
-            case 8:
+              return _context22.abrupt("return", abort);
+            case 2:
               _iterator2 = _createForOfIteratorHelper(servers);
-              _context20.prev = 9;
+              _context22.prev = 3;
               _loop = /*#__PURE__*/_regenerator.default.mark(function _loop() {
-                var _this7$backupMobiusUr;
-                var url, serverType, _this7$deviceInfo$dev, _resp$headers, _resp$headers$trackin, _resp$headers2, _this7$deviceInfo$dev2, resp, body;
-                return _regenerator.default.wrap(function _loop$(_context19) {
-                  while (1) switch (_context19.prev = _context19.next) {
+                var _this8$backupMobiusUr;
+                var url, serverType, _this8$deviceInfo$dev, _resp$headers, _resp$headers$trackin, _resp$headers2, _this8$deviceInfo$dev2, resp, body, _t11;
+                return _regenerator.default.wrap(function (_context21) {
+                  while (1) switch (_context21.prev = _context21.next) {
                     case 0:
                       url = _step2.value;
-                      serverType = _this7.primaryMobiusUris.includes(url) && 'PRIMARY' || ((_this7$backupMobiusUr = _this7.backupMobiusUris) === null || _this7$backupMobiusUr === void 0 ? void 0 : _this7$backupMobiusUr.includes(url)) && 'BACKUP' || 'UNKNOWN';
-                      _context19.prev = 2;
+                      serverType = _this8.primaryMobiusUris.includes(url) && 'PRIMARY' || ((_this8$backupMobiusUr = _this8.backupMobiusUris) === null || _this8$backupMobiusUr === void 0 ? void 0 : _this8$backupMobiusUr.includes(url)) && 'BACKUP' || 'UNKNOWN';
+                      _context21.prev = 1;
                       abort = false;
-                      _this7.registrationStatus = _types2.RegistrationStatus.INACTIVE;
-                      _this7.lineEmitter(_types3.LINE_EVENTS.CONNECTING);
+                      _this8.registrationStatus = _types2.RegistrationStatus.INACTIVE;
+                      _this8.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 _this7.postRegistration(url);
-                    case 9:
-                      resp = _context19.sent;
-                      _this7.deviceInfo = resp.body;
-                      _this7.registrationStatus = _types2.RegistrationStatus.ACTIVE;
-                      _this7.setActiveMobiusUrl(url);
-                      _this7.lineEmitter(_types3.LINE_EVENTS.REGISTERED, resp.body);
-                      _Logger.default.log("Registration successful for deviceId: ".concat((_this7$deviceInfo$dev = _this7.deviceInfo.device) === null || _this7$deviceInfo$dev === void 0 ? void 0 : _this7$deviceInfo$dev.deviceId, " userId: ").concat(_this7.userId, " responseTrackingId: ").concat((_resp$headers = resp.headers) === null || _resp$headers === void 0 ? void 0 : _resp$headers.trackingid), {
+                      _context21.next = 2;
+                      return _this8.postRegistration(url);
+                    case 2:
+                      resp = _context21.sent;
+                      _this8.clearFailoverState();
+                      _this8.deviceInfo = resp.body;
+                      _this8.registrationStatus = _types2.RegistrationStatus.ACTIVE;
+                      _this8.setActiveMobiusUrl(url);
+                      _this8.lineEmitter(_types3.LINE_EVENTS.REGISTERED, resp.body);
+                      _Logger.default.log("Registration successful for deviceId: ".concat((_this8$deviceInfo$dev = _this8.deviceInfo.device) === null || _this8$deviceInfo$dev === void 0 ? void 0 : _this8$deviceInfo$dev.deviceId, " userId: ").concat(_this8.userId, " responseTrackingId: ").concat((_resp$headers = resp.headers) === null || _resp$headers === void 0 ? void 0 : _resp$headers.trackingid), {
                         file: _constants2.REGISTRATION_FILE,
                         method: _constants2.METHODS.REGISTER
                       });
-                      _this7.setIntervalValues(_this7.deviceInfo);
-                      _this7.metricManager.setDeviceInfo(_this7.deviceInfo);
-                      _this7.metricManager.submitRegistrationMetric(_types.METRIC_EVENT.REGISTRATION, _types.REG_ACTION.REGISTER, _types.METRIC_TYPE.BEHAVIORAL, caller, serverType, (_resp$headers$trackin = (_resp$headers2 = resp.headers) === null || _resp$headers2 === void 0 ? void 0 : _resp$headers2.trackingid) !== null && _resp$headers$trackin !== void 0 ? _resp$headers$trackin : '', undefined, undefined);
-                      _this7.startKeepaliveTimer((_this7$deviceInfo$dev2 = _this7.deviceInfo.device) === null || _this7$deviceInfo$dev2 === void 0 ? void 0 : _this7$deviceInfo$dev2.uri, _this7.deviceInfo.keepaliveInterval, serverType);
-                      _this7.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;
+                      _this8.setIntervalValues(_this8.deviceInfo);
+                      _this8.metricManager.setDeviceInfo(_this8.deviceInfo);
+                      _this8.metricManager.submitRegistrationMetric(_types.METRIC_EVENT.REGISTRATION, _types.REG_ACTION.REGISTER, _types.METRIC_TYPE.BEHAVIORAL, caller, serverType, (_resp$headers$trackin = (_resp$headers2 = resp.headers) === null || _resp$headers2 === void 0 ? void 0 : _resp$headers2.trackingid) !== null && _resp$headers$trackin !== void 0 ? _resp$headers$trackin : '', undefined, undefined);
+                      _this8.startKeepaliveTimer((_this8$deviceInfo$dev2 = _this8.deviceInfo.device) === null || _this8$deviceInfo$dev2 === void 0 ? void 0 : _this8$deviceInfo$dev2.uri, _this8.deviceInfo.keepaliveInterval, serverType);
+                      _this8.initiateFailback();
+                      return _context21.abrupt("return", 0);
+                    case 3:
+                      _context21.prev = 3;
+                      _t11 = _context21["catch"](1);
+                      body = _t11; // eslint-disable-next-line no-await-in-loop, @typescript-eslint/no-unused-vars
+                      _context21.next = 4;
                       return (0, _common.handleRegistrationErrors)(body, function (clientError, finalError) {
                         var _body$headers$trackin, _body$headers;
                         if (finalError) {
-                          _this7.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
+                          _this8.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
                         } else {
-                          _this7.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
+                          _this8.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
                         }
-                        _this7.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);
+                        _this8.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 _this7.handle429Retry(retryAfter, retryCaller);
-                      }, _this7.restoreRegistrationCallBack());
-                    case 28:
-                      abort = _context19.sent;
-                      if (!(_this7.registrationStatus === _types2.RegistrationStatus.ACTIVE)) {
-                        _context19.next = 32;
+                        return _this8.handle429Retry(retryAfter, retryCaller);
+                      }, _this8.restoreRegistrationCallBack());
+                    case 4:
+                      abort = _context21.sent;
+                      if (!(_this8.registrationStatus === _types2.RegistrationStatus.ACTIVE)) {
+                        _context21.next = 5;
                         break;
                       }
-                      _Logger.default.info("[".concat(caller, "] : Device is already restored, active mobius url: ").concat(_this7.activeMobiusUrl), {
+                      _Logger.default.info("[".concat(caller, "] : Device is already restored, active mobius url: ").concat(_this8.activeMobiusUrl), {
                         file: _constants2.REGISTRATION_FILE,
-                        method: _this7.attemptRegistrationWithServers.name
+                        method: _this8.attemptRegistrationWithServers.name
                       });
-                      return _context19.abrupt("return", 0);
-                    case 32:
+                      return _context21.abrupt("return", 0);
+                    case 5:
                       if (!abort) {
-                        _context19.next = 37;
+                        _context21.next = 7;
                         break;
                       }
-                      _this7.setStatus(_types2.RegistrationStatus.INACTIVE);
+                      _this8.setStatus(_types2.RegistrationStatus.INACTIVE);
                       // eslint-disable-next-line no-await-in-loop
-                      _context19.next = 36;
+                      _context21.next = 6;
                       return (0, _common.uploadLogs)();
-                    case 36:
-                      return _context19.abrupt("return", 0);
-                    case 37:
+                    case 6:
+                      return _context21.abrupt("return", 0);
+                    case 7:
                     case "end":
-                      return _context19.stop();
+                      return _context21.stop();
                   }
-                }, _loop, null, [[2, 23]]);
+                }, _loop, null, [[1, 3]]);
               });
               _iterator2.s();
-            case 12:
+            case 4:
               if ((_step2 = _iterator2.n()).done) {
-                _context20.next = 19;
+                _context22.next = 7;
                 break;
               }
-              return _context20.delegateYield(_loop(), "t0", 14);
-            case 14:
-              _ret = _context20.t0;
+              return _context22.delegateYield(_loop(), "t0", 5);
+            case 5:
+              _ret = _context22.t0;
               if (!(_ret === 0)) {
-                _context20.next = 17;
+                _context22.next = 6;
                 break;
               }
-              return _context20.abrupt("break", 19);
-            case 17:
-              _context20.next = 12;
+              return _context22.abrupt("continue", 7);
+            case 6:
+              _context22.next = 4;
               break;
-            case 19:
-              _context20.next = 24;
+            case 7:
+              _context22.next = 9;
               break;
-            case 21:
-              _context20.prev = 21;
-              _context20.t1 = _context20["catch"](9);
-              _iterator2.e(_context20.t1);
-            case 24:
-              _context20.prev = 24;
+            case 8:
+              _context22.prev = 8;
+              _t12 = _context22["catch"](3);
+              _iterator2.e(_t12);
+            case 9:
+              _context22.prev = 9;
               _iterator2.f();
-              return _context20.finish(24);
-            case 27:
-              return _context20.abrupt("return", abort);
-            case 28:
+              return _context22.finish(9);
+            case 10:
+              return _context22.abrupt("return", abort);
+            case 11:
             case "end":
-              return _context20.stop();
+              return _context22.stop();
           }
-        }, _callee19, this, [[9, 21, 24, 27]]);
+        }, _callee21, this, [[3, 8, 9, 10]]);
       }));
       function attemptRegistrationWithServers(_x11) {
         return _attemptRegistrationWithServers.apply(this, arguments);
@@ -1233,48 +1365,48 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "startKeepaliveTimer",
     value: (function () {
-      var _startKeepaliveTimer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee22(url, interval, serverType) {
-        var _this8 = this;
+      var _startKeepaliveTimer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee24(url, interval, serverType) {
+        var _this9 = this;
         var RETRY_COUNT_THRESHOLD;
-        return _regenerator.default.wrap(function _callee22$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regenerator.default.wrap(function (_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               this.clearKeepaliveTimer();
               RETRY_COUNT_THRESHOLD = this.isCCFlow ? 4 : 5;
-              _context23.next = 4;
-              return this.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee21() {
+              _context25.next = 1;
+              return this.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee23() {
                 var accessToken, blob, blobUrl;
-                return _regenerator.default.wrap(function _callee21$(_context22) {
-                  while (1) switch (_context22.prev = _context22.next) {
+                return _regenerator.default.wrap(function (_context24) {
+                  while (1) switch (_context24.prev = _context24.next) {
                     case 0:
-                      if (!_this8.isDeviceRegistered()) {
-                        _context22.next = 5;
+                      if (!_this9.isDeviceRegistered()) {
+                        _context24.next = 2;
                         break;
                       }
-                      _context22.next = 3;
-                      return _this8.webex.credentials.getUserToken();
-                    case 3:
-                      accessToken = _context22.sent;
-                      if (!_this8.webWorker) {
+                      _context24.next = 1;
+                      return _this9.webex.credentials.getUserToken();
+                    case 1:
+                      accessToken = _context24.sent;
+                      if (!_this9.webWorker) {
                         blob = new Blob([_webWorkerStr.default], {
                           type: 'application/javascript'
                         });
                         blobUrl = URL.createObjectURL(blob);
-                        _this8.webWorker = new Worker(blobUrl);
+                        _this9.webWorker = new Worker(blobUrl);
                         URL.revokeObjectURL(blobUrl);
-                        _this8.webWorker.postMessage({
+                        _this9.webWorker.postMessage({
                           type: _types2.WorkerMessageType.START_KEEPALIVE,
                           accessToken: String(accessToken),
-                          deviceUrl: String(_this8.webex.internal.device.url),
+                          deviceUrl: String(_this9.webex.internal.device.url),
                           interval: interval,
                           retryCountThreshold: RETRY_COUNT_THRESHOLD,
                           url: url
                         });
-                        _this8.webWorker.onmessage = /*#__PURE__*/function () {
-                          var _ref10 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee20(event) {
+                        _this9.webWorker.onmessage = /*#__PURE__*/function () {
+                          var _ref11 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee22(event) {
                             var logContext, error, abort;
-                            return _regenerator.default.wrap(function _callee20$(_context21) {
-                              while (1) switch (_context21.prev = _context21.next) {
+                            return _regenerator.default.wrap(function (_context23) {
+                              while (1) switch (_context23.prev = _context23.next) {
                                 case 0:
                                   logContext = {
                                     file: _constants2.REGISTRATION_FILE,
@@ -1282,81 +1414,81 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                                   };
                                   if (event.data.type === _types2.WorkerMessageType.KEEPALIVE_SUCCESS) {
                                     _Logger.default.info("Sent Keepalive, status: ".concat(event.data.statusCode), logContext);
-                                    _this8.lineEmitter(_types3.LINE_EVENTS.RECONNECTED);
+                                    _this9.lineEmitter(_types3.LINE_EVENTS.RECONNECTED);
                                   }
                                   if (!(event.data.type === _types2.WorkerMessageType.KEEPALIVE_FAILURE)) {
-                                    _context21.next = 25;
+                                    _context23.next = 7;
                                     break;
                                   }
                                   error = event.data.err;
                                   _Logger.default.warn("Keep-alive missed ".concat(event.data.keepAliveRetryCount, " times. Status -> ").concat(error.statusCode, " "), logContext);
-                                  _context21.next = 7;
+                                  _context23.next = 1;
                                   return (0, _common.handleRegistrationErrors)(error, function (clientError, finalError) {
                                     var _error$headers$tracki, _error$headers;
                                     if (finalError) {
-                                      _this8.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
+                                      _this9.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
                                     }
-                                    _this8.metricManager.submitRegistrationMetric(_types.METRIC_EVENT.KEEPALIVE_ERROR, _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 : '', event.data.keepAliveRetryCount, clientError);
+                                    _this9.metricManager.submitRegistrationMetric(_types.METRIC_EVENT.KEEPALIVE_ERROR, _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 : '', event.data.keepAliveRetryCount, clientError);
                                   }, {
                                     method: _constants2.KEEPALIVE_UTIL,
                                     file: _constants2.REGISTRATION_FILE
                                   }, function (retryAfter, retryCaller) {
-                                    return _this8.handle429Retry(retryAfter, retryCaller);
+                                    return _this9.handle429Retry(retryAfter, retryCaller);
                                   });
-                                case 7:
-                                  abort = _context21.sent;
+                                case 1:
+                                  abort = _context23.sent;
                                   if (!(abort || event.data.keepAliveRetryCount >= RETRY_COUNT_THRESHOLD)) {
-                                    _context21.next = 24;
+                                    _context23.next = 6;
                                     break;
                                   }
-                                  _this8.failoverImmediately = _this8.isCCFlow;
-                                  _this8.setStatus(_types2.RegistrationStatus.INACTIVE);
-                                  _this8.clearKeepaliveTimer();
-                                  _this8.clearFailbackTimer();
-                                  _this8.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
-                                  _context21.next = 16;
+                                  _this9.failoverImmediately = _this9.isCCFlow;
+                                  _this9.setStatus(_types2.RegistrationStatus.INACTIVE);
+                                  _this9.clearKeepaliveTimer();
+                                  _this9.clearFailbackTimer();
+                                  _this9.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
+                                  _context23.next = 2;
                                   return (0, _common.uploadLogs)();
-                                case 16:
+                                case 2:
                                   if (abort) {
-                                    _context21.next = 21;
+                                    _context23.next = 4;
                                     break;
                                   }
-                                  _context21.next = 19;
-                                  return _this8.reconnectOnFailure(_constants2.KEEPALIVE_UTIL);
-                                case 19:
-                                  _context21.next = 22;
+                                  _context23.next = 3;
+                                  return _this9.reconnectOnFailure(_constants2.RECONNECT_ON_FAILURE_UTIL);
+                                case 3:
+                                  _context23.next = 5;
                                   break;
-                                case 21:
+                                case 4:
                                   if (error.statusCode === 404) {
-                                    _this8.handle404KeepaliveFailure(_constants2.KEEPALIVE_UTIL);
+                                    _this9.handle404KeepaliveFailure(_constants2.KEEPALIVE_UTIL);
                                   }
-                                case 22:
-                                  _context21.next = 25;
+                                case 5:
+                                  _context23.next = 7;
                                   break;
-                                case 24:
-                                  _this8.lineEmitter(_types3.LINE_EVENTS.RECONNECTING);
-                                case 25:
+                                case 6:
+                                  _this9.lineEmitter(_types3.LINE_EVENTS.RECONNECTING);
+                                case 7:
                                 case "end":
-                                  return _context21.stop();
+                                  return _context23.stop();
                               }
-                            }, _callee20);
+                            }, _callee22);
                           }));
                           return function (_x15) {
-                            return _ref10.apply(this, arguments);
+                            return _ref11.apply(this, arguments);
                           };
                         }();
                       }
-                    case 5:
+                    case 2:
                     case "end":
-                      return _context22.stop();
+                      return _context24.stop();
                   }
-                }, _callee21);
+                }, _callee23);
               })));
-            case 4:
+            case 1:
             case "end":
-              return _context23.stop();
+              return _context25.stop();
           }
-        }, _callee22, this);
+        }, _callee24, this);
       }));
       function startKeepaliveTimer(_x12, _x13, _x14) {
         return _startKeepaliveTimer.apply(this, arguments);
@@ -1386,36 +1518,37 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "deregister",
     value: function () {
-      var _deregister = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee23() {
-        var _this$deviceInfo$devi2, _this$deviceInfo$devi3;
-        return _regenerator.default.wrap(function _callee23$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      var _deregister = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee25() {
+        var _this$deviceInfo$devi, _this$deviceInfo$devi2, _t13;
+        return _regenerator.default.wrap(function (_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              _context24.prev = 0;
-              _context24.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);
-            case 3:
+              _context26.prev = 0;
+              _context26.next = 1;
+              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 1:
               _Logger.default.log('Registration successfully deregistered', {
                 file: _constants2.REGISTRATION_FILE,
                 method: _constants2.METHODS.DEREGISTER
               });
-              _context24.next = 9;
+              _context26.next = 3;
               break;
-            case 6:
-              _context24.prev = 6;
-              _context24.t0 = _context24["catch"](0);
-              _Logger.default.warn("Delete failed with Mobius: ".concat(_context24.t0), {
+            case 2:
+              _context26.prev = 2;
+              _t13 = _context26["catch"](0);
+              _Logger.default.warn("Delete failed with Mobius: ".concat((0, _stringify.default)(_t13)), {
                 file: _constants2.REGISTRATION_FILE,
                 method: _constants2.METHODS.DEREGISTER
               });
-            case 9:
+            case 3:
               this.clearKeepaliveTimer();
               this.setStatus(_types2.RegistrationStatus.INACTIVE);
-            case 11:
+              this.clearFailoverState();
+            case 4:
             case "end":
-              return _context24.stop();
+              return _context26.stop();
           }
-        }, _callee23, this, [[0, 6]]);
+        }, _callee25, this, [[0, 2]]);
       }));
       function deregister() {
         return _deregister.apply(this, arguments);
@@ -1479,10 +1612,10 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "reconnectOnFailure",
     value: (function () {
-      var _reconnectOnFailure = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee24(caller) {
+      var _reconnectOnFailure = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee26(caller) {
         var abort;
-        return _regenerator.default.wrap(function _callee24$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regenerator.default.wrap(function (_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               _Logger.default.info(_constants.METHOD_START_MESSAGE, {
                 method: _constants2.METHODS.RECONNECT_ON_FAILURE,
@@ -1490,37 +1623,37 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               });
               this.reconnectPending = false;
               if (this.isDeviceRegistered()) {
-                _context25.next = 14;
+                _context27.next = 4;
                 break;
               }
               if (!((0, _keys.default)(this.callManager.getActiveCalls()).length === 0)) {
-                _context25.next = 12;
+                _context27.next = 3;
                 break;
               }
-              _context25.next = 6;
+              _context27.next = 1;
               return this.restorePreviousRegistration(caller);
-            case 6:
-              abort = _context25.sent;
+            case 1:
+              abort = _context27.sent;
               if (!(!abort && !this.isDeviceRegistered())) {
-                _context25.next = 10;
+                _context27.next = 2;
                 break;
               }
-              _context25.next = 10;
+              _context27.next = 2;
               return this.restartRegistration(caller);
-            case 10:
-              _context25.next = 14;
+            case 2:
+              _context27.next = 4;
               break;
-            case 12:
+            case 3:
               this.reconnectPending = true;
               _Logger.default.info('Active call(s) present, deferred reconnect till call cleanup.', {
                 file: _constants2.REGISTRATION_FILE,
                 method: _constants2.METHODS.RECONNECT_ON_FAILURE
               });
-            case 14:
+            case 4:
             case "end":
-              return _context25.stop();
+              return _context27.stop();
           }
-        }, _callee24, this);
+        }, _callee26, this);
       }));
       function reconnectOnFailure(_x16) {
         return _reconnectOnFailure.apply(this, arguments);
@@ -1528,7 +1661,6 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
       return reconnectOnFailure;
     }())
   }]);
-  return Registration;
 }();
 /*
  */