@webex/calling 3.0.0-next.15 → 3.0.0-next.17

package/dist/CallingClient/CallingClient.test.js

@@ -38,6 +38,7 @@ describe('CallingClient Tests', function () {
 
   var handleErrorSpy = jest.spyOn(utils, 'handleCallingClientErrors');
   var webex = (0, _testUtil.getTestUtilsWebex)();
+  webex.internal.services['_hostCatalog'] = _callingClientFixtures.mockCatalogUS;
   var defaultServiceIndicator = _types2.ServiceIndicator.CALLING;
   var callManager = (0, _callManager.getCallManager)(webex, defaultServiceIndicator);
   var logSpy = jest.spyOn(_Logger.default, 'info');
@@ -377,7 +378,7 @@ describe('CallingClient Tests', function () {
             expect(webex.request).nthCalledWith(1, _objectSpread(_objectSpread({
               method: 'GET'
             }, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "myip")
+              uri: "".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT).concat(_constants.IP_ENDPOINT)
             }));
             expect(webex.request).nthCalledWith(2, {
               method: 'GET',
@@ -388,7 +389,7 @@ describe('CallingClient Tests', function () {
             expect(webex.request).nthCalledWith(3, _objectSpread(_objectSpread({
               method: 'GET'
             }, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "?regionCode=").concat(_callingClientFixtures.regionBody.clientRegion, "&countryCode=").concat(_callingClientFixtures.regionBody.countryCode)
+              uri: "".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT, "?regionCode=").concat(_callingClientFixtures.regionBody.clientRegion, "&countryCode=").concat(_callingClientFixtures.regionBody.countryCode)
             }));
           case 10:
           case "end":
@@ -413,22 +414,29 @@ describe('CallingClient Tests', function () {
             });
           case 4:
             callingClient = _context14.sent;
-            expect(handleErrorSpy).toBeCalledOnceWith(failurePayload, expect.anything(), {
-              file: _constants.CALLING_CLIENT_FILE,
-              method: 'getMobiusServers'
-            });
-            expect(webex.request).toBeCalledOnceWith(_objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "myip"),
+            expect(webex.request).nthCalledWith(1, _objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
+              uri: 'https://mobius-us-east-1.prod.infra.webex.com/api/v1/calling/web/myip',
               method: 'GET'
             }));
-            expect(callingClient.primaryMobiusUris).toEqual([_callingClientFixtures.uri]);
-            expect(webex.request).nthCalledWith(1, _objectSpread(_objectSpread({
+            expect(webex.request).nthCalledWith(2, _objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
+              uri: 'https://mobius-ca-central-1.prod.infra.webex.com/api/v1/calling/web/myip',
               method: 'GET'
-            }, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "myip")
             }));
-            expect(warnSpy).toBeCalledWith('Error in finding Mobius Servers. Will use the default URL.', '');
-          case 10:
+            expect(webex.request).nthCalledWith(3, _objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
+              uri: 'https://mobius-eu-central-1.prod.infra.webex.com/api/v1/calling/web/myip',
+              method: 'GET'
+            }));
+            expect(webex.request).nthCalledWith(4, _objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
+              uri: 'https://mobius-ap-southeast-2.prod.infra.webex.com/api/v1/calling/web/myip',
+              method: 'GET'
+            }));
+            expect(handleErrorSpy).toBeCalledWith(failurePayload, expect.anything(), {
+              file: _constants.CALLING_CLIENT_FILE,
+              method: 'getMobiusServers'
+            });
+            expect(callingClient.primaryMobiusUris).toEqual(["".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT)]);
+            expect(warnSpy).toBeCalledWith("Couldn't resolve the region and country code. Defaulting to the catalog entries to discover mobius servers", '');
+          case 12:
           case "end":
             return _context14.stop();
         }
@@ -456,11 +464,11 @@ describe('CallingClient Tests', function () {
               method: 'getMobiusServers'
             });
             expect(webex.request).toBeCalledTimes(3);
