@webex/calling 3.12.0-mobius-socket.11 → 3.12.0-mobius-socket.13

package/dist/CallingClient/registration/register.js

@@ -317,25 +317,44 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     value: (function () {
       var _restorePreviousRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(caller) {
         var _this = this;
-        var abort;
+        var loggerContext, abort;
         return _regenerator.default.wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
+              loggerContext = {
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.METHODS.RESTORE_PREVIOUS_REGISTRATION
+              };
+              _Logger.default.info("".concat(_constants.METHOD_START_MESSAGE, " - caller: ").concat(caller, ", activeMobiusUrl: ").concat(this.activeMobiusUrl), loggerContext);
               abort = false;
-              if (!this.activeMobiusUrl) {
-                _context5.next = 6;
+              if (!this.apiRequest.isSocketEnabled()) {
+                _context5.next = 1;
                 break;
               }
+              _Logger.default.info("Disconnecting from Mobius socket to restore previous registration.", {
+                file: _constants2.REGISTRATION_FILE,
+                method: 'restorePreviousRegistration'
+              });
               _context5.next = 1;
-              return this.attemptRegistrationWithServers(caller, [this.activeMobiusUrl]);
+              return this.apiRequest.disconnectFromMobiusSocket({
+                code: 3050,
+                reason: 'done (permanent)'
+              });
             case 1:
+              if (!this.activeMobiusUrl) {
+                _context5.next = 7;
+                break;
+              }
+              _context5.next = 2;
+              return this.attemptRegistrationWithServers(caller, [this.activeMobiusUrl]);
+            case 2:
               abort = _context5.sent;
               if (!this.retryAfter) {
-                _context5.next = 6;
+                _context5.next = 7;
                 break;
               }
               if (!(this.retryAfter < _constants2.RETRY_TIMER_UPPER_LIMIT)) {
-                _context5.next = 2;
+                _context5.next = 3;
                 break;
               }
               // If retry-after is less than threshold, honor it and schedule retry
@@ -351,28 +370,30 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                   }
                 }, _callee4);
               })), this.retryAfter * 1000);
-              _context5.next = 5;
+              _context5.next = 6;
               break;
-            case 2:
+            case 3:
               if (!(this.primaryMobiusUris.includes(this.activeMobiusUrl) && this.backupMobiusUris.length > 0)) {
-                _context5.next = 4;
+                _context5.next = 5;
                 break;
               }
-              _context5.next = 3;
+              _context5.next = 4;
               return this.attemptRegistrationWithServers(caller, this.backupMobiusUris);
-            case 3:
+            case 4:
               abort = _context5.sent;
-              _context5.next = 5;
+              _context5.next = 6;
               break;
-            case 4:
-              // If we are using backup and got 429, restart registration
-              this.restartRegistration(caller);
             case 5:
+              _context5.next = 6;
+              return this.restartRegistration(caller);
+            case 6:
               this.retryAfter = undefined;
+              _Logger.default.log("restorePreviousRegistration completed via 429 retry-after path - caller: ".concat(caller), loggerContext);
               return _context5.abrupt("return", true);
-            case 6:
-              return _context5.abrupt("return", abort);
             case 7:
+              _Logger.default.log("restorePreviousRegistration completed - caller: ".concat(caller, ", deviceRegistered: ").concat(this.isDeviceRegistered(), ", abort: ").concat(abort), loggerContext);
+              return _context5.abrupt("return", abort);
+            case 8:
             case "end":
               return _context5.stop();
           }
