@webex/webex-core 3.10.0 → 3.11.0

package/dist/lib/services-v2/service-fed-ramp.js.map

@@ -1 +1 @@
-{"version":3,"names":["hydra","u2c","sqdiscovery"],"sources":["service-fed-ramp.ts"],"sourcesContent":["export default {\n  hydra: 'https://api-usgov.webex.com/v1',\n  u2c: 'https://u2c.gov.ciscospark.com/u2c/api/v1',\n  sqdiscovery: 'https://ds.ciscospark.com/v1/region', // TODO: fedramp load balanced URL? this has been here for years as of now but now explicitly done\n};\n"],"mappings":";;;;;;;iCAAe;EACbA,KAAK,EAAE,gCAAgC;EACvCC,GAAG,EAAE,2CAA2C;EAChDC,WAAW,EAAE,qCAAqC,CAAE;AACtD,CAAC"}
+{"version":3,"names":["hydra","u2c","sqdiscovery"],"sources":["service-fed-ramp.ts"],"sourcesContent":["export default {\n  hydra: 'https://api-usgov.webex.com/v1',\n  u2c: 'https://u2c.gov.ciscospark.com/u2c/api/v1',\n  sqdiscovery: 'https://ds.ciscospark.com/v1/region', // TODO: fedramp load balanced URL? this has been here for years as of now but now explicitly done\n};\n"],"mappings":";;;;;;;iCAAe;EACbA,KAAK,EAAE,gCAAgC;EACvCC,GAAG,EAAE,2CAA2C;EAChDC,WAAW,EAAE,qCAAqC,CAAE;AACtD,CAAC","ignoreList":[]}

package/dist/lib/services-v2/services-v2.js

@@ -11,12 +11,17 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.DEFAULT_CLUSTER_SERVICE = exports.DEFAULT_CLUSTER = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
 var _weakMap = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/weak-map"));
+var _isArray = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/array/is-array"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
 var _values = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/values"));
+var _now = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/date/now"));
+var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 var _sha = _interopRequireDefault(require("crypto-js/sha256"));
 var _lodash = require("lodash");
 var _webexPlugin = _interopRequireDefault(require("../webex-plugin"));
@@ -34,6 +39,8 @@ var DEFAULT_CLUSTER = exports.DEFAULT_CLUSTER = 'urn:TEAM:us-east-2_a';
 var DEFAULT_CLUSTER_SERVICE = exports.DEFAULT_CLUSTER_SERVICE = 'identityLookup';
 var CLUSTER_SERVICE = process.env.WEBEX_CONVERSATION_CLUSTER_SERVICE || DEFAULT_CLUSTER_SERVICE;
 var DEFAULT_CLUSTER_IDENTIFIER = process.env.WEBEX_CONVERSATION_DEFAULT_CLUSTER || "".concat(DEFAULT_CLUSTER, ":").concat(CLUSTER_SERVICE);
