@chaosity/location-client 0.6.0 → 0.8.0

package/dist/cjs/server/LocationServiceConnector.js

@@ -7,11 +7,74 @@ exports.LocationServiceConnector = void 0;
 const debug_1 = __importDefault(require("debug"));
 const LocationServiceException_js_1 = require("../errors/LocationServiceException.js");
 const endpoints_js_1 = require("../transport/endpoints.js");
+const errors_js_1 = require("../transport/errors.js");
 const http_js_1 = require("../transport/http.js");
 const roundPosition_js_1 = require("../utils/roundPosition.js");
 const tokenClaims_js_1 = require("../utils/tokenClaims.js");
 const getClientConfig_js_1 = require("./getClientConfig.js");
 const log = (0, debug_1.default)('location-client:connector');
+/** Header lookup that does not care how the caller capitalised the name. */
+function headerValue(headers, name) {
+    if (!headers)
+        return undefined;
+    const wanted = name.toLowerCase();
+    for (const [key, value] of Object.entries(headers)) {
+        if (key.toLowerCase() === wanted)
+            return value;
+    }
+    return undefined;
+}
+/**
+ * The headers `dispatch` sets itself, and which a caller therefore cannot
+ * supply. Lower-case, because that is how they are compared.
+ *
+ * Kept beside `withoutHeaders` so the list and the record in `dispatch` cannot
+ * drift apart: a header added there must be added here too, or the caller's own
+ * spelling of it survives the merge.
+ */
+const SYSTEM_HEADERS = ['origin', 'content-type', 'authorization'];
+/**
+ * What to check when the token source comes up empty. The guard itself is
+ * shared with the map fetches (`noTokenAvailable`); only the advice differs,
+ * and on this path the answer is always the credentials.
+ */
+const NO_TOKEN_ADVICE = 'check clientId/clientSecret configuration';
+/** The caller's headers minus `names`, however they capitalised them. */
+function withoutHeaders(headers, names) {
+    if (!headers)
+        return {};
+    const wanted = new Set(names);
+    return Object.fromEntries(Object.entries(headers).filter(([key]) => !wanted.has(key.toLowerCase())));
+}
+/**
+ * Say why the 403 happened, when we know.
+ *
+ * `Origin not allowed` with no Origin sent is not an ambiguous failure — it is
+ * the documented backend path missing one piece of configuration (#45), and the
+ * API's own message cannot say so because from its side the header is simply
+ * absent. A new integrator following the README hit a bare "Origin not allowed"
+ * that named neither the cause nor the fix.
+ */
+function explainMissingOrigin(err, sentOrigin) {
+    if (sentOrigin)
+        return err;
+    if (!(err instanceof LocationServiceException_js_1.LocationServiceException))
+        return err;
+    if (err.code !== 'OriginNotAllowedException')
+        return err;
+    return new LocationServiceException_js_1.LocationServiceException({
+        code: err.code,
+        message: `${err.message} — this request carried no Origin header, and the API requires ` +
+            `one it recognises on every data request. Set \`origin\` on the ` +
+            `LocationServiceConnector, set LOCATION_ORIGIN, or pass an Origin in the ` +
+            `per-call headers; if the application has no allowed domain configured in ` +
+            `the developer portal yet, set that first.`,
+        statusCode: err.statusCode,
+        requestId: err.requestId,
+        details: err.details,
+        cause: err,
+    });
+}
 /**
  * LocationServiceConnector — server-side connector for the Location Service API.
  *
@@ -19,28 +82,79 @@ const log = (0, debug_1.default)('location-client:connector');
  * token management, and the same transport (timeout, cancellation, retry) as the
  * browser client.
  *
+ * Configuration is COMPLETED from the environment rather than replaced by it.
+ * The constructor used to be all-or-nothing — any argument at all took the
+ * "caller supplies everything" branch — so `new LocationServiceConnector()` had
+ * credentials but could never send an Origin (403 on every data request) and
+ * `new LocationServiceConnector({ origin })` had an Origin but no credentials
+ * (#45). Now an explicit `token`/`getToken` still wins outright, and anything
+ * short of that is filled in from `LOCATION_API_URL` / `LOCATION_CLIENT_ID` /
+ * `LOCATION_CLIENT_SECRET` / `LOCATION_ORIGIN`.
+ *
  * @example
  * ```typescript
+ * // Credentials and apiUrl from the environment, Origin supplied here
  * const connector = new LocationServiceConnector({ origin: 'https://app.example.com' })
  * const result = await connector.send(new SearchTextCommand({ QueryText: 'Space Needle' }))
  * ```
  */
 class LocationServiceConnector {
-    constructor(config) {
+    constructor(config = {}) {
         this.serviceId = 'Geo Places';
-        this.configPromise = config ? Promise.resolve(config) : (0, getClientConfig_js_1.getClientConfig)();
-        this.origin = config?.origin;
+        this.config = config;
+        // `||`, not `??`, to match the other four env-completed fields: an empty
+        // string is not a choice to send no Origin, it is a missing value, and the
+        // asymmetry meant `origin: ''` suppressed the environment and then produced
+        // an error telling the caller to set a variable they may already have set.
+        this.origin =
+            config.origin ||
+                process.env.LOCATION_ORIGIN ||
+                process.env.LOCATION_SERVICE_ORIGIN;
+    }
+    /**
+     * One place that knows how a token is obtained, so nothing can drift.
+     *
+     * Built on first use rather than in the constructor: resolving the
+     * environment path used to start a `/auth/token` round trip from `new`, whose
+     * rejection nothing was awaiting yet — an unhandled rejection for a
+     * misconfigured process, before it had made a single request.
+     */
+    source() {
+        return (this.tokenSource ?? (this.tokenSource = this.buildSource()));
     }
-    /** One place that knows how a token is obtained, so nothing can drift. */
-    async resolveToken() {
-        const config = await this.configPromise;
-        if ('getToken' in config && typeof config.getToken === 'function') {
-            const result = await config.getToken();
-            if (!result)
-                return undefined;
-            return typeof result === 'string' ? result : result.token;
+    buildSource() {
+        const { apiUrl, token, getToken, clientId, clientSecret } = this.config;
+        // An explicit token source wins outright. A caller that supplied one is
+        // managing credentials itself, and quietly reading the environment
+        // underneath it could send another application's token.
+        if (getToken) {
+            return {
+                apiUrl: () => requireApiUrl(apiUrl),
+                get: async (forceRefresh) => {
+                    const result = await getToken(forceRefresh);
+                    if (!result)
+                        return undefined;
+                    return typeof result === 'string' ? result : result.token;
+                },
+            };
+        }
+        if (token) {
+            return {
+                apiUrl: () => requireApiUrl(apiUrl),
+                // A fixed string. Asking again returns the same one, which is how the
+                // retry guard knows there is nothing to retry with.
+                get: async () => token,
+            };
         }
-        return config.token;
+        // Nothing but (at most) an apiUrl and an origin — complete it from the
+        // environment. This is the branch every sample and doc actually takes.
+        const env = (0, getClientConfig_js_1.serverTokenSource)({ apiUrl, clientId, clientSecret });
+        return {
+            // Already validated by serverTokenSource, which cannot resolve
+            // credentials without it.
+            apiUrl: () => env.apiUrl,
+            get: async (forceRefresh) => (await env.getToken(forceRefresh)).token,
+        };
     }
     /**
      * This application's own configuration, as carried on the access token
@@ -57,35 +171,99 @@ class LocationServiceConnector {
      * case until one is configured in the portal.
      */
     async getAppConfig() {
-        return (0, tokenClaims_js_1.readAppConfigClaims)(await this.resolveToken());
+        return (0, tokenClaims_js_1.readAppConfigClaims)(await this.source().get());
+    }
+    /**
+     * The Origin this request will actually carry.
+     *
+     * ONE definition, for the two readers that must never disagree about it: the
+     * header merge in `dispatch`, and the 403 explanation in `send`. A per-call
+     * header beats the connector default, whatever the caller capitalised.
+     */
+    effectiveOrigin(options) {
+        // `||` for the same reason as the constructor: an empty per-call header is
+        // a missing value, not a decision to send no Origin.
+        return headerValue(options?.headers, 'origin') || this.origin;
     }
     async send(command, options) {
-        const token = await this.resolveToken();
-        if (!token) {
-            throw new LocationServiceException_js_1.LocationServiceException({
-                code: 'InvalidCredentialsException',
-                message: 'No token available — check clientId/clientSecret configuration',
-                details: { source: 'client' },
-            });
-        }
+        const source = this.source();
         const cmd = command;
-        const endpoint = (0, endpoints_js_1.resolveEndpoint)(cmd);
-        // The token is already resolved above, so the precision this application
-        // is entitled to is available before the request is shaped (api#65).
-        // Absent claim -> the 3 dp floor, which is what every application gets
-        // until one is configured otherwise.
+        const url = `${source.apiUrl()}${(0, endpoints_js_1.resolveEndpoint)(cmd)}`;
+        try {
+            return await this.dispatchWithRetry(source, url, cmd, options);
+        }
+        catch (err) {
+            throw explainMissingOrigin(err, this.effectiveOrigin(options));
+        }
+    }
+    async dispatchWithRetry(source, url, cmd, options) {
+        const token = await source.get();
+        if (!token)
+            throw (0, errors_js_1.noTokenAvailable)(NO_TOKEN_ADVICE);
+        try {
+            return await this.dispatch(url, token, cmd, options);
+        }
+        catch (err) {
+            if (!(0, errors_js_1.isTokenRejected)(err))
+                throw err;
+            // One retry, and only when the replacement is genuinely a different
+            // token. That single comparison covers every source: a fixed `token`
+            // string, a caller `getToken` that ignores `forceRefresh`, and a cached
+            // token the API has revoked before its `exp` all hand back what we
+            // already sent — and re-sending it would be a second doomed request for
+            // the same answer.
+            const fresh = await source.get(true);
+            if (!fresh || fresh === token)
+                throw err;
+            log('401 on a token the API no longer accepts — retrying once, refreshed');
+            return await this.dispatch(url, fresh, cmd, options);
+        }
+    }
+    dispatch(url, token, cmd, options) {
+        // The token is resolved before the request is shaped, so the precision this
+        // application is entitled to is available (api#65). Absent claim -> the
+        // 3 dp floor, which is what every application gets until one is configured
+        // otherwise. Recomputed per attempt because a refreshed token may carry
+        // different claims.
         const { biasDecimals } = (0, tokenClaims_js_1.readAppConfigClaims)(token);
         const input = (0, roundPosition_js_1.roundPositionFields)(cmd.input, biasDecimals);
-        // Caller headers first so the system ones below cannot be overridden, but an
-        // explicit per-call Origin still beats the connector-wide default.
+        // Every system header is set exactly ONCE, and the caller's own spelling of
+        // each is dropped first.
+        //
+        // Spreading them over the caller's record is not enough, because fetch's
+        // Headers fill APPENDS rather than replaces: a caller's lowercase key
+        // survives beside the canonical one and both go on the wire. For Origin
+        // that produced `Origin: default, per-call`, which the API's exact-match
+        // domain check rejects (observed: 403 OriginNotAllowedException) — and two
+        // keys with the SAME value fared no better, `Origin: x, x`. For
+        // Authorization it is worse than a failed override: `{ authorization:
+        // 'Bearer not-yours' }` went out as `Bearer not-yours, Bearer <real>`,
+        // corrupting the token rather than being ignored by it.
+        //
+        // Origin's value comes from `effectiveOrigin`, so a per-call header still
+        // beats the connector default — it is the DUPLICATE that is removed, not
+        // the caller's intent.
+        const origin = this.effectiveOrigin(options);
         const headers = {
-            ...(this.origin ? { Origin: this.origin } : {}),
-            ...(options?.headers ?? {}),
+            ...withoutHeaders(options?.headers, SYSTEM_HEADERS),
+            ...(origin ? { Origin: origin } : {}),
             'Content-Type': 'application/json',
             Authorization: `Bearer ${token}`,
         };
-        log('Sending %s request to %s', cmd.constructor?.name, endpoint);
-        return (0, http_js_1.requestJson)(`${(await this.configPromise).apiUrl}${endpoint}`, { method: 'POST', headers, body: JSON.stringify(input) }, options);
+        log('Sending %s request to %s', cmd.constructor?.name, url);
+        return (0, http_js_1.requestJson)(url, { method: 'POST', headers, body: JSON.stringify(input) }, options);
     }
 }
 exports.LocationServiceConnector = LocationServiceConnector;
+function requireApiUrl(explicit) {
+    const apiUrl = (0, getClientConfig_js_1.resolveApiUrl)(explicit);
+    if (!apiUrl) {
+        throw new LocationServiceException_js_1.LocationServiceException({
+            code: 'ValidationException',
+            message: 'No API URL. Pass `apiUrl` to the LocationServiceConnector constructor ' +
+                'or set LOCATION_API_URL.',
+            details: { source: 'client' },
+        });
+    }
+    return apiUrl;
+}

package/dist/cjs/server/getClientConfig.d.ts

@@ -1,12 +1,71 @@
+import type { TokenResponse } from '../auth/TokenProvider.js';
 import type { ClientConfig } from '../types/index.js';
 export interface ServerAuthConfig {
     apiUrl?: string;
     clientId?: string;
     clientSecret?: string;
+    /**
+     * Mint a new token instead of returning the cached one.
+     *
+     * For the case the cache cannot see: a token the API has stopped accepting
+     * before its `exp` — revoked in the portal, or issued against a secret that
+     * has since been rotated. `TokenProvider` judges freshness from `exp` alone,
+     * so without this a caller holding a dead token waits out its whole lifetime.
+     */
+    forceRefresh?: boolean;
 }
+/**
+ * How many applications one process keeps token providers for.
+ *
+ * A provider holds a URL, a client id, a secret and one cached JWT, so the
+ * ceiling is about memory containment rather than a tuned working set — 64 is
+ * far above what a single-tenant service needs and far below anything worth
+ * worrying about. An agency past it pays a re-mint for the least recently used
+ * application, which is exactly the behaviour this replaced, but only for the
+ * coldest one instead of for every alternation.
+ */
+export declare const MAX_CACHED_PROVIDERS = 64;
 export interface ServerClientConfig extends ClientConfig {
+    /**
+     * Narrowed back to required. `ClientConfig.token` is optional because a
+     * client can be driven by `getToken`/`refreshToken` alone, but this type is
+     * what `getClientConfig` RESOLVES — it either has a token or it threw — and
+     * widening it would push a needless `string | undefined` onto every consumer
+     * that reads `config.token`.
+     */
+    token: string;
     expiresAt?: number;
 }
+/**
+ * Where the API lives, from the argument or the environment.
+ *
+ * Separate from the credentials because the two are independently overridable:
+ * a caller can hand `LocationServiceConnector` its own `token` and still expect
+ * `LOCATION_API_URL` to say where to send it.
+ */
+export declare function resolveApiUrl(explicit?: string): string | undefined;
+/**
+ * A LIVE token source: resolved credentials plus a `getToken` that re-mints
+ * when the cached token is spent.
+ *
+ * This is the seam `getClientConfig` and `LocationServiceConnector` share, and
+ * it exists because the two need different SHAPES of the same thing.
+ * `getClientConfig` has to return plain data — see the warning on its return
+ * value — so it can only ever hand back a snapshot. The connector is long-lived
+ * and needs the source itself, or it dies at the first `exp` (#36).
+ *
+ * Deliberately not exported from `./server`: it hands out a callable bound to
+ * the process-wide provider, and the public surface stays the two functions
+ * that were already there.
+ */
+export interface ServerTokenSource {
+    apiUrl: string;
+    /** Resolves with a token or rejects; it never resolves tokenless. */
+    getToken(forceRefresh?: boolean): Promise<TokenResponse & {
+        token: string;
+    }>;
+}
+export declare function serverTokenSource(config?: ServerAuthConfig): ServerTokenSource;
 /**
  * Get client configuration with OAuth2 authentication.
  *
@@ -26,6 +85,21 @@ export interface ServerClientConfig extends ClientConfig {
  * NEVER call from browser/client code as it exposes credentials.
  * For SPA projects, create your own backend endpoint that calls this.
  *
+ * ## The return value is PLAIN DATA, and has to stay that way
+ *
+ * `{ apiUrl, token, expiresAt }` — no methods, no closures. The reason is not
+ * style: the shape every sample uses is a Next.js Server Action that returns
+ * this straight to a Client Component (every `src/lib/actions/location.ts`
+ * under `location-service-samples/web`), and the RSC boundary
+ * serialises it. A function on this object is not serialisable and throws at
+ * the boundary, so "make getClientConfig return getToken" — which #36 proposed
+ * and this JSDoc used to promise two lines below — would break every Next.js
+ * consumer of the library.
+ *
+ * A caller that needs a token which REFRESHES wants one of:
+ * - `LocationServiceConnector`, which holds a live source internally (#36), or
+ * - `TokenProvider` directly, if it is managing its own lifecycle.
+ *
  * @example
  * // Auto-detect from environment
  * const config = await getClientConfig()
@@ -33,8 +107,7 @@ export interface ServerClientConfig extends ClientConfig {
  * // Or override specific values
  * const config = await getClientConfig({ apiUrl: 'https://custom.api.com' })
  *
- * // Use getToken() for automatic caching and refresh
- * const { token } = await config.getToken()
- * const connector = new LocationServiceConnector({ apiUrl: config.apiUrl, token })
+ * // The API rejected the token before its exp — revoked, or secret rotated
+ * const fresh = await getClientConfig({ forceRefresh: true })
  */
 export declare function getClientConfig(config?: ServerAuthConfig): Promise<ServerClientConfig>;

package/dist/cjs/server/getClientConfig.js

@@ -3,15 +3,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MAX_CACHED_PROVIDERS = void 0;
+exports.resolveApiUrl = resolveApiUrl;
+exports.serverTokenSource = serverTokenSource;
 exports.getClientConfig = getClientConfig;
 const debug_1 = __importDefault(require("debug"));
 const node_crypto_1 = require("node:crypto");
 const TokenProvider_js_1 = require("../auth/TokenProvider.js");
 const LocationServiceException_js_1 = require("../errors/LocationServiceException.js");
 const log = (0, debug_1.default)('location-client:clientConfig');
-// Singleton instance to prevent race conditions
-let tokenProviderInstance = null;
-let currentConfig = null;
+/**
+ * How many applications one process keeps token providers for.
+ *
+ * A provider holds a URL, a client id, a secret and one cached JWT, so the
+ * ceiling is about memory containment rather than a tuned working set — 64 is
+ * far above what a single-tenant service needs and far below anything worth
+ * worrying about. An agency past it pays a re-mint for the least recently used
+ * application, which is exactly the behaviour this replaced, but only for the
+ * coldest one instead of for every alternation.
+ */
+exports.MAX_CACHED_PROVIDERS = 64;
+/**
+ * One provider per configuration, most-recently-used last.
+ *
+ * This used to be TWO module-level variables holding a single provider, and a
+ * process serving more than one application therefore evicted the cache on
+ * every alternation: A→B→A→B took a full `/auth/token` round trip per call,
+ * each writing a jti row, all against the one shared token-endpoint throttle.
+ * The hit rate under alternating load was 0% (#39). Nothing leaked between
+ * tenants — each caller closes over the provider it asked for — so what this
+ * fixes is availability and cost, not confidentiality.
+ *
+ * A `Map` iterates in insertion order, so re-inserting on a hit makes the first
+ * key the least recently used, and an LRU needs no other bookkeeping.
+ */
+const tokenProviders = new Map();
 function getTokenProvider(apiUrl, clientId, clientSecret) {
     // The SECRET is part of the key. Without it, rotating a client secret while
     // keeping the same clientId left this process reusing a provider built on the
@@ -19,16 +45,112 @@ function getTokenProvider(apiUrl, clientId, clientSecret) {
     // rather than concatenated so the key is never a secret in its own right, and
     // never ends up in a log line (#5).
     const configKey = `${apiUrl}:${clientId}:${(0, node_crypto_1.createHash)('sha256').update(clientSecret).digest('hex').slice(0, 16)}`;
-    // Reuse existing instance if config matches
-    if (tokenProviderInstance && currentConfig === configKey) {
+    const cached = tokenProviders.get(configKey);
+    if (cached) {
         log('[getTokenProvider] Reusing existing TokenProvider instance');
-        return tokenProviderInstance;
+        // Re-insert to mark it most recently used.
+        tokenProviders.delete(configKey);
+        tokenProviders.set(configKey, cached);
+        return cached;
     }
-    // Create new instance if config changed
     log('[getTokenProvider] Creating new TokenProvider instance');
-    tokenProviderInstance = new TokenProvider_js_1.TokenProvider({ apiUrl, clientId, clientSecret });
-    currentConfig = configKey;
-    return tokenProviderInstance;
+    const provider = new TokenProvider_js_1.TokenProvider({ apiUrl, clientId, clientSecret });
+    tokenProviders.set(configKey, provider);
+    if (tokenProviders.size > exports.MAX_CACHED_PROVIDERS) {
+        const leastRecentlyUsed = tokenProviders.keys().next().value;
+        /* c8 ignore next — size > 0 here, so the iterator always yields */
+        if (leastRecentlyUsed !== undefined) {
+            log('[getTokenProvider] Evicting the least recently used TokenProvider');
+            tokenProviders.delete(leastRecentlyUsed);
+        }
+    }
+    return provider;
+}
+/**
+ * Where the API lives, from the argument or the environment.
+ *
+ * Separate from the credentials because the two are independently overridable:
+ * a caller can hand `LocationServiceConnector` its own `token` and still expect
+ * `LOCATION_API_URL` to say where to send it.
+ */
+function resolveApiUrl(explicit) {
+    return (explicit ||
+        process.env.LOCATION_API_URL ||
+        process.env.LOCATION_SERVICE_API_URL);
+}
+function serverTokenSource(config = {}) {
+    log('[serverTokenSource] Starting with config:', {
+        hasApiUrl: !!config.apiUrl,
+        hasClientId: !!config.clientId,
+    });
+    // Auto-detect from environment with fallbacks
+    const apiUrl = resolveApiUrl(config.apiUrl);
+    const clientId = config.clientId ||
+        process.env.LOCATION_CLIENT_ID ||
+        process.env.LOCATION_SERVICE_CLIENT_ID;
+    const clientSecret = config.clientSecret ||
+        process.env.LOCATION_CLIENT_SECRET ||
+        process.env.LOCATION_SERVICE_CLIENT_SECRET;
+    log('[serverTokenSource] Resolved config:', {
+        apiUrl,
+        clientId: clientId?.substring(0, 10) + '...',
+    });
+    // Validate required values. A LocationServiceException like everything else
+    // this package throws — it used to be a bare `Error`, which was survivable
+    // while only `getClientConfig` could raise it and is not now that the
+    // connector reaches this path too.
+    if (!apiUrl || !clientId || !clientSecret) {
+        console.error('[location-client] Missing required configuration');
+        throw new LocationServiceException_js_1.LocationServiceException({
+            code: 'ValidationException',
+            message: 'Missing required configuration. Set environment variables: ' +
+                'LOCATION_API_URL, LOCATION_CLIENT_ID, LOCATION_CLIENT_SECRET',
+            details: { source: 'client' },
+        });
+    }
+    log('[serverTokenSource] Getting TokenProvider instance');
+    const provider = getTokenProvider(apiUrl, clientId, clientSecret);
+    return {
+        apiUrl,
+        async getToken(forceRefresh = false) {
+            log('[serverTokenSource] Fetching token (forceRefresh=%s)', forceRefresh);
+            let result;
+            try {
+                result = await provider.getToken(forceRefresh);
+            }
+            catch (error) {
+                // The provider now rejects rather than resolving with success:false, and
+                // the rejection is typed — so a store outage (503) can be reported as a
+                // store outage instead of as bad credentials.
+                if (error instanceof LocationServiceException_js_1.LocationServiceException) {
+                    if (error.isAuth) {
+                        throw new LocationServiceException_js_1.LocationServiceException({
+                            code: 'InvalidCredentialsException',
+                            message: `Authentication failed for client ID "${clientId}". ` +
+                                `Verify LOCATION_CLIENT_ID and LOCATION_CLIENT_SECRET match your application in the developer portal.`,
+                            statusCode: error.statusCode,
+                            requestId: error.requestId,
+                            cause: error,
+                        });
+                    }
+                    throw error;
+                }
+                throw error;
+            }
+            // TokenProvider rejects rather than returning a tokenless success, so this
+            // is unreachable in practice — it is here to keep the contract explicit at
+            // the type level rather than asserting non-null.
+            const token = result.token;
+            if (!token) {
+                throw new LocationServiceException_js_1.LocationServiceException({
+                    code: 'InvalidCredentialsException',
+                    message: 'Token provider returned no token',
+                    details: { source: 'client' },
+                });
+            }
+            return { ...result, token };
+        },
+    };
 }
 /**
  * Get client configuration with OAuth2 authentication.
@@ -49,6 +171,21 @@ function getTokenProvider(apiUrl, clientId, clientSecret) {
  * NEVER call from browser/client code as it exposes credentials.
  * For SPA projects, create your own backend endpoint that calls this.
  *
+ * ## The return value is PLAIN DATA, and has to stay that way
+ *
+ * `{ apiUrl, token, expiresAt }` — no methods, no closures. The reason is not
+ * style: the shape every sample uses is a Next.js Server Action that returns
+ * this straight to a Client Component (every `src/lib/actions/location.ts`
+ * under `location-service-samples/web`), and the RSC boundary
+ * serialises it. A function on this object is not serialisable and throws at
+ * the boundary, so "make getClientConfig return getToken" — which #36 proposed
+ * and this JSDoc used to promise two lines below — would break every Next.js
+ * consumer of the library.
+ *
+ * A caller that needs a token which REFRESHES wants one of:
+ * - `LocationServiceConnector`, which holds a live source internally (#36), or
+ * - `TokenProvider` directly, if it is managing its own lifecycle.
+ *
  * @example
  * // Auto-detect from environment
  * const config = await getClientConfig()
@@ -56,74 +193,15 @@ function getTokenProvider(apiUrl, clientId, clientSecret) {
  * // Or override specific values
  * const config = await getClientConfig({ apiUrl: 'https://custom.api.com' })
  *
- * // Use getToken() for automatic caching and refresh
- * const { token } = await config.getToken()
- * const connector = new LocationServiceConnector({ apiUrl: config.apiUrl, token })
+ * // The API rejected the token before its exp — revoked, or secret rotated
+ * const fresh = await getClientConfig({ forceRefresh: true })
  */
 async function getClientConfig(config = {}) {
-    log('[getClientConfig] Starting with config:', {
-        hasApiUrl: !!config.apiUrl,
-        hasClientId: !!config.clientId,
-    });
-    // Auto-detect from environment with fallbacks
-    const apiUrl = config.apiUrl ||
-        process.env.LOCATION_API_URL ||
-        process.env.LOCATION_SERVICE_API_URL;
-    const clientId = config.clientId ||
-        process.env.LOCATION_CLIENT_ID ||
-        process.env.LOCATION_SERVICE_CLIENT_ID;
-    const clientSecret = config.clientSecret ||
-        process.env.LOCATION_CLIENT_SECRET ||
-        process.env.LOCATION_SERVICE_CLIENT_SECRET;
-    log('[getClientConfig] Resolved config:', {
-        apiUrl,
-        clientId: clientId?.substring(0, 10) + '...',
-    });
-    // Validate required values
-    if (!apiUrl || !clientId || !clientSecret) {
-        console.error('[getClientConfig] Missing required configuration');
-        throw new Error('Missing required configuration. Set environment variables: ' +
-            'LOCATION_API_URL, LOCATION_CLIENT_ID, LOCATION_CLIENT_SECRET');
-    }
-    log('[getClientConfig] Getting TokenProvider instance');
-    const provider = getTokenProvider(apiUrl, clientId, clientSecret);
-    log('[getClientConfig] Fetching token');
-    let result;
-    try {
-        result = await provider.getToken();
-    }
-    catch (error) {
-        // The provider now rejects rather than resolving with success:false, and the
-        // rejection is typed — so a store outage (503) can be reported as a store
-        // outage instead of as bad credentials.
-        if (error instanceof LocationServiceException_js_1.LocationServiceException) {
-            if (error.isAuth) {
-                throw new LocationServiceException_js_1.LocationServiceException({
-                    code: 'InvalidCredentialsException',
-                    message: `Authentication failed for client ID "${clientId}". ` +
-                        `Verify LOCATION_CLIENT_ID and LOCATION_CLIENT_SECRET match your application in the developer portal.`,
-                    statusCode: error.statusCode,
-                    requestId: error.requestId,
-                    cause: error,
-                });
-            }
-            throw error;
-        }
-        throw error;
-    }
-    // TokenProvider rejects rather than returning a tokenless success, so this is
-    // unreachable in practice — it is here to keep the contract explicit at the
-    // type level rather than asserting non-null.
-    if (!result.token) {
-        throw new LocationServiceException_js_1.LocationServiceException({
-            code: 'InvalidCredentialsException',
-            message: 'Token provider returned no token',
-            details: { source: 'client' },
-        });
-    }
+    const source = serverTokenSource(config);
+    const result = await source.getToken(config.forceRefresh);
     log('[getClientConfig] Token fetched successfully, length:', result.token.length);
     return {
-        apiUrl,
+        apiUrl: source.apiUrl,
         token: result.token,
         expiresAt: result.expiresAt,
     };