@@ -391,12 +412,17 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     key: "handle404KeepaliveFailure",
     value: (function () {
       var _handle404KeepaliveFailure = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(caller) {
-        var abort;
+        var loggerContext, abort;
         return _regenerator.default.wrap(function (_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
+              loggerContext = {
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.METHODS.HANDLE_404_KEEPALIVE_FAILURE
+              };
+              _Logger.default.info("".concat(_constants.METHOD_START_MESSAGE, " - caller: ").concat(caller), loggerContext);
               if (!(caller === _constants2.KEEPALIVE_UTIL)) {
-                _context6.next = 2;
+                _context6.next = 4;
                 break;
               }
               _context6.next = 1;
@@ -404,12 +430,18 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
             case 1:
               abort = _context6.sent;
               if (!(!abort && !this.isDeviceRegistered())) {
-                _context6.next = 2;
+                _context6.next = 3;
                 break;
               }
+              _Logger.default.warn('Keepalive 404 recovery: re-registration did not complete, starting failover timer', loggerContext);
               _context6.next = 2;
               return this.startFailoverTimer();
             case 2:
+              _context6.next = 4;
+              break;
+            case 3:
+              _Logger.default.log("Keepalive 404 recovery handled - deviceRegistered: ".concat(this.isDeviceRegistered(), ", abort: ").concat(abort), loggerContext);
+            case 4:
             case "end":
               return _context6.stop();
           }
@@ -602,13 +634,26 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                 }, _callee0);
               })), interval * _constants2.SEC_TO_MSEC_MFACTOR);
               _Logger.default.log("Scheduled retry with primary in ".concat(interval, " seconds, number of attempts : ").concat(attempt), loggerContext);
-              _context11.next = 5;
+              _context11.next = 7;
               break;
             case 1:
               if (!this.backupMobiusUris.length) {
+                _context11.next = 5;
+                break;
+              }
+              if (!this.apiRequest.isSocketEnabled()) {
                 _context11.next = 3;
                 break;
               }
+              _Logger.default.info('Disconnecting from primary Mobius socket for failover to backup servers', loggerContext);
+              _context11.next = 2;
+              return this.apiRequest.disconnectFromMobiusSocket({
+                code: 3050,
+                reason: 'done (permanent)'
+              });
+            case 2:
+              _Logger.default.log('Mobius socket disconnect complete prior to backup failover', loggerContext);
+            case 3:
               this.saveFailoverState({
                 attempt: attempt,
                 timeElapsed: timeElapsed,
@@ -617,9 +662,9 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               });
               _Logger.default.info('Failing over to backup servers.', loggerContext);
               this.failoverImmediately = false;
-              _context11.next = 2;
+              _context11.next = 4;
               return this.attemptRegistrationWithServers(_constants2.FAILOVER_UTIL, this.backupMobiusUris);
-            case 2:
+            case 4:
               abort = _context11.sent;
               if (!abort && !this.isDeviceRegistered()) {
                 interval = this.getRegRetryInterval();
@@ -663,16 +708,16 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                 })), interval * _constants2.SEC_TO_MSEC_MFACTOR);
                 _Logger.default.log("Scheduled retry with backup servers in ".concat(interval, " seconds."), loggerContext);
               }
-              _context11.next = 5;
+              _context11.next = 7;
               break;
-            case 3:
-              _context11.next = 4;
+            case 5:
+              _context11.next = 6;
               return (0, _common.uploadLogs)();
-            case 4:
+            case 6:
               (0, _common.emitFinalFailure)(function (clientError) {
                 _this3.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
               }, loggerContext, interval < 0 ? 'Timer threshold exceeded during failover' : undefined);
-            case 5:
+            case 7:
             case "end":
               return _context11.stop();
           }
