@chaosity/location-client 0.5.1 → 0.7.0

package/dist/server/LocationServiceConnector.d.ts

@@ -1,15 +1,35 @@
-import type { RequestOptions } from '../transport/http';
-import type { AppConfigClaims } from '../utils/tokenClaims';
+import type { RequestOptions } from '../transport/http.js';
+import type { AppConfigClaims } from '../utils/tokenClaims.js';
 export interface ConnectorConfig {
+    /** Falls back to `LOCATION_API_URL` / `LOCATION_SERVICE_API_URL`. */
     apiUrl?: string;
+    /**
+     * A fixed token. Nothing can refresh it, so it dies at its own `exp` — pass
+     * `getToken` instead, or nothing at all, for a connector that keeps working.
+     */
     token?: string;
-    getToken?: () => Promise<{
-        token: string;
-    }>;
+    /**
+     * Where a token comes from. Called for every request, so this is what makes
+     * a long-lived connector survive expiry.
+     *
+     * `forceRefresh` is passed as `true` when the API has just rejected the token
+     * this returned — the signature is `TokenProvider.getToken`'s exactly, so
+     * `getToken: (f) => provider.getToken(f)` is a complete implementation.
+     */
+    getToken?: (forceRefresh?: boolean) => Promise<string | {
+        token?: string;
+    } | undefined>;
+    /** Falls back to `LOCATION_CLIENT_ID` / `LOCATION_SERVICE_CLIENT_ID`. */
+    clientId?: string;
+    /** Falls back to `LOCATION_CLIENT_SECRET` / `LOCATION_SERVICE_CLIENT_SECRET`. */
+    clientSecret?: string;
     /**
      * Sent as the `Origin` header on every request. The API requires an Origin it
      * recognises on every data request and answers 403 without one, so every
      * caller was setting it by hand on each `send`; this does it once.
+     *
+     * Falls back to `LOCATION_ORIGIN` / `LOCATION_SERVICE_ORIGIN`, so the
+     * zero-argument connector can be made to work from the environment alone.
      */
     origin?: string;
 }
@@ -23,19 +43,38 @@ export interface SendOptions extends RequestOptions {
  * 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' }))
  * ```
  */
 export declare class LocationServiceConnector {
-    private configPromise;
-    private origin?;
+    private readonly config;
+    private tokenSource?;
+    private readonly origin?;
     readonly serviceId: string;
     constructor(config?: ConnectorConfig);
-    /** One place that knows how a token is obtained, so nothing can drift. */
-    private resolveToken;
+    /**
+     * 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.
+     */
+    private source;
+    private buildSource;
     /**
      * This application's own configuration, as carried on the access token
      * (api#65) — bias precision, and the countries it is scoped to.
@@ -51,5 +90,15 @@ export declare class LocationServiceConnector {
      * case until one is configured in the portal.
      */
     getAppConfig(): Promise<AppConfigClaims>;
+    /**
+     * 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.
+     */
+    private effectiveOrigin;
     send<TInput, TOutput>(command: TInput, options?: SendOptions): Promise<TOutput>;
+    private dispatchWithRetry;
+    private dispatch;
 }

package/dist/server/LocationServiceConnector.js

@@ -1,11 +1,68 @@
 import debug from 'debug';
-import { LocationServiceException } from '../errors/LocationServiceException';
-import { resolveEndpoint } from '../transport/endpoints';
-import { requestJson } from '../transport/http';
-import { roundPositionFields } from '../utils/roundPosition';
-import { readAppConfigClaims } from '../utils/tokenClaims';
-import { getClientConfig } from './getClientConfig';
+import { LocationServiceException } from '../errors/LocationServiceException.js';
+import { resolveEndpoint } from '../transport/endpoints.js';
+import { isTokenRejected } from '../transport/errors.js';
+import { requestJson } from '../transport/http.js';
+import { roundPositionFields } from '../utils/roundPosition.js';
+import { readAppConfigClaims } from '../utils/tokenClaims.js';
+import { resolveApiUrl, serverTokenSource } from './getClientConfig.js';
 const log = debug('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'];
+/** 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))
+        return err;
+    if (err.code !== 'OriginNotAllowedException')
+        return err;
+    return new 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.
  *
@@ -13,28 +70,79 @@ const log = debug('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' }))
  * ```
  */
 export class LocationServiceConnector {
-    constructor(config) {
+    constructor(config = {}) {
         this.serviceId = 'Geo Places';
-        this.configPromise = config ? Promise.resolve(config) : 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 = 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
@@ -51,34 +159,105 @@ export class LocationServiceConnector {
      * case until one is configured in the portal.
      */
     async getAppConfig() {
-        return readAppConfigClaims(await this.resolveToken());
+        return 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({
-                code: 'InvalidCredentialsException',
-                message: 'No token available — check clientId/clientSecret configuration',
-                details: { source: 'client' },
-            });
-        }
+        const source = this.source();
         const cmd = command;
-        const endpoint = 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()}${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 noTokenAvailable();
+        try {
+            return await this.dispatch(url, token, cmd, options);
+        }
+        catch (err) {
+            if (!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, and
+            // a second billed one.
+            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 } = readAppConfigClaims(token);
         const input = 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 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 requestJson(url, { method: 'POST', headers, body: JSON.stringify(input) }, options);
     }
 }
+function requireApiUrl(explicit) {
+    const apiUrl = resolveApiUrl(explicit);
+    if (!apiUrl) {
+        throw new LocationServiceException({
+            code: 'ValidationException',
+            message: 'No API URL. Pass `apiUrl` to the LocationServiceConnector constructor ' +
+                'or set LOCATION_API_URL.',
+            details: { source: 'client' },
+        });
+    }
+    return apiUrl;
+}
+function noTokenAvailable() {
+    return new LocationServiceException({
+        code: 'InvalidCredentialsException',
+        message: 'No token available — check clientId/clientSecret configuration',
+        details: { source: 'client' },
+    });
+}

package/dist/server/getClientConfig.d.ts

@@ -1,12 +1,52 @@
-import type { ClientConfig } from '../types';
+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;
 }
 export interface ServerClientConfig extends ClientConfig {
     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 +66,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 +88,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>;