-            expect(callingClient.primaryMobiusUris).toEqual([_callingClientFixtures.uri]);
+            expect(callingClient.primaryMobiusUris).toEqual(["".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT)]);
             expect(webex.request).nthCalledWith(1, _objectSpread(_objectSpread({
               method: 'GET'
             }, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "myip")
+              uri: "".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT).concat(_constants.IP_ENDPOINT)
             }));
             expect(webex.request).nthCalledWith(2, {
               method: 'GET',
@@ -468,7 +476,7 @@ describe('CallingClient Tests', function () {
               addAuthHeader: false,
               headers: (0, _defineProperty2.default)({}, _constants.SPARK_USER_AGENT, null)
             });
-            expect(warnSpy).toBeCalledWith('Error in finding Mobius Servers. Will use the default URL.', '');
+            expect(warnSpy).toBeCalledWith("Couldn't resolve the region and country code. Defaulting to the catalog entries to discover mobius servers", '');
           case 11:
           case "end":
             return _context15.stop();
@@ -500,7 +508,7 @@ describe('CallingClient Tests', function () {
               method: 'getMobiusServers'
             });
             expect(webex.request).toBeCalledOnceWith(_objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "?regionCode=").concat(_callingClientFixtures.regionBody.clientRegion, "&countryCode=").concat(_callingClientFixtures.regionBody.countryCode),
+              uri: "".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT, "?regionCode=").concat(_callingClientFixtures.regionBody.clientRegion, "&countryCode=").concat(_callingClientFixtures.regionBody.countryCode),
               method: 'GET'
             }));
             expect(handleErrorSpy).not.toBeCalled();
@@ -511,6 +519,64 @@ describe('CallingClient Tests', function () {
       }, _callee16);
     })));
   });
