@webex/webex-core 3.0.0-beta.4 → 3.0.0-beta.400

package/test/unit/spec/services/service-state.js

@@ -11,57 +11,48 @@ describe('webex-core', () => {
 
     describe('#constructor()', () => {
       it('should create a collection of catalog states', () => {
-        assert.isTrue(serviceConstants.SERVICE_CATALOGS.every(
-          (catalog) => !!(serviceState[catalog])
-        ));
+        assert.isTrue(
+          serviceConstants.SERVICE_CATALOGS.every((catalog) => !!serviceState[catalog])
+        );
       });
 
       it('should initialize states with false collecting values', () => {
-        assert.isTrue(serviceConstants.SERVICE_CATALOGS.every(
-          (catalog) => (serviceState[catalog].collecting === false)
-        ));
+        assert.isTrue(
+          serviceConstants.SERVICE_CATALOGS.every(
+            (catalog) => serviceState[catalog].collecting === false
+          )
+        );
       });
     });
 
     describe('#setCollecting()', () => {
       it('should set the collecting value of a catalog state to true', () => {
         serviceState.setCollecting(serviceConstants.SERVICE_CATALOGS[0], true);
-        assert.isTrue(
-          serviceState[serviceConstants.SERVICE_CATALOGS[0]].collecting
-        );
+        assert.isTrue(serviceState[serviceConstants.SERVICE_CATALOGS[0]].collecting);
       });
 
       it('should set the collecting value of a catalog state to false', () => {
         serviceState.setCollecting(serviceConstants.SERVICE_CATALOGS[0], false);
-        assert.isFalse(
-          serviceState[serviceConstants.SERVICE_CATALOGS[0]].collecting
-        );
+        assert.isFalse(serviceState[serviceConstants.SERVICE_CATALOGS[0]].collecting);
       });
     });
 
     describe('#setReady()', () => {
       it('should set the collecting value of a catalog state to true', () => {
         serviceState.setReady(serviceConstants.SERVICE_CATALOGS[0], true);
-        assert.isTrue(
-          serviceState[serviceConstants.SERVICE_CATALOGS[0]].ready
-        );
+        assert.isTrue(serviceState[serviceConstants.SERVICE_CATALOGS[0]].ready);
       });
 
       it('should set the collecting value of a catalog state to false', () => {
         serviceState.setReady(serviceConstants.SERVICE_CATALOGS[0], false);
-        assert.isFalse(
-          serviceState[serviceConstants.SERVICE_CATALOGS[0]].ready
-        );
+        assert.isFalse(serviceState[serviceConstants.SERVICE_CATALOGS[0]].ready);
       });
     });
 
     describe('static methods', () => {
       describe('#generateCatalogState()', () => {
         it('returns an object with the correct keys', () => {
-          assert.containsAllKeys(
-            ServiceState.generateCatalogState(),
-            ['collecting', 'ready']
-          );
+          assert.containsAllKeys(ServiceState.generateCatalogState(), ['collecting', 'ready']);
         });
       });
     });

package/test/unit/spec/services/service-url.js

@@ -26,38 +26,38 @@ describe('webex-core', () => {
             priority: 1,
             ttl: -1,
             id: '1',
-            homeCluster: false
+            homeCluster: false,
           },
           {
             host: 'example-host-p2.com',
             priority: 2,
             ttl: -1,
             id: '2',
-            homeCluster: false
+            homeCluster: false,
           },
           {
             host: 'example-host-p3.com',
             priority: 3,
             ttl: -1,
             id: '3',
-            homeCluster: true
+            homeCluster: true,
           },
           {
             host: 'example-host-p4.com',
             priority: 4,
             ttl: -1,
             id: '4',
-            homeCluster: true
+            homeCluster: true,
           },
           {
             host: 'example-host-p5.com',
             priority: 5,
             ttl: -1,
             id: '5',
-            homeCluster: true
-          }
+            homeCluster: true,
+          },
         ],
-        name: 'example'
+        name: 'example',
       };
       serviceUrl = new ServiceUrl({...template});
     });
@@ -103,8 +103,7 @@ describe('webex-core', () => {
 
       it('replaces the host of a pass in url', () => {
         serviceUrl.hosts.forEach(({host}) => {
-          assert.include(serviceUrl._generateHostUrl(host),
-            `https://${host}/api/v1`);
+          assert.include(serviceUrl._generateHostUrl(host), `https://${host}/api/v1`);
         });
       });
     });