+var CATALOG_CACHE_KEY_V2 = 'services.v2.u2cHostMap';
+var CATALOG_TTL_MS = 24 * 60 * 60 * 1000; // 24 hours
 
 /* eslint-disable no-underscore-dangle */
 /**
@@ -57,6 +64,45 @@ var Services = _webexPlugin.default.extend({
   _getCatalog: function _getCatalog() {
     return this._catalogs.get(this.webex);
   },
+  /**
+   * Safely access localStorage if available; returns the Storage or null.
+   * @returns {Storage | null}
+   */
+  _getLocalStorageSafe: function _getLocalStorageSafe() {
+    if (typeof window !== 'undefined' && window.localStorage) {
+      return window.localStorage;
+    }
+    return null;
+  },
+  /**
+   * Determine the intended preauth selection based on the current context.
+   * @param {string} [currentOrgId]
+   * @returns {{selectionType: string, selectionValue: string}}
+   */
+  getIntendedPreauthSelection: function getIntendedPreauthSelection(currentOrgId) {
+    var _this$webex$credentia;
+    if ((_this$webex$credentia = this.webex.credentials) !== null && _this$webex$credentia !== void 0 && _this$webex$credentia.canAuthorize) {
+      if (currentOrgId) {
+        return {
+          selectionType: 'orgId',
+          selectionValue: currentOrgId
+        };
+      }
+    }
+    var emailConfig = this.webex.config && this.webex.config.email;
+    if (typeof emailConfig === 'string' && emailConfig.trim()) {
+      return {
+        selectionType: 'emailhash',
+        selectionValue: (0, _sha.default)(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.
@@ -98,6 +144,48 @@ var Services = _webexPlugin.default.extend({
     var catalog = this._getCatalog();
     return catalog.markFailedServiceUrl(url);
   },
+  /**
+   * Get all Mobius cluster host entries from the v2 services list.
+   * @returns {Array<ServiceHost>} - An array of `ServiceHost` objects.
+   */
+  getMobiusClusters: function getMobiusClusters() {
+    this.logger.info('services: fetching mobius clusters');
+    var clusters = [];
+    var services = this._services || [];
+    services.filter(function (service) {
+      return (service === null || service === void 0 ? void 0 : service.serviceName) === 'mobius' && (0, _isArray.default)(service.serviceUrls) && service.serviceUrls.length > 0;
+    }).forEach(function (service) {
+      service.serviceUrls.forEach(function (serviceUrl) {
+        var modifiedHost = serviceUrl.baseUrl.replace('https://', '').replace('/api/v1', '');
+        if (!clusters.find(function (c) {
+          return c && c.host === modifiedHost;
+        })) {
+          clusters.push({
+            host: modifiedHost,
+            priority: serviceUrl.priority,
+            id: service.id,
+            ttl: 0
+          });
+        }
+      });
+    });
+    return clusters;
+  },
+  /**
+   * Check is valid host from services list.
+   * @param {string} host
+   * @returns {Boolean}
+   */
+  isValidHost: function isValidHost(host) {
+    var services = this._services || [];
+    return services.some(function (service) {
+      return service.serviceUrls.some(function (serviceUrl) {
+        var _URL;
+        var serviceHost = (serviceUrl === null || serviceUrl === void 0 ? void 0 : serviceUrl.baseUrl) && ((_URL = new URL(serviceUrl.baseUrl)) === null || _URL === void 0 ? void 0 : _URL.host);
+        return serviceHost === host;
+      });
+    });
+  },
   /**
    * saves all the services from the pre and post catalog service
    * @param {ActiveServices} activeServices
@@ -180,6 +268,18 @@ var Services = _webexPlugin.default.extend({
       forceRefresh: forceRefresh
     }).then(function (serviceHostMap) {
       catalog.updateServiceGroups(serviceGroup, serviceHostMap === null || serviceHostMap === void 0 ? void 0 : serviceHostMap.services, serviceHostMap === null || serviceHostMap === void 0 ? void 0 : serviceHostMap.timestamp);
+      // Build selection metadata for caching discrimination (preauth/signin)
+      var selectionMeta;
+      if (serviceGroup === 'preauth' || serviceGroup === 'signin') {
+        var key = formattedQuery && (0, _keys.default)(formattedQuery || {})[0];
+        if (key) {
+          selectionMeta = {
+            selectionType: key,
+            selectionValue: formattedQuery[key]
+          };
+        }
+      }
+      _this._cacheCatalog(serviceGroup, serviceHostMap, selectionMeta);
       _this.updateCredentialsConfig();
       catalog.status[serviceGroup].collecting = false;
     }).catch(function (error) {
@@ -256,9 +356,9 @@ var Services = _webexPlugin.default.extend({
 
     // Destructure the client authorization details.
     /* eslint-disable camelcase */
-    var _this$webex$credentia = this.webex.credentials.config,
-      client_id = _this$webex$credentia.client_id,
-      client_secret = _this$webex$credentia.client_secret;
+    var _this$webex$credentia2 = this.webex.credentials.config,
+      client_id = _this$webex$credentia2.client_id,
+      client_secret = _this$webex$credentia2.client_secret;
 
     // Validate that client authentication details exist.
     if (!client_id || !client_secret) {
@@ -449,15 +549,18 @@ var Services = _webexPlugin.default.extend({
 
     // try to fetch client region info first
     return this.fetchClientRegionInfo().then(function (clientRegionInfo) {
+      var _this6$webex$config$s;
       if (clientRegionInfo) {
         countryCode = clientRegionInfo.countryCode;
         timezone = clientRegionInfo.timezone;
       }
 
-      // Send the user activation request to the **License** service.
+      // Send the user activation request.
+      // Use user-onboarding service if configured, otherwise use license service.
+      var useUserOnboarding = (_this6$webex$config$s = _this6.webex.config.services) === null || _this6$webex$config$s === void 0 ? void 0 : _this6$webex$config$s.useUserOnboardingServiceForActivations;
       return _this6.request({
-        service: 'license',
-        resource: 'users/activations',
+        service: useUserOnboarding ? 'user-onboarding' : 'license',
+        resource: useUserOnboarding ? 'api/v1/users/activations' : 'users/activations',
         method: 'POST',
         headers: {
           accept: 'application/json',
@@ -491,7 +594,7 @@ var Services = _webexPlugin.default.extend({
    */
   updateCatalog: function updateCatalog(serviceGroup, hostMap) {
     var catalog = this._getCatalog();
-    var serviceHostMap = this._formatReceivedHostmap(hostMap);
+    var serviceHostMap = this._formatReceivedHostmap(hostMap || {});
     return catalog.updateServiceGroups(serviceGroup, serviceHostMap === null || serviceHostMap === void 0 ? void 0 : serviceHostMap.services, serviceHostMap === null || serviceHostMap === void 0 ? void 0 : serviceHostMap.timestamp);
   },
   /**
@@ -568,7 +671,6 @@ var Services = _webexPlugin.default.extend({
           idbroker: {
             url: idbrokerUrl.replace(trailingSlashes, '') // remove trailing slash
           },
-
           identity: {
             url: identityUrl.replace(trailingSlashes, '') // remove trailing slash
           }
@@ -711,16 +813,16 @@ var Services = _webexPlugin.default.extend({
    * catalog endpoint.
    * @returns {Array<Service>}
    */
-  _formatReceivedHostmap: function _formatReceivedHostmap(_ref10) {
+  _formatReceivedHostmap: function _formatReceivedHostmap(_ref0) {
     var _this8 = this;
-    var services = _ref10.services,
-      activeServices = _ref10.activeServices,
-      timestamp = _ref10.timestamp,
-      orgId = _ref10.orgId,
-      format = _ref10.format;
+    var services = _ref0.services,
+      activeServices = _ref0.activeServices,
+      timestamp = _ref0.timestamp,
+      orgId = _ref0.orgId,
+      format = _ref0.format;
     var formattedHostmap = {
       activeServices: activeServices,
-      services: services.map(function (service) {
+      services: services === null || services === void 0 ? void 0 : services.map(function (service) {
         return _this8._formatHostMapEntry(service);
       }),
       timestamp: timestamp,
@@ -761,9 +863,9 @@ var Services = _webexPlugin.default.extend({
    * @returns {String} url of the service
    */
   getServiceUrlFromClusterId: function getServiceUrlFromClusterId() {
-    var _ref11 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-      _ref11$cluster = _ref11.cluster,
-      cluster = _ref11$cluster === void 0 ? 'us' : _ref11$cluster;
+    var _ref1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      _ref1$cluster = _ref1.cluster,
+      cluster = _ref1$cluster === void 0 ? 'us' : _ref1$cluster;
     var clusterId = cluster === 'us' ? DEFAULT_CLUSTER_IDENTIFIER : cluster;
 
     // Determine if cluster has service name (non-US clusters from hydra do not)
@@ -771,10 +873,10 @@ var Services = _webexPlugin.default.extend({
       // Add Service to cluster identifier
       clusterId = "".concat(cluster, ":").concat(CLUSTER_SERVICE);
     }
-    var _ref12 = this.getServiceFromClusterId({
+    var _ref10 = this.getServiceFromClusterId({
         clusterId: clusterId
       }) || {},
-      url = _ref12.url;
+      url = _ref10.url;
     if (!url) {
       throw Error("Could not find service for cluster [".concat(cluster, "]"));
     }
@@ -832,6 +934,213 @@ var Services = _webexPlugin.default.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>}
+   */
+  _cacheCatalog: function _cacheCatalog(serviceGroup, hostMap, meta) {
+    var _this9 = this;
+    return (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var current, orgId, _this9$webex$config, _this9$webex$config$c, _this9$webex, _this9$webex$config2, _this9$webex2, _this9$webex2$config, _this9$webex2$config$, _this9$webex2$config$2, _ls, cachedJson, credentials, _current, env, fedramp, u2cDiscoveryUrl, updated, ls, _t;
+      return _regenerator.default.wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            current = {};
+            _context.prev = 1;
+            if ((_this9$webex$config = _this9.webex.config) !== null && _this9$webex$config !== void 0 && (_this9$webex$config$c = _this9$webex$config.calling) !== null && _this9$webex$config$c !== void 0 && _this9$webex$config$c.cacheU2C) {
+              _context.next = 2;
+              break;
+            }
+            _this9.logger.info("services: skipping cache write for ".concat(serviceGroup, " as per the config"));
+            return _context.abrupt("return");
+          case 2:
+            try {
+              _ls = _this9._getLocalStorageSafe();
+              cachedJson = _ls ? _ls.getItem(CATALOG_CACHE_KEY_V2) : null;
+              current = cachedJson ? JSON.parse(cachedJson) : {};
+            } catch (_unused2) {
+              current = {};
+            }
+            try {
+              credentials = _this9.webex.credentials;
+              orgId = credentials.getOrgId();
+            } catch (_unused3) {
+              orgId = current.orgId;
+            }
+
+            // Capture environment fingerprint to invalidate cache across env changes
+            _current = current, env = _current.env;
+            fedramp = !!((_this9$webex = _this9.webex) !== null && _this9$webex !== void 0 && (_this9$webex$config2 = _this9$webex.config) !== null && _this9$webex$config2 !== void 0 && _this9$webex$config2.fedramp);
+            u2cDiscoveryUrl = (_this9$webex2 = _this9.webex) === null || _this9$webex2 === void 0 ? void 0 : (_this9$webex2$config = _this9$webex2.config) === null || _this9$webex2$config === void 0 ? void 0 : (_this9$webex2$config$ = _this9$webex2$config.services) === null || _this9$webex2$config$ === void 0 ? void 0 : (_this9$webex2$config$2 = _this9$webex2$config$.discovery) === null || _this9$webex2$config$2 === void 0 ? void 0 : _this9$webex2$config$2.u2c;
+            env = {
+              fedramp: fedramp,
+              u2cDiscoveryUrl: u2cDiscoveryUrl
+            };
+            updated = _objectSpread(_objectSpread({}, current), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({
+              orgId: orgId || current.orgId,
+              env: env || current.env
+            }, serviceGroup, meta ? {
+              hostMap: hostMap,
+              meta: meta
+            } : hostMap), "cachedAt", (0, _now.default)()));
+            ls = _this9._getLocalStorageSafe();
+            if (ls) {
+              ls.setItem(CATALOG_CACHE_KEY_V2, (0, _stringify.default)(updated));
+            }
+            _context.next = 4;
+            break;
+          case 3:
+            _context.prev = 3;
+            _t = _context["catch"](1);
+            _this9.logger.warn('services: error caching catalog', _t);
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1, 3]]);
+    }))();
+  },
+  /**
+   * @private
+   * Load the catalog from cache and hydrate the in-memory ServiceCatalog.
+   * @returns {Promise<boolean>} true if cache was loaded, false otherwise
+   */
+  _loadCatalogFromCache: function _loadCatalogFromCache() {
+    var _this0 = this;
+    return (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      var currentOrgId, _this0$webex$config, _this0$webex$config$c, _this0$webex$config2, _this0$webex$config3, _this0$webex$config3$, _this0$webex$config3$2, ls, cachedJson, cached, cachedAt, _this0$webex$credenti, credentials, fedramp, u2cDiscoveryUrl, currentEnv, sameEnv, catalog, groups, _t2, _t3;
+      return _regenerator.default.wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            if ((_this0$webex$config = _this0.webex.config) !== null && _this0$webex$config !== void 0 && (_this0$webex$config$c = _this0$webex$config.calling) !== null && _this0$webex$config$c !== void 0 && _this0$webex$config$c.cacheU2C) {
+              _context2.next = 1;
+              break;
+            }
+            _this0.logger.info('services: skipping cache warm-up as per the cache config');
+            return _context2.abrupt("return", false);
+          case 1:
+            ls = _this0._getLocalStorageSafe();
+            if (ls) {
+              _context2.next = 2;
+              break;
+            }
+            _this0.logger.info('services: skipping cache warm-up as no localStorage is available');
+            return _context2.abrupt("return", false);
+          case 2:
+            cachedJson = ls.getItem(CATALOG_CACHE_KEY_V2);
+            cached = cachedJson ? JSON.parse(cachedJson) : undefined;
+            if (cached) {
+              _context2.next = 3;
+              break;
+            }
+            return _context2.abrupt("return", false);
+          case 3:
+            // TTL enforcement
+            cachedAt = Number(cached.cachedAt) || 0;
+            if (!(!cachedAt || (0, _now.default)() - cachedAt > CATALOG_TTL_MS)) {
+              _context2.next = 4;
+              break;
+            }
+            _this0.clearCatalogCache();
+            return _context2.abrupt("return", false);
+          case 4:
+            _context2.prev = 4;
+            if (!((_this0$webex$credenti = _this0.webex.credentials) !== null && _this0$webex$credenti !== void 0 && _this0$webex$credenti.canAuthorize)) {
+              _context2.next = 5;
+              break;
+            }
+            credentials = _this0.webex.credentials;
+            currentOrgId = credentials.getOrgId();
+            if (!(cached.orgId && cached.orgId !== currentOrgId)) {
+              _context2.next = 5;
+              break;
+            }
+            return _context2.abrupt("return", false);
+          case 5:
+            _context2.next = 7;
+            break;
+          case 6:
+            _context2.prev = 6;
+            _t2 = _context2["catch"](4);
+            _this0.logger.warn('services: error checking orgId', _t2);
+          case 7:
+            // Ensure cached environment matches current environment
+            fedramp = !!((_this0$webex$config2 = _this0.webex.config) !== null && _this0$webex$config2 !== void 0 && _this0$webex$config2.fedramp);
+            u2cDiscoveryUrl = (_this0$webex$config3 = _this0.webex.config) === null || _this0$webex$config3 === void 0 ? void 0 : (_this0$webex$config3$ = _this0$webex$config3.services) === null || _this0$webex$config3$ === void 0 ? void 0 : (_this0$webex$config3$2 = _this0$webex$config3$.discovery) === null || _this0$webex$config3$2 === void 0 ? void 0 : _this0$webex$config3$2.u2c;
+            currentEnv = {
+              fedramp: fedramp,
+              u2cDiscoveryUrl: u2cDiscoveryUrl
+            };
+            if (!cached.env) {
+              _context2.next = 8;
+              break;
+            }
+            sameEnv = cached.env.fedramp === currentEnv.fedramp && cached.env.u2cDiscoveryUrl === currentEnv.u2cDiscoveryUrl;
+            if (sameEnv) {
+              _context2.next = 8;
+              break;
+            }
+            return _context2.abrupt("return", false);
+          case 8:
+            catalog = _this0._getCatalog();
+            groups = ['preauth', 'signin', 'postauth'];
+            groups.forEach(function (serviceGroup) {
+              var cachedGroup = cached[serviceGroup];
+              if (!cachedGroup) {
+                return;
+              }
+
+              // Support legacy (hostMap) and new ({hostMap, meta}) shapes
+              var hostMap = cachedGroup && cachedGroup.hostMap ? cachedGroup.hostMap : cachedGroup;
+              var meta = cachedGroup === null || cachedGroup === void 0 ? void 0 : cachedGroup.meta;
+              if (serviceGroup === 'preauth' && meta) {
+                // For proximity-based selection, always fetch fresh to respect IP/region changes
+                if (meta.selectionType === 'mode') {
+                  return;
+                }
+                var intended = _this0.getIntendedPreauthSelection(currentOrgId);
+                var matches = intended && intended.selectionType === meta.selectionType && intended.selectionValue === meta.selectionValue;
+                if (!matches) {
+                  return;
+                }
+              }
+              if (hostMap) {
+                catalog.updateServiceGroups(serviceGroup, hostMap === null || hostMap === void 0 ? void 0 : hostMap.services, hostMap === null || hostMap === void 0 ? void 0 : hostMap.timestamp);
+              }
+            });
+            _this0.updateCredentialsConfig();
+            return _context2.abrupt("return", true);
+          case 9:
+            _context2.prev = 9;
+            _t3 = _context2["catch"](0);
+            return _context2.abrupt("return", false);
+          case 10:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[0, 9], [4, 6]]);
+    }))();
+  },
+  /**
+   * Clear the catalog cache from the bounded storage (v2).
+   * @returns {Promise<void>}
+   */
+  clearCatalogCache: function clearCatalogCache() {
+    try {
+      var ls = this._getLocalStorageSafe();
+      if (ls) {
+        ls.removeItem(CATALOG_CACHE_KEY_V2);
+      }
+    } catch (e) {
+      this.logger.warn('services: error clearing catalog cache', e);
+    }
+    return _promise.default.resolve();
+  },
   /**
    * @private
    * Simplified method wrapper for sending a request to get
@@ -846,12 +1155,12 @@ var Services = _webexPlugin.default.extend({
    * @returns {Promise<object>}
    */
   _fetchNewServiceHostmap: function _fetchNewServiceHostmap() {
-    var _this9 = this;
-    var _ref13 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-      from = _ref13.from,
-      query = _ref13.query,
-      token = _ref13.token,
-      forceRefresh = _ref13.forceRefresh;
+    var _this1 = this;
+    var _ref11 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      from = _ref11.from,
+      query = _ref11.query,
+      token = _ref11.token,
+      forceRefresh = _ref11.forceRefresh;
     var service = 'u2c';
     var resource = from ? "/".concat(from, "/catalog") : '/catalog';
     var qs = _objectSpread(_objectSpread({}, query || {}), {}, {
@@ -873,10 +1182,10 @@ var Services = _webexPlugin.default.extend({
       };
     }
     return this.webex.internal.newMetrics.callDiagnosticLatencies.measureLatency(function () {
-      return _this9.request(requestObject);
-    }, 'internal.get.u2c.time').then(function (_ref14) {
-      var body = _ref14.body;
-      return _this9._formatReceivedHostmap(body);
+      return _this1.request(requestObject);
+    }, 'internal.get.u2c.time').then(function (_ref12) {
+      var body = _ref12.body;
+      return _this1._formatReceivedHostmap(body || {});
     });
   },
   /**
@@ -1006,28 +1315,47 @@ var Services = _webexPlugin.default.extend({
 
     // wait for webex instance to be ready before attempting
     // to update the service catalogs
-    this.listenToOnce(this.webex, 'ready', function () {
-      var supertoken = _this12.webex.credentials.supertoken;
-      // Validate if the supertoken exists.
-      if (supertoken && supertoken.access_token) {
-        _this12.initServiceCatalogs().then(function () {
-          catalog.isReady = true;
-        }).catch(function (error) {
-          _this12.initFailed = true;
-          _this12.logger.error("services: failed to init initial services when credentials available, ".concat(error === null || error === void 0 ? void 0 : error.message));
-        });
-      } else {
-        var email = _this12.webex.config.email;
-        _this12.collectPreauthCatalog(email ? {
-          email: email
-        } : undefined).catch(function (error) {
-          _this12.initFailed = true;
-          _this12.logger.error("services: failed to init initial services when no credentials available, ".concat(error === null || error === void 0 ? void 0 : error.message));
-        });
-      }
-    });
+    this.listenToOnce(this.webex, 'ready', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      var warmed, supertoken, email;
+      return _regenerator.default.wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 1;
+            return _this12._loadCatalogFromCache();
+          case 1:
+            warmed = _context3.sent;
+            if (!warmed) {
+              _context3.next = 2;
+              break;
+            }
+            catalog.isReady = true;
+            return _context3.abrupt("return");
+          case 2:
+            supertoken = _this12.webex.credentials.supertoken; // Validate if the supertoken exists.
+            if (supertoken && supertoken.access_token) {
+              _this12.initServiceCatalogs().then(function () {
+                catalog.isReady = true;
+              }).catch(function (error) {
+                _this12.initFailed = true;
+                _this12.logger.error("services: failed to init initial services when credentials available, ".concat(error === null || error === void 0 ? void 0 : error.message));
+              });
+            } else {
+              email = _this12.webex.config.email;
+              _this12.collectPreauthCatalog(email ? {
+                email: email
+              } : undefined).catch(function (error) {
+                _this12.initFailed = true;
+                _this12.logger.error("services: failed to init initial services when no credentials available, ".concat(error === null || error === void 0 ? void 0 : error.message));
+              });
+            }
+          case 3:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    })));
   },
-  version: "3.10.0"
+  version: "0.0.0"
 });
 /* eslint-enable no-underscore-dangle */
 var _default = exports.default = Services;