@webex/webex-core 3.12.0-next.9 → 3.12.0-task-refactor.1

package/src/lib/services/services.js

@@ -20,8 +20,6 @@ export const DEFAULT_CLUSTER_SERVICE = 'identityLookup';
 const CLUSTER_SERVICE = process.env.WEBEX_CONVERSATION_CLUSTER_SERVICE || DEFAULT_CLUSTER_SERVICE;
 const DEFAULT_CLUSTER_IDENTIFIER =
   process.env.WEBEX_CONVERSATION_DEFAULT_CLUSTER || `${DEFAULT_CLUSTER}:${CLUSTER_SERVICE}`;
-const CATALOG_CACHE_KEY_V1 = 'services.v1.u2cHostMap';
-const CATALOG_TTL_MS = 24 * 60 * 60 * 1000; // 24 hours
 
 /* eslint-disable no-underscore-dangle */
 /**
@@ -98,49 +96,6 @@ const Services = WebexPlugin.extend({
     return this._catalogs.get(this.webex);
   },
 
-  /**
-   * Safely access localStorage if available; returns the Storage or null.
-   * @returns {Storage|null}
-   */
-  _getLocalStorageSafe() {
-    if (typeof window !== 'undefined' && window.localStorage) {
-      return window.localStorage;
-    }
-
-    return null;
-  },
-
-  /**
-   * Determine the intended preauth selection based on the current context.
-   * @param {string|undefined} currentOrgId
-   * @returns {{selectionType: string, selectionValue: string}}
-   */
-  getIntendedPreauthSelection(currentOrgId) {
-    if (this.webex.credentials?.canAuthorize) {
-      if (currentOrgId) {
-        return {
-          selectionType: 'orgId',
-          selectionValue: currentOrgId,
-        };
-      }
-    }
-
-    const emailConfig = this.webex.config && this.webex.config.email;
-
-    if (typeof emailConfig === 'string' && emailConfig.trim()) {
-      return {
-        selectionType: 'emailhash',
-        selectionValue: sha256(emailConfig.toLowerCase()).toString(),
-      };
-    }
-
-    // fall back to proximity mode when no orgId or email available
-    return {
-      selectionType: 'mode',
-      selectionValue: 'DEFAULT_BY_PROXIMITY',
-    };
-  },
-
   /**
    * Get a service url from the current services list by name
    * from the associated instance catalog.
@@ -210,10 +165,9 @@ const Services = WebexPlugin.extend({
 
   /**
    * Get all Mobius cluster host entries from the legacy host catalog.
-   * @returns {Array<{host: string, id: string, ttl: number, priority: number}>}
+   * @returns {Array<Object>}
    */
   getMobiusClusters() {
-    this.logger.info('services: fetching mobius clusters');
     const clusters = [];
     const hostCatalog = this._hostCatalog || {};
 
@@ -243,28 +197,6 @@ const Services = WebexPlugin.extend({
 
     return !!hostCatalog[host]?.length;
   },
-
-  /**
-   * Checks if the current environment is an integration (INT) environment
-   * by examining the u2c discovery URL from webex config.
-   * INT environments use discovery URLs containing 'intb' (e.g., u2c-intb.ciscospark.com).
-   * @returns {boolean} True if INT environment, false otherwise
-   */
-  isIntegrationEnvironment() {
-    try {
-      const u2cUrl = this.webex?.config?.services?.discovery?.u2c || '';
-      const isInt = u2cUrl.includes('intb');
-
-      this.logger.info(`services: isIntegrationEnvironment: ${isInt}`);
-
-      return isInt;
-    } catch (error) {
-      this.logger.error('services: failed to determine integration environment', error);
-
-      return false;
-    }
-  },
-
   /**
    * Merge provided active cluster mappings into current state.
    * @param {Record<string,string>} activeServices
@@ -305,7 +237,7 @@ const Services = WebexPlugin.extend({
    * @param {string} [param.token] - used for signin catalog
    * @returns {Promise<object>}
    */
-  async updateServices({from, query, token, forceRefresh} = {}) {
+  updateServices({from, query, token, forceRefresh} = {}) {
     const catalog = this._getCatalog();
     let formattedQuery;
     let serviceGroup;
@@ -359,20 +291,7 @@ const Services = WebexPlugin.extend({
       forceRefresh,
     })
       .then((serviceHostMap) => {
-        const formattedServiceHostMap = this._formatReceivedHostmap(serviceHostMap);
-        // Build selection metadata for caching discrimination
-        let selectionMeta;
-        if (serviceGroup === 'preauth' || serviceGroup === 'signin') {
-          const key = formattedQuery && Object.keys(formattedQuery || {})[0];
-          if (key) {
-            selectionMeta = {
-              selectionType: key,
-              selectionValue: formattedQuery[key],
-            };
-          }
-        }
-        this._cacheCatalog(serviceGroup, serviceHostMap, selectionMeta);
-        catalog.updateServiceUrls(serviceGroup, formattedServiceHostMap);
+        catalog.updateServiceUrls(serviceGroup, serviceHostMap);
         this.updateCredentialsConfig();
         catalog.status[serviceGroup].collecting = false;
       })
@@ -1089,197 +1008,7 @@ const Services = WebexPlugin.extend({
 
     return this.webex.internal.newMetrics.callDiagnosticLatencies
       .measureLatency(() => this.request(requestObject), 'internal.get.u2c.time')
-      .then(({body}) => body);
-  },
-
-  /**
-   * Cache the catalog in the bounded storage.
-   * @param {string} serviceGroup - preauth, signin, postauth
-   * @param {object} hostMap - The hostmap to cache
-   * @param {object} [meta] - Optional selection metadata used to validate cache reuse
-   * @returns {Promise<void>}
-   *
-   */
-  async _cacheCatalog(serviceGroup, hostMap, meta) {
-    let current = {};
-    let orgId;
-    try {
-      // Respect calling.cacheU2C toggle; if disabled, skip writing cache
-      if (!this.webex.config?.calling?.cacheU2C) {
-        this.logger.info(`services: skipping cache write for ${serviceGroup} as per the config`);
-
-        return;
-      }
-
-      // Persist to localStorage to survive browser refresh
-      try {
-        const ls = this._getLocalStorageSafe();
-        const cachedJson = ls ? ls.getItem(CATALOG_CACHE_KEY_V1) : null;
-        current = cachedJson ? JSON.parse(cachedJson) : {};
-      } catch (e) {
-        current = {};
-      }
-
-      try {
-        const {credentials} = this.webex;
-        orgId = credentials.getOrgId();
-      } catch (e) {
-        orgId = current.orgId;
-      }
-
-      // Capture environment fingerprint to invalidate cache across env changes
-      let {env} = current;
-      const fedramp = !!this.webex?.config?.fedramp;
-      const u2cDiscoveryUrl = this.webex?.config?.services?.discovery?.u2c;
-      env = {fedramp, u2cDiscoveryUrl};
-
-      const updated = {
-        ...current,
-        orgId: orgId || current.orgId,
-        env: env || current.env,
-        // When selection meta is provided, store as an object; otherwise keep legacy shape
-        [serviceGroup]: meta ? {hostMap, meta} : hostMap,
-        cachedAt: Date.now(),
-      };
-
-      const ls = this._getLocalStorageSafe();
-      if (ls) {
-        ls.setItem(CATALOG_CACHE_KEY_V1, JSON.stringify(updated));
-      }
-    } catch (error) {
-      this.logger.warn('services: error caching catalog', error);
-    }
-  },
-
-  /**
-   * Load the catalog from cache and hydrate the in-memory ServiceCatalog.
-   * @returns {Promise<boolean>} true if cache was loaded, false otherwise
-   */
-  async _loadCatalogFromCache() {
-    let currentOrgId;
-    try {
-      // Respect calling.cacheU2C toggle; if disabled, skip using cache
-      if (!this.webex.config?.calling?.cacheU2C) {
-        this.logger.info('services: skipping cache warm-up as per the cache config');
-
-        return false;
-      }
-
-      const ls = this._getLocalStorageSafe();
-      if (!ls) {
-        this.logger.info('services: skipping cache warm-up as no localStorage is available');
-
-        return false;
-      }
-      const cachedJson = ls.getItem(CATALOG_CACHE_KEY_V1);
-      const cached = cachedJson ? JSON.parse(cachedJson) : undefined;
-      if (!cached) {
-        return false;
-      }
-      // TTL enforcement: clear if older than 24 hours
-      const cachedAt = Number(cached.cachedAt) || 0;
-      if (!cachedAt || Date.now() - cachedAt > CATALOG_TTL_MS) {
-        this.clearCatalogCache();
-
-        return false;
-      }
-
-      // If authorized, ensure cached org matches
-      try {
-        if (this.webex.credentials?.canAuthorize) {
-          const {credentials} = this.webex;
-          currentOrgId = credentials.getOrgId();
-          if (cached.orgId && cached.orgId !== currentOrgId) {
-            return false;
-          }
-        }
-      } catch (e) {
-        this.logger.warn('services: error checking orgId', e);
-      }
-
-      // Ensure cached environment matches current environment
-
-      const fedramp = !!this.webex.config?.fedramp;
-      const u2cDiscoveryUrl = this.webex.config?.services?.discovery?.u2c;
-      const currentEnv = {fedramp, u2cDiscoveryUrl};
-      if (cached.env) {
-        const sameEnv =
-          cached.env.fedramp === currentEnv.fedramp &&
-          cached.env.u2cDiscoveryUrl === currentEnv.u2cDiscoveryUrl;
-        if (!sameEnv) {
-          this.logger.info('services: skipping cache warm due to environment mismatch');
-
-          return false;
-        }
-      }
-
-      const catalog = this._getCatalog();
-
-      // Apply any cached groups (with preauth selection validation if available)
-      const groups = ['preauth', 'signin', 'postauth'];
-      groups.forEach((serviceGroup) => {
-        const cachedGroup = cached[serviceGroup];
-        if (!cachedGroup) {
-          return;
-        }
-
-        // Support legacy (hostMap) and new ({hostMap, meta}) shapes
-        const hostMap = cachedGroup && cachedGroup.hostMap ? cachedGroup.hostMap : cachedGroup;
-        const meta = cachedGroup?.meta;
-
-        if (serviceGroup === 'preauth' && meta) {
-          // For proximity-based selection, always fetch fresh to respect IP/region changes
-          if (meta.selectionType === 'mode') {
-            this.logger.info('services: skipping preauth cache warm for proximity mode');
-
-            return;
-          }
-
-          const intended = this.getIntendedPreauthSelection(currentOrgId);
-          const matches =
-            intended &&
-            intended.selectionType === meta.selectionType &&
-            intended.selectionValue === meta.selectionValue;
-
-          if (!matches) {
-            this.logger.info('services: skipping preauth cache warm due to selection mismatch');
-
-            return;
-          }
-        }
-
-        if (hostMap) {
-          const formatted = this._formatReceivedHostmap(hostMap);
-          catalog.updateServiceUrls(serviceGroup, formatted);
-        }
-      });
-
-      // Align credentials against warmed catalog
-      this.updateCredentialsConfig();
-
-      return true;
-    } catch (e) {
-      this.logger.warn('services: error loading catalog from cache', e);
-
-      return false;
-    }
-  },
-
-  /**
-   * Clear the catalog cache from the bounded storage.
-   * @returns {Promise<void>}
-   */
-  clearCatalogCache() {
-    try {
-      const ls = this._getLocalStorageSafe();
-      if (ls) {
-        ls.removeItem(CATALOG_CACHE_KEY_V1);
-      }
-    } catch (e) {
-      this.logger.warn('services: error clearing catalog cache', e);
-    }
-
-    return Promise.resolve();
+      .then(({body}) => this._formatReceivedHostmap(body));
   },
 
   /**
@@ -1359,7 +1088,6 @@ const Services = WebexPlugin.extend({
           // Validate if the token is authorized.
           if (credentials.canAuthorize) {
             // Attempt to collect the postauth catalog.
-
             return this.updateServices().catch(() => {
               this.initFailed = true;
               this.logger.warn('services: cannot retrieve postauth catalog');
@@ -1395,15 +1123,7 @@ const Services = WebexPlugin.extend({
 
     // wait for webex instance to be ready before attempting
     // to update the service catalogs
-    // this can cause a race condition because credentials may
-    // not be valid when services is initialized
-    this.listenToOnce(this.webex, 'ready', async () => {
-      const cachedCatalog = await this._loadCatalogFromCache();
-      if (cachedCatalog) {
-        catalog.isReady = true;
-
-        return; // skip initServiceCatalogs() on reload when cache exists
-      }
+    this.listenToOnce(this.webex, 'ready', () => {
       const {supertoken} = this.webex.credentials;
       // Validate if the supertoken exists.
       if (supertoken && supertoken.access_token) {

package/src/lib/services-v2/services-v2.ts

@@ -15,7 +15,6 @@ import {
   ServiceHostmap,
   ServiceGroup,
   ServiceHost,
-  SelectionMeta,
 } from './types';
 
 const trailingSlashes = /(?:^\/)|(?:\/$)/;
@@ -29,9 +28,6 @@ const CLUSTER_SERVICE = process.env.WEBEX_CONVERSATION_CLUSTER_SERVICE || DEFAUL
 const DEFAULT_CLUSTER_IDENTIFIER =
   process.env.WEBEX_CONVERSATION_DEFAULT_CLUSTER || `${DEFAULT_CLUSTER}:${CLUSTER_SERVICE}`;
 
-const CATALOG_CACHE_KEY_V2 = 'services.v2.u2cHostMap';
-const CATALOG_TTL_MS = 24 * 60 * 60 * 1000; // 24 hours
-
 /* eslint-disable no-underscore-dangle */
 /**
  * @class
@@ -60,46 +56,6 @@ const Services = WebexPlugin.extend({
     return this._catalogs.get(this.webex);
   },
 
-  /**
-   * Safely access localStorage if available; returns the Storage or null.
-   * @returns {Storage | null}
-   */
-  _getLocalStorageSafe(): Storage | null {
-    if (typeof window !== 'undefined' && (window as any).localStorage) {
-      return (window as any).localStorage as Storage;
-    }
-
-    return null;
-  },
-
-  /**
-   * Determine the intended preauth selection based on the current context.
-   * @param {string} [currentOrgId]
-   * @returns {{selectionType: string, selectionValue: string}}
-   */
-  getIntendedPreauthSelection(currentOrgId?: string): {
-    selectionType: string;
-    selectionValue: string;
-  } {
-    if (this.webex.credentials?.canAuthorize) {
-      if (currentOrgId) {
-        return {selectionType: 'orgId', selectionValue: currentOrgId};
-      }
-    }
-
-    const emailConfig = this.webex.config && this.webex.config.email;
-
-    if (typeof emailConfig === 'string' && emailConfig.trim()) {
-      return {
-        selectionType: 'emailhash',
-        selectionValue: sha256(emailConfig.toLowerCase()).toString(),
-      };
-    }
-
-    // fall back to proximity mode when no orgId or email available
-    return {selectionType: 'mode', selectionValue: 'DEFAULT_BY_PROXIMITY'};
-  },
-
   /**
    * Get a service url from the current services list by name
    * from the associated instance catalog.
@@ -154,7 +110,6 @@ const Services = WebexPlugin.extend({
    * @returns {Array<ServiceHost>} - An array of `ServiceHost` objects.
    */
   getMobiusClusters(): Array<ServiceHost> {
-    this.logger.info('services: fetching mobius clusters');
     const clusters: Array<ServiceHost> = [];
     const services: Array<Service> = this._services || [];
 
@@ -198,27 +153,6 @@ const Services = WebexPlugin.extend({
       });
     });
   },
-
-  /**
-   * Checks if the current environment is an integration (INT) environment
-   * by examining the u2c discovery URL from webex config.
-   * INT environments use discovery URLs containing 'intb' (e.g., u2c-intb.ciscospark.com).
-   * @returns {boolean} True if INT environment, false otherwise
-   */
-  isIntegrationEnvironment(): boolean {
-    try {
-      const u2cUrl = this.webex?.config?.services?.discovery?.u2c || '';
-      const isInt = u2cUrl.includes('intb');
-
-      this.logger.info(`services: isIntegrationEnvironment: ${isInt}`);
-
-      return isInt;
-    } catch (error) {
-      this.logger.error('services: failed to determine integration environment', error);
-
-      return false;
-    }
-  },
   /**
    * saves all the services from the pre and post catalog service
    * @param {ActiveServices} activeServices
@@ -315,18 +249,6 @@ const Services = WebexPlugin.extend({
           serviceHostMap?.services,
           serviceHostMap?.timestamp
         );
-        // Build selection metadata for caching discrimination (preauth/signin)
-        let selectionMeta: SelectionMeta | undefined;
-        if (serviceGroup === 'preauth' || serviceGroup === 'signin') {
-          const key = formattedQuery && Object.keys(formattedQuery || {})[0];
-          if (key) {
-            selectionMeta = {
-              selectionType: key,
-              selectionValue: formattedQuery[key],
-            };
-          }
-        }
-        this._cacheCatalog(serviceGroup, serviceHostMap, selectionMeta);
         this.updateCredentialsConfig();
         catalog.status[serviceGroup].collecting = false;
       })
@@ -1012,190 +934,6 @@ const Services = WebexPlugin.extend({
     return url.replace(data.defaultUrl, data.priorityUrl);
   },
 
-  /**
-   * @private
-   * Cache the catalog in the bounded storage.
-   * @param {ServiceGroup} serviceGroup - preauth, signin, postauth
-   * @param {ServiceHostmap} hostMap - The hostmap to cache
-   * @param {object} [meta] - Optional selection metadata for cache discrimination
-   * @returns {Promise<void>}
-   */
-  async _cacheCatalog(
-    serviceGroup: ServiceGroup,
-    hostMap: ServiceHostmap,
-    meta?: SelectionMeta
-  ): Promise<void> {
-    let current: {orgId?: string; env?: {fedramp?: boolean; u2cDiscoveryUrl?: string}} = {};
-    let orgId: string | undefined;
-    try {
-      // Respect calling.cacheU2C toggle; if disabled, skip writing cache
-      if (!this.webex.config?.calling?.cacheU2C) {
-        this.logger.info(`services: skipping cache write for ${serviceGroup} as per the config`);
-
-        return;
-      }
-
-      try {
-        const ls = this._getLocalStorageSafe();
-        const cachedJson = ls ? ls.getItem(CATALOG_CACHE_KEY_V2) : null;
-        current = cachedJson ? JSON.parse(cachedJson) : {};
-      } catch {
-        current = {};
-      }
-
-      try {
-        const {credentials} = this.webex;
-        orgId = credentials.getOrgId();
-      } catch {
-        orgId = current.orgId;
-      }
-
-      // Capture environment fingerprint to invalidate cache across env changes
-      let {env} = current;
-      const fedramp = !!this.webex?.config?.fedramp;
-      const u2cDiscoveryUrl = this.webex?.config?.services?.discovery?.u2c;
-      env = {fedramp, u2cDiscoveryUrl};
-
-      const updated = {
-        ...current,
-        orgId: orgId || current.orgId,
-        env: env || current.env,
-        // When selection meta is provided, store as an object; otherwise keep legacy shape
-        [serviceGroup]: meta ? {hostMap, meta} : hostMap,
-        cachedAt: Date.now(),
-      };
-
-      const ls = this._getLocalStorageSafe();
-      if (ls) {
-        ls.setItem(CATALOG_CACHE_KEY_V2, JSON.stringify(updated));
-      }
-    } catch (e) {
-      this.logger.warn('services: error caching catalog', e);
-    }
-  },
-
-  /**
-   * @private
-   * Load the catalog from cache and hydrate the in-memory ServiceCatalog.
-   * @returns {Promise<boolean>} true if cache was loaded, false otherwise
-   */
-  async _loadCatalogFromCache(): Promise<boolean> {
-    let currentOrgId: string | undefined;
-    try {
-      // Respect calling.cacheU2C toggle; if disabled, skip using cache
-      if (!this.webex.config?.calling?.cacheU2C) {
-        this.logger.info('services: skipping cache warm-up as per the cache config');
-
-        return false;
-      }
-
-      const ls = this._getLocalStorageSafe();
-      if (!ls) {
-        this.logger.info('services: skipping cache warm-up as no localStorage is available');
-
-        return false;
-      }
-      const cachedJson = ls.getItem(CATALOG_CACHE_KEY_V2);
-      const cached = cachedJson ? JSON.parse(cachedJson) : undefined;
-      if (!cached) {
-        return false;
-      }
-
-      // TTL enforcement
-      const cachedAt = Number(cached.cachedAt) || 0;
-      if (!cachedAt || Date.now() - cachedAt > CATALOG_TTL_MS) {
-        this.clearCatalogCache();
-
-        return false;
-      }
-
-      // If authorized, ensure cached org matches
-      try {
-        if (this.webex.credentials?.canAuthorize) {
-          const {credentials} = this.webex;
-          currentOrgId = credentials.getOrgId();
-          if (cached.orgId && cached.orgId !== currentOrgId) {
-            return false;
-          }
-        }
-      } catch (e) {
-        this.logger.warn('services: error checking orgId', e);
-      }
-
-      // Ensure cached environment matches current environment
-
-      const fedramp = !!this.webex.config?.fedramp;
-      const u2cDiscoveryUrl = this.webex.config?.services?.discovery?.u2c;
-      const currentEnv = {fedramp, u2cDiscoveryUrl};
-      if (cached.env) {
-        const sameEnv =
-          cached.env.fedramp === currentEnv.fedramp &&
-          cached.env.u2cDiscoveryUrl === currentEnv.u2cDiscoveryUrl;
-        if (!sameEnv) {
-          return false;
-        }
-      }
-
-      const catalog = this._getCatalog();
-      const groups: Array<ServiceGroup> = ['preauth', 'signin', 'postauth'];
-
-      groups.forEach((serviceGroup) => {
-        const cachedGroup = cached[serviceGroup];
-        if (!cachedGroup) {
-          return;
-        }
-
-        // Support legacy (hostMap) and new ({hostMap, meta}) shapes
-        const hostMap: ServiceHostmap =
-          cachedGroup && cachedGroup.hostMap ? cachedGroup.hostMap : cachedGroup;
-        const meta: SelectionMeta | undefined = cachedGroup?.meta;
-
-        if (serviceGroup === 'preauth' && meta) {
-          // For proximity-based selection, always fetch fresh to respect IP/region changes
-          if (meta.selectionType === 'mode') {
-            return;
-          }
-
-          const intended = this.getIntendedPreauthSelection(currentOrgId);
-          const matches =
-            intended &&
-            intended.selectionType === meta.selectionType &&
-            intended.selectionValue === meta.selectionValue;
-          if (!matches) {
-            return;
-          }
-        }
-
-        if (hostMap) {
-          catalog.updateServiceGroups(serviceGroup, hostMap?.services, hostMap?.timestamp);
-        }
-      });
-
-      this.updateCredentialsConfig();
-
-      return true;
-    } catch (e) {
-      return false;
-    }
-  },
-
-  /**
-   * Clear the catalog cache from the bounded storage (v2).
-   * @returns {Promise<void>}
-   */
-  clearCatalogCache(): Promise<void> {
-    try {
-      const ls = this._getLocalStorageSafe();
-      if (ls) {
-        ls.removeItem(CATALOG_CACHE_KEY_V2);
-      }
-    } catch (e) {
-      this.logger.warn('services: error clearing catalog cache', e);
-    }
-
-    return Promise.resolve();
-  },
-
   /**
    * @private
    * Simplified method wrapper for sending a request to get
@@ -1355,13 +1093,7 @@ const Services = WebexPlugin.extend({
 
     // wait for webex instance to be ready before attempting
     // to update the service catalogs
-    this.listenToOnce(this.webex, 'ready', async () => {
-      const warmed = await this._loadCatalogFromCache();
-      if (warmed) {
-        catalog.isReady = true;
-
-        return;
-      }
+    this.listenToOnce(this.webex, 'ready', () => {
       const {supertoken} = this.webex.credentials;
       // Validate if the supertoken exists.
       if (supertoken && supertoken.access_token) {

package/src/lib/services-v2/types.ts

@@ -2,11 +2,6 @@ type ServiceName = string;
 type ClusterId = string;
 export type ServiceGroup = 'discovery' | 'override' | 'preauth' | 'postauth' | 'signin';
 
-export type SelectionMeta = {
-  selectionType: string;
-  selectionValue: string;
-};
-
 export type ServiceHost = {
   host: string;
   ttl: number;