@webex/calling 3.9.0-webinar5k.1 → 3.10.0

package/dist/CallingClient/registration/register.js

@@ -34,9 +34,9 @@ var _SDKConnector = _interopRequireDefault(require("../../SDKConnector"));
 var _types2 = require("../../common/types");
 var _constants2 = require("../constants");
 var _types3 = require("../line/types");
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && o[_Symbol$iterator] || o["@@iterator"]; if (!it) { if (_Array$isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof _Symbol && r[_Symbol$iterator] || r["@@iterator"]; if (!t) { if (_Array$isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? _Array$from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function ownKeys(e, r) { var t = _Object$keys2(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -126,7 +126,7 @@ 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 _callee(url, deviceId, deviceUrl) {
         var _response;
         var response;
         return _regenerator.default.wrap(function _callee$(_context) {
@@ -158,20 +158,22 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               return (0, _context.t0)(_context.t1, _context.t14);
             case 20:
               response = _context.sent;
-              _context.next = 26;
+              _context.next = 28;
               break;
             case 23:
               _context.prev = 23;
               _context.t15 = _context["catch"](0);
               _Logger.default.warn("Delete failed with Mobius ".concat(_context.t15), {
                 file: _constants2.REGISTRATION_FILE,
-                method: _constants2.METHODS.DEREGISTER
+                method: _constants2.METHODS.DELETE_REGISTRATION
               });
-            case 26:
+              _context.next = 28;
+              return (0, _common.uploadLogs)();
+            case 28:
               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 29:
+            case 31:
             case "end":
               return _context.stop();
           }
@@ -190,7 +192,7 @@ 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 _callee2(url) {
         var deviceInfo;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -228,7 +230,7 @@ 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 _callee3(caller) {
         var abort;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -256,26 +258,64 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
       return restorePreviousRegistration;
     }()
     /**
-     *
+     * Callback for handling 404 response from the server for register keepalive
      */
     )
   }, {
-    key: "handle429Retry",
+    key: "handle404KeepaliveFailure",
     value: (function () {
-      var _handle429Retry = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(retryAfter, caller) {
-        var interval, abort;
+      var _handle404KeepaliveFailure = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4(caller) {
+        var abort;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              if (!(caller === _constants2.KEEPALIVE_UTIL)) {
+                _context4.next = 7;
+                break;
+              }
+              _context4.next = 3;
+              return this.attemptRegistrationWithServers(caller);
+            case 3:
+              abort = _context4.sent;
+              if (!(!abort && !this.isDeviceRegistered())) {
+                _context4.next = 7;
+                break;
+              }
+              _context4.next = 7;
+              return this.startFailoverTimer();
+            case 7:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function handle404KeepaliveFailure(_x6) {
+        return _handle404KeepaliveFailure.apply(this, arguments);
+      }
+      return handle404KeepaliveFailure;
+    }()
+    /**
+     * Callback for handling 429 retry response from the server
+     */
+    )
+  }, {
+    key: "handle429Retry",
+    value: (function () {
+      var _handle429Retry = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(retryAfter, caller) {
+        var _this = this;
+        var interval, abort;
+        return _regenerator.default.wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               if (!(caller === _constants2.FAILBACK_UTIL)) {
-                _context4.next = 17;
+                _context6.next = 17;
                 break;
               }
               if (!(this.failback429RetryAttempts >= _constants2.REG_FAILBACK_429_MAX_RETRIES)) {
-                _context4.next = 3;
+                _context6.next = 3;
                 break;
               }
-              return _context4.abrupt("return");
+              return _context6.abrupt("return");
             case 3:
               this.clearFailbackTimer();
               this.failback429RetryAttempts += 1;
@@ -286,28 +326,51 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               interval = this.getRegRetryInterval(this.failback429RetryAttempts);
               this.startFailbackTimer(interval);
               this.scheduled429Retry = true;
-              _context4.next = 11;
+              _context6.next = 11;
               return this.restorePreviousRegistration(_constants2.REG_429_RETRY_UTIL);
             case 11:
-              abort = _context4.sent;
+              abort = _context6.sent;
               if (!(!abort && !this.isDeviceRegistered())) {
-                _context4.next = 15;
+                _context6.next = 15;
                 break;
               }
-              _context4.next = 15;
+              _context6.next = 15;
               return this.restartRegistration(_constants2.REG_429_RETRY_UTIL);
             case 15:
-              _context4.next = 18;
+              _context6.next = 18;
               break;
             case 17:
-              this.retryAfter = retryAfter;
+              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) {
+                      case 0:
+                        _Logger.default.log("Resuming keepalive after ".concat(retryAfter, " seconds"), {
+                          file: _constants2.REGISTRATION_FILE,
+                          method: _constants2.REG_429_RETRY_UTIL
+                        });
+
+                        // 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:
+                      case "end":
+                        return _context5.stop();
+                    }
+                  }, _callee5);
+                })), retryAfter * 1000);
+              } else {
+                this.retryAfter = retryAfter;
+              }
             case 18:
             case "end":
-              return _context4.stop();
+              return _context6.stop();
           }
-        }, _callee4, this);
+        }, _callee6, this);
       }));
