@webex/calling 3.8.1-next.7 → 3.8.1-next.9

package/dist/CallingClient/registration/register.test.js

@@ -702,16 +702,15 @@ describe('Registration Tests', function () {
         while (1) switch (_context13.prev = _context13.next) {
           case 0:
             /* keep keepalive as active so that it wont interfere with the failback tests */
-            jest.spyOn(reg, 'postKeepAlive').mockResolvedValue(successPayload);
             jest.useFakeTimers();
             postRegistrationSpy.mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockResolvedValueOnce(successPayload);
-            _context13.next = 5;
+            _context13.next = 4;
             return reg.triggerRegistration();
-          case 5:
+          case 4:
             jest.advanceTimersByTime(_constants.REG_TRY_BACKUP_TIMER_VAL_IN_SEC * _constants.SEC_TO_MSEC_MFACTOR);
-            _context13.next = 8;
+            _context13.next = 7;
             return flushPromises();
-          case 8:
+          case 7:
             reg.rehomingIntervalMin = _constants.DEFAULT_REHOMING_INTERVAL_MIN;
             reg.rehomingIntervalMax = _constants.DEFAULT_REHOMING_INTERVAL_MAX;
 
@@ -721,7 +720,7 @@ describe('Registration Tests', function () {
             /* Active Url must match with the backup url as per the test */
             expect(reg.getActiveMobiusUrl()).toStrictEqual(mobiusUris.backup[0]);
             expect(reg.getStatus()).toEqual(_types.RegistrationStatus.ACTIVE);
-          case 13:
+          case 12:
           case "end":
             return _context13.stop();
         }
@@ -928,13 +927,6 @@ describe('Registration Tests', function () {
 
   // Keep-alive related test cases
   describe('Keep-alive Tests', function () {
-    var logObj = {
-      file: _constants.REGISTRATION_FILE,
-      method: 'startKeepaliveTimer'
-    };
-    var mockKeepAliveBody = {
-      device: _registerFixtures.mockPostResponse.device
-    };
     var beforeEachSetupForKeepalive = /*#__PURE__*/function () {
       var _ref20 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20() {
         return _regenerator.default.wrap(function _callee20$(_context20) {
@@ -946,7 +938,8 @@ describe('Registration Tests', function () {
               return reg.triggerRegistration();
             case 4:
               expect(reg.getStatus()).toBe(_types.RegistrationStatus.ACTIVE);
-            case 5:
+              expect(reg.webWorker).toBeDefined();
+            case 6:
             case "end":
               return _context20.stop();
           }
@@ -959,10 +952,7 @@ describe('Registration Tests', function () {
     afterEach(function () {
       jest.clearAllTimers();
       jest.clearAllMocks();
-      if (reg.keepaliveTimer) {
-        clearInterval(reg.keepaliveTimer);
-        reg.keepaliveTimer = undefined;
-      }
+      reg.clearKeepaliveTimer();
       reg.reconnectPending = false;
       var calls = (0, _values.default)(reg.callManager.getActiveCalls());
       calls.forEach(function (call) {
@@ -970,175 +960,172 @@ describe('Registration Tests', function () {
       });
     });
     it('verify successful keep-alive cases', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21() {
-      var keepAlivePayload, funcSpy;
+      var postMessageSpy;
       return _regenerator.default.wrap(function _callee21$(_context21) {
         while (1) switch (_context21.prev = _context21.next) {
           case 0:
-            _context21.next = 2;
+            postMessageSpy = jest.spyOn(Worker.prototype, 'postMessage');
+            _context21.next = 3;
             return beforeEachSetupForKeepalive();
-          case 2:
-            keepAlivePayload = {
-              statusCode: 200,
-              body: mockKeepAliveBody
-            };
-            webex.request.mockReturnValue(keepAlivePayload);
-            funcSpy = jest.spyOn(reg, 'postKeepAlive');
-            jest.advanceTimersByTime(2 * _registerFixtures.mockPostResponse.keepaliveInterval * _constants.SEC_TO_MSEC_MFACTOR);
-            _context21.next = 8;
-            return flushPromises();
-          case 8:
-            expect(funcSpy).toBeCalledTimes(2); // should be called 2 times: first try and after the interval.
-
-            expect(logSpy).toBeCalledWith('Sent Keepalive, status: 200', logObj);
-            expect(infoSpy).not.toBeCalledWith('Sent Keepalive, status: 200', logObj);
-          case 11:
+          case 3:
+            expect(reg.webWorker).toBeDefined();
+            expect(postMessageSpy).toHaveBeenCalledWith(expect.objectContaining({
+              type: 'START_KEEPALIVE',
+              accessToken: expect.any(String),
+              deviceUrl: expect.any(String),
+              interval: expect.any(Number),
+              retryCountThreshold: expect.any(Number),
+              url: expect.any(String)
+            }));
+            reg.webWorker.onmessage({
+              data: {
+                type: 'KEEPALIVE_SUCCESS',
+                statusCode: 200
+              }
+            });
+            expect(lineEmitter).toBeCalledWith(_types4.LINE_EVENTS.RECONNECTED);
+          case 7:
           case "end":
             return _context21.stop();
         }
       }, _callee21);
     })));
     it('verify failure keep-alive cases: Retry Success', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22() {
-      var failurePayload, successPayload, timer;
+      var worker;
       return _regenerator.default.wrap(function _callee22$(_context22) {
         while (1) switch (_context22.prev = _context22.next) {
           case 0:
             _context22.next = 2;
             return beforeEachSetupForKeepalive();
           case 2:
-            failurePayload = {
-              statusCode: 503,
-              body: mockKeepAliveBody
-            };
-            successPayload = {
-              statusCode: 200,
-              body: mockKeepAliveBody
-            };
-            timer = reg.keepaliveTimer;
+            worker = reg.webWorker;
             lineEmitter.mockClear();
-            webex.request.mockRejectedValueOnce(failurePayload).mockResolvedValue(successPayload);
-            jest.advanceTimersByTime(2 * _registerFixtures.mockPostResponse.keepaliveInterval * _constants.SEC_TO_MSEC_MFACTOR);
-            _context22.next = 10;
-            return flushPromises();
-          case 10:
-            expect(handleErrorSpy).toBeCalledOnceWith(failurePayload, expect.anything(), {
-              method: 'startKeepaliveTimer',
-              file: _constants.REGISTRATION_FILE
+            worker.onmessage({
+              data: {
+                type: 'KEEPALIVE_FAILURE',
+                err: {
+                  statusCode: 503
+                },
+                keepAliveRetryCount: 1
+              }
             });
-            expect(reg.getStatus()).toBe(_types.RegistrationStatus.ACTIVE);
-            expect(reg.keepaliveTimer).toBe(timer);
-            expect(lineEmitter).nthCalledWith(1, _types4.LINE_EVENTS.RECONNECTING);
-            expect(lineEmitter).nthCalledWith(2, _types4.LINE_EVENTS.RECONNECTED);
-            expect(lineEmitter).toBeCalledTimes(2);
-          case 16:
+            worker.onmessage({
+              data: {
+                type: 'KEEPALIVE_SUCCESS',
+                statusCode: 200
+              }
+            });
+            expect(lineEmitter).toHaveBeenCalledWith(_types4.LINE_EVENTS.RECONNECTED);
+          case 7:
           case "end":
             return _context22.stop();
         }
       }, _callee22);
     })));
     it('verify failure keep-alive cases: Restore failure', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee23() {
-      var restoreSpy, restartRegSpy, reconnectSpy, failurePayload, clearIntervalSpy, timer;
+      var reconnectSpy, restoreSpy, restartRegSpy, RETRY_COUNT_THRESHOLD, failureEvent;
       return _regenerator.default.wrap(function _callee23$(_context23) {
         while (1) switch (_context23.prev = _context23.next) {
           case 0:
             _context23.next = 2;
             return beforeEachSetupForKeepalive();
           case 2:
-            restoreSpy = jest.spyOn(reg, 'restorePreviousRegistration');
-            restartRegSpy = jest.spyOn(reg, 'restartRegistration');
             reconnectSpy = jest.spyOn(reg, 'reconnectOnFailure');
-            failurePayload = {
-              statusCode: 503,
-              body: mockKeepAliveBody
-            };
-            clearIntervalSpy = jest.spyOn(global, 'clearInterval');
+            restoreSpy = jest.spyOn(reg, 'restorePreviousRegistration');
+            restartRegSpy = jest.spyOn(reg, 'restartRegistration'); // Clear previous event emissions
             lineEmitter.mockClear();
-            webex.request.mockRejectedValue(failurePayload);
+
+            // Assume registration is active
             expect(reg.getStatus()).toEqual(_types.RegistrationStatus.ACTIVE);
-            timer = reg.keepaliveTimer;
-            jest.advanceTimersByTime(5 * _registerFixtures.mockPostResponse.keepaliveInterval * _constants.SEC_TO_MSEC_MFACTOR);
+
+            // Use fake timers to trigger keepalive initialization
+            jest.useFakeTimers();
+            jest.advanceTimersByTime(_registerFixtures.mockPostResponse.keepaliveInterval * _constants.SEC_TO_MSEC_MFACTOR);
+
+            // Simulate the worker sending a KEEPALIVE_FAILURE message with retry count at threshold.
+            RETRY_COUNT_THRESHOLD = reg.isCCFlow ? 4 : 5;
+            failureEvent = {
+              data: {
+                type: _types.WorkerMessageType.KEEPALIVE_FAILURE,
+                err: {
+                  statusCode: 503
+                },
+                keepAliveRetryCount: RETRY_COUNT_THRESHOLD
+              }
+            };
+            reg.webWorker.onmessage(failureEvent);
             _context23.next = 14;
             return flushPromises();
           case 14:
-            expect(clearIntervalSpy).toBeCalledOnceWith(timer);
-
-            // sendKeepAlive tries to retry 5 times before accepting failure
-            // later 2 attempts to register with primary server
-            expect(handleErrorSpy).toBeCalledTimes(7);
             expect(reg.getStatus()).toEqual(_types.RegistrationStatus.INACTIVE);
-            expect(reg.reconnectPending).toStrictEqual(false);
+            expect(lineEmitter).toHaveBeenCalledWith(_types4.LINE_EVENTS.UNREGISTERED);
             expect(reconnectSpy).toBeCalledOnceWith(_constants.KEEPALIVE_UTIL);
             expect(restoreSpy).toBeCalledOnceWith(_constants.KEEPALIVE_UTIL);
             expect(restartRegSpy).toBeCalledOnceWith(_constants.KEEPALIVE_UTIL);
-            expect(warnSpy).toHaveBeenCalledWith('Keep-alive missed 1 times. Status -> 503 ', expect.objectContaining({
-              file: _constants.REGISTRATION_FILE,
-              method: 'startKeepaliveTimer'
-            }));
-            expect(webex.request).toBeCalledTimes(7);
-            expect(reg.keepaliveTimer).toBe(undefined);
-            expect(warnSpy).toHaveBeenCalledWith('Keep-alive missed 1 times. Status -> 503 ', expect.objectContaining({
+            jest.useRealTimers();
+            expect(warnSpy).toHaveBeenCalledWith('Keep-alive missed 5 times. Status -> 503 ', expect.objectContaining({
               file: _constants.REGISTRATION_FILE,
               method: 'startKeepaliveTimer'
             }));
-            expect(lineEmitter).nthCalledWith(1, _types4.LINE_EVENTS.RECONNECTING);
-            expect(lineEmitter).nthCalledWith(4, _types4.LINE_EVENTS.RECONNECTING);
-            expect(lineEmitter).nthCalledWith(5, _types4.LINE_EVENTS.UNREGISTERED);
-
-            /** there will be 2 registration attempts */
-            expect(lineEmitter).nthCalledWith(6, _types4.LINE_EVENTS.CONNECTING);
-            expect(lineEmitter).nthCalledWith(7, _types4.LINE_EVENTS.UNREGISTERED);
-            expect(lineEmitter).nthCalledWith(8, _types4.LINE_EVENTS.CONNECTING);
-            expect(lineEmitter).nthCalledWith(9, _types4.LINE_EVENTS.UNREGISTERED);
-            expect(lineEmitter).toBeCalledTimes(9);
-          case 33:
+          case 21:
           case "end":
             return _context23.stop();
         }
       }, _callee23);
     })));
     it('verify failure keep-alive cases: Restore Success', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee24() {
-      var restoreSpy, restartRegSpy, reconnectSpy, failurePayload, successPayload, clearIntervalSpy, url, timer;
+      var reconnectSpy, url;
       return _regenerator.default.wrap(function _callee24$(_context24) {
         while (1) switch (_context24.prev = _context24.next) {
           case 0:
             _context24.next = 2;
             return beforeEachSetupForKeepalive();
           case 2:
-            restoreSpy = jest.spyOn(reg, 'restorePreviousRegistration');
-            restartRegSpy = jest.spyOn(reg, 'restartRegistration');
+            expect(reg.webWorker).toBeDefined();
             reconnectSpy = jest.spyOn(reg, 'reconnectOnFailure');
-            failurePayload = {
-              statusCode: 503,
-              body: mockKeepAliveBody
-            };
-            successPayload = {
-              statusCode: 200,
-              body: mockKeepAliveBody
-            };
-            clearIntervalSpy = jest.spyOn(global, 'clearInterval');
-            webex.request.mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockResolvedValue(successPayload);
-
-            /* successful registration */
-            // webex.request.mockResolvedValue(successPayload);
-
-            expect(reg.getStatus()).toEqual(_types.RegistrationStatus.ACTIVE);
-            url = 'https://mobius.asydm-m-1.prod.infra.webex.com/api/v1';
-            /* set active Url and expect the registration to restore to this url */
-            reg.setActiveMobiusUrl(url);
-            timer = reg.keepaliveTimer;
-            jest.advanceTimersByTime(5 * _registerFixtures.mockPostResponse.keepaliveInterval * _constants.SEC_TO_MSEC_MFACTOR);
+            url = 'https://mobius-dfw.webex.com/api/v1/calling/web/';
+            reg.webWorker.onmessage({
+              data: {
+                type: _types.WorkerMessageType.KEEPALIVE_FAILURE,
+                err: {
+                  statusCode: 503
+                },
+                keepAliveRetryCount: 5
+              }
+            });
+            jest.advanceTimersByTime(1000);
+            _context24.next = 9;
+            return flushPromises();
+          case 9:
+            expect(reg.webWorker).toBeUndefined();
+            expect(reconnectSpy).toBeCalledOnceWith(reg.startKeepaliveTimer.name);
+            webex.request.mockResolvedValueOnce(successPayload);
+            _context24.next = 14;
+            return reg.triggerRegistration();
+          case 14:
             _context24.next = 16;
             return flushPromises();
           case 16:
-            expect(clearIntervalSpy).toBeCalledOnceWith(timer);
-            expect(handleErrorSpy).toBeCalledTimes(5);
+            expect(reg.webWorker).toBeDefined();
+            reg.webWorker.onmessage({
+              data: {
+                type: _types.WorkerMessageType.KEEPALIVE_SUCCESS,
+                statusCode: 200
+              }
+            });
+
+            // Advance timers and flush any remaining promises.
+            jest.advanceTimersByTime(1000);
+            _context24.next = 21;
+            return flushPromises();
+          case 21:
             expect(reg.getStatus()).toEqual(_types.RegistrationStatus.ACTIVE);
-            expect(reconnectSpy).toBeCalledOnceWith(_constants.KEEPALIVE_UTIL);
-            expect(restoreSpy).toBeCalledOnceWith(_constants.KEEPALIVE_UTIL);
-            expect(restartRegSpy).not.toBeCalled();
+            // reconnectSpy should have been called only once.
+            expect(reconnectSpy).toBeCalledTimes(1);
+            expect(restoreSpy).toBeCalledOnceWith(reg.startKeepaliveTimer.name);
+            expect(restartSpy).toBeCalledOnceWith(reg.startKeepaliveTimer.name);
+            // Active Mobius URL should remain unchanged.
             expect(reg.getActiveMobiusUrl()).toStrictEqual(url);
-            expect(reg.reconnectPending).toStrictEqual(false);
-            expect(reg.keepaliveTimer).toBeTruthy();
-            expect(reg.keepaliveTimer).not.toBe(timer);
           case 26:
           case "end":
             return _context24.stop();
@@ -1146,42 +1133,84 @@ describe('Registration Tests', function () {
       }, _callee24);
     })));
     it('verify failure followed by recovery of keepalive', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee25() {
-      var failurePayload, successPayload, clearIntervalSpy, timer;
       return _regenerator.default.wrap(function _callee25$(_context25) {
         while (1) switch (_context25.prev = _context25.next) {
           case 0:
             _context25.next = 2;
             return beforeEachSetupForKeepalive();
           case 2:
-            failurePayload = {
-              statusCode: 503,
-              body: mockKeepAliveBody
-            };
-            successPayload = {
-              statusCode: 200,
-              body: mockKeepAliveBody
-            };
-            clearIntervalSpy = jest.spyOn(global, 'clearInterval');
-            webex.request.mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockResolvedValue(successPayload);
             expect(reg.getStatus()).toBe(_types.RegistrationStatus.ACTIVE);
-            timer = reg.keepaliveTimer; // sendKeepAlive tries to retry 3 times and receiving success on third time
-            jest.advanceTimersByTime(3 * _registerFixtures.mockPostResponse.keepaliveInterval * _constants.SEC_TO_MSEC_MFACTOR);
-            _context25.next = 11;
+            expect(reg.webWorker).toBeDefined();
+            webex.request.mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockResolvedValue(successPayload);
+            reg.webWorker.onmessage({
+              data: {
+                type: _types.WorkerMessageType.KEEPALIVE_FAILURE,
+                err: failurePayload,
+                keepAliveRetryCount: reg.isCCFlow ? 4 : 5
+              }
+            });
+            _context25.next = 8;
             return flushPromises();
-          case 11:
-            expect(webex.request).toBeCalledTimes(3);
-            expect(reg.getStatus()).toBe(_types.RegistrationStatus.ACTIVE);
-            expect(handleErrorSpy).toBeCalledTimes(2);
-            expect(clearIntervalSpy).not.toBeCalled();
-            expect(reg.keepaliveTimer).toBe(timer);
-          case 16:
+          case 8:
+            expect(reg.webWorker).toBeUndefined();
+            expect(handleErrorSpy).toBeCalledTimes(3);
+            _context25.next = 12;
+            return reg.triggerRegistration();
+          case 12:
+            _context25.next = 14;
+            return flushPromises();
+          case 14:
+            expect(reg.webWorker).toBeDefined();
+            reg.webWorker.onmessage({
+              data: {
+                type: _types.WorkerMessageType.KEEPALIVE_SUCCESS,
+                statusCode: 200
+              }
+            });
+            _context25.next = 18;
+            return flushPromises();
+          case 18:
+            // In a complete failure‐then-recovery scenario, we expect another failure event to have been handled.
+            // For that, simulate a second failure event on the new worker.
+            reg.webWorker.onmessage({
+              data: {
+                type: _types.WorkerMessageType.KEEPALIVE_FAILURE,
+                err: failurePayload,
+                keepAliveRetryCount: reg.isCCFlow ? 4 : 5
+              }
+            });
+            _context25.next = 21;
+            return flushPromises();
+          case 21:
+            expect(handleErrorSpy).toBeCalledTimes(4);
+
+            // And then re-register successfully:
+            _context25.next = 24;
+            return reg.triggerRegistration();
+          case 24:
+            _context25.next = 26;
+            return flushPromises();
+          case 26:
+            expect(reg.webWorker).toBeDefined();
+            reg.webWorker.onmessage({
+              data: {
+                type: _types.WorkerMessageType.KEEPALIVE_SUCCESS,
+                statusCode: 200
+              }
+            });
+            _context25.next = 30;
+            return flushPromises();
+          case 30:
+            expect(reg.getStatus()).toEqual(_types.RegistrationStatus.ACTIVE);
+            expect(reg.webWorker).toBeDefined();
+          case 32:
           case "end":
             return _context25.stop();
         }
       }, _callee25);
     })));
     it('cc: verify failover to backup server after 4 keep alive failure with primary server', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee26() {
-      var failurePayload, successPayload, clearIntervalSpy, timer;
+      var clearKeepaliveSpy, reconnectSpy;
       return _regenerator.default.wrap(function _callee26$(_context26) {
         while (1) switch (_context26.prev = _context26.next) {
           case 0:
@@ -1192,158 +1221,158 @@ describe('Registration Tests', function () {
             _context26.next = 3;
             return beforeEachSetupForKeepalive();
           case 3:
-            failurePayload = {
-              statusCode: 503,
-              body: mockKeepAliveBody
-            };
-            successPayload = {
-              statusCode: 200,
-              body: mockKeepAliveBody
-            };
-            clearIntervalSpy = jest.spyOn(global, 'clearInterval');
-            jest.spyOn(reg, 'postKeepAlive').mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockResolvedValue(successPayload);
-            expect(reg.getStatus()).toBe(_types.RegistrationStatus.ACTIVE);
-            timer = reg.keepaliveTimer;
-            jest.advanceTimersByTime(5 * _registerFixtures.mockPostResponse.keepaliveInterval * _constants.SEC_TO_MSEC_MFACTOR);
-            _context26.next = 12;
-            return flushPromises();
-          case 12:
-            expect(clearIntervalSpy).toBeCalledOnceWith(timer);
-            expect(reg.getStatus()).toBe(_types.RegistrationStatus.INACTIVE);
-            expect(reg.keepaliveTimer).not.toBe(timer);
-            webex.request.mockResolvedValue(successPayload);
-            jest.advanceTimersByTime(_constants.REG_TRY_BACKUP_TIMER_VAL_FOR_CC_IN_SEC * _constants.SEC_TO_MSEC_MFACTOR);
-            _context26.next = 19;
+            webex.request.mockResolvedValueOnce(successPayload);
+            _context26.next = 6;
+            return reg.triggerRegistration();
+          case 6:
+            expect(reg.getStatus()).toEqual(_types.RegistrationStatus.ACTIVE);
+            expect(reg.webWorker).toBeDefined();
+
+            // Spy on clearKeepaliveTimer and simulate reconnectOnFailure behavior
+            clearKeepaliveSpy = jest.spyOn(reg, 'clearKeepaliveTimer');
+            reconnectSpy = jest.spyOn(reg, 'reconnectOnFailure'); // Simulate a KEEPALIVE_FAILURE message from the worker with a retry count equal to threshold (4 for CC)
+            reg.webWorker.onmessage({
+              data: {
+                type: _types.WorkerMessageType.KEEPALIVE_FAILURE,
+                err: {
+                  statusCode: 503
+                },
+                keepAliveRetryCount: 4
+              }
+            });
+
+            // Wait for any asynchronous actions to complete
+            _context26.next = 13;
             return flushPromises();
-          case 19:
-            /* Active Url must match with the backup url as per the test */
+          case 13:
+            // Verify that the keepalive timer was cleared and reconnectOnFailure was triggered
+            expect(clearKeepaliveSpy).toHaveBeenCalled();
+            expect(reconnectSpy).toHaveBeenCalledWith(reg.startKeepaliveTimer.name);
+
+            // Verify that the active Mobius URL has been updated to the backup server and registration is active
             expect(reg.getActiveMobiusUrl()).toEqual(mobiusUris.backup[0]);
-            expect(reg.getStatus()).toBe(_types.RegistrationStatus.ACTIVE);
-          case 21:
+            expect(reg.getStatus()).toEqual(_types.RegistrationStatus.ACTIVE);
+          case 17:
           case "end":
             return _context26.stop();
         }
       }, _callee26);
     })));
-    it('verify final error for keep-alive', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee27() {
-      var restoreSpy, restartRegSpy, reconnectSpy, failurePayload, clearIntervalSpy;
+    it('verify failure keep-alive case with active call present: Restore Success after call ends', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee27() {
+      var reconnectSpy, restoreSpy, restartRegSpy, clearTimerSpy, threshold, failureEvent;
       return _regenerator.default.wrap(function _callee27$(_context27) {
         while (1) switch (_context27.prev = _context27.next) {
           case 0:
             _context27.next = 2;
             return beforeEachSetupForKeepalive();
           case 2:
-            restoreSpy = jest.spyOn(reg, 'restorePreviousRegistration');
-            restartRegSpy = jest.spyOn(reg, 'restartRegistration');
             reconnectSpy = jest.spyOn(reg, 'reconnectOnFailure');
-            failurePayload = {
-              statusCode: 404,
-              body: mockKeepAliveBody
+            restoreSpy = jest.spyOn(reg, 'restorePreviousRegistration');
+            restartRegSpy = jest.spyOn(reg, 'restartRegistration'); // Simulate an active call.
+            reg.callManager.createCall();
+            expect((0, _keys.default)(reg.callManager.getActiveCalls()).length).toBe(1);
+            clearTimerSpy = jest.spyOn(reg, 'clearKeepaliveTimer');
+            threshold = reg.isCCFlow ? 4 : 5; // Simulate a KEEPALIVE_FAILURE event with a 503 error at threshold.
+            failureEvent = {
+              data: {
+                type: _types.WorkerMessageType.KEEPALIVE_FAILURE,
+                err: {
+                  statusCode: 503
+                },
+                keepAliveRetryCount: threshold
+              }
             };
-            clearIntervalSpy = jest.spyOn(global, 'clearInterval');
-            webex.request.mockRejectedValue(failurePayload);
-            expect(reg.getStatus()).toBe(_types.RegistrationStatus.ACTIVE);
-
-            /* send one keepalive */
-            jest.advanceTimersByTime(_registerFixtures.mockPostResponse.keepaliveInterval * _constants.SEC_TO_MSEC_MFACTOR);
-            _context27.next = 12;
+            reg.webWorker.onmessage(failureEvent);
+            _context27.next = 13;
             return flushPromises();
-          case 12:
-            expect(clearIntervalSpy).toBeCalledTimes(1);
-            expect(reg.getStatus()).toBe(_types.RegistrationStatus.INACTIVE);
-            expect(reconnectSpy).not.toBeCalled();
+          case 13:
+            // At this point, clearKeepaliveTimer was called so the worker is terminated.
+            expect(clearTimerSpy).toHaveBeenCalled();
+            expect(reg.webWorker).toBeUndefined();
+            expect(reg.getStatus()).toEqual(_types.RegistrationStatus.INACTIVE);
+            expect(lineEmitter).lastCalledWith(_types4.LINE_EVENTS.UNREGISTERED);
+            expect(reg.keepaliveTimer).toStrictEqual(undefined);
+            expect(reg.failbackTimer).toStrictEqual(undefined);
+            expect(reconnectSpy).toBeCalledOnceWith(_constants.KEEPALIVE_UTIL);
             expect(restoreSpy).not.toBeCalled();
             expect(restartRegSpy).not.toBeCalled();
-            expect(reg.reconnectPending).toStrictEqual(false);
-            expect(webex.request).toBeCalledOnceWith({
-              headers: mockResponse.headers,
-              uri: "".concat(mockKeepAliveBody.device.uri, "/status"),
-              method: 'POST',
-              service: mockResponse.service
-            });
-            expect(reg.keepaliveTimer).toBe(undefined);
-            expect(handleErrorSpy).toBeCalledOnceWith(failurePayload, expect.anything(), {
+            expect(reg.reconnectPending).toStrictEqual(true);
+            expect(infoSpy).toBeCalledWith('Active call(s) present, deferred reconnect till call cleanup.', {
               file: _constants.REGISTRATION_FILE,
-              method: _constants.KEEPALIVE_UTIL
+              method: expect.any(String)
             });
-            expect(warnSpy).toBeCalledWith('Keep-alive missed 1 times. Status -> 404 ', expect.objectContaining({
-              file: _constants.REGISTRATION_FILE,
-              method: 'startKeepaliveTimer'
-            }));
-          case 22:
+            reconnectSpy.mockClear();
+
+            // Now simulate call cleanup.
+            reg.callManager.callCollection = {};
+            webex.request.mockResolvedValueOnce(successPayload);
+
+            // Call reconnectOnFailure manually. With no active calls, this should trigger re-registration.
+            _context27.next = 29;
+            return reg.reconnectOnFailure(_constants.CALLS_CLEARED_HANDLER_UTIL);
+          case 29:
+            _context27.next = 31;
+            return flushPromises();
+          case 31:
+            expect((0, _keys.default)(reg.callManager.getActiveCalls()).length).toBe(0);
+            // After re-registration, registration status becomes ACTIVE and a new worker is created.
+            expect(reg.getStatus()).toEqual(_types.RegistrationStatus.ACTIVE);
+            expect(reg.webWorker).toBeDefined();
+            expect(reconnectSpy).toBeCalledOnceWith(_constants.CALLS_CLEARED_HANDLER_UTIL);
+            expect(restoreSpy).toBeCalledOnceWith(_constants.CALLS_CLEARED_HANDLER_UTIL);
+            expect(restartRegSpy).not.toBeCalled();
+            expect(reg.reconnectPending).toStrictEqual(false);
+          case 38:
           case "end":
             return _context27.stop();
         }
       }, _callee27);
     })));
-    it('verify failure keep-alive case with active call present: Restore Success after call ends', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee28() {
-      var restoreSpy, restartRegSpy, reconnectSpy, failurePayload, successPayload, clearIntervalSpy, url, timer, call;
+    it('checks for keep-alive failure with final error: 404', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee28() {
+      var reconnectSpy, restoreSpy, restartRegSpy, clearTimerSpy;
       return _regenerator.default.wrap(function _callee28$(_context28) {
         while (1) switch (_context28.prev = _context28.next) {
           case 0:
             _context28.next = 2;
             return beforeEachSetupForKeepalive();
           case 2:
+            reconnectSpy = jest.spyOn(reg, 'reconnectOnFailure');
             restoreSpy = jest.spyOn(reg, 'restorePreviousRegistration');
             restartRegSpy = jest.spyOn(reg, 'restartRegistration');
-            reconnectSpy = jest.spyOn(reg, 'reconnectOnFailure');
-            failurePayload = {
-              statusCode: 503,
-              body: mockKeepAliveBody
-            };
-            successPayload = {
-              statusCode: 200,
-              body: mockKeepAliveBody
-            };
-            clearIntervalSpy = jest.spyOn(global, 'clearInterval');
-            webex.request.mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockRejectedValueOnce(failurePayload).mockResolvedValue(successPayload);
-
-            // jest.spyOn(callingClient['registration'], 'createDevice').mockResolvedValue(successPayload);
-            url = 'https://mobius.asydm-m-1.prod.infra.webex.com/api/v1';
-            reg.setActiveMobiusUrl(url);
-            expect(reg.reconnectPending).toStrictEqual(false);
-            timer = reg.keepaliveTimer;
-            /* add a call to the callManager */
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            call = reg.callManager.createCall();
-            expect((0, _keys.default)(reg.callManager.getActiveCalls()).length).toBe(1);
-
-            /* send one keepalive */
-            jest.advanceTimersByTime(5 * _registerFixtures.mockPostResponse.keepaliveInterval * _constants.SEC_TO_MSEC_MFACTOR);
-            _context28.next = 18;
+            clearTimerSpy = jest.spyOn(reg, 'clearKeepaliveTimer');
+            jest.spyOn(utils, 'handleRegistrationErrors').mockResolvedValue(true);
+            reg.webWorker.onmessage({
+              data: {
+                type: _types.WorkerMessageType.KEEPALIVE_FAILURE,
+                err: {
+                  statusCode: 404
+                },
+                keepAliveRetryCount: 1
+              }
+            });
+            _context28.next = 10;
             return flushPromises();
-          case 18:
-            expect(clearIntervalSpy).toBeCalledOnceWith(timer);
-            expect(handleErrorSpy).toBeCalledTimes(5);
-            expect(reg.keepaliveTimer).toStrictEqual(undefined);
-            expect(reg.failbackTimer).toStrictEqual(undefined);
-            expect(reg.getStatus()).toBe(_types.RegistrationStatus.INACTIVE);
-            expect(lineEmitter).lastCalledWith(_types4.LINE_EVENTS.UNREGISTERED);
-            expect(reconnectSpy).toBeCalledOnceWith(_constants.KEEPALIVE_UTIL);
-            expect(restoreSpy).not.toBeCalled();
-            expect(restartRegSpy).not.toBeCalled();
-            expect(reg.reconnectPending).toStrictEqual(true);
-            expect(infoSpy).toBeCalledWith('Active call(s) present, deferred reconnect till call cleanup.', {
+          case 10:
+            expect(warnSpy).toBeCalledWith('Keep-alive missed 1 times. Status -> 404 ', expect.objectContaining({
               file: _constants.REGISTRATION_FILE,
-              method: expect.any(String)
+              method: 'startKeepaliveTimer'
+            }));
+            expect(handleErrorSpy).toBeCalledOnceWith({
+              statusCode: 404
+            }, expect.anything(), {
+              file: _constants.REGISTRATION_FILE,
+              method: _constants.KEEPALIVE_UTIL
             });
-            reconnectSpy.mockClear();
-
-            /* simulate call disconnect and Calling client will trigger reconnect upon receiving disconnect event from CallManager */
-            reg.callManager.callCollection = {};
-            _context28.next = 33;
-            return reg.reconnectOnFailure(_constants.CALLS_CLEARED_HANDLER_UTIL);
-          case 33:
-            expect((0, _keys.default)(reg.callManager.getActiveCalls()).length).toBe(0);
-            expect(reg.getStatus()).toBe(_types.RegistrationStatus.ACTIVE);
-            expect(reconnectSpy).toBeCalledOnceWith(_constants.CALLS_CLEARED_HANDLER_UTIL);
-            expect(restoreSpy).toBeCalledOnceWith(_constants.CALLS_CLEARED_HANDLER_UTIL);
-            expect(restartRegSpy).not.toBeCalled();
+            expect(reg.getStatus()).toEqual(_types.RegistrationStatus.INACTIVE);
+            expect(lineEmitter).toHaveBeenCalledWith(_types4.LINE_EVENTS.UNREGISTERED);
+            expect(clearTimerSpy).toBeCalledTimes(1);
+            expect(reconnectSpy).not.toHaveBeenCalled();
+            expect(restoreSpy).not.toHaveBeenCalled();
+            expect(restartRegSpy).not.toHaveBeenCalled();
             expect(reg.reconnectPending).toStrictEqual(false);
-            expect(reg.getActiveMobiusUrl()).toStrictEqual(url);
-            expect(reg.keepaliveTimer).toBeTruthy();
-            expect(reg.keepaliveTimer).not.toBe(timer);
-          case 42:
+            expect(reg.keepaliveTimer).toBe(undefined);
+            expect(reg.webWorker).toBeUndefined();
+          case 21:
           case "end":
             return _context28.stop();
         }