@webex/webex-core 3.12.0-next.41 → 3.12.0-next.42

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

@@ -1375,6 +1375,26 @@ var Services = _webexPlugin.default.extend({
       }, _callee3);
     }))();
   },
+  /**
+   * Build a promise that rejects once the catalog init timeout elapses. Race
+   * this against catalog collection so a hung request never leaves
+   * `services.ready` false forever - that would stall `webex.ready` and leave
+   * consumers waiting on it indefinitely. Timeout is configurable via
+   * `config.services.catalogInitTimeout` (defaults to 15s in config). Created
+   * lazily so paths that skip catalog collection never schedule a stray timer.
+   *
+   * @private
+   * @returns {Promise<never>}
+   */
+  _makeInitTimeout: function _makeInitTimeout() {
+    var _this$webex$config4, _this$webex$config4$s;
+    var initTimeoutMs = (_this$webex$config4 = this.webex.config) === null || _this$webex$config4 === void 0 ? void 0 : (_this$webex$config4$s = _this$webex$config4.services) === null || _this$webex$config4$s === void 0 ? void 0 : _this$webex$config4$s.catalogInitTimeout;
+    return new _promise.default(function (_, reject) {
+      setTimeout(function () {
+        return reject(new Error("services: init timed out after ".concat(initTimeoutMs, "ms")));
+      }, initTimeoutMs);
+    });
+  },
   /**
    * Initializer
    *
@@ -1423,7 +1443,7 @@ var Services = _webexPlugin.default.extend({
     // wait for webex instance to be ready before attempting
     // to update the service catalogs
     this.listenToOnce(this.webex, 'ready', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4() {
-      var warmed, supertoken, email;
+      var warmed, supertoken, _this14$webex$config, _this14$webex$config$, email;
       return _regenerator.default.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -1439,23 +1459,34 @@ var Services = _webexPlugin.default.extend({
             return _context4.abrupt("return");
           case 2:
             supertoken = _this14.webex.credentials.supertoken; // Validate if the supertoken exists.
-            if (supertoken && supertoken.access_token) {
-              // `initServiceCatalogs` marks the catalog ready internally once the
-              // postauth catalog is collected.
-              _this14.initServiceCatalogs().catch(function (error) {
-                _this14.initFailed = true;
-                _this14.logger.error("services: failed to init initial services when credentials available, ".concat(error === null || error === void 0 ? void 0 : error.message));
-              });
-            } else {
-              email = _this14.webex.config.email;
-              _this14.collectPreauthCatalog(email ? {
-                email: email
-              } : undefined).catch(function (error) {
-                _this14.initFailed = true;
-                _this14.logger.error("services: failed to init initial services when no credentials available, ".concat(error === null || error === void 0 ? void 0 : error.message));
-              });
+            if (!(supertoken && supertoken.access_token)) {
+              _context4.next = 3;
+              break;
             }
+            // `initServiceCatalogs` marks the catalog ready internally once the
+            // postauth catalog is collected.
+            _this14.initServiceCatalogs().catch(function (error) {
+              _this14.initFailed = true;
+              _this14.logger.error("services: failed to init initial services when credentials available, ".concat(error === null || error === void 0 ? void 0 : error.message));
+            });
+            _context4.next = 5;
+            break;
           case 3:
+            email = _this14.webex.config.email;
+            if (!(((_this14$webex$config = _this14.webex.config) === null || _this14$webex$config === void 0 ? void 0 : (_this14$webex$config$ = _this14$webex$config.services) === null || _this14$webex$config$ === void 0 ? void 0 : _this14$webex$config$.skipPreauthCatalogOnUnauthenticated) === true)) {
+              _context4.next = 4;
+              break;
+            }
+            _this14.logger.info('services: skipping preauth catalog collection while unauthenticated as per the config');
+            return _context4.abrupt("return");
+          case 4:
+            _this14.collectPreauthCatalog(email ? {
+              email: email
+            } : undefined).catch(function (error) {
+              _this14.initFailed = true;
+              _this14.logger.error("services: failed to init initial services when no credentials available, ".concat(error === null || error === void 0 ? void 0 : error.message));
+            });
+          case 5:
           case "end":
             return _context4.stop();
         }
@@ -1478,8 +1509,7 @@ var Services = _webexPlugin.default.extend({
     // catalogs. We listen for 'loaded' instead of 'ready' because `services.ready`
     // now blocks `webex.ready` - listening to 'ready' would deadlock.
     this.listenToOnce(this.webex, 'loaded', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5() {
-      var _this15$webex$config, _this15$webex$config$;
-      var warmed, supertoken, initTimeoutMs, initServiceCatalogsTimeout, email;
+      var warmed, supertoken, _this15$webex$config, _this15$webex$config$, email;
       return _regenerator.default.wrap(function (_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -1497,38 +1527,19 @@ var Services = _webexPlugin.default.extend({
           case 2:
             return _context5.abrupt("return");
           case 3:
-            supertoken = _this15.webex.credentials.supertoken; // Race init against a hard timeout so a hung request never leaves
-            // `services.ready` false forever - that would stall `webex.ready` and
-            // leave consumers waiting on it indefinitely. Timeout is configurable via
-            // `config.services.catalogInitTimeout` (defaults to 15s in config).
-            initTimeoutMs = (_this15$webex$config = _this15.webex.config) === null || _this15$webex$config === void 0 ? void 0 : (_this15$webex$config$ = _this15$webex$config.services) === null || _this15$webex$config$ === void 0 ? void 0 : _this15$webex$config$.catalogInitTimeout;
-            initServiceCatalogsTimeout = new _promise.default(function (_, reject) {
-              setTimeout(function () {
-                return reject(new Error("services: init timed out after ".concat(initTimeoutMs, "ms")));
-              }, initTimeoutMs);
-            }); // Validate if the supertoken exists.
+            supertoken = _this15.webex.credentials.supertoken; // Validate if the supertoken exists.
             if (supertoken && supertoken.access_token) {
               // `initServiceCatalogs` marks the catalog ready internally once the
               // postauth catalog is collected - even if it loses the timeout race
-              // above, so a slow fetch still eventually flips `catalog.isReady`.
-              _promise.default.race([_this15.initServiceCatalogs(), initServiceCatalogsTimeout]).catch(function (error) {
+              // below, so a slow fetch still eventually flips `catalog.isReady`.
+              _promise.default.race([_this15.initServiceCatalogs(), _this15._makeInitTimeout()]).catch(function (error) {
                 _this15.initFailed = true;
                 _this15.logger.error("services: failed to init initial services when credentials available, ".concat(error === null || error === void 0 ? void 0 : error.message));
               }).finally(function () {
                 return _this15._finalizeReady();
               });
             } else {
-              email = _this15.webex.config.email;
-              _promise.default.race([_this15.collectPreauthCatalog(email ? {
-                email: email
-              } : undefined), initServiceCatalogsTimeout]).catch(function (error) {
-                _this15.initFailed = true;
-                _this15.logger.error("services: failed to init initial services when no credentials available, ".concat(error === null || error === void 0 ? void 0 : error.message));
-              }).finally(function () {
-                return _this15._finalizeReady();
-              });
-
-              // Handle fresh login: 'loaded' fires before OAuth completes, so listen
+              email = _this15.webex.config.email; // Handle fresh login: 'loaded' fires before OAuth completes, so listen
               // for `canAuthorize` flipping true and then collect the postauth catalog.
               _this15.listenToOnce(_this15.webex, 'change:canAuthorize', function () {
                 if (_this15.webex.canAuthorize && !catalog.status.postauth.ready) {
@@ -1538,6 +1549,23 @@ var Services = _webexPlugin.default.extend({
                   });
                 }
               });
+              if (((_this15$webex$config = _this15.webex.config) === null || _this15$webex$config === void 0 ? void 0 : (_this15$webex$config$ = _this15$webex$config.services) === null || _this15$webex$config$ === void 0 ? void 0 : _this15$webex$config$.skipPreauthCatalogOnUnauthenticated) === true) {
+                // Skip the preauth catalog fetch (it will be collected manually
+                // later), but still finalize `services.ready` so `webex.ready` is not
+                // stalled while unauthenticated. No timeout is created here so there
+                // is no stray timer or unhandled rejection.
+                _this15.logger.info('services: skipping preauth catalog collection while unauthenticated as per the config');
+                _this15._finalizeReady();
+              } else {
+                _promise.default.race([_this15.collectPreauthCatalog(email ? {
+                  email: email
+                } : undefined), _this15._makeInitTimeout()]).catch(function (error) {
+                  _this15.initFailed = true;
+                  _this15.logger.error("services: failed to init initial services when no credentials available, ".concat(error === null || error === void 0 ? void 0 : error.message));
+                }).finally(function () {
+                  return _this15._finalizeReady();
+                });
+              }
             }
           case 4:
           case "end":
@@ -1546,7 +1574,7 @@ var Services = _webexPlugin.default.extend({
       }, _callee5);
     })));
   },
-  version: "3.12.0-next.41"
+  version: "3.12.0-next.42"
 });
 /* eslint-enable no-underscore-dangle */
 var _default = exports.default = Services;