-      function handle429Retry(_x6, _x7) {
+      function handle429Retry(_x7, _x8) {
         return _handle429Retry.apply(this, arguments);
       }
       return handle429Retry;
@@ -336,8 +399,8 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "startFailoverTimer",
     value: (function () {
-      var _startFailoverTimer = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
-        var _this = this;
+      var _startFailoverTimer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1() {
+        var _this2 = this;
         var attempt,
           timeElapsed,
           loggerContext,
@@ -346,12 +409,12 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
           excessVal,
           abort,
           scheduledTime,
-          _args9 = arguments;
-        return _regenerator.default.wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+          _args1 = arguments;
+        return _regenerator.default.wrap(function _callee1$(_context1) {
+          while (1) switch (_context1.prev = _context1.next) {
             case 0:
-              attempt = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : 1;
-              timeElapsed = _args9.length > 1 && _args9[1] !== undefined ? _args9[1] : 0;
+              attempt = _args1.length > 0 && _args1[0] !== undefined ? _args1[0] : 1;
+              timeElapsed = _args1.length > 1 && _args1[1] !== undefined ? _args1[1] : 0;
               loggerContext = {
                 file: _constants2.REGISTRATION_FILE,
                 method: _constants2.FAILOVER_UTIL
@@ -366,116 +429,116 @@ 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)) {
-                _context9.next = 14;
+                _context1.next = 14;
                 break;
               }
               scheduledTime = Math.floor((0, _now.default)() / 1000);
               if (this.retryAfter != null) {
                 interval = Math.max(interval, this.retryAfter);
               }
-              setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
-                return _regenerator.default.wrap(function _callee6$(_context6) {
-                  while (1) switch (_context6.prev = _context6.next) {
+              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) {
                     case 0:
-                      _context6.next = 2;
-                      return _this.mutex.runExclusive( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+                      _context8.next = 2;
+                      return _this2.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7() {
                         var currentTime;
-                        return _regenerator.default.wrap(function _callee5$(_context5) {
-                          while (1) switch (_context5.prev = _context5.next) {
+                        return _regenerator.default.wrap(function _callee7$(_context7) {
+                          while (1) switch (_context7.prev = _context7.next) {
                             case 0:
-                              _context5.next = 2;
-                              return _this.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL);
+                              _context7.next = 2;
+                              return _this2.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL);
                             case 2:
-                              abort = _context5.sent;
+                              abort = _context7.sent;
                               currentTime = Math.floor((0, _now.default)() / 1000);
-                              if (!(!abort && !_this.isDeviceRegistered())) {
-                                _context5.next = 7;
+                              if (!(!abort && !_this2.isDeviceRegistered())) {
+                                _context7.next = 7;
                                 break;
                               }
-                              _context5.next = 7;
-                              return _this.startFailoverTimer(attempt + 1, timeElapsed + (currentTime - scheduledTime));
+                              _context7.next = 7;
+                              return _this2.startFailoverTimer(attempt + 1, timeElapsed + (currentTime - scheduledTime));
                             case 7:
                             case "end":
-                              return _context5.stop();
+                              return _context7.stop();
                           }
-                        }, _callee5);
+                        }, _callee7);
                       })));
                     case 2:
                     case "end":
-                      return _context6.stop();
+                      return _context8.stop();
                   }
-                }, _callee6);
+                }, _callee8);
               })), interval * _constants2.SEC_TO_MSEC_MFACTOR);
               _Logger.default.log("Scheduled retry with primary in ".concat(interval, " seconds, number of attempts : ").concat(attempt), loggerContext);
-              _context9.next = 26;
+              _context1.next = 26;
               break;
             case 14:
               if (!this.backupMobiusUris.length) {
-                _context9.next = 23;
+                _context1.next = 23;
                 break;
               }
               _Logger.default.info('Failing over to backup servers.', loggerContext);
               this.failoverImmediately = false;
