@webex/calling 3.12.0-next.41 → 3.12.0-next.43

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

@@ -1696,7 +1696,7 @@ describe('Registration Tests', function () {
     })));
     it('checks for keep-alive failure with 429', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee35() {
       var _reg$deviceInfo$devic;
-      var keepaliveSpy, postMessageSpy, clearTimerSpy, retry429Spy;
+      var keepaliveSpy, postMessageSpy, clearTimerSpy, retry429Spy, keepaliveInterval, retryAfter, adjustedResumeDelayMs;
       return _regenerator.default.wrap(function (_context35) {
         while (1) switch (_context35.prev = _context35.next) {
           case 0:
@@ -1707,13 +1707,17 @@ describe('Registration Tests', function () {
             postMessageSpy = jest.spyOn(Worker.prototype, 'postMessage');
             clearTimerSpy = jest.spyOn(reg, 'clearKeepaliveTimer');
             retry429Spy = jest.spyOn(reg, 'handle429Retry');
+            keepaliveInterval = reg.deviceInfo.keepaliveInterval; // Choose a retryAfter strictly greater than keepaliveInterval so the
+            // adjusted resume delay (retryAfter - keepaliveInterval) is positive and verifiable.
+            retryAfter = keepaliveInterval + 30;
+            adjustedResumeDelayMs = (retryAfter - keepaliveInterval) * _constants.SEC_TO_MSEC_MFACTOR;
             reg.webWorker.onmessage({
               data: {
                 type: _types.WorkerMessageType.KEEPALIVE_FAILURE,
                 err: {
                   statusCode: 429,
                   headers: {
-                    'retry-after': 20
+                    'retry-after': retryAfter
                   }
                 },
                 keepAliveRetryCount: 1
@@ -1729,23 +1733,33 @@ describe('Registration Tests', function () {
             expect(handleErrorSpy).toBeCalledOnceWith({
               statusCode: 429,
               headers: {
-                'retry-after': 20
+                'retry-after': retryAfter
               }
             }, expect.anything(), {
               file: _constants.REGISTRATION_FILE,
               method: _constants.KEEPALIVE_UTIL
             }, expect.anything());
-            expect(retry429Spy).toBeCalledOnceWith(20, 'startKeepaliveTimer');
+            expect(retry429Spy).toBeCalledOnceWith(retryAfter, 'startKeepaliveTimer');
             expect(clearTimerSpy).toBeCalledTimes(1);
             expect(reg.reconnectPending).toStrictEqual(false);
             expect(reg.keepaliveTimer).toBe(undefined);
             expect(reg.webWorker).toBeUndefined();
-            jest.advanceTimersByTime(20 * _constants.SEC_TO_MSEC_MFACTOR);
+
+            // Resume timer must NOT fire before the adjusted (retryAfter - keepaliveInterval) interval.
+            jest.advanceTimersByTime(adjustedResumeDelayMs - 1);
             _context35.next = 3;
             return flushPromises();
           case 3:
-            expect(keepaliveSpy).toBeCalledOnceWith((_reg$deviceInfo$devic = reg.deviceInfo.device) === null || _reg$deviceInfo$devic === void 0 ? void 0 : _reg$deviceInfo$devic.uri, reg.deviceInfo.keepaliveInterval, 'UNKNOWN');
-            expect(logSpy).toBeCalledWith('Resuming keepalive after 20 seconds', {
+            expect(keepaliveSpy).not.toBeCalled();
+            expect(reg.webWorker).toBeUndefined();
+
+            // Advance the remaining 1ms to hit the exact adjusted timeout; keepalive must resume now.
+            jest.advanceTimersByTime(1);
+            _context35.next = 4;
+            return flushPromises();
+          case 4:
+            expect(keepaliveSpy).toBeCalledOnceWith((_reg$deviceInfo$devic = reg.deviceInfo.device) === null || _reg$deviceInfo$devic === void 0 ? void 0 : _reg$deviceInfo$devic.uri, keepaliveInterval, 'UNKNOWN');
+            expect(logSpy).toBeCalledWith("Resuming keepalive after ".concat(retryAfter, " seconds"), {
               file: _constants.REGISTRATION_FILE,
               method: 'handle429Retry'
             });
@@ -1755,18 +1769,76 @@ describe('Registration Tests', function () {
               interval: expect.any(Number),
               retryCountThreshold: expect.any(Number)
             }));
-          case 4:
+          case 5:
           case "end":
             return _context35.stop();
         }
       }, _callee35);
     })));
-    it('ensure retryAfter is set when 429 occurs during failover retry', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee36() {
+    it.each([{
+      description: 'retryAfter less than keepaliveInterval -> negative delay fires immediately',
+      retryAfterDelta: -10
+    }, {
+      description: 'retryAfter equal to keepaliveInterval -> zero delay fires immediately',
+      retryAfterDelta: 0
+    }])('adjusts retry-after with keepaliveInterval on 429 keepalive failure ($description)', /*#__PURE__*/function () {
+      var _ref37 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee36(_ref36) {
+        var _reg$deviceInfo$devic2;
+        var retryAfterDelta, keepaliveSpy, keepaliveInterval, retryAfter;
+        return _regenerator.default.wrap(function (_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
+            case 0:
+              retryAfterDelta = _ref36.retryAfterDelta;
+              _context36.next = 1;
+              return beforeEachSetupForKeepalive();
+            case 1:
+              keepaliveSpy = jest.spyOn(reg, 'startKeepaliveTimer');
+              keepaliveInterval = reg.deviceInfo.keepaliveInterval;
+              retryAfter = keepaliveInterval + retryAfterDelta;
+              reg.webWorker.onmessage({
+                data: {
+                  type: _types.WorkerMessageType.KEEPALIVE_FAILURE,
+                  err: {
+                    statusCode: 429,
+                    headers: {
+                      'retry-after': retryAfter
+                    }
+                  },
+                  keepAliveRetryCount: 1
+                }
+              });
+              _context36.next = 2;
+              return flushPromises();
+            case 2:
+              expect(reg.webWorker).toBeUndefined();
+              expect(keepaliveSpy).not.toBeCalled();
+
+              // With a non-positive adjusted delay, the timer should fire on the next tick.
+              jest.advanceTimersByTime(0);
+              _context36.next = 3;
+              return flushPromises();
+            case 3:
+              expect(keepaliveSpy).toBeCalledOnceWith((_reg$deviceInfo$devic2 = reg.deviceInfo.device) === null || _reg$deviceInfo$devic2 === void 0 ? void 0 : _reg$deviceInfo$devic2.uri, keepaliveInterval, 'UNKNOWN');
+              expect(logSpy).toBeCalledWith("Resuming keepalive after ".concat(retryAfter, " seconds"), {
+                file: _constants.REGISTRATION_FILE,
+                method: 'handle429Retry'
+              });
+            case 4:
+            case "end":
+              return _context36.stop();
+          }
+        }, _callee36);
+      }));
+      return function (_x) {
+        return _ref37.apply(this, arguments);
+      };
+    }());
+    it('ensure retryAfter is set when 429 occurs during failover retry', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee37() {
       var retry429Spy;
-      return _regenerator.default.wrap(function (_context36) {
-        while (1) switch (_context36.prev = _context36.next) {
+      return _regenerator.default.wrap(function (_context37) {
+        while (1) switch (_context37.prev = _context37.next) {
           case 0:
-            _context36.next = 1;
+            _context37.next = 1;
             return beforeEachSetupForKeepalive();
           case 1:
             // Simulate loss of registration so failover path attempts a new registration
@@ -1777,11 +1849,11 @@ describe('Registration Tests', function () {
             webex.request.mockRejectedValueOnce(failurePayload429One);
 
             // Directly schedule the failover attempt
-            _context36.next = 2;
+            _context37.next = 2;
             return reg.startFailoverTimer();
           case 2:
             jest.advanceTimersByTime(33 * _constants.SEC_TO_MSEC_MFACTOR);
-            _context36.next = 3;
+            _context37.next = 3;
             return flushPromises();
           case 3:
             expect(retry429Spy).toBeCalledWith(failurePayload429One.headers['retry-after'], 'startFailoverTimer');
@@ -1789,16 +1861,16 @@ describe('Registration Tests', function () {
             jest.useRealTimers();
           case 4:
           case "end":
-            return _context36.stop();
+            return _context37.stop();
         }
-      }, _callee36);
+      }, _callee37);
     })));
-    it('sets retryAfter when reconnectOnFailure caller receives 429 after keepalive threshold miss', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee37() {
+    it('sets retryAfter when reconnectOnFailure caller receives 429 after keepalive threshold miss', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee38() {
       var retry429Spy, threshold;
-      return _regenerator.default.wrap(function (_context37) {
-        while (1) switch (_context37.prev = _context37.next) {
+      return _regenerator.default.wrap(function (_context38) {
+        while (1) switch (_context38.prev = _context38.next) {
           case 0:
-            _context37.next = 1;
+            _context38.next = 1;
             return beforeEachSetupForKeepalive();
           case 1:
             retry429Spy = jest.spyOn(reg, 'handle429Retry'); // On reconnectOnFailure(RECONNECT_ON_FAILURE_UTIL) first restore attempt, make registration respond with 429 (retry-after: 20)
@@ -1821,7 +1893,7 @@ describe('Registration Tests', function () {
                 keepAliveRetryCount: threshold
               }
             });
-            _context37.next = 2;
+            _context38.next = 2;
             return flushPromises();
           case 2:
             // handle429Retry is called with caller 'reconnectOnFailure' → else branch executes and sets retryAfter
@@ -1829,25 +1901,25 @@ describe('Registration Tests', function () {
             expect(reg.retryAfter).toEqual(undefined); // Clear retryAfter after 429 retry
           case 3:
           case "end":
-            return _context37.stop();
+            return _context38.stop();
         }
-      }, _callee37);
+      }, _callee38);
     })));
   });
   describe('Primary server status checks', function () {
-    it('success: primary server status to be up', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee38() {
+    it('success: primary server status to be up', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee39() {
       var pingSuccessPayload, status;
-      return _regenerator.default.wrap(function (_context38) {
-        while (1) switch (_context38.prev = _context38.next) {
+      return _regenerator.default.wrap(function (_context39) {
+        while (1) switch (_context39.prev = _context39.next) {
           case 0:
             pingSuccessPayload = {
               statusCode: 200
             };
             webex.request.mockResolvedValue(pingSuccessPayload);
-            _context38.next = 1;
+            _context39.next = 1;
             return reg.isPrimaryActive();
           case 1:
-            status = _context38.sent;
+            status = _context39.sent;
             expect(webex.request).toBeCalledWith(_objectSpread({
               method: 'GET',
               uri: "https://mobius-dfw.webex.com/api/v1/ping"
@@ -1855,23 +1927,23 @@ describe('Registration Tests', function () {
             expect(status).toEqual(true);
           case 2:
           case "end":
-            return _context38.stop();
+            return _context39.stop();
         }
-      }, _callee38);
+      }, _callee39);
     })));
-    it('failed: primary server status to be down', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee39() {
+    it('failed: primary server status to be down', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee40() {
       var pingFailurePayload, status;
-      return _regenerator.default.wrap(function (_context39) {
-        while (1) switch (_context39.prev = _context39.next) {
+      return _regenerator.default.wrap(function (_context40) {
+        while (1) switch (_context40.prev = _context40.next) {
           case 0:
             pingFailurePayload = {
               statusCode: 500
             };
             webex.request.mockResolvedValue(pingFailurePayload);
-            _context39.next = 1;
+            _context40.next = 1;
             return reg.isPrimaryActive();
           case 1:
-            status = _context39.sent;
+            status = _context40.sent;
             expect(webex.request).toBeCalledWith(_objectSpread({
               method: 'GET',
               uri: "https://mobius-dfw.webex.com/api/v1/ping"
@@ -1879,9 +1951,9 @@ describe('Registration Tests', function () {
             expect(status).toEqual(false);
           case 2:
           case "end":
-            return _context39.stop();
+            return _context40.stop();
         }
-      }, _callee39);
+      }, _callee40);
     })));
   });
   describe('handleRegistrationDownEvent tests', function () {
@@ -1901,20 +1973,20 @@ describe('Registration Tests', function () {
         }
       }
     };
-    beforeEach(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee40() {
-      return _regenerator.default.wrap(function (_context40) {
-        while (1) switch (_context40.prev = _context40.next) {
+    beforeEach(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee41() {
+      return _regenerator.default.wrap(function (_context41) {
+        while (1) switch (_context41.prev = _context41.next) {
           case 0:
             postRegistrationSpy.mockResolvedValueOnce(successPayload);
-            _context40.next = 1;
+            _context41.next = 1;
             return reg.triggerRegistration();
           case 1:
             expect(reg.getStatus()).toBe(_types.RegistrationStatus.ACTIVE);
           case 2:
           case "end":
-            return _context40.stop();
+            return _context41.stop();
         }
-      }, _callee40);
+      }, _callee41);
     })));
     afterEach(function () {
       var calls = (0, _values.default)(reg.callManager.getActiveCalls());
@@ -1923,10 +1995,10 @@ describe('Registration Tests', function () {
       });
       reg.callManager.callCollection = {};
     });
-    it('runs cleanup immediately when no active calls are present (socket disabled)', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee41() {
+    it('runs cleanup immediately when no active calls are present (socket disabled)', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee42() {
       var clearKeepaliveSpy, setStatusSpy, disconnectSocketSpy;
-      return _regenerator.default.wrap(function (_context41) {
-        while (1) switch (_context41.prev = _context41.next) {
+      return _regenerator.default.wrap(function (_context42) {
+        while (1) switch (_context42.prev = _context42.next) {
           case 0:
             clearKeepaliveSpy = jest.spyOn(reg, 'clearKeepaliveTimer');
             setStatusSpy = jest.spyOn(reg, 'setStatus');
@@ -1935,7 +2007,7 @@ describe('Registration Tests', function () {
             }), 'disconnectFromMobiusSocket');
             lineEmitter.mockClear();
             expect((0, _keys.default)(reg.callManager.getActiveCalls()).length).toBe(0);
-            _context41.next = 1;
+            _context42.next = 1;
             return reg.handleRegistrationDownEvent(registrationDownEvent);
           case 1:
             expect(clearKeepaliveSpy).toHaveBeenCalled();
@@ -1950,14 +2022,14 @@ describe('Registration Tests', function () {
             expect(lineEmitter).toHaveBeenCalledWith(_types4.LINE_EVENTS.UNREGISTERED);
           case 2:
           case "end":
-            return _context41.stop();
+            return _context42.stop();
         }
-      }, _callee41);
+      }, _callee42);
     })));
-    it('ends the active call and still runs cleanup when an active call is present', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee42() {
+    it('ends the active call and still runs cleanup when an active call is present', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee43() {
       var clearKeepaliveSpy, setStatusSpy, activeCall, endSpy;
-      return _regenerator.default.wrap(function (_context42) {
-        while (1) switch (_context42.prev = _context42.next) {
+      return _regenerator.default.wrap(function (_context43) {
+        while (1) switch (_context43.prev = _context43.next) {
           case 0:
             clearKeepaliveSpy = jest.spyOn(reg, 'clearKeepaliveTimer');
             setStatusSpy = jest.spyOn(reg, 'setStatus');
@@ -1965,7 +2037,7 @@ describe('Registration Tests', function () {
             endSpy = jest.spyOn(activeCall, 'end');
             expect((0, _keys.default)(reg.callManager.getActiveCalls()).length).toBe(1);
             lineEmitter.mockClear();
-            _context42.next = 1;
+            _context43.next = 1;
             return reg.handleRegistrationDownEvent(registrationDownEvent);
           case 1:
             expect(endSpy).toHaveBeenCalledTimes(1);
@@ -1975,18 +2047,18 @@ describe('Registration Tests', function () {
             expect(lineEmitter).toHaveBeenCalledWith(_types4.LINE_EVENTS.UNREGISTERED);
           case 2:
           case "end":
-            return _context42.stop();
+            return _context43.stop();
         }
-      }, _callee42);
+      }, _callee43);
     })));
-    it('runs cleanup without calling end when no active call is present on re-invocation', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee43() {
+    it('runs cleanup without calling end when no active call is present on re-invocation', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee44() {
       var clearKeepaliveSpy, setStatusSpy;
-      return _regenerator.default.wrap(function (_context43) {
-        while (1) switch (_context43.prev = _context43.next) {
+      return _regenerator.default.wrap(function (_context44) {
+        while (1) switch (_context44.prev = _context44.next) {
           case 0:
             clearKeepaliveSpy = jest.spyOn(reg, 'clearKeepaliveTimer');
             setStatusSpy = jest.spyOn(reg, 'setStatus');
-            _context43.next = 1;
+            _context44.next = 1;
             return reg.handleRegistrationDownEvent(registrationDownEvent);
           case 1:
             expect(reg.getStatus()).toBe(_types.RegistrationStatus.INACTIVE);
@@ -1994,7 +2066,7 @@ describe('Registration Tests', function () {
             setStatusSpy.mockClear();
             lineEmitter.mockClear();
             expect((0, _keys.default)(reg.callManager.getActiveCalls()).length).toBe(0);
-            _context43.next = 2;
+            _context44.next = 2;
             return reg.handleRegistrationDownEvent(registrationDownEvent);
           case 2:
             expect(clearKeepaliveSpy).toHaveBeenCalled();
@@ -2003,14 +2075,14 @@ describe('Registration Tests', function () {
             expect(lineEmitter).toHaveBeenCalledWith(_types4.LINE_EVENTS.UNREGISTERED);
           case 3:
           case "end":
-            return _context43.stop();
+            return _context44.stop();
         }
-      }, _callee43);
+      }, _callee44);
     })));
-    it('disconnects the Mobius WebSocket when socket is enabled', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee44() {
+    it('disconnects the Mobius WebSocket when socket is enabled', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee45() {
       var apiRequest, disconnectSocketSpy;
-      return _regenerator.default.wrap(function (_context44) {
-        while (1) switch (_context44.prev = _context44.next) {
+      return _regenerator.default.wrap(function (_context45) {
+        while (1) switch (_context45.prev = _context45.next) {
           case 0:
             apiRequest = _request.APIRequest.getInstance({
               webex: webex
@@ -2019,7 +2091,7 @@ describe('Registration Tests', function () {
             disconnectSocketSpy = jest.spyOn(apiRequest, 'disconnectFromMobiusSocket').mockResolvedValue();
             lineEmitter.mockClear();
             expect((0, _keys.default)(reg.callManager.getActiveCalls()).length).toBe(0);
-            _context44.next = 1;
+            _context45.next = 1;
             return reg.handleRegistrationDownEvent(registrationDownEvent);
           case 1:
             expect(disconnectSocketSpy).toHaveBeenCalledWith({
@@ -2030,14 +2102,14 @@ describe('Registration Tests', function () {
             expect(lineEmitter).toHaveBeenCalledWith(_types4.LINE_EVENTS.UNREGISTERED);
           case 2:
           case "end":
-            return _context44.stop();
+            return _context45.stop();
         }
-      }, _callee44);
+      }, _callee45);
     })));
-    it('still emits UNREGISTERED when socket disconnect fails', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee45() {
+    it('still emits UNREGISTERED when socket disconnect fails', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee46() {
       var apiRequest, disconnectSocketSpy;
-      return _regenerator.default.wrap(function (_context45) {
-        while (1) switch (_context45.prev = _context45.next) {
+      return _regenerator.default.wrap(function (_context46) {
+        while (1) switch (_context46.prev = _context46.next) {
           case 0:
             apiRequest = _request.APIRequest.getInstance({
               webex: webex
@@ -2045,7 +2117,7 @@ describe('Registration Tests', function () {
             jest.spyOn(apiRequest, 'isSocketEnabled').mockReturnValue(true);
             disconnectSocketSpy = jest.spyOn(apiRequest, 'disconnectFromMobiusSocket').mockRejectedValue(new Error('socket teardown failed'));
             lineEmitter.mockClear();
-            _context45.next = 1;
+            _context46.next = 1;
             return reg.handleRegistrationDownEvent(registrationDownEvent);
           case 1:
             expect(disconnectSocketSpy).toHaveBeenCalled();
@@ -2057,9 +2129,9 @@ describe('Registration Tests', function () {
             expect(lineEmitter).toHaveBeenCalledWith(_types4.LINE_EVENTS.UNREGISTERED);
           case 2:
           case "end":
-            return _context45.stop();
+            return _context46.stop();
         }
-      }, _callee45);
+      }, _callee46);
     })));
   });
 });