@salesforce/lds-runtime-webruntime 1.428.0-dev10 → 1.428.0-dev12

package/dist/ldsWebruntimeOneStoreInit.js

@@ -1588,9 +1588,12 @@ const _FetchNetworkCommand = class _FetchNetworkCommand extends NetworkCommand {
     this.services = services;
     this.additionalNullResponses = [];
   }
-  fetch() {
+  fetch(contextSeed) {
     try {
-      return this.convertFetchResponseToData(this.services.fetch(...this.fetchParams));
+      const [input, init] = this.fetchParams;
+      const initWithSeed = contextSeed === void 0 ? init : { ...init, __contextSeed: contextSeed };
+      const fetchCall = initWithSeed === void 0 ? this.services.fetch(input) : this.services.fetch(input, initWithSeed);
+      return this.convertFetchResponseToData(fetchCall);
     } catch (reason) {
       return resolvedPromiseLike$2(err$1(toError(reason)));
     }
@@ -3379,7 +3382,7 @@ function buildServiceDescriptor$9(luvio) {
         },
     };
 }
-// version: 1.428.0-dev10-109bf232e1
+// version: 1.428.0-dev12-f80887e01b
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -3405,7 +3408,7 @@ function buildServiceDescriptor$8(notifyRecordUpdateAvailable, getNormalizedLuvi
         },
     };
 }
-// version: 1.428.0-dev10-109bf232e1
+// version: 1.428.0-dev12-f80887e01b
 
 /*!
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -4732,11 +4735,13 @@ class JwtToken {
    * @param _token - The JWT string.
    * @param _decodedInfo - The decoded information from the JWT.
    * @param _extraInfo - Any additional information associated with the JWT.
+   * @param _mintParams - The parameters used to mint this token. Undefined for legacy parameterless tokens.
    */
-  constructor(_token, _decodedInfo, _extraInfo) {
+  constructor(_token, _decodedInfo, _extraInfo, _mintParams) {
     this._token = _token;
     this._decodedInfo = _decodedInfo;
     this._extraInfo = _extraInfo;
+    this._mintParams = _mintParams;
   }
   /**
    * Get the JWT string.
@@ -4762,6 +4767,14 @@ class JwtToken {
   get decodedInfo() {
     return this._decodedInfo;
   }
+  /**
+   * Get the mint parameters used to produce this token.
+   *
+   * @returns The mint parameters, or undefined for legacy parameterless tokens.
+   */
+  get mintParams() {
+    return this._mintParams;
+  }
   /**
    * Get the remaining time in seconds until the JWT expires.
    *
@@ -4779,6 +4792,12 @@ class JwtToken {
     return this.tokenRemainingSeconds <= 0;
   }
 }
+function cacheKeyFor(params) {
+  if (params === void 0) {
+    return "jwt:";
+  }
+  return `jwt:${stableJSONStringify(params) ?? ""}`;
+}
 let defaultLogger = {
   trace: () => {
   },
@@ -4812,85 +4831,146 @@ class JwtRepository {
     this.limitInSeconds = limitInSeconds;
     this.defaultTokenTTLInSeconds = defaultTokenTTLInSeconds;
     this.logger = logger;
+    this._tokens = /* @__PURE__ */ new Map();
+    this.timeoutHandlers = /* @__PURE__ */ new Map();
     this.observers = [];
   }
   /**
-   * Get the current token.
+   * Get the legacy (parameterless) token. Equivalent to `getToken()` with
+   * no args. Preserved for backward compatibility with code that reads the
+   * `token` property directly.
    */
   get token() {
-    return this._token;
+    return this.getToken();
   }
   /**
-   * Set the current token.
+   * Get the cached token for the given mint params.
+   *
+   * @param params - The mint params identifying the token. Omit for the legacy global token.
+   */
+  getToken(params) {
+    return this._tokens.get(cacheKeyFor(params));
+  }
+  /**
+   * Set the cached token for the given mint params.
    *
    * @param token - JWT token as a string.
    * @param extraInfo - Optional extra information.
+   * @param params - The mint params identifying the token. Omit for the legacy global token.
    */