@@ -120,8 +119,7 @@ describe('webex-core', () => {
         const hostUrls = serviceUrl._getHostUrls();
 
         hostUrls.forEach((hu, i) => {
-          assert.equal(hu.url,
-            serviceUrl._generateHostUrl(serviceUrl.hosts[i].host));
+          assert.equal(hu.url, serviceUrl._generateHostUrl(serviceUrl.hosts[i].host));
           assert.equal(hu.priority, serviceUrl.hosts[i].priority);
         });
       });
@@ -132,9 +130,8 @@ describe('webex-core', () => {
 
       beforeEach('get a high priority host manually', () => {
         highPriorityHost = serviceUrl._generateHostUrl(
-          serviceUrl.hosts.reduce((o, c) => (
-            o.priority > c.priority || !o.homeCluster ? c : o
-          )).host
+          serviceUrl.hosts.reduce((o, c) => (o.priority > c.priority || !o.homeCluster ? c : o))
+            .host
         );
       });
 
@@ -143,22 +140,16 @@ describe('webex-core', () => {
       });
 
       it('should reset the hosts when all have failed', () => {
-        serviceUrl.hosts.forEach(
-          (host) => {
-            /* eslint-disable-next-line no-param-reassign */
-            host.failed = true;
-          }
-        );
+        serviceUrl.hosts.forEach((host) => {
+          /* eslint-disable-next-line no-param-reassign */
+          host.failed = true;
+        });
 
         serviceUrl._getPriorityHostUrl();
 
-        const homeClusterUrls = serviceUrl.hosts.filter(
-          (host) => host.homeCluster
-        );
+        const homeClusterUrls = serviceUrl.hosts.filter((host) => host.homeCluster);
 
-        assert.isTrue(homeClusterUrls.every(
-          (host) => !host.failed
-        ));
+        assert.isTrue(homeClusterUrls.every((host) => !host.failed));
       });
     });
 