@@ -826,13 +871,21 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
   }, {
     key: "initiateFailback",
     value: function initiateFailback() {
+      var loggerContext = {
+        file: _constants2.REGISTRATION_FILE,
+        method: _constants2.METHODS.INITIATE_FAILBACK
+      };
       if (this.isFailbackRequired()) {
         if (!this.failbackTimer) {
           this.failback429RetryAttempts = 0;
           var intervalInMinutes = this.getFailbackInterval();
+          _Logger.default.info("Scheduling failback to primary - intervalMinutes: ".concat(intervalInMinutes), loggerContext);
           this.startFailbackTimer(intervalInMinutes * _constants2.MINUTES_TO_SEC_MFACTOR);
+        } else {
+          _Logger.default.info('Failback timer already scheduled, skipping', loggerContext);
         }
       } else {
+        _Logger.default.info('Failback not required, clearing any pending failback timer', loggerContext);
         this.failback429RetryAttempts = 0;
         this.clearFailbackTimer();
       }
@@ -872,9 +925,15 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     value: (function () {
       var _executeFailback = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee16() {
         var _this5 = this;
+        var loggerContext;
         return _regenerator.default.wrap(function (_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
+              loggerContext = {
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.METHODS.EXECUTE_FAILBACK
+              };
+              _Logger.default.info(_constants.METHOD_START_MESSAGE, loggerContext);
               _context16.next = 1;
               return this.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15() {
                 var primaryServerStatus, abort, abortNew;
@@ -882,7 +941,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                   while (1) switch (_context15.prev = _context15.next) {
                     case 0:
                       if (!_this5.isFailbackRequired()) {
-                        _context15.next = 12;
+                        _context15.next = 13;
                         break;
                       }
                       _context15.next = 1;
@@ -890,70 +949,67 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                     case 1:
                       primaryServerStatus = _context15.sent;
                       if (!((0, _keys.default)(_this5.callManager.getActiveCalls()).length === 0 && primaryServerStatus)) {
-                        _context15.next = 11;
+                        _context15.next = 12;
                         break;
                       }
-                      _Logger.default.info("Attempting failback to primary.", {
-                        file: _constants2.REGISTRATION_FILE,
-                        method: _this5.executeFailback.name
-                      });
+                      _Logger.default.info("Attempting failback to primary.", loggerContext);
                       _context15.next = 2;
                       return _this5.deregister();
                     case 2:
                       if (!_this5.apiRequest.isSocketEnabled()) {
-                        _context15.next = 3;
+                        _context15.next = 4;
                         break;
                       }
+                      _Logger.default.info('Disconnecting from backup Mobius socket for failback to primary', loggerContext);
                       _context15.next = 3;
                       return _this5.apiRequest.disconnectFromMobiusSocket({
                         code: 3050,
                         reason: 'done (permanent)'
                       });
                     case 3:
-                      _context15.next = 4;
-                      return _this5.attemptRegistrationWithServers(_constants2.FAILBACK_UTIL);
+                      _Logger.default.log('Mobius socket disconnect complete prior to primary failback', loggerContext);
                     case 4:
+                      _context15.next = 5;
+                      return _this5.attemptRegistrationWithServers(_constants2.FAILBACK_UTIL);
+                    case 5:
                       abort = _context15.sent;
                       if (!(_this5.scheduled429Retry || abort || _this5.isDeviceRegistered())) {
-                        _context15.next = 5;
+                        _context15.next = 6;
                         break;
                       }
                       return _context15.abrupt("return");
-                    case 5:
-                      _context15.next = 6;
-                      return _this5.restorePreviousRegistration(_constants2.FAILBACK_UTIL);
                     case 6:
+                      _context15.next = 7;
+                      return _this5.restorePreviousRegistration(_constants2.FAILBACK_UTIL);
+                    case 7:
                       abortNew = _context15.sent;
                       if (!abortNew) {
-                        _context15.next = 7;
+                        _context15.next = 8;
                         break;
                       }
                       _this5.clearFailbackTimer();
                       return _context15.abrupt("return");
-                    case 7:
+                    case 8:
                       if (_this5.isDeviceRegistered()) {
-                        _context15.next = 9;
+                        _context15.next = 10;
                         break;
                       }
-                      _context15.next = 8;
-                      return _this5.restartRegistration(_this5.executeFailback.name);
-                    case 8:
-                      _context15.next = 10;
-                      break;
+                      _context15.next = 9;
+                      return _this5.restartRegistration(loggerContext.method);
                     case 9:
+                      _context15.next = 11;
+                      break;
+                    case 10:
                       _this5.failbackTimer = undefined;
                       _this5.initiateFailback();
-                    case 10:
-                      _context15.next = 12;
-                      break;
                     case 11:
-                      _Logger.default.info('Active calls present or primary Mobius is down, deferring failback to next cycle.', {
-                        file: _constants2.REGISTRATION_FILE,
-                        method: _this5.executeFailback.name
-                      });
+                      _context15.next = 13;
+                      break;
+                    case 12:
+                      _Logger.default.info('Active calls present or primary Mobius is down, deferring failback to next cycle.', loggerContext);
                       _this5.failbackTimer = undefined;
                       _this5.initiateFailback();
-                    case 12:
+                    case 13:
                     case "end":
                       return _context15.stop();
                   }
@@ -1027,10 +1083,16 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     key: "restartRegistration",
     value: (function () {
       var _restartRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17(caller) {
-        var abort;
+        var loggerContext, abort;
         return _regenerator.default.wrap(function (_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
+              loggerContext = {
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.METHODS.RESTART_REGISTRATION
+              };
+              _Logger.default.info("".concat(_constants.METHOD_START_MESSAGE, " - caller: ").concat(caller), loggerContext);
+
               /*
                * Cancel any failback timer running
                * and start fresh registration attempt with retry as true.
@@ -1048,6 +1110,8 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               _context17.next = 2;
               return this.startFailoverTimer();
             case 2:
+              _Logger.default.log("restartRegistration completed - caller: ".concat(caller, ", deviceRegistered: ").concat(this.isDeviceRegistered(), ", abort: ").concat(abort), loggerContext);
+            case 3:
             case "end":
               return _context17.stop();
           }
@@ -1204,10 +1268,15 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     key: "triggerRegistration",
     value: (function () {
       var _triggerRegistration = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee21() {
-        var abort;
+        var loggerContext, abort;
         return _regenerator.default.wrap(function (_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
+              loggerContext = {
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.METHODS.TRIGGER_REGISTRATION
+              };
+              _Logger.default.info(_constants.METHOD_START_MESSAGE, loggerContext);
               _context21.next = 1;
               return this.resumeFailover();
             case 1:
@@ -1215,10 +1284,11 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                 _context21.next = 2;
                 break;
               }
+              _Logger.default.info('Registration trigger handled by resumeFailover path', loggerContext);
               return _context21.abrupt("return");
             case 2:
               if (!(this.primaryMobiusUris.length > 0)) {
-                _context21.next = 4;
+                _context21.next = 5;
                 break;
               }
               _context21.next = 3;
@@ -1232,6 +1302,12 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
               _context21.next = 4;
               return this.startFailoverTimer();
             case 4:
+              _Logger.default.log("triggerRegistration completed - deviceRegistered: ".concat(this.isDeviceRegistered(), ", abort: ").concat(abort), loggerContext);
+              _context21.next = 6;
+              break;
+            case 5:
+              _Logger.default.warn('triggerRegistration skipped: no primary Mobius URIs available', loggerContext);
+            case 6:
             case "end":
               return _context21.stop();
           }
@@ -1257,6 +1333,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
       var _attemptRegistrationWithServers = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee22(caller) {
         var _this8 = this;
         var servers,
+          loggerContext,
           abort,
           connectedWebSocketUrl,
           _iterator2,
@@ -1269,6 +1346,10 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
               servers = _args23.length > 1 && _args23[1] !== undefined ? _args23[1] : this.primaryMobiusUris;
+              loggerContext = {
+                file: _constants2.REGISTRATION_FILE,
+                method: _constants2.REGISTER_UTIL
+              };
               abort = false;
               this.retryAfter = undefined;
               if (!this.failoverImmediately) {
@@ -1281,17 +1362,14 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                 _context23.next = 2;
                 break;
               }
-              _Logger.default.info("[".concat(caller, "] : Device already registered with : ").concat(this.activeMobiusUrl), {
-                file: _constants2.REGISTRATION_FILE,
-                method: _constants2.REGISTER_UTIL
-              });
+              _Logger.default.info("[".concat(caller, "] : Device already registered with : ").concat(this.activeMobiusUrl), loggerContext);
               return _context23.abrupt("return", abort);
             case 2:
               _iterator2 = _createForOfIteratorHelper(servers);
               _context23.prev = 3;
               _loop = /*#__PURE__*/_regenerator.default.mark(function _loop() {
                 var _this8$backupMobiusUr;
-                var url, serverType, _this8$deviceInfo$dev, _resp$headers, _resp$headers$trackin, _resp$headers2, _this8$deviceInfo$dev2, wssNormalizedUrl, resp, body, _t5;
+                var url, serverType, _this8$deviceInfo$dev, _resp$headers, _resp$headers$trackin, _resp$headers2, _this8$deviceInfo$dev2, wssNormalizedUrl, resp, body, _yield$handleRegistra, finalError, shouldDisconnect, _t5;
                 return _regenerator.default.wrap(function (_context22) {
                   while (1) switch (_context22.prev = _context22.next) {
                     case 0:
@@ -1301,20 +1379,21 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                       abort = false;
                       _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
-                      });
+                      _Logger.default.info("[".concat(caller, "] : Mobius url to contact: ").concat(url), loggerContext);
                       if (!_this8.apiRequest.isSocketEnabled()) {
                         _context22.next = 3;
                         break;
                       }
-                      wssNormalizedUrl = url.endsWith('/') ? url.slice(0, -1) : url; // eslint-disable-next-line no-await-in-loop
+                      wssNormalizedUrl = url.endsWith('/') ? url.slice(0, -1) : url;
+                      _Logger.default.info("[".concat(caller, "] : Connecting to Mobius WebSocket - serverType: ").concat(serverType, ", wssUrl: ").concat(wssNormalizedUrl), loggerContext);
+
+                      // eslint-disable-next-line no-await-in-loop
                       _context22.next = 2;
                       return _this8.apiRequest.connectToMobiusSocket(wssNormalizedUrl);
                     case 2:
                       connectedWebSocketUrl = _context22.sent;
                       connectedWebSocketUrl = connectedWebSocketUrl ? "".concat(connectedWebSocketUrl, "/") : undefined;
+                      _Logger.default.log("[".concat(caller, "] : Mobius WebSocket connected - serverType: ").concat(serverType, ", connectedWebSocketUrl: ").concat(connectedWebSocketUrl), loggerContext);
                     case 3:
                       _context22.next = 4;
                       return _this8.postRegistration(url);
@@ -1325,10 +1404,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                       _this8.registrationStatus = _types2.RegistrationStatus.ACTIVE;
                       _this8.setActiveMobiusUrl(connectedWebSocketUrl || 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
-                      });
+                      _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), loggerContext);
                       _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);
@@ -1338,19 +1414,11 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                     case 5:
                       _context22.prev = 5;
                       _t5 = _context22["catch"](1);
-                      connectedWebSocketUrl = undefined;
-                      // eslint-disable-next-line no-await-in-loop
-                      _context22.next = 6;
-                      return _this8.apiRequest.disconnectFromMobiusSocket({
-                        code: 3050,
-                        reason: 'done (permanent)'
-                      });
-                    case 6:
                       body = _t5; // eslint-disable-next-line no-await-in-loop, @typescript-eslint/no-unused-vars
-                      _context22.next = 7;
-                      return (0, _common.handleRegistrationErrors)(body, function (clientError, finalError) {
+                      _context22.next = 6;
+                      return (0, _common.handleRegistrationErrors)(body, function (clientError, isFinalError) {
                         var _body$headers$trackin, _body$headers;
-                        if (finalError) {
+                        if (isFinalError) {
                           _this8.lineEmitter(_types3.LINE_EVENTS.ERROR, undefined, clientError);
                         } else {
                           _this8.lineEmitter(_types3.LINE_EVENTS.UNREGISTERED);
@@ -1361,30 +1429,46 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                         file: _constants2.REGISTRATION_FILE
                       }, function (retryAfter, retryCaller) {
                         return _this8.handle429Retry(retryAfter, retryCaller);
-                      }, _this8.restoreRegistrationCallBack());
-                    case 7:
-                      abort = _context22.sent;
+                      }, _this8.restoreRegistrationCallBack(), servers.length);
+                    case 6:
+                      _yield$handleRegistra = _context22.sent;
+                      finalError = _yield$handleRegistra.finalError;
+                      shouldDisconnect = _yield$handleRegistra.shouldDisconnect;
+                      abort = finalError;
                       if (!(_this8.registrationStatus === _types2.RegistrationStatus.ACTIVE)) {
-                        _context22.next = 8;
+                        _context22.next = 7;
                         break;
                       }
-                      _Logger.default.info("[".concat(caller, "] : Device is already restored, active mobius url: ").concat(_this8.activeMobiusUrl), {
-                        file: _constants2.REGISTRATION_FILE,
-                        method: _this8.attemptRegistrationWithServers.name
-                      });
+                      _Logger.default.info("[".concat(caller, "] : Device is already restored, active mobius url: ").concat(_this8.activeMobiusUrl), loggerContext);
                       return _context22.abrupt("return", 0);
+                    case 7:
+                      if (!(shouldDisconnect && _this8.apiRequest.isSocketEnabled())) {
+                        _context22.next = 9;
+                        break;
+                      }
+                      connectedWebSocketUrl = undefined;
+                      _Logger.default.info("[".concat(caller, "] : Tearing down Mobius WebSocket after registration error - serverType: ").concat(serverType), loggerContext);
+
+                      // eslint-disable-next-line no-await-in-loop
+                      _context22.next = 8;
+                      return _this8.apiRequest.disconnectFromMobiusSocket({
+                        code: 3050,
+                        reason: 'done (permanent)'
+                      });
                     case 8:
+                      _Logger.default.log("[".concat(caller, "] : Mobius WebSocket disconnect complete after registration error - serverType: ").concat(serverType), loggerContext);
+                    case 9:
                       if (!abort) {
-                        _context22.next = 10;
+                        _context22.next = 11;
                         break;
                       }
                       _this8.setStatus(_types2.RegistrationStatus.INACTIVE);
                       // eslint-disable-next-line no-await-in-loop
-                      _context22.next = 9;
+                      _context22.next = 10;
                       return (0, _common.uploadLogs)();
-                    case 9:
-                      return _context22.abrupt("return", 0);
                     case 10:
+                      return _context22.abrupt("return", 0);
+                    case 11:
                     case "end":
                       return _context22.stop();
                   }
@@ -1468,7 +1552,7 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                           });
                           _this9.webWorker.onmessage = /*#__PURE__*/function () {
                             var _ref11 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee23(event) {
-                              var logContext, _this9$webWorker, res, _err$headers, _this9$webWorker2, error, _error, abort, _t7;
+                              var logContext, _this9$webWorker, res, _err$headers, _this9$webWorker2, error, _error, _yield$handleRegistra2, abort, _t7;
                               return _regenerator.default.wrap(function (_context24) {
                                 while (1) switch (_context24.prev = _context24.next) {
                                   case 0:
@@ -1532,7 +1616,8 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
                                       return _this9.handle429Retry(retryAfter, retryCaller);
                                     });
                                   case 5:
-                                    abort = _context24.sent;
+                                    _yield$handleRegistra2 = _context24.sent;
+                                    abort = _yield$handleRegistra2.finalError;
                                     if (!(abort || event.data.keepAliveRetryCount >= RETRY_COUNT_THRESHOLD)) {
                                       _context24.next = 10;
                                       break;
@@ -1616,36 +1701,35 @@ var Registration = exports.Registration = /*#__PURE__*/function () {
     key: "deregister",
     value: function () {
       var _deregister = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee26() {
-        var _this$deviceInfo$devi2, _this$deviceInfo$devi3, _t8;
+        var loggerContext, _this$deviceInfo$devi2, _this$deviceInfo$devi3, _t8;
         return _regenerator.default.wrap(function (_context27) {
           while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              _context27.prev = 0;
-              _context27.next = 1;
-              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 1:
-              _Logger.default.log('Registration successfully deregistered', {
+              loggerContext = {
                 file: _constants2.REGISTRATION_FILE,
                 method: _constants2.METHODS.DEREGISTER
-              });
-              _context27.next = 3;
-              break;
+              };
+              _Logger.default.info(_constants.METHOD_START_MESSAGE, loggerContext);
+              _context27.prev = 1;
+              _context27.next = 2;
+              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 2:
-              _context27.prev = 2;
-              _t8 = _context27["catch"](0);
-              _Logger.default.warn("Delete failed with Mobius: ".concat((0, _stringify.default)(_t8)), {
-                file: _constants2.REGISTRATION_FILE,
-                method: _constants2.METHODS.DEREGISTER
-              });
+              _Logger.default.log('Registration successfully deregistered', loggerContext);
+              _context27.next = 4;
+              break;
             case 3:
+              _context27.prev = 3;
+              _t8 = _context27["catch"](1);
+              _Logger.default.warn("Delete failed with Mobius: ".concat((0, _stringify.default)(_t8)), loggerContext);
+            case 4:
               this.clearKeepaliveTimer();
               this.setStatus(_types2.RegistrationStatus.INACTIVE);
               this.clearFailoverState();
-            case 4:
+            case 5:
             case "end":
               return _context27.stop();
           }
-        }, _callee26, this, [[0, 2]]);
+        }, _callee26, this, [[1, 3]]);
       }));
       function deregister() {
         return _deregister.apply(this, arguments);