-              _context9.next = 19;
+              _context1.next = 19;
               return this.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL, this.backupMobiusUris);
             case 19:
-              abort = _context9.sent;
+              abort = _context1.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 _callee8() {
-                  return _regenerator.default.wrap(function _callee8$(_context8) {
-                    while (1) switch (_context8.prev = _context8.next) {
+                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) {
                       case 0:
-                        _context8.next = 2;
-                        return _this.mutex.runExclusive( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
-                          return _regenerator.default.wrap(function _callee7$(_context7) {
-                            while (1) switch (_context7.prev = _context7.next) {
+                        _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) {
                               case 0:
-                                _context7.next = 2;
-                                return _this.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL, _this.backupMobiusUris);
+                                _context9.next = 2;
+                                return _this2.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL, _this2.backupMobiusUris);
                               case 2:
-                                abort = _context7.sent;
-                                if (!(!abort && !_this.isDeviceRegistered())) {
-                                  _context7.next = 7;
+                                abort = _context9.sent;
+                                if (!(!abort && !_this2.isDeviceRegistered())) {
+                                  _context9.next = 7;
                                   break;
                                 }
-                                _context7.next = 6;
+                                _context9.next = 6;
                                 return (0, _common.uploadLogs)();
                               case 6:
                                 (0, _common.emitFinalFailure)(function (clientError) {
-                                  _this.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
+                                  _this2.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
                                 }, loggerContext);
                               case 7:
                               case "end":
-                                return _context7.stop();
+                                return _context9.stop();
                             }
-                          }, _callee7);
+                          }, _callee9);
                         })));
                       case 2:
                       case "end":
-                        return _context8.stop();
+                        return _context0.stop();
                     }
-                  }, _callee8);
+                  }, _callee0);
                 })), interval * _constants2.SEC_TO_MSEC_MFACTOR);
                 _Logger.default.log("Scheduled retry with backup servers in ".concat(interval, " seconds."), loggerContext);
               }
-              _context9.next = 26;
+              _context1.next = 26;
               break;
             case 23:
-              _context9.next = 25;
+              _context1.next = 25;
               return (0, _common.uploadLogs)();
             case 25:
               (0, _common.emitFinalFailure)(function (clientError) {
-                _this.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
+                _this2.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
               }, loggerContext);
             case 26:
             case "end":
-              return _context9.stop();
+              return _context1.stop();
           }
-        }, _callee9, this);
+        }, _callee1, this);
       }));
       function startFailoverTimer() {
         return _startFailoverTimer.apply(this, arguments);
@@ -497,8 +560,8 @@ 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, _ref5, statusCode;
+      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) {
             case 0:
@@ -522,7 +585,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               });
             case 9:
               response = _context10.sent;