+  describe('Testing each cluster present withing host catalog', function () {
+    var mobiusCluster = ['mobius-eu-central-1.prod.infra.webex.com', 'mobius-us-east-1.int.infra.webex.com', 'mobius-eu-central-1.int.infra.webex.com'];
+    var checkCluster = /*#__PURE__*/function () {
+      var _ref17 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(mockServiceHosts, mockCatalog) {
+        var callingClient;
+        return _regenerator.default.wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
+            case 0:
+              webex.internal.services._hostCatalog = mockCatalog;
+              _context17.next = 3;
+              return (0, _CallingClient.createClient)(webex, {
+                logger: {
+                  level: _types.LOGGER.INFO
+                }
+              });
+            case 3:
+              callingClient = _context17.sent;
+              expect(callingClient['mobiusClusters']).toStrictEqual(mockServiceHosts);
+            case 5:
+            case "end":
+              return _context17.stop();
+          }
+        }, _callee17);
+      }));
+      return function checkCluster(_x, _x2) {
+        return _ref17.apply(this, arguments);
+      };
+    }();
+    it.each(mobiusCluster)('%s', /*#__PURE__*/function () {
+      var _ref18 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18(clusterName) {
+        return _regenerator.default.wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
+            case 0:
+              _context18.t0 = clusterName;
+              _context18.next = _context18.t0 === 'mobius-eu-central-1.prod.infra.webex.com' ? 3 : _context18.t0 === 'mobius-us-east-1.int.infra.webex.com' ? 5 : _context18.t0 === 'mobius-eu-central-1.int.infra.webex.com' ? 7 : 9;
+              break;
+            case 3:
+              checkCluster(_callingClientFixtures.mockEUServiceHosts, _callingClientFixtures.mockCatalogEU);
+              return _context18.abrupt("break", 10);
+            case 5:
+              checkCluster(_callingClientFixtures.mockIntServiceHosts, _callingClientFixtures.mockCatalogUSInt);
+              return _context18.abrupt("break", 10);
+            case 7:
+              checkCluster(_callingClientFixtures.mockEUIntServiceHosts, _callingClientFixtures.mockCatalogEUInt);
+              return _context18.abrupt("break", 10);
+            case 9:
+              return _context18.abrupt("break", 10);
+            case 10:
+            case "end":
+              return _context18.stop();
+          }
+        }, _callee18);
+      }));
+      return function (_x3) {
+        return _ref18.apply(this, arguments);
+      };
+    }());
+  });
   describe('Network activity detection tests', function () {
     var callingClient;
     var line;
@@ -519,23 +585,23 @@ describe('CallingClient Tests', function () {
     var restoreSpy;
     var restartRegisterSpy;
     var registerSpy;
-    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17() {
-      return _regenerator.default.wrap(function _callee17$(_context17) {
-        while (1) switch (_context17.prev = _context17.next) {
+    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee19() {
+      return _regenerator.default.wrap(function _callee19$(_context19) {
+        while (1) switch (_context19.prev = _context19.next) {
           case 0:
             jest.useFakeTimers();
             webex.request.mockResolvedValueOnce(_callingClientFixtures.ipPayload).mockResolvedValueOnce(_callingClientFixtures.regionPayload).mockResolvedValueOnce(_callingClientFixtures.discoveryPayload).mockResolvedValueOnce(_callingClientFixtures.registrationPayload);
-            _context17.next = 4;
+            _context19.next = 4;
             return (0, _CallingClient.createClient)(webex, {
               logger: {
                 level: _types.LOGGER.INFO
               }
             });
           case 4:
-            callingClient = _context17.sent;
+            callingClient = _context19.sent;
             line = (0, _values.default)(callingClient.lineDict)[0];
             reg = line.registration;
-            _context17.next = 9;
+            _context19.next = 9;
             return line.register();
           case 9:
             deRegSpy = jest.spyOn(line.registration, 'deregister');
@@ -544,9 +610,9 @@ describe('CallingClient Tests', function () {
             registerSpy = jest.spyOn(reg, 'attemptRegistrationWithServers');
           case 13:
           case "end":
-            return _context17.stop();
+            return _context19.stop();
         }
-      }, _callee17);
+      }, _callee19);
     })));
     afterEach(function () {
       jest.clearAllTimers();
@@ -556,9 +622,9 @@ describe('CallingClient Tests', function () {
       callingClient = undefined;
       jest.useRealTimers();
     });
-    it('detect a network flap in mercury connection', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18() {
-      return _regenerator.default.wrap(function _callee18$(_context18) {
-        while (1) switch (_context18.prev = _context18.next) {
+    it('detect a network flap in mercury connection', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20() {
+      return _regenerator.default.wrap(function _callee20$(_context20) {
+        while (1) switch (_context20.prev = _context20.next) {
           case 0:
             expect(line.getStatus()).toEqual(_types2.RegistrationStatus.ACTIVE);
 
@@ -575,7 +641,7 @@ describe('CallingClient Tests', function () {
             /* Set mercury connection to be up and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = true;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
-            _context18.next = 8;
+            _context20.next = 8;
             return flushPromises();
           case 8:
             /* We should be detecting the network recovery */
@@ -590,14 +656,14 @@ describe('CallingClient Tests', function () {
             expect(registerSpy).lastCalledWith('handleConnectionRestoration', [_callingClientFixtures.primaryUrl]);
           case 14:
           case "end":
-            return _context18.stop();
+            return _context20.stop();
         }
-      }, _callee18);
+      }, _callee20);
     })));
-    it('Simulate a network flap with no active calls and re-verify registration: Restore Failure', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee19() {
+    it('Simulate a network flap with no active calls and re-verify registration: Restore Failure', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21() {
       var failurePayload, mockRegistrationBody, successPayload;
-      return _regenerator.default.wrap(function _callee19$(_context19) {
-        while (1) switch (_context19.prev = _context19.next) {
+      return _regenerator.default.wrap(function _callee21$(_context21) {
+        while (1) switch (_context21.prev = _context21.next) {
           case 0:
             expect(line.getStatus()).toEqual(_types2.RegistrationStatus.ACTIVE);
             failurePayload = {
@@ -624,7 +690,7 @@ describe('CallingClient Tests', function () {
             /* Set mercury connection to be up and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = true;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
-            _context19.next = 12;
+            _context21.next = 12;
             return flushPromises();
           case 12:
             /* We should be detecting the network recovery */
@@ -639,14 +705,14 @@ describe('CallingClient Tests', function () {
             expect(registerSpy).lastCalledWith('handleConnectionRestoration', [_callingClientFixtures.primaryUrl]);
           case 18:
           case "end":
-            return _context19.stop();
+            return _context21.stop();
         }
-      }, _callee19);
+      }, _callee21);
     })));
-    it('Simulate a network flap before initial registration is done', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20() {
+    it('Simulate a network flap before initial registration is done', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22() {
       var handleConnectionRestoreSpy;
-      return _regenerator.default.wrap(function _callee20$(_context20) {
-        while (1) switch (_context20.prev = _context20.next) {
+      return _regenerator.default.wrap(function _callee22$(_context22) {
+        while (1) switch (_context22.prev = _context22.next) {
           case 0:
             handleConnectionRestoreSpy = jest.spyOn(reg, 'handleConnectionRestoration');
             reg.setStatus(_types2.RegistrationStatus.IDLE);
@@ -664,7 +730,7 @@ describe('CallingClient Tests', function () {
             /* Set mercury connection to be up and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = true;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
-            _context20.next = 9;
+            _context22.next = 9;
             return flushPromises();
           case 9:
             /* We should be detecting the network recovery */
@@ -680,13 +746,13 @@ describe('CallingClient Tests', function () {
             expect(handleConnectionRestoreSpy).not.toBeCalledOnceWith();
           case 11:
           case "end":
-            return _context20.stop();
+            return _context22.stop();
         }
-      }, _callee20);
+      }, _callee22);
     })));
-    it('Simulate a network flap with 1 active call', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21() {
-      return _regenerator.default.wrap(function _callee21$(_context21) {
-        while (1) switch (_context21.prev = _context21.next) {
+    it('Simulate a network flap with 1 active call', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee23() {
+      return _regenerator.default.wrap(function _callee23$(_context23) {
+        while (1) switch (_context23.prev = _context23.next) {
           case 0:
             expect(line.getStatus()).toEqual(_types2.RegistrationStatus.ACTIVE);
 
@@ -697,7 +763,7 @@ describe('CallingClient Tests', function () {
             /* Set mercury connection to be down and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = false;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
-            _context21.next = 7;
+            _context23.next = 7;
             return flushPromises();
           case 7:
             /* We should be detecting the network flap */
@@ -709,7 +775,7 @@ describe('CallingClient Tests', function () {
             /* Set mercury connection to be up and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = true;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
-            _context21.next = 12;
+            _context23.next = 12;
             return flushPromises();
           case 12:
             /* We should be detecting the network recovery */
@@ -720,28 +786,28 @@ describe('CallingClient Tests', function () {
             expect(registerSpy).not.toBeCalledWith(true);
           case 14:
           case "end":
-            return _context21.stop();
+            return _context23.stop();
         }
-      }, _callee21);
+      }, _callee23);
     })));
   });
   describe('Line creation tests', function () {
     var callingClient;
     var line;
-    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22() {
-      return _regenerator.default.wrap(function _callee22$(_context22) {
-        while (1) switch (_context22.prev = _context22.next) {
+    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee24() {
+      return _regenerator.default.wrap(function _callee24$(_context24) {
+        while (1) switch (_context24.prev = _context24.next) {
           case 0:
-            _context22.next = 2;
+            _context24.next = 2;
             return (0, _CallingClient.createClient)(webex);
           case 2:
-            callingClient = _context22.sent;
+            callingClient = _context24.sent;
             line = (0, _values.default)(callingClient.lineDict)[0];
           case 4:
           case "end":
-            return _context22.stop();
+            return _context24.stop();
         }
-      }, _callee22);
+      }, _callee24);
     })));
     afterEach(function () {
       jest.clearAllTimers();
@@ -776,15 +842,15 @@ describe('CallingClient Tests', function () {
     });
     var callingClient;
     var line;
-    beforeAll( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee23() {
+    beforeAll( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee25() {
       var calls;
-      return _regenerator.default.wrap(function _callee23$(_context23) {
-        while (1) switch (_context23.prev = _context23.next) {
+      return _regenerator.default.wrap(function _callee25$(_context25) {
+        while (1) switch (_context25.prev = _context25.next) {
           case 0:
-            _context23.next = 2;
+            _context25.next = 2;
             return (0, _CallingClient.createClient)(webex);
           case 2:
-            callingClient = _context23.sent;
+            callingClient = _context25.sent;
             line = new _line.default(userId, clientDeviceUri, mutex, primaryMobiusUris(), backupMobiusUris(), _types.LOGGER.INFO);
             calls = (0, _values.default)(callManager.getActiveCalls());
             calls.forEach(function (call) {
@@ -792,9 +858,9 @@ describe('CallingClient Tests', function () {
             });
           case 6:
           case "end":
-            return _context23.stop();
+            return _context25.stop();
         }
-      }, _callee23);
+      }, _callee25);
     })));
     afterAll(function () {
       callingClient.removeAllListeners();
@@ -877,23 +943,23 @@ describe('CallingClient Tests', function () {
   describe('Call Session Event test', function () {
     var mockOn = webex.internal.mercury.on;
     var callingClient;
-    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee24() {
-      return _regenerator.default.wrap(function _callee24$(_context24) {
-        while (1) switch (_context24.prev = _context24.next) {
+    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee26() {
+      return _regenerator.default.wrap(function _callee26$(_context26) {
+        while (1) switch (_context26.prev = _context26.next) {
           case 0:
-            _context24.next = 2;
+            _context26.next = 2;
             return (0, _CallingClient.createClient)(webex, {
               logger: {
                 level: _types.LOGGER.INFO
               }
             });
           case 2:
-            callingClient = _context24.sent;
+            callingClient = _context26.sent;
           case 3:
           case "end":
-            return _context24.stop();
+            return _context26.stop();
         }
-      }, _callee24);
+      }, _callee26);
     })));
     afterEach(function () {
       callingClient.removeAllListeners();