-  setToken(token, extraInfo) {
+  setToken(token, extraInfo, params) {
     const decodedInfo = computeDecodedInfo(
       token,
       this.defaultTokenTTLInSeconds,
       this.logger
     );
-    this._token = new JwtToken(token, decodedInfo, extraInfo);
-    this.observeTokenExpiration();
-    return this._token;
+    const key = cacheKeyFor(params);
+    const jwtToken = new JwtToken(token, decodedInfo, extraInfo, params);
+    this._tokens.set(key, jwtToken);
+    this.observeTokenExpiration(key);
+    return jwtToken;
   }
   /**
-   * Remove the current token.
+   * Remove the cached token for the given mint params.
+   *
+   * @param params - The mint params identifying the token. Omit to remove
+   * only the legacy global-key entry (matches today's behavior of "remove
+   * the only token there is").
    */
-  removeToken() {
-    this._token = void 0;
-    this.clearTimeoutHandler();
+  removeToken(params) {
+    const key = cacheKeyFor(params);
+    this._tokens.delete(key);
+    this.clearTimeoutHandler(key);
   }
   /**
-   * Subscribe to the token nearing its expiration.
+   * Remove every cached token and clear every near-expiry timer. Used by
+   * test teardown and full auth-reset paths that previously called
+   * `removeToken()` to clear the single token.
+   */
+  clearAllTokens() {
+    for (const key of Array.from(this.timeoutHandlers.keys())) {
+      this.clearTimeoutHandler(key);
+    }
+    this._tokens.clear();
+  }
+  /**
+   * Subscribe to any cached token nearing its expiration.
+   *
+   * The callback receives the specific token whose timer fired. Use
+   * `token.mintParams` to determine which token-set the expiry belongs to.
+   *
+   * Already-cached tokens are armed at subscribe time. Tokens added later
+   * via `setToken` arm their own timers from inside `setToken`, so this
+   * loop only needs to cover the existing entries.
    *
-   * @param cb - Callback function to execute when token is nearing expiration.
+   * @param cb - Callback function to execute when a token is nearing expiration.
    */
   subscribeToTokenNearExpiration(cb) {
     this.observers.push(cb);
-    this.observeTokenExpiration();
+    for (const key of this._tokens.keys()) {
+      this.observeTokenExpiration(key);
+    }
     return () => {
       this.observers = this.observers.filter((observer) => observer !== cb);
+      if (this.observers.length === 0) {
+        for (const key of Array.from(this.timeoutHandlers.keys())) {
+          this.clearTimeoutHandler(key);
+        }
+      }
     };
   }
   /**
-   * Clear the timeout handler.
+   * Number of currently cached tokens. Exposed for size observability so
+   * runtime callers can emit a metric on cache growth and detect adapters
+   * that misuse `dynamicParams` for per-request values.
+   */
+  get size() {
+    return this._tokens.size;
+  }
+  /**
+   * Clear the timeout handler for a specific cache key.
    */
-  clearTimeoutHandler() {
-    if (this.timeoutHandler !== void 0) {
-      clearTimeout(this.timeoutHandler);
+  clearTimeoutHandler(key) {
+    const handler = this.timeoutHandlers.get(key);
+    if (handler !== void 0) {
+      clearTimeout(handler);
+      this.timeoutHandlers.delete(key);
     }
   }
   /**
-   * Observe and handle token expiration.
+   * Observe and handle expiration of the token at the given cache key.
    */
-  observeTokenExpiration() {
-    this.clearTimeoutHandler();
-    if (this.observers.length === 0 || this.token === void 0) {
+  observeTokenExpiration(key) {
+    this.clearTimeoutHandler(key);
+    const token = this._tokens.get(key);
+    if (this.observers.length === 0 || token === void 0) {
       return;
     }
-    this.timeoutHandler = setTimeout(
-      () => this.notifyTokenIsExpiring(),
-      this.computeTimeoutTimeInMs()
+    const handler = setTimeout(
+      () => this.notifyTokenIsExpiring(key),
+      this.computeTimeoutTimeInMs(token)
     );
+    this.timeoutHandlers.set(key, handler);
   }
   /**
-   * Compute the timeout time in milliseconds.
+   * Compute the timeout time in milliseconds for the given token.
    */
-  computeTimeoutTimeInMs() {
-    const remainingSeconds = this.token.tokenRemainingSeconds;
-    let timeoutTimeInSeconds = remainingSeconds - this.limitInSeconds;
+  computeTimeoutTimeInMs(token) {
+    const remainingSeconds = token.tokenRemainingSeconds;
+    const timeoutTimeInSeconds = remainingSeconds - this.limitInSeconds;
     return timeoutTimeInSeconds < 0 ? 0 : timeoutTimeInSeconds * 1e3;
   }
   /**
-   * Notify all observers that the token is expiring.
+   * Notify all observers that the token at the given cache key is expiring.
    */
-  notifyTokenIsExpiring() {
+  notifyTokenIsExpiring(key) {
+    const token = this._tokens.get(key);
+    if (token === void 0) {
+      return;
+    }
     this.observers.forEach((cb) => {
       try {
-        cb.call(void 0, this.token);
+        cb.call(void 0, token);
       } catch (e2) {
         this.logger.error(e2.message);
       }
@@ -4908,57 +4988,68 @@ class JwtManager {
   constructor(jwtRepository, resolver, options) {
     this.jwtRepository = jwtRepository;
     this.resolver = resolver;
+    this.inflightPromises = /* @__PURE__ */ new Map();
     if (options == null ? void 0 : options.keepTokenUpdated) {
-      jwtRepository.subscribeToTokenNearExpiration(() => this.refreshToken());
+      jwtRepository.subscribeToTokenNearExpiration(
+        (token) => this.refreshToken(token.mintParams)
+      );
     }
   }
   /**
-   * Method to get a JWT token.
-   * If there's a token request in progress, it will return the Promise of this request.
-   * If the current token is undefined or expired, it will initiate a token refresh.
-   * Otherwise, it will return the current token.
+   * Method to get a JWT token for the given mint params.
+   *
+   * If a request for the same params is in flight, returns its promise. If
+   * a cached token for those params exists and is not expired, returns it
+   * synchronously. Otherwise initiates a refresh.
    *
-   * @returns {JwtToken<T, ExtraInfo> | Promise<JwtToken<T, ExtraInfo>>} The current token or the Promise of a token request.
+   * @param params - Optional mint parameters. Omit for the legacy parameterless token.
+   * @returns The cached token (sync) or a promise that resolves to the refreshed token.
    */
-  getJwt() {
-    if (this.inflightPromise) {
-      return this.inflightPromise;
+  getJwt(params) {
+    const key = cacheKeyFor(params);
+    const inflight = this.inflightPromises.get(key);
+    if (inflight) {
+      return inflight;
     }
-    const token = this.jwtRepository.token;
+    const token = this.jwtRepository.getToken(params);
     if (token === void 0 || token.isExpired) {
-      return this.refreshToken();
+      return this.refreshToken(params);
     }
     return token;
   }
   /**
-   * Method to refresh a JWT token.
-   * If a refresh request is already in progress, it will return the Promise of this request.
-   * Otherwise, it will start a new refresh request and return its Promise.
+   * Method to refresh a JWT token for the given mint params.
    *
-   * @returns {Promise<JwtToken<T, ExtraInfo>>} Promise of the refreshed token.
+   * @param params - Optional mint parameters. Omit for the legacy parameterless token.
+   * @returns Promise of the refreshed token.
    */
-  refreshToken() {
-    if (this.inflightPromise === void 0) {
-      this.inflightPromise = new Promise((resolve, reject) => {
-        this.resolver.getJwt().then(({ jwt, extraInfo }) => {
-          this.inflightPromise = void 0;
-          const token = this.jwtRepository.setToken(jwt, extraInfo);
-          resolve(token);
-        }).catch((reason) => {
-          this.inflightPromise = void 0;
-          reject(reason);
-        });
+  refreshToken(params) {
+    const key = cacheKeyFor(params);
+    const existing = this.inflightPromises.get(key);
+    if (existing !== void 0) {
+      return existing;
+    }
+    const resolverPromise = params === void 0 ? this.resolver.getJwt() : this.resolver.getJwt(params);
+    const promise = new Promise((resolve, reject) => {
+      resolverPromise.then(({ jwt, extraInfo }) => {
+        this.inflightPromises.delete(key);
+        const token = this.jwtRepository.setToken(jwt, extraInfo, params);
+        resolve(token);
+      }).catch((reason) => {
+        this.inflightPromises.delete(key);
+        reject(reason);
       });
-    }
-    return this.inflightPromise;
+    });
+    this.inflightPromises.set(key, promise);
+    return promise;
   }
   /**
-   * Method to check if a token refresh is in progress.
+   * Method to check if any token refresh is in progress.
    *
-   * @returns {boolean} true if a token refresh is in progress, false otherwise.
+   * @returns {boolean} true if at least one refresh is in flight, false otherwise.
    */
   get isRefreshingToken() {
-    return this.inflightPromise !== void 0;
+    return this.inflightPromises.size > 0;
   }
 }
 
@@ -4976,9 +5067,18 @@ function buildServiceDescriptor(interceptors = {
   return {
     type: "fetch",
     version: "1.0",
-    service: function(...args) {
+    service: function(input, init) {
       var _a;
-      const context = (_a = interceptors.createContext) == null ? void 0 : _a.call(interceptors);
+      let contextSeed;
+      let cleanInit = init;
+      if (init !== void 0 && "__contextSeed" in init) {
+        const { __contextSeed, ...initWithoutSeed } = init;
+        contextSeed = __contextSeed;
+        cleanInit = Object.keys(initWithoutSeed).length === 0 ? void 0 : initWithoutSeed;
+      }
+      const fetchArgs = cleanInit === void 0 ? [input] : [input, cleanInit];
+      const baseContext = (_a = interceptors.createContext) == null ? void 0 : _a.call(interceptors);
+      const context = contextSeed === void 0 ? baseContext : { ...baseContext, ...contextSeed };
       const {
         request: requestInterceptors = [],
         retry: retryInterceptor = void 0,
@@ -4986,17 +5086,17 @@ function buildServiceDescriptor(interceptors = {
         finally: finallyInterceptors = []
       } = interceptors;
       const pending = requestInterceptors.reduce(
-        (previousPromise, interceptor) => previousPromise.then((args2) => interceptor(args2, context)),
-        resolvedPromiseLike$2(args)
+        (previousPromise, interceptor) => previousPromise.then((args) => interceptor(args, context)),
+        resolvedPromiseLike$2(fetchArgs)
       );
-      return Promise.resolve(pending).then((args2) => {
+      return Promise.resolve(pending).then((args) => {
         if (retryInterceptor) {
-          return retryInterceptor(args2, retryService, context);
+          return retryInterceptor(args, retryService, context);
         } else {
           if (retryService) {
-            return retryService.applyRetry(() => fetch(...args2));
+            return retryService.applyRetry(() => fetch(...args));
           }
-          return fetch(...args2);
+          return fetch(...args);
         }
       }).then((response) => {
         return responseInterceptors.reduce(
@@ -5329,4 +5429,4 @@ withDefaultLuvio((luvio) => {
     ];
     setServices(services);
 });
-// version: 1.428.0-dev10-1e665d263f
+// version: 1.428.0-dev12-1c6599e2b3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-webruntime",
-    "version": "1.428.0-dev10",
+    "version": "1.428.0-dev12",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS engine for Webruntime runtime",
     "main": "dist/ldsWebruntimeOneStoreInit.js",
@@ -35,46 +35,46 @@
         "ready": "yarn build && jest --collectCoverage && yarn test:size && yarn release:corejar"
     },
     "devDependencies": {
-        "@conduit-client/service-provisioner": "3.18.1-dev2",
-        "@conduit-client/tools-core": "3.18.1-dev2",
+        "@conduit-client/service-provisioner": "3.19.0-dev3",
+        "@conduit-client/tools-core": "3.19.0-dev3",
         "jwt-encode": "1.0.1"
     },
     "dependencies": {
-        "@conduit-client/command-aura-network": "3.18.1-dev2",
-        "@conduit-client/command-aura-normalized-cache-control": "3.18.1-dev2",
-        "@conduit-client/command-aura-resource-cache-control": "3.18.1-dev2",
-        "@conduit-client/command-fetch-network": "3.18.1-dev2",
-        "@conduit-client/command-http-normalized-cache-control": "3.18.1-dev2",
-        "@conduit-client/command-ndjson": "3.18.1-dev2",
-        "@conduit-client/command-network": "3.18.1-dev2",
-        "@conduit-client/command-sse": "3.18.1-dev2",
-        "@conduit-client/command-streaming": "3.18.1-dev2",
-        "@conduit-client/jwt-manager": "3.18.1-dev2",
-        "@conduit-client/service-aura-network": "3.18.1-dev2",
-        "@conduit-client/service-bindings-imperative": "3.18.1-dev2",
-        "@conduit-client/service-bindings-lwc": "3.18.1-dev2",
-        "@conduit-client/service-cache": "3.18.1-dev2",
-        "@conduit-client/service-cache-control": "3.18.1-dev2",
-        "@conduit-client/service-cache-inclusion-policy": "3.18.1-dev2",
-        "@conduit-client/service-fetch-network": "3.18.1-dev2",
-        "@conduit-client/service-instrument-command": "3.18.1-dev2",
-        "@conduit-client/service-pubsub": "3.18.1-dev2",
-        "@conduit-client/service-store": "3.18.1-dev2",
-        "@conduit-client/utils": "3.18.1-dev2",
+        "@conduit-client/command-aura-network": "3.19.0-dev3",
+        "@conduit-client/command-aura-normalized-cache-control": "3.19.0-dev3",
+        "@conduit-client/command-aura-resource-cache-control": "3.19.0-dev3",
+        "@conduit-client/command-fetch-network": "3.19.0-dev3",
+        "@conduit-client/command-http-normalized-cache-control": "3.19.0-dev3",
+        "@conduit-client/command-ndjson": "3.19.0-dev3",
+        "@conduit-client/command-network": "3.19.0-dev3",
+        "@conduit-client/command-sse": "3.19.0-dev3",
+        "@conduit-client/command-streaming": "3.19.0-dev3",
+        "@conduit-client/jwt-manager": "3.19.0-dev3",
+        "@conduit-client/service-aura-network": "3.19.0-dev3",
+        "@conduit-client/service-bindings-imperative": "3.19.0-dev3",
+        "@conduit-client/service-bindings-lwc": "3.19.0-dev3",
+        "@conduit-client/service-cache": "3.19.0-dev3",
+        "@conduit-client/service-cache-control": "3.19.0-dev3",
+        "@conduit-client/service-cache-inclusion-policy": "3.19.0-dev3",
+        "@conduit-client/service-fetch-network": "3.19.0-dev3",
+        "@conduit-client/service-instrument-command": "3.19.0-dev3",
+        "@conduit-client/service-pubsub": "3.19.0-dev3",
+        "@conduit-client/service-store": "3.19.0-dev3",
+        "@conduit-client/utils": "3.19.0-dev3",
         "@luvio/network-adapter-composable": "0.160.3",
         "@luvio/network-adapter-fetch": "0.160.3",
         "@salesforce/lds-adapters-uiapi-lex": "^1.415.0",
-        "@salesforce/lds-default-luvio": "^1.428.0-dev10",
-        "@salesforce/lds-luvio-service": "^1.428.0-dev10",
-        "@salesforce/lds-luvio-uiapi-records-service": "^1.428.0-dev10"
+        "@salesforce/lds-default-luvio": "^1.428.0-dev12",
+        "@salesforce/lds-luvio-service": "^1.428.0-dev12",
+        "@salesforce/lds-luvio-uiapi-records-service": "^1.428.0-dev12"
     },
     "luvioBundlesize": [
         {
             "path": "./dist/ldsWebruntimeOneStoreInit.js",
             "maxSize": {
-                "none": "165.00 kB",
-                "min": "85 kB",
-                "compressed": "25.50 kB"
+                "none": "167.00 kB",
+                "min": "86 kB",
+                "compressed": "27 kB"
             }
         }
     ],