@webex/webex-core 3.8.1 → 3.9.0-next.2

package/src/webex-core.js

@@ -26,12 +26,13 @@ import RequestTimingInterceptor from './interceptors/request-timing';
 import ResponseLoggerInterceptor from './interceptors/response-logger';
 import WebexHttpError from './lib/webex-http-error';
 import UserAgentInterceptor from './interceptors/user-agent';
+import ProxyInterceptor from './interceptors/proxy';
 import WebexTrackingIdInterceptor from './interceptors/webex-tracking-id';
 import WebexUserAgentInterceptor from './interceptors/webex-user-agent';
 import RateLimitInterceptor from './interceptors/rate-limit';
 import EmbargoInterceptor from './interceptors/embargo';
 import DefaultOptionsInterceptor from './interceptors/default-options';
-import HostMapInterceptor from './lib/services/interceptors/hostmap';
+import HostMapInterceptor from './lib/interceptors/hostmap';
 import config from './config';
 import {makeWebexStore} from './lib/storage';
 import mixinWebexCorePlugins from './lib/webex-core-plugin-mixin';
@@ -58,6 +59,7 @@ const interceptors = {
   RequestTimingInterceptor: RequestTimingInterceptor.create,
   ServiceInterceptor: undefined,
   UserAgentInterceptor: UserAgentInterceptor.create,
+  ProxyInterceptor: ProxyInterceptor.create,
   WebexUserAgentInterceptor: WebexUserAgentInterceptor.create,
   AuthInterceptor: AuthInterceptor.create,
   KmsDryErrorInterceptor: undefined,
@@ -578,8 +580,14 @@ const WebexCore = AmpState.extend({
     return Promise.resolve();
   },
 
-  async upload(options) {
-    if (!options.file) {
+  /**
+   * Uploads a file provided in `file` property
+   *
+   * @param {Object} options
+   * @returns {Promise}
+   */
+  upload(options) {
+    if (!options || !options.file) {
       return Promise.reject(new Error('`options.file` is required'));
     }
 

package/test/fixtures/host-catalog-v2.ts

@@ -1,125 +1,3 @@
-export const serviceHostmapV2 = {
-  activeServices: {
-    conversation: 'urn:TEAM:us-east-2_a:conversation',
-    idbroker: 'urn:TEAM:us-east-2_a:idbroker',
-    locus: 'urn:TEAM:us-east-2_a:locus',
-    mercury: 'urn:TEAM:us-east-2_a:mercury',
-  },
-  services: [
-    {
-      id: 'urn:TEAM:us-east-2_a:conversation',
-      serviceName: 'conversation',
-      serviceUrls: [
-        {
-          baseUrl: 'https://prod-achm-message.svc.webex.com/conversation/api/v1',
-          priority: 1,
-        },
-        {
-          baseUrl: 'https://conv-a.wbx2.com/conversation/api/v1',
-          priority: 2,
-        },
-      ],
-    },
-    {
-      id: 'urn:TEAM:me-central-1_d:conversation',
-      serviceName: 'conversation',
-      serviceUrls: [
-        {
-          baseUrl: 'https://prod-adxb-message.svc.webex.com/conversation/api/v1',
-          priority: 1,
-        },
-        {
-          baseUrl: 'https://conv-d.wbx2.com/conversation/api/v1',
-          priority: 2,
-        },
-      ],
-    },
-    {
-      id: 'urn:TEAM:us-east-2_a:idbroker',
-      serviceName: 'idbroker',
-      serviceUrls: [
-        {
-          baseUrl: 'https://prod-adxb-message.svc.webex.com/idbroker/api/v1',
-          priority: 1,
-        },
-        {
-          baseUrl: 'https://idbroker.webex.com/idb/api/v1',
-          priority: 2,
-        },
-      ],
-    },
-    {
-      id: 'urn:TEAM:me-central-1_d:idbroker',
-      serviceName: 'idbroker',
-      serviceUrls: [
-        {
-          baseUrl: 'https://prod-adxb-message.svc.webex.com/idbroker/api/v1',
-          priority: 1,
-        },
-        {
-          baseUrl: 'https://conv-d.wbx2.com/idbroker/api/v1',
-          priority: 2,
-        },
-      ],
-    },
-    {
-      id: 'urn:TEAM:us-east-2_a:locus',
-      serviceName: 'locus',
-      serviceUrls: [
-        {
-          baseUrl: 'https://prod-adxb-message.svc.webex.com/locus/api/v1',
-          priority: 1,
-        },
-        {
-          baseUrl: 'https://locus-a.wbx2.com/locus/api/v1',
-          priority: 2,
-        },
-      ],
-    },
-    {
-      id: 'urn:TEAM:me-central-1_d:locus',
-      serviceName: 'locus',
-      serviceUrls: [
-        {
-          baseUrl: 'https://prod-adxb-message.svc.webex.com/locus/api/v1',
-          priority: 1,
-        },
-        {
-          baseUrl: 'https://conv-d.wbx2.com/locus/api/v1',
-          priority: 2,
-        },
-      ],
-    },
-    {
-      id: 'urn:TEAM:us-east-2_a:mercury',
-      serviceName: 'mercury',
-      serviceUrls: [
-        {
-          baseUrl: 'https://mercury-a.wbx2.com/mercury/api/v1',
-          priority: 1,
-        },
-      ],
-    },
-    {
-      id: 'urn:TEAM:me-central-1_d:mercury',
-      serviceName: 'mercury',
-      serviceUrls: [
-        {
-          baseUrl: 'https://prod-adxb-message.svc.webex.com/mercury/api/v1',
-          priority: 1,
-        },
-        {
-          baseUrl: 'https://conv-d.wbx2.com/mercury/api/v1',
-          priority: 2,
-        },
-      ],
-    },
-  ],
-  orgId: '3e0e410f-f83f-4ee4-ac32-12692e99355c',
-  timestamp: '1745533341',
-  format: 'U2Cv2',
-};
-
 export const formattedServiceHostmapEntryConv = {
   id: 'urn:TEAM:us-east-2_a:conversation',
   serviceName: 'conversation',
@@ -137,6 +15,23 @@ export const formattedServiceHostmapEntryConv = {
   ],
 };
 
+export const formattedServiceHostmapEntryTest = {
+  id: 'urn:TEAM:us-east-2_a:test',
+  serviceName: 'test',
+  serviceUrls: [
+    {
+      baseUrl: 'wss://int-first-test.svc.webex.com/test-connection-partition0/api/v1',
+      host: 'int-first-test.svc.webex.com',
+      priority: 1,
+    },
+    {
+      baseUrl: 'wss://test-connection-partition0-intb.ciscospark.com/v1',
+      host: 'test-connection-partition0-intb.ciscospark.com',
+      priority: 2,
+    },
+  ],
+};
+
 export const formattedServiceHostmapV2 = [
   formattedServiceHostmapEntryConv,
   {
@@ -247,3 +142,16 @@ export const formattedServiceHostmapV2 = [
     ],
   },
 ];
+
+export const serviceHostmapV2 = {
+  activeServices: {
+    conversation: 'urn:TEAM:us-east-2_a:conversation',
+    idbroker: 'urn:TEAM:us-east-2_a:idbroker',
+    locus: 'urn:TEAM:us-east-2_a:locus',
+    mercury: 'urn:TEAM:us-east-2_a:mercury',
+  },
+  services: formattedServiceHostmapV2,
+  orgId: '3e0e410f-f83f-4ee4-ac32-12692e99355c',
+  timestamp: '1745533341',
+  format: 'U2Cv2',
+};

package/test/integration/spec/services/services.js

@@ -10,6 +10,10 @@ import WebexCore, {
   ServiceCatalog,
   ServiceRegistry,
   ServiceState,
+  Services,
+  ServiceInterceptor,
+  ServerErrorInterceptor,
+  registerInternalPlugin,
   ServiceUrl,
   serviceConstants,
 } from '@webex/webex-core';
@@ -50,6 +54,13 @@ describe('webex-core', () => {
     );
 
     beforeEach('create webex instance', () => {
+      registerInternalPlugin('services', Services, {
+        interceptors: {
+          ServiceInterceptor: ServiceInterceptor.create,
+          ServerErrorInterceptor: ServerErrorInterceptor.create,
+        },
+        replace: true,
+      });
       webex = new WebexCore({credentials: {supertoken: webexUser.token}});
       webexEU = new WebexCore({credentials: {supertoken: webexUserEU.token}});
       services = webex.internal.services;