@@ -175,9 +166,7 @@ describe('webex-core', () => {
       it('marks a host as failed', () => {
         serviceUrl.failHost(hostUrl);
 
-        const removedHost = serviceUrl.hosts.find(
-          (currentHost) => currentHost.host === host
-        );
+        const removedHost = serviceUrl.hosts.find((currentHost) => currentHost.host === host);
 
         assert.isTrue(removedHost.failed);
       });
@@ -202,9 +191,7 @@ describe('webex-core', () => {
       });
 
       it('returns false if hostUrl was not found', () => {
-        const removedHostResult = serviceUrl.failHost(
-          'https://someurl.com/api/vq'
-        );
+        const removedHostResult = serviceUrl.failHost('https://someurl.com/api/vq');
 
         assert.isFalse(removedHostResult);
       });
@@ -225,9 +212,7 @@ describe('webex-core', () => {
         const hpUrl = serviceUrl.get(true);
 
         assert.equal(hpUrl, serviceUrl._getPriorityHostUrl());
-        assert.isDefined(serviceUrl.hosts.find(
-          (hostObj) => hpUrl.includes(hostObj.host)
-        ));
+        assert.isDefined(serviceUrl.hosts.find((hostObj) => hpUrl.includes(hostObj.host)));
       });
 
       describe('when a clusterId is provided', () => {
@@ -239,10 +224,8 @@ describe('webex-core', () => {
           beforeEach(() => {
             hosts = serviceUrl.hosts.filter((host) => host.homeCluster);
 
-            highPriorityHost = hosts.reduce(
-              (current, next) => (current.priority <= next.priority ?
-                current :
-                next)
+            highPriorityHost = hosts.reduce((current, next) =>
+              current.priority <= next.priority ? current : next
             ).host;
 
             url = serviceUrl.get(true, hosts[0].id);
@@ -257,10 +240,8 @@ describe('webex-core', () => {
           beforeEach(() => {
             hosts = serviceUrl.hosts.filter((host) => !host.homeCluster);
 
-            highPriorityHost = hosts.reduce(
-              (current, next) => (current.priority <= next.priority ?
-                current :
-                next)
+            highPriorityHost = hosts.reduce((current, next) =>
+              current.priority <= next.priority ? current : next
             ).host;
 
             url = serviceUrl.get(true, hosts[0].id);

package/test/unit/spec/services/services.js

@@ -6,6 +6,7 @@ import {assert} from '@webex/test-helper-chai';
 import MockWebex from '@webex/test-helper-mock-webex';
 import sinon from 'sinon';
 import {Services, ServiceRegistry, ServiceState} from '@webex/webex-core';
+import {NewMetrics} from '@webex/internal-plugin-metrics';
 
 /* eslint-disable no-underscore-dangle */
 describe('webex-core', () => {
@@ -17,8 +18,9 @@ describe('webex-core', () => {
     before('initialize webex', () => {
       webex = new MockWebex({
         children: {
-          services: Services
-        }
+          services: Services,
+          newMetrics: NewMetrics,
+        },
       });
       services = webex.internal.services;
       catalog = services._getCatalog();
@@ -93,10 +95,9 @@ describe('webex-core', () => {
       it('successfully resolves with undefined if fetch request failed', () => {
         webex.request = sinon.stub().returns(Promise.reject());
 
-        return assert.isFulfilled(services.fetchClientRegionInfo())
-          .then((r) => {
-            assert.isUndefined(r);
-          });
+        return assert.isFulfilled(services.fetchClientRegionInfo()).then((r) => {
+          assert.isUndefined(r);
+        });
       });
     });
 
@@ -111,7 +112,7 @@ describe('webex-core', () => {
         assert.calledWith(webex.request, {
           method: 'GET',
           service: 'hydra',
-          resource: 'meetingPreferences'
+          resource: 'meetingPreferences',
         });
         assert.isDefined(res);
         assert.equal(res, userPreferences);
@@ -125,12 +126,66 @@ describe('webex-core', () => {
         assert.calledWith(webex.request, {
           method: 'GET',
           service: 'hydra',
-          resource: 'meetingPreferences'
+          resource: 'meetingPreferences',
         });
         assert.isUndefined(res);
       });
     });
 
+    describe('#_fetchNewServiceHostmap()', () => {
+
+      beforeEach(() => {
+        sinon.spy(webex.internal.newMetrics.callDiagnosticLatencies, 'measureLatency');
+      });
+
+      afterEach(() => {
+        sinon.restore();
+      });
+
+      it('checks service request resolves', async () => {
+        const mapResponse = 'map response';
+
+        sinon.stub(services, '_formatReceivedHostmap').resolves(mapResponse);
+        sinon.stub(services, 'request').resolves({});
+        
+        const mapResult = await services._fetchNewServiceHostmap({from: 'limited'});
+
+        assert.deepEqual(mapResult, mapResponse);
+
+        assert.calledOnceWithExactly(services.request, {
+          method: 'GET',
+          service: 'u2c',
+          resource: '/limited/catalog',
+          qs: {format: 'hostmap'}
+        }
+        );
+        assert.calledOnceWithExactly(webex.internal.newMetrics.callDiagnosticLatencies.measureLatency, sinon.match.func, 'internal.get.u2c.time');
+      });
+
+      it('checks service request rejects', async () => {
+        const error = new Error('some error');
+
+        sinon.spy(services, '_formatReceivedHostmap');
+        sinon.stub(services, 'request').rejects(error);
+        
+        const promise = services._fetchNewServiceHostmap({from: 'limited'});
+        const rejectedValue = await assert.isRejected(promise);
+
+        assert.deepEqual(rejectedValue, error);
+
+        assert.notCalled(services._formatReceivedHostmap);
+
+        assert.calledOnceWithExactly(services.request, {
+          method: 'GET',
+          service: 'u2c',
+          resource: '/limited/catalog',
+          qs: {format: 'hostmap'}
+        }
+        );
+        assert.calledOnceWithExactly(webex.internal.newMetrics.callDiagnosticLatencies.measureLatency, sinon.match.func, 'internal.get.u2c.time');
+      });
+    });
+
     describe('#_formatReceivedHostmap()', () => {
       let serviceHostmap;
       let formattedHM;
@@ -141,78 +196,117 @@ describe('webex-core', () => {
             'example-a': 'https://example-a.com/api/v1',
             'example-b': 'https://example-b.com/api/v1',
             'example-c': 'https://example-c.com/api/v1',
-            'example-d': 'https://example-d.com/api/v1'
+            'example-d': 'https://example-d.com/api/v1',
           },
           hostCatalog: {
             'example-a.com': [
               {
-                host: 'example-a-1.com', ttl: -1, priority: 5, id: '0:0:0:example-a'
+                host: 'example-a-1.com',
+                ttl: -1,
+                priority: 5,
+                id: '0:0:0:example-a',
               },
               {
-                host: 'example-a-2.com', ttl: -1, priority: 3, id: '0:0:0:example-a'
+                host: 'example-a-2.com',
+                ttl: -1,
+                priority: 3,
+                id: '0:0:0:example-a',
               },
               {
-                host: 'example-a-3.com', ttl: -1, priority: 1, id: '0:0:0:example-a-x'
-              }
+                host: 'example-a-3.com',
+                ttl: -1,
+                priority: 1,
+                id: '0:0:0:example-a-x',
+              },
             ],
             'example-b.com': [
               {
-                host: 'example-b-1.com', ttl: -1, priority: 5, id: '0:0:0:example-b'
+                host: 'example-b-1.com',
+                ttl: -1,
+                priority: 5,
+                id: '0:0:0:example-b',
               },
               {
-                host: 'example-b-2.com', ttl: -1, priority: 3, id: '0:0:0:example-b'
+                host: 'example-b-2.com',
+                ttl: -1,
+                priority: 3,
+                id: '0:0:0:example-b',
               },
               {
-                host: 'example-b-3.com', ttl: -1, priority: 1, id: '0:0:0:example-b-x'
-              }
+                host: 'example-b-3.com',
+                ttl: -1,
+                priority: 1,
+                id: '0:0:0:example-b-x',
+              },
             ],
             'example-c.com': [
               {
-                host: 'example-c-1.com', ttl: -1, priority: 5, id: '0:0:0:example-c'
+                host: 'example-c-1.com',
+                ttl: -1,
+                priority: 5,
+                id: '0:0:0:example-c',
               },
               {
-                host: 'example-c-2.com', ttl: -1, priority: 3, id: '0:0:0:example-c'
+                host: 'example-c-2.com',
+                ttl: -1,
+                priority: 3,
+                id: '0:0:0:example-c',
               },
               {
-                host: 'example-c-3.com', ttl: -1, priority: 1, id: '0:0:0:example-c-x'
-              }
+                host: 'example-c-3.com',
+                ttl: -1,
+                priority: 1,
+                id: '0:0:0:example-c-x',
+              },
             ],
             'example-d.com': [
               {
-                host: 'example-c-1.com', ttl: -1, priority: 5, id: '0:0:0:example-d'
+                host: 'example-c-1.com',
+                ttl: -1,
+                priority: 5,
+                id: '0:0:0:example-d',
               },
               {
-                host: 'example-c-2.com', ttl: -1, priority: 3, id: '0:0:0:example-d'
+                host: 'example-c-2.com',
+                ttl: -1,
+                priority: 3,
+                id: '0:0:0:example-d',
               },
               {
-                host: 'example-c-3.com', ttl: -1, priority: 1, id: '0:0:0:example-d-x'
-              }
-            ]
+                host: 'example-c-3.com',
+                ttl: -1,
+                priority: 1,
+                id: '0:0:0:example-d-x',
+              },
+            ],
           },
-          format: 'hostmap'
+          format: 'hostmap',
         };
       });
 
       it('creates a formmatted host map that contains the same amount of entries as the original received hostmap', () => {
         formattedHM = services._formatReceivedHostmap(serviceHostmap);
 
-        assert(Object.keys(serviceHostmap.serviceLinks).length >=
-          formattedHM.length, 'length is not equal or less than');
+        assert(
+          Object.keys(serviceHostmap.serviceLinks).length >= formattedHM.length,
+          'length is not equal or less than'
+        );
       });
 
       it.skip('creates an array of equal or less length of hostMap', () => {
         formattedHM = services._formatReceivedHostmap(serviceHostmap);
 
-        assert(Object.keys(serviceHostmap.hostCatalog).length >=
-          formattedHM.length, 'length is not equal or less than');
+        assert(
+          Object.keys(serviceHostmap.hostCatalog).length >= formattedHM.length,
+          'length is not equal or less than'
+        );
       });
 
       it('creates an array with matching url data', () => {
         formattedHM = services._formatReceivedHostmap(serviceHostmap);
 
         formattedHM.forEach((entry) => {
-          assert.equal(serviceHostmap.serviceLinks[entry.name],
-            entry.defaultUrl);
+          assert.equal(serviceHostmap.serviceLinks[entry.name], entry.defaultUrl);
         });
       });
 
@@ -221,8 +315,11 @@ describe('webex-core', () => {
 
         formattedHM.forEach((service) => {
           service.hosts.forEach((host) => {
-            assert.hasAllKeys(host,
-              ['homeCluster', 'host', 'id', 'priority', 'ttl'], `${service.name} has an invalid host shape`);
+            assert.hasAllKeys(
+              host,
+              ['homeCluster', 'host', 'id', 'priority', 'ttl'],
+              `${service.name} has an invalid host shape`
+            );
           });
         });
       });
@@ -231,8 +328,9 @@ describe('webex-core', () => {
         formattedHM = services._formatReceivedHostmap(serviceHostmap);
 
         formattedHM.forEach((service) => {
-          const foundServiceKey = Object.keys(serviceHostmap.serviceLinks)
-            .find((key) => service.name === key);
+          const foundServiceKey = Object.keys(serviceHostmap.serviceLinks).find(
+            (key) => service.name === key
+          );
 
           assert.isDefined(foundServiceKey);
         });
@@ -251,8 +349,16 @@ describe('webex-core', () => {
       it('creates an array with matching names', () => {
         formattedHM = services._formatReceivedHostmap(serviceHostmap);
 
-        assert.hasAllKeys(serviceHostmap.serviceLinks,
-          formattedHM.map((item) => item.name));
+        assert.hasAllKeys(
+          serviceHostmap.serviceLinks,
+          formattedHM.map((item) => item.name)
+        );
+      });
+
+      it('has hostCatalog updated', () => {
+        services._formatReceivedHostmap(serviceHostmap);
+
+        assert.deepStrictEqual(services._hostCatalog, serviceHostmap.hostCatalog);
       });
     });
 
@@ -260,13 +366,13 @@ describe('webex-core', () => {
       // updateCredentialsConfig must remove `/` if exist. so expected serviceList must be.
       const expectedServiceList = {
         idbroker: 'https://idbroker.webex.com',
-        identity: 'https://identity.webex.com'
+        identity: 'https://identity.webex.com',
       };
 
       beforeEach('get services list', async () => {
         const servicesList = {
           idbroker: 'https://idbroker.webex.com',
-          identity: 'https://identity.webex.com/'
+          identity: 'https://identity.webex.com/',
         };
 
         catalog.list = sinon.stub().returns(servicesList);

package/test/unit/spec/storage/persist.js

@@ -6,10 +6,7 @@
 
 import {assert} from '@webex/test-helper-chai';
 import MockWebex from '@webex/test-helper-mock-webex';
-import {
-  persist,
-  WebexPlugin
-} from '@webex/webex-core';
+import {persist, WebexPlugin} from '@webex/webex-core';
 
 describe('webex-core', () => {
   describe('@persist', () => {
@@ -18,8 +15,8 @@ describe('webex-core', () => {
         props: {
           test: {
             default: false,
-            type: 'boolean'
-          }
+            type: 'boolean',
+          },
         },
 
         namespace: 'MockChild',
@@ -27,13 +24,13 @@ describe('webex-core', () => {
         @persist('@')
         initialize(...args) {
           return Reflect.apply(WebexPlugin.prototype.initialize, this, args);
-        }
+        },
       });
 
       const webex = new MockWebex({
         children: {
-          mockChild: MockChild
-        }
+          mockChild: MockChild,
+        },
       });
 
       webex.internal.mockChild.test = true;

package/test/unit/spec/storage/wait-for-value.js

@@ -7,11 +7,7 @@
 import {assert} from '@webex/test-helper-chai';
 import sinon from 'sinon';
 import MockWebex from '@webex/test-helper-mock-webex';
-import {
-  persist,
-  WebexPlugin,
-  waitForValue
-} from '@webex/webex-core';
+import {persist, WebexPlugin, waitForValue} from '@webex/webex-core';
 
 describe('webex-core', () => {
   describe('@waitForValue', () => {
@@ -20,8 +16,8 @@ describe('webex-core', () => {
         props: {
           test: {
             default: false,
-            type: 'boolean'
-          }
+            type: 'boolean',
+          },
         },
 
         namespace: 'MockChild',
@@ -33,29 +29,34 @@ describe('webex-core', () => {
 
         @waitForValue('@')
         testMethod() {
-          return this.webex.request()
-            .then(() => {
-              this.test = true;
-            });
-        }
+          return this.webex.request().then(() => {
+            this.test = true;
+          });
+        },
       });
 
       const webex = new MockWebex({
         children: {
-          mockChild: MockChild
-        }
+          mockChild: MockChild,
+        },
       });
 
       let resolve;
 
-      sinon.stub(webex.boundedStorage, 'get').returns(new Promise((r) => { resolve = r; }));
+      sinon.stub(webex.boundedStorage, 'get').returns(
+        new Promise((r) => {
+          resolve = r;
+        })
+      );
 
-      webex.request.returns(Promise.resolve({
-        body: {
-          access_token: 'fake token @waitForValue',
-          token_type: 'Bearer'
-        }
-      }));
+      webex.request.returns(
+        Promise.resolve({
+          body: {
+            access_token: 'fake token @waitForValue',
+            token_type: 'Bearer',
+          },
+        })
+      );
 
       const promise = webex.internal.mockChild.testMethod();