-              _ref5 = response, statusCode = _ref5.statusCode;
+              _ref6 = response, statusCode = _ref6.statusCode;
               if (!(statusCode === 200)) {
                 _context10.next = 15;
                 break;
@@ -616,12 +679,12 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "startFailbackTimer",
     value: function startFailbackTimer(intervalInSeconds) {
-      var _this2 = this;
-      this.failbackTimer = setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
+      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) {
             case 0:
-              return _context11.abrupt("return", _this2.executeFailback());
+              return _context11.abrupt("return", _this3.executeFailback());
             case 1:
             case "end":
               return _context11.stop();
@@ -641,79 +704,79 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "executeFailback",
     value: (function () {
-      var _executeFailback = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13() {
-        var _this3 = this;
+      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) {
             case 0:
               _context13.next = 2;
-              return this.mutex.runExclusive( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12() {
+              return this.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12() {
                 var primaryServerStatus, abort, abortNew;
                 return _regenerator.default.wrap(function _callee12$(_context12) {
                   while (1) switch (_context12.prev = _context12.next) {
                     case 0:
-                      if (!_this3.isFailbackRequired()) {
+                      if (!_this4.isFailbackRequired()) {
                         _context12.next = 31;
                         break;
                       }
                       _context12.next = 3;
-                      return _this3.isPrimaryActive();
+                      return _this4.isPrimaryActive();
                     case 3:
                       primaryServerStatus = _context12.sent;
-                      if (!((0, _keys.default)(_this3.callManager.getActiveCalls()).length === 0 && primaryServerStatus)) {
+                      if (!((0, _keys.default)(_this4.callManager.getActiveCalls()).length === 0 && primaryServerStatus)) {
                         _context12.next = 28;
                         break;
                       }
                       _Logger.default.info("Attempting failback to primary.", {
                         file: _constants2.REGISTRATION_FILE,
-                        method: _this3.executeFailback.name
+                        method: _this4.executeFailback.name
                       });
                       _context12.next = 8;
-                      return _this3.deregister();
+                      return _this4.deregister();
                     case 8:
                       _context12.next = 10;
-                      return _this3.attemptRegistrationWithServers(_constants2.FAILBACK_UTIL);
+                      return _this4.attemptRegistrationWithServers(_constants2.FAILBACK_UTIL);
                     case 10:
                       abort = _context12.sent;
-                      if (!(_this3.scheduled429Retry || abort || _this3.isDeviceRegistered())) {
+                      if (!(_this4.scheduled429Retry || abort || _this4.isDeviceRegistered())) {
                         _context12.next = 13;
                         break;
                       }
                       return _context12.abrupt("return");
                     case 13:
                       _context12.next = 15;
-                      return _this3.restorePreviousRegistration(_constants2.FAILBACK_UTIL);
+                      return _this4.restorePreviousRegistration(_constants2.FAILBACK_UTIL);
                     case 15:
                       abortNew = _context12.sent;
                       if (!abortNew) {
                         _context12.next = 19;
                         break;
                       }
-                      _this3.clearFailbackTimer();
+                      _this4.clearFailbackTimer();
                       return _context12.abrupt("return");
                     case 19:
-                      if (_this3.isDeviceRegistered()) {
+                      if (_this4.isDeviceRegistered()) {
                         _context12.next = 24;
                         break;
                       }
                       _context12.next = 22;
-                      return _this3.restartRegistration(_this3.executeFailback.name);
+                      return _this4.restartRegistration(_this4.executeFailback.name);
                     case 22:
                       _context12.next = 26;
                       break;
                     case 24:
-                      _this3.failbackTimer = undefined;
-                      _this3.initiateFailback();
+                      _this4.failbackTimer = undefined;
+                      _this4.initiateFailback();
                     case 26:
                       _context12.next = 31;
                       break;
                     case 28:
                       _Logger.default.info('Active calls present or primary Mobius is down, deferring failback to next cycle.', {
                         file: _constants2.REGISTRATION_FILE,
-                        method: _this3.executeFailback.name
+                        method: _this4.executeFailback.name
                       });
-                      _this3.failbackTimer = undefined;
-                      _this3.initiateFailback();
+                      _this4.failbackTimer = undefined;
+                      _this4.initiateFailback();
                     case 31:
                     case "end":
                       return _context12.stop();
@@ -787,7 +850,7 @@ 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 _callee14(caller) {
         var abort;
         return _regenerator.default.wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
@@ -814,7 +877,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
           }
         }, _callee14, this);
       }));
-      function restartRegistration(_x8) {
+      function restartRegistration(_x9) {
         return _restartRegistration.apply(this, arguments);
       }
       return restartRegistration;
@@ -828,8 +891,8 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "handleConnectionRestoration",
     value: (function () {
-      var _handleConnectionRestoration = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee16(retry) {
-        var _this4 = this;
+      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) {
             case 0:
@@ -838,7 +901,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                 file: _constants2.REGISTRATION_FILE
               });
               _context16.next = 3;
-              return this.mutex.runExclusive( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15() {
+              return this.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15() {
                 var abort;
                 return _regenerator.default.wrap(function _callee15$(_context15) {
                   while (1) switch (_context15.prev = _context15.next) {
@@ -847,32 +910,32 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                         _context15.next = 14;
                         break;
                       }
-                      _Logger.default.log('Mercury connection is up again, re-registering with Webex Calling if needed', {
+                      _Logger.default.log('Network is up again, re-registering with Webex Calling if needed', {
                         file: _constants2.REGISTRATION_FILE,
-                        method: _this4.handleConnectionRestoration.name
+                        method: _constants2.METHODS.HANDLE_CONNECTION_RESTORATION
                       });
-                      _this4.clearKeepaliveTimer();
-                      if (!_this4.isDeviceRegistered()) {
+                      _this5.clearKeepaliveTimer();
+                      if (!_this5.isDeviceRegistered()) {
                         _context15.next = 6;
                         break;
                       }
                       _context15.next = 6;
-                      return _this4.deregister();
+                      return _this5.deregister();
                     case 6:
-                      if (!_this4.activeMobiusUrl) {
+                      if (!_this5.activeMobiusUrl) {
                         _context15.next = 13;
                         break;
                       }
                       _context15.next = 9;
-                      return _this4.restorePreviousRegistration(_this4.handleConnectionRestoration.name);
+                      return _this5.restorePreviousRegistration(_constants2.METHODS.HANDLE_CONNECTION_RESTORATION);
                     case 9:
                       abort = _context15.sent;
-                      if (!(!abort && !_this4.isDeviceRegistered())) {
+                      if (!(!abort && !_this5.isDeviceRegistered())) {
                         _context15.next = 13;
                         break;
                       }
                       _context15.next = 13;
-                      return _this4.restartRegistration(_this4.handleConnectionRestoration.name);
+                      return _this5.restartRegistration(_constants2.METHODS.HANDLE_CONNECTION_RESTORATION);
                     case 13:
                       retry = false;
                     case 14:
@@ -889,7 +952,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
           }
         }, _callee16, this);
       }));
-      function handleConnectionRestoration(_x9) {
+      function handleConnectionRestoration(_x0) {
         return _handleConnectionRestoration.apply(this, arguments);
       }
       return handleConnectionRestoration;
@@ -903,9 +966,9 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "restoreRegistrationCallBack",
     value: function restoreRegistrationCallBack() {
-      var _this5 = this;
+      var _this6 = this;
       return /*#__PURE__*/function () {
-        var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(restoreData, caller) {
+        var _ref0 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17(restoreData, caller) {
           var logContext, restore, finalError;
           return _regenerator.default.wrap(function _callee17$(_context17) {
             while (1) switch (_context17.prev = _context17.next) {
@@ -914,35 +977,35 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                   file: _constants2.REGISTRATION_FILE,
                   method: caller
                 };
-                if (_this5.isRegRetry()) {
+                if (_this6.isRegRetry()) {
                   _context17.next = 17;
                   break;
                 }
                 _Logger.default.info('Registration restoration in progress.', logContext);
-                restore = _this5.getExistingDevice(restoreData);
+                restore = _this6.getExistingDevice(restoreData);
                 if (!restore) {
                   _context17.next = 14;
                   break;
                 }
-                _this5.setRegRetry(true);
+                _this6.setRegRetry(true);
                 _context17.next = 8;
-                return _this5.deregister();
+                return _this6.deregister();
               case 8:
                 _context17.next = 10;
-                return _this5.restorePreviousRegistration(caller);
+                return _this6.restorePreviousRegistration(caller);
               case 10:
                 finalError = _context17.sent;
-                _this5.setRegRetry(false);
-                if (_this5.isDeviceRegistered()) {
+                _this6.setRegRetry(false);
+                if (_this6.isDeviceRegistered()) {
                   _Logger.default.info('Registration restored successfully.', logContext);
                 }
                 return _context17.abrupt("return", finalError);
               case 14:
-                _this5.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
+                _this6.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
                 _context17.next = 18;
                 break;
               case 17:
-                _this5.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
+                _this6.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
               case 18:
                 return _context17.abrupt("return", false);
               case 19:
@@ -951,8 +1014,8 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
             }
           }, _callee17);
         }));
-        return function (_x10, _x11) {
-          return _ref9.apply(this, arguments);
+        return function (_x1, _x10) {
+          return _ref0.apply(this, arguments);
         };
       }();
     }
@@ -964,7 +1027,7 @@ 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 _callee18() {
         var abort;
         return _regenerator.default.wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
@@ -1006,8 +1069,8 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "attemptRegistrationWithServers",
     value: (function () {
-      var _attemptRegistrationWithServers = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee19(caller) {
-        var _this6 = this;
+      var _attemptRegistrationWithServers = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee19(caller) {
+        var _this7 = this;
         var servers,
           abort,
           _iterator2,
@@ -1040,39 +1103,39 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               _iterator2 = _createForOfIteratorHelper(servers);
               _context20.prev = 9;
               _loop = /*#__PURE__*/_regenerator.default.mark(function _loop() {
-                var _this6$backupMobiusUr;
-                var url, serverType, _this6$deviceInfo$dev, _resp$headers$trackin, _resp$headers, _this6$deviceInfo$dev2, resp, body;
+                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) {
                     case 0:
                       url = _step2.value;
-                      serverType = _this6.primaryMobiusUris.includes(url) && 'PRIMARY' || ((_this6$backupMobiusUr = _this6.backupMobiusUris) === null || _this6$backupMobiusUr === void 0 ? void 0 : _this6$backupMobiusUr.includes(url)) && 'BACKUP' || 'UNKNOWN';
+                      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;
                       abort = false;
-                      _this6.registrationStatus = _types2.RegistrationStatus.INACTIVE;
-                      _this6.lineEmitter(_types3.LINE_EVENTS.CONNECTING);
+                      _this7.registrationStatus = _types2.RegistrationStatus.INACTIVE;
+                      _this7.lineEmitter(_types3.LINE_EVENTS.CONNECTING);
                       _Logger.default.info("[".concat(caller, "] : Mobius url to contact: ").concat(url), {
                         file: _constants2.REGISTRATION_FILE,
                         method: _constants2.REGISTER_UTIL
                       });
                       // eslint-disable-next-line no-await-in-loop
                       _context19.next = 9;
-                      return _this6.postRegistration(url);
+                      return _this7.postRegistration(url);
                     case 9:
                       resp = _context19.sent;
-                      _this6.deviceInfo = resp.body;
-                      _this6.registrationStatus = _types2.RegistrationStatus.ACTIVE;
-                      _this6.lineEmitter(_types3.LINE_EVENTS.REGISTERED, resp.body);
-                      _Logger.default.log("Registration successful for deviceId: ".concat((_this6$deviceInfo$dev = _this6.deviceInfo.device) === null || _this6$deviceInfo$dev === void 0 ? void 0 : _this6$deviceInfo$dev.deviceId, " userId: ").concat(_this6.userId), {
+                      _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), {
                         file: _constants2.REGISTRATION_FILE,
                         method: _constants2.METHODS.REGISTER
                       });
-                      _this6.setActiveMobiusUrl(url);
-                      _this6.setIntervalValues(_this6.deviceInfo);
-                      _this6.metricManager.setDeviceInfo(_this6.deviceInfo);
-                      _this6.metricManager.submitRegistrationMetric(_types.METRIC_EVENT.REGISTRATION, _types.REG_ACTION.REGISTER, _types.METRIC_TYPE.BEHAVIORAL, caller, serverType, (_resp$headers$trackin = (_resp$headers = resp.headers) === null || _resp$headers === void 0 ? void 0 : _resp$headers.trackingid) !== null && _resp$headers$trackin !== void 0 ? _resp$headers$trackin : '', undefined, undefined);
-                      _this6.startKeepaliveTimer((_this6$deviceInfo$dev2 = _this6.deviceInfo.device) === null || _this6$deviceInfo$dev2 === void 0 ? void 0 : _this6$deviceInfo$dev2.uri, _this6.deviceInfo.keepaliveInterval, serverType);
-                      _this6.initiateFailback();
+                      _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;
@@ -1082,36 +1145,40 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                       return (0, _common.handleRegistrationErrors)(body, function (clientError, finalError) {
                         var _body$headers$trackin, _body$headers;
                         if (finalError) {
-                          _this6.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
+                          _this7.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
                         } else {
-                          _this6.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
+                          _this7.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
                         }
-                        _this6.metricManager.submitRegistrationMetric(_types.METRIC_EVENT.REGISTRATION_ERROR, _types.REG_ACTION.REGISTER, _types.METRIC_TYPE.BEHAVIORAL, caller, serverType, (_body$headers$trackin = (_body$headers = body.headers) === null || _body$headers === void 0 ? void 0 : _body$headers.trackingid) !== null && _body$headers$trackin !== void 0 ? _body$headers$trackin : '', undefined, clientError);
+                        _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);
                       }, {
                         method: caller,
                         file: _constants2.REGISTRATION_FILE
                       }, function (retryAfter, retryCaller) {
-                        return _this6.handle429Retry(retryAfter, retryCaller);
-                      }, _this6.restoreRegistrationCallBack());
+                        return _this7.handle429Retry(retryAfter, retryCaller);
+                      }, _this7.restoreRegistrationCallBack());
                     case 28:
                       abort = _context19.sent;
-                      if (!(_this6.registrationStatus === _types2.RegistrationStatus.ACTIVE)) {
+                      if (!(_this7.registrationStatus === _types2.RegistrationStatus.ACTIVE)) {
                         _context19.next = 32;
                         break;
                       }
-                      _Logger.default.info("[".concat(caller, "] : Device is already restored, active mobius url: ").concat(_this6.activeMobiusUrl), {
+                      _Logger.default.info("[".concat(caller, "] : Device is already restored, active mobius url: ").concat(_this7.activeMobiusUrl), {
                         file: _constants2.REGISTRATION_FILE,
-                        method: _this6.attemptRegistrationWithServers.name
+                        method: _this7.attemptRegistrationWithServers.name
                       });
                       return _context19.abrupt("return", 0);
                     case 32:
                       if (!abort) {
-                        _context19.next = 35;
+                        _context19.next = 37;
                         break;
                       }
-                      _this6.setStatus(_types2.RegistrationStatus.INACTIVE);
+                      _this7.setStatus(_types2.RegistrationStatus.INACTIVE);
+                      // eslint-disable-next-line no-await-in-loop
+                      _context19.next = 36;
+                      return (0, _common.uploadLogs)();
+                    case 36:
                       return _context19.abrupt("return", 0);
-                    case 35:
+                    case 37:
                     case "end":
                       return _context19.stop();
                   }
@@ -1153,7 +1220,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
           }
         }, _callee19, this, [[9, 21, 24, 27]]);
       }));
-      function attemptRegistrationWithServers(_x12) {
+      function attemptRegistrationWithServers(_x11) {
         return _attemptRegistrationWithServers.apply(this, arguments);
       }
       return attemptRegistrationWithServers;
@@ -1166,8 +1233,8 @@ 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 _this7 = this;
+      var _startKeepaliveTimer = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee22(url, interval, serverType) {
+        var _this8 = this;
         var RETRY_COUNT_THRESHOLD;
         return _regenerator.default.wrap(function _callee22$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
@@ -1175,50 +1242,50 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               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() {
+              return this.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee21() {
                 var accessToken, blob, blobUrl;
                 return _regenerator.default.wrap(function _callee21$(_context22) {
                   while (1) switch (_context22.prev = _context22.next) {
                     case 0:
-                      if (!_this7.isDeviceRegistered()) {
+                      if (!_this8.isDeviceRegistered()) {
                         _context22.next = 5;
                         break;
                       }
                       _context22.next = 3;
-                      return _this7.webex.credentials.getUserToken();
+                      return _this8.webex.credentials.getUserToken();
                     case 3:
                       accessToken = _context22.sent;
-                      if (!_this7.webWorker) {
+                      if (!_this8.webWorker) {
                         blob = new Blob([_webWorkerStr.default], {
                           type: 'application/javascript'
                         });
                         blobUrl = URL.createObjectURL(blob);
-                        _this7.webWorker = new Worker(blobUrl);
+                        _this8.webWorker = new Worker(blobUrl);
                         URL.revokeObjectURL(blobUrl);
-                        _this7.webWorker.postMessage({
+                        _this8.webWorker.postMessage({
                           type: _types2.WorkerMessageType.START_KEEPALIVE,
                           accessToken: String(accessToken),
-                          deviceUrl: String(_this7.webex.internal.device.url),
+                          deviceUrl: String(_this8.webex.internal.device.url),
                           interval: interval,
                           retryCountThreshold: RETRY_COUNT_THRESHOLD,
                           url: url
                         });
-                        _this7.webWorker.onmessage = /*#__PURE__*/function () {
-                          var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20(event) {
+                        _this8.webWorker.onmessage = /*#__PURE__*/function () {
+                          var _ref10 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee20(event) {
                             var logContext, error, abort;
                             return _regenerator.default.wrap(function _callee20$(_context21) {
                               while (1) switch (_context21.prev = _context21.next) {
                                 case 0:
                                   logContext = {
                                     file: _constants2.REGISTRATION_FILE,
-                                    method: _this7.startKeepaliveTimer.name
+                                    method: _constants2.KEEPALIVE_UTIL
                                   };
                                   if (event.data.type === _types2.WorkerMessageType.KEEPALIVE_SUCCESS) {
                                     _Logger.default.info("Sent Keepalive, status: ".concat(event.data.statusCode), logContext);
-                                    _this7.lineEmitter(_types3.LINE_EVENTS.RECONNECTED);
+                                    _this8.lineEmitter(_types3.LINE_EVENTS.RECONNECTED);
                                   }
                                   if (!(event.data.type === _types2.WorkerMessageType.KEEPALIVE_FAILURE)) {
-                                    _context21.next = 20;
+                                    _context21.next = 25;
                                     break;
                                   }
                                   error = event.data.err;
@@ -1227,43 +1294,55 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                                   return (0, _common.handleRegistrationErrors)(error, function (clientError, finalError) {
                                     var _error$headers$tracki, _error$headers;
                                     if (finalError) {
-                                      _this7.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
+                                      _this8.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
                                     }
-                                    _this7.metricManager.submitRegistrationMetric(_types.METRIC_EVENT.REGISTRATION, _types.REG_ACTION.KEEPALIVE_FAILURE, _types.METRIC_TYPE.BEHAVIORAL, _constants2.KEEPALIVE_UTIL, serverType, (_error$headers$tracki = (_error$headers = error.headers) === null || _error$headers === void 0 ? void 0 : _error$headers.trackingid) !== null && _error$headers$tracki !== void 0 ? _error$headers$tracki : '', event.data.keepAliveRetryCount, 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);
                                   }, {
                                     method: _constants2.KEEPALIVE_UTIL,
                                     file: _constants2.REGISTRATION_FILE
+                                  }, function (retryAfter, retryCaller) {
+                                    return _this8.handle429Retry(retryAfter, retryCaller);
                                   });
                                 case 7:
                                   abort = _context21.sent;
                                   if (!(abort || event.data.keepAliveRetryCount >= RETRY_COUNT_THRESHOLD)) {
-                                    _context21.next = 19;
+                                    _context21.next = 24;
                                     break;
                                   }
-                                  _this7.failoverImmediately = _this7.isCCFlow;
-                                  _this7.setStatus(_types2.RegistrationStatus.INACTIVE);
-                                  _this7.clearKeepaliveTimer();
-                                  _this7.clearFailbackTimer();
-                                  _this7.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
+                                  _this8.failoverImmediately = _this8.isCCFlow;
+                                  _this8.setStatus(_types2.RegistrationStatus.INACTIVE);
+                                  _this8.clearKeepaliveTimer();
+                                  _this8.clearFailbackTimer();
+                                  _this8.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
+                                  _context21.next = 16;
+                                  return (0, _common.uploadLogs)();
+                                case 16:
                                   if (abort) {
-                                    _context21.next = 17;
+                                    _context21.next = 21;
                                     break;
                                   }
-                                  _context21.next = 17;
-                                  return _this7.reconnectOnFailure(_constants2.KEEPALIVE_UTIL);
-                                case 17:
-                                  _context21.next = 20;
-                                  break;
+                                  _context21.next = 19;
+                                  return _this8.reconnectOnFailure(_constants2.KEEPALIVE_UTIL);
                                 case 19:
-                                  _this7.lineEmitter(_types3.LINE_EVENTS.RECONNECTING);
-                                case 20:
+                                  _context21.next = 22;
+                                  break;
+                                case 21:
+                                  if (error.statusCode === 404) {
+                                    _this8.handle404KeepaliveFailure(_constants2.KEEPALIVE_UTIL);
+                                  }
+                                case 22:
+                                  _context21.next = 25;
+                                  break;
+                                case 24:
+                                  _this8.lineEmitter(_types3.LINE_EVENTS.RECONNECTING);
+                                case 25:
                                 case "end":
                                   return _context21.stop();
                               }
                             }, _callee20);
                           }));
-                          return function (_x16) {
-                            return _ref11.apply(this, arguments);
+                          return function (_x15) {
+                            return _ref10.apply(this, arguments);
                           };
                         }();
                       }
@@ -1279,7 +1358,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
           }
         }, _callee22, this);
       }));
-      function startKeepaliveTimer(_x13, _x14, _x15) {
+      function startKeepaliveTimer(_x12, _x13, _x14) {
         return _startKeepaliveTimer.apply(this, arguments);
       }
       return startKeepaliveTimer;
@@ -1307,14 +1386,14 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "deregister",
     value: function () {
-      var _deregister = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee23() {
-        var _this$deviceInfo$devi, _this$deviceInfo$devi2;
+      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) {
             case 0:
               _context24.prev = 0;
               _context24.next = 3;
-              return this.deleteRegistration(this.activeMobiusUrl, (_this$deviceInfo$devi = this.deviceInfo.device) === null || _this$deviceInfo$devi === void 0 ? void 0 : _this$deviceInfo$devi.deviceId, (_this$deviceInfo$devi2 = this.deviceInfo.device) === null || _this$deviceInfo$devi2 === void 0 ? void 0 : _this$deviceInfo$devi2.clientDeviceUri);
+              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:
               _Logger.default.log('Registration successfully deregistered', {
                 file: _constants2.REGISTRATION_FILE,
@@ -1400,7 +1479,7 @@ 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 _callee24(caller) {
         var abort;
         return _regenerator.default.wrap(function _callee24$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
@@ -1443,7 +1522,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
           }
         }, _callee24, this);
       }));
-      function reconnectOnFailure(_x17) {
+      function reconnectOnFailure(_x16) {
         return _reconnectOnFailure.apply(this, arguments);
       }
       return reconnectOnFailure;