@chaosity/location-client 0.11.0 → 0.13.0

package/dist/cjs/client/GeoPlacesClient.d.ts

@@ -1,18 +1,22 @@
 import type { RequestOptions } from '../transport/http.js';
-import type { ClientConfig } from '../types/index.js';
+import type { ClientConfig, CommandOutput, CommandWithOutput } from '../types/index.js';
 import type { AppConfigClaims } from '../utils/tokenClaims.js';
 import type { VerifyAddressResponse } from './commands.js';
 export type SendOptions = RequestOptions;
 /**
  * GeoPlacesClient — AWS Location Service compatible client with custom auth.
  *
- * Uses AWS SDK command classes but replaces SigV4 with a Bearer token. All
- * request and response types are identical to AWS Location Service.
+ * Uses AWS SDK command classes but replaces SigV4 with a Bearer token. The
+ * request and response types are the AWS SDK's, except that the Places
+ * commands take neither `IntendedUse` nor `Key` (#40), and `VerifyAddressCommand`
+ * is this package's own (#54).
  *
  * Pass `getToken` in config for live refresh without recreating the client.
  */
 export declare class GeoPlacesClient {
     private clientConfig;
+    /** A token the API refused, and why, until the hold lapses (#38). */
+    private readonly refused;
     readonly config: {
         serviceId: string;
     };
@@ -36,6 +40,11 @@ export declare class GeoPlacesClient {
     getAppConfig(): AppConfigClaims;
     /** Prefer the getToken callback (live ref) over a static token string. */
     private currentToken;
+    /**
+     * `refreshToken`, held to the caller's signal and deadline (#62). A slow or
+     * stuck callback used to hold `send` past both.
+     */
+    private askRefreshToken;
     /**
      * A token to send, or a refusal — never `undefined`.
      *
@@ -44,10 +53,21 @@ export declare class GeoPlacesClient {
      */
     private ensureToken;
     /**
+     * Send a command, and resolve with its output:
+     * `await client.send(new AutocompleteCommand(…))` is an
+     * `AutocompleteCommandOutput`, with nothing to annotate (#68).
+     *
      * @param options `signal` to cancel, `timeoutMs` per attempt,
      *   `overallTimeoutMs` for the whole call, `retry: false` to disable the
      *   retry loop. Every failure throws LocationServiceException.
      */
+    send<C extends CommandWithOutput>(command: C, options?: SendOptions): Promise<CommandOutput<C>>;
+    /**
+     * The signature `send` had before it inferred its output (#68). It stays
+     * so that a call naming both type arguments, and a client typed by a
+     * structural `send<TInput, TOutput>` — as `@chaosity/address-form` types
+     * its client — still compile.
+     */
     send<TInput, TOutput>(command: TInput, options?: SendOptions): Promise<TOutput>;
     /**
      * Verify a PlaceId: `send(new VerifyAddressCommand({ PlaceId }))`, typed

package/dist/cjs/client/GeoPlacesClient.js

@@ -5,22 +5,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GeoPlacesClient = void 0;
 const debug_1 = __importDefault(require("debug"));
+const tokenHold_js_1 = require("../auth/tokenHold.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 tokenClaims_js_1 = require("../utils/tokenClaims.js");
 const commands_js_1 = require("./commands.js");
 const log = (0, debug_1.default)('location-client:api');
+/**
+ * What a hold is kept against when there was no token in hand to key it to.
+ * `ensureToken` treats an empty token as none, so no real token is this.
+ */
+const NO_TOKEN = '';
 /**
  * GeoPlacesClient — AWS Location Service compatible client with custom auth.
  *
- * Uses AWS SDK command classes but replaces SigV4 with a Bearer token. All
- * request and response types are identical to AWS Location Service.
+ * Uses AWS SDK command classes but replaces SigV4 with a Bearer token. The
+ * request and response types are the AWS SDK's, except that the Places
+ * commands take neither `IntendedUse` nor `Key` (#40), and `VerifyAddressCommand`
+ * is this package's own (#54).
  *
  * Pass `getToken` in config for live refresh without recreating the client.
  */
 class GeoPlacesClient {
     constructor(config) {
+        /** A token the API refused, and why, until the hold lapses (#38). */
+        this.refused = new tokenHold_js_1.TokenHold();
         this.clientConfig = config;
         this.config = { serviceId: 'Geo Places' };
     }
@@ -47,29 +57,48 @@ class GeoPlacesClient {
     currentToken() {
         return this.clientConfig.getToken?.() ?? this.clientConfig.token;
     }
+    /**
+     * `refreshToken`, held to the caller's signal and deadline (#62). A slow or
+     * stuck callback used to hold `send` past both.
+     */
+    askRefreshToken(call) {
+        const asked = this.clientConfig.refreshToken?.();
+        return asked ? (0, http_js_1.withinCall)(asked, call) : Promise.resolve(undefined);
+    }
     /**
      * A token to send, or a refusal — never `undefined`.
      *
      * `refreshToken` is asked only when there is nothing at all in hand, so a
      * client configured the ordinary way pays nothing for this.
      */
-    async ensureToken() {
-        // `||`, not `??`: an empty string is a token source with nothing to give,
-        // not a decision to send an empty one. With `??` it survived the coalesce,
-        // skipped `refreshToken`, and then failed the check two lines below — so
+    async ensureToken(call) {
+        // Truthiness, not `??`: an empty string is a token source with nothing to
+        // give, not a decision to send an empty one. With `??` it survived the
+        // coalesce, skipped `refreshToken`, and then failed the check below — so
         // `getToken: () => undefined` got the refresh ask and `getToken: () => ''`
         // did not, which is a distinction no caller means to draw.
-        const token = this.currentToken() || (await this.clientConfig.refreshToken?.());
+        const inHand = this.currentToken();
+        if (inHand)
+            return inHand;
+        // `refreshToken` refused a moment ago, and there is still nothing in hand:
+        // answer with that rather than ask it again on every send (#38). The hold
+        // is kept against "no token", so one arriving from `getToken` ends it.
+        const held = this.refused.check(NO_TOKEN)?.error;
+        if (held)
+            throw held;
+        let token;
+        try {
+            token = await this.askRefreshToken(call);
+        }
+        catch (refusal) {
+            this.refused.remember(refusal, NO_TOKEN);
+            throw refusal;
+        }
         if (!token) {
             throw (0, errors_js_1.noTokenAvailable)('the client has no token yet. Pass `token`, or a `getToken`/`refreshToken` that has one.');
         }
         return token;
     }
-    /**
-     * @param options `signal` to cancel, `timeoutMs` per attempt,
-     *   `overallTimeoutMs` for the whole call, `retry: false` to disable the
-     *   retry loop. Every failure throws LocationServiceException.
-     */
     async send(command, options) {
         const cmd = command;
         const url = `${this.clientConfig.apiUrl}${(0, endpoints_js_1.resolveEndpoint)(cmd)}`;
@@ -80,26 +109,15 @@ class GeoPlacesClient {
         // source has not produced one yet spent a whole round trip to learn
         // something it already knew. Ask the refresh source instead, and refuse if
         // there is still nothing.
-        const token = await this.ensureToken();
-        try {
-            return await this.dispatch(url, token, cmd, options);
-        }
-        catch (err) {
-            if (!(0, errors_js_1.isTokenRejected)(err))
-                throw err;
-            // One shot. `refreshToken` is the only way to actually obtain a new
-            // token here — `getToken` is synchronous and returns the one already in
-            // hand — but it is re-read as a fallback because a provider that
-            // refreshes in the background may have landed a new one while this
-            // request was in flight.
-            const fresh = (await this.clientConfig.refreshToken?.()) ?? this.currentToken();
-            // Nothing new to send. Repeating the request would fail identically — a
-            // second round trip for the same 401.
-            if (!fresh || fresh === token)
-                throw err;
-            log('401 — retrying %s once with a refreshed token', cmd.constructor?.name);
-            return await this.dispatch(url, fresh, cmd, options);
-        }
+        // The call's deadline starts here, before any wait for a token (#62).
+        const call = (0, http_js_1.startCall)(options);
+        const token = await this.ensureToken(call);
+        // One shot, through `sendRetryingOnce` like every 401 retry here (#38).
+        // `refreshToken` is the only way to actually obtain a new token here —
+        // `getToken` is synchronous and returns the one already in hand — but it
+        // is re-read as a fallback because a provider that refreshes in the
+        // background may have landed a new one while this request was in flight.
+        return (0, tokenHold_js_1.sendRetryingOnce)(this.refused, token, (t) => this.dispatch(url, t, cmd, call), async () => (await this.askRefreshToken(call)) ?? this.currentToken(), () => log('401 — retrying %s once with a refreshed token', cmd.constructor?.name));
     }
     /**
      * Verify a PlaceId: `send(new VerifyAddressCommand({ PlaceId }))`, typed

package/dist/cjs/client/commands.d.ts

@@ -125,9 +125,8 @@ export interface VerifyAddressCommandInput {
  * Japan, which may not be stored at all. Every other Places result is for
  * display.
  *
- * Keep the PlaceId you sent beside it. The answer's own `PlaceId` can differ,
- * and for a unit it does: the service fails that one on every Places route,
- * while the one you sent verifies again.
+ * Its `PlaceId` is the one sent, for a unit as for a building, so a stored
+ * verification can be verified, or looked up, again by its own `PlaceId`.
  */
 export type VerifyAddressResponse = Omit<GetPlaceResponse, 'PricingBucket'> & {
     /**

package/dist/cjs/errors/LocationServiceException.d.ts

@@ -12,9 +12,36 @@
  * caller hears of it; there is no check to make beforehand.
  */
 export declare const FEATURE_NOT_ENTITLED = "FeatureNotEntitledException";
+/**
+ * Every `code` the API sends (#38): its error contract, published at
+ * https://docs.chaosity.cloud/api/errors, plus the Amazon Location exception
+ * names it passes through from upstream.
+ *
+ * A few are worth knowing apart. `RateLimitExceededException` is the
+ * application's own throttle; `ThrottlingException` is Amazon Location
+ * throttling the service; `IpRateLimitExceededException` is the per-address
+ * limit in front of `/auth/token`. `ApplicationNotActiveException` (403) is an
+ * application that is new, suspended or off its plan.
+ * `TokenExpiredException` is in the contract but never sent: an expired token
+ * arrives as `UnauthorizedException`.
+ */
+export declare const API_ERROR_CODES: readonly ["AccessDeniedException", "ApplicationNotActiveException", "ClientException", "FeatureNotEntitledException", "ForbiddenException", "InternalException", "InternalServerException", "InvalidCredentialsException", "IpRateLimitExceededException", "NotAcceptableException", "NotFoundException", "OriginNotAllowedException", "RateLimitExceededException", "ResourceNotFoundException", "ServiceUnavailableException", "ThrottlingException", "TimeoutException", "TokenExpiredException", "UnauthorizedException", "UpstreamException", "ValidationException"];
+/**
+ * The codes only this package raises, for failures that never reached the
+ * API. It raises some of the API's codes too — `TimeoutException` for its own
+ * timeout, `InvalidCredentialsException` for a missing token — and those are
+ * in the list above.
+ */
+export declare const CLIENT_ERROR_CODES: readonly ["AbortedException", "NetworkException", "ServiceException", "UnknownCommandException"];
+export declare const LOCATION_SERVICE_ERROR_CODES: readonly ["AccessDeniedException", "ApplicationNotActiveException", "ClientException", "FeatureNotEntitledException", "ForbiddenException", "InternalException", "InternalServerException", "InvalidCredentialsException", "IpRateLimitExceededException", "NotAcceptableException", "NotFoundException", "OriginNotAllowedException", "RateLimitExceededException", "ResourceNotFoundException", "ServiceUnavailableException", "ThrottlingException", "TimeoutException", "TokenExpiredException", "UnauthorizedException", "UpstreamException", "ValidationException", "AbortedException", "NetworkException", "ServiceException", "UnknownCommandException"];
+/**
+ * A `LocationServiceException`'s `code`: one of these, or a code the API adds
+ * after this release, which arrives all the same.
+ */
+export type LocationServiceErrorCode = (typeof LOCATION_SERVICE_ERROR_CODES)[number];
 export interface LocationServiceExceptionOptions {
     message: string;
-    code: string;
+    code: LocationServiceErrorCode | (string & {});
     /** Absent for failures that never reached the server: network, timeout, abort. */
     statusCode?: number;
     requestId?: string;
@@ -32,7 +59,8 @@ export interface LocationServiceExceptionOptions {
  * rather than sniffing at `TypeError` vs `DOMException` vs a bare `Error`.
  */
 export declare class LocationServiceException extends Error {
-    readonly code: string;
+    /** See `LocationServiceErrorCode`: typed, and open to a code added later. */
+    readonly code: LocationServiceErrorCode | (string & {});
     readonly statusCode?: number;
     readonly requestId?: string;
     readonly details?: Record<string, unknown>;

package/dist/cjs/errors/LocationServiceException.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocationServiceException = exports.FEATURE_NOT_ENTITLED = void 0;
+exports.LocationServiceException = exports.LOCATION_SERVICE_ERROR_CODES = exports.CLIENT_ERROR_CODES = exports.API_ERROR_CODES = exports.FEATURE_NOT_ENTITLED = void 0;
 /**
  * The code of a 403 for an option the application's plan does not include
  * (#55): a map feature such as `satellite` or `terrain`, or rich place data.
@@ -15,6 +15,58 @@ exports.LocationServiceException = exports.FEATURE_NOT_ENTITLED = void 0;
  * caller hears of it; there is no check to make beforehand.
  */
 exports.FEATURE_NOT_ENTITLED = 'FeatureNotEntitledException';
+/**
+ * Every `code` the API sends (#38): its error contract, published at
+ * https://docs.chaosity.cloud/api/errors, plus the Amazon Location exception
+ * names it passes through from upstream.
+ *
+ * A few are worth knowing apart. `RateLimitExceededException` is the
+ * application's own throttle; `ThrottlingException` is Amazon Location
+ * throttling the service; `IpRateLimitExceededException` is the per-address
+ * limit in front of `/auth/token`. `ApplicationNotActiveException` (403) is an
+ * application that is new, suspended or off its plan.
+ * `TokenExpiredException` is in the contract but never sent: an expired token
+ * arrives as `UnauthorizedException`.
+ */
+exports.API_ERROR_CODES = [
+    'AccessDeniedException',
+    'ApplicationNotActiveException',
+    'ClientException',
+    'FeatureNotEntitledException',
+    'ForbiddenException',
+    'InternalException',
+    'InternalServerException',
+    'InvalidCredentialsException',
+    'IpRateLimitExceededException',
+    'NotAcceptableException',
+    'NotFoundException',
+    'OriginNotAllowedException',
+    'RateLimitExceededException',
+    'ResourceNotFoundException',
+    'ServiceUnavailableException',
+    'ThrottlingException',
+    'TimeoutException',
+    'TokenExpiredException',
+    'UnauthorizedException',
+    'UpstreamException',
+    'ValidationException',
+];
+/**
+ * The codes only this package raises, for failures that never reached the
+ * API. It raises some of the API's codes too — `TimeoutException` for its own
+ * timeout, `InvalidCredentialsException` for a missing token — and those are
+ * in the list above.
+ */
+exports.CLIENT_ERROR_CODES = [
+    'AbortedException',
+    'NetworkException',
+    'ServiceException',
+    'UnknownCommandException',
+];
+exports.LOCATION_SERVICE_ERROR_CODES = [
+    ...exports.API_ERROR_CODES,
+    ...exports.CLIENT_ERROR_CODES,
+];
 /**
  * The single error type this package throws.
  *

package/dist/cjs/index.d.ts

@@ -4,11 +4,10 @@ export { DEFAULT_MAX_ATTEMPTS, DEFAULT_OVERALL_TIMEOUT_MS, DEFAULT_TIMEOUT_MS, }
 export type { RequestOptions } from './transport/http.js';
 export { TOKEN_REFRESH_BUFFER_SECONDS, readTokenExpiry, } from './auth/tokenRefresh.js';
 export { FEATURE_NOT_ENTITLED, LocationServiceException, } from './errors/LocationServiceException.js';
-export type { LocationServiceExceptionOptions } from './errors/LocationServiceException.js';
-export * from '@aws-sdk/client-geo-places';
+export type { LocationServiceErrorCode, LocationServiceExceptionOptions, } from './errors/LocationServiceException.js';
+export * from './aws.js';
 export { AutocompleteCommand, GeocodeCommand, GetPlaceCommand, ReverseGeocodeCommand, SearchNearbyCommand, SearchTextCommand, SuggestCommand, VerifyAddressCommand, } from './client/commands.js';
 export type { AutocompleteCommandInput, AutocompleteRequest, GeocodeCommandInput, GeocodeRequest, GetPlaceCommandInput, GetPlaceRequest, NeverForwarded, ReverseGeocodeCommandInput, ReverseGeocodeRequest, SearchNearbyCommandInput, SearchNearbyRequest, SearchTextCommandInput, SearchTextRequest, SuggestCommandInput, SuggestRequest, VerifyAddressCommandInput, VerifyAddressResponse, } from './client/commands.js';
-export * from '@aws/amazon-location-utilities-datatypes';
 export { GeoPlaces } from './adapters/GeoPlaces.js';
 export type { GeoPlacesDetailOptions, GeoPlacesOptions, } from './adapters/GeoPlaces.js';
 export { createTransformRequest } from './maps/createTransformRequest.js';
@@ -17,10 +16,12 @@ export { POI_CATEGORIES, setAllPoiVisibility, setPoiVisibility, } from './maps/m
 export type { PoiCategory } from './maps/mapPoi.js';
 export { buildMapStyleUrl, fetchMapStyle } from './maps/mapStyle.js';
 export type { MapStyleOptions } from './maps/mapStyle.js';
+export { refreshTokenOnUnauthorized } from './maps/mapToken.js';
+export type { MapTokenSource, MapTokens, TokenRefreshMap, } from './maps/mapToken.js';
 export { buildStaticMapUrl, fetchStaticMap, staticMapAccept, } from './maps/staticMap.js';
 export type { StaticMapFileName, StaticMapOptions } from './maps/staticMap.js';
 export { BUILDINGS, COLOR_SCHEMES, CONTOUR_DENSITIES, LABEL_SIZES, MAP_FEATURE_MODES, MAP_STYLES, POI_DENSITIES, SCALE_BAR_UNITS, SPRITE_VARIANTS, STATIC_MAP_STYLES, STYLE_POI_CATEGORIES, TERRAINS, TRAFFIC_MODES, TRAVEL_MODES, } from './maps/mapEnums.js';
 export type { Buildings, ColorScheme, ContourDensity, LabelSize, MapFeatureMode, MapStyle, PoiDensity, ScaleBarUnit, SpriteVariant, StaticMapStyle, StylePoiCategory, Terrain, TrafficMode, TravelMode, } from './maps/mapEnums.js';
 export { transformRequest } from './maps/Utils.js';
-export type { ClientConfig, GeoPlacesCommand, MapLike } from './types/index.js';
+export type { ClientConfig, CommandOutput, CommandWithOutput, GeoPlacesCommand, MapLike, } from './types/index.js';
 export type { AppConfigClaims } from './utils/tokenClaims.js';

package/dist/cjs/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformRequest = exports.TRAVEL_MODES = exports.TRAFFIC_MODES = exports.TERRAINS = exports.STYLE_POI_CATEGORIES = exports.STATIC_MAP_STYLES = exports.SPRITE_VARIANTS = exports.SCALE_BAR_UNITS = exports.POI_DENSITIES = exports.MAP_STYLES = exports.MAP_FEATURE_MODES = exports.LABEL_SIZES = exports.CONTOUR_DENSITIES = exports.COLOR_SCHEMES = exports.BUILDINGS = exports.staticMapAccept = exports.fetchStaticMap = exports.buildStaticMapUrl = exports.fetchMapStyle = exports.buildMapStyleUrl = exports.setPoiVisibility = exports.setAllPoiVisibility = exports.POI_CATEGORIES = exports.applyMapLanguage = exports.createTransformRequest = exports.GeoPlaces = exports.VerifyAddressCommand = exports.SuggestCommand = exports.SearchTextCommand = exports.SearchNearbyCommand = exports.ReverseGeocodeCommand = exports.GetPlaceCommand = exports.GeocodeCommand = exports.AutocompleteCommand = exports.LocationServiceException = exports.FEATURE_NOT_ENTITLED = exports.readTokenExpiry = exports.TOKEN_REFRESH_BUFFER_SECONDS = exports.DEFAULT_TIMEOUT_MS = exports.DEFAULT_OVERALL_TIMEOUT_MS = exports.DEFAULT_MAX_ATTEMPTS = exports.GeoPlacesClient = void 0;
+exports.transformRequest = exports.TRAVEL_MODES = exports.TRAFFIC_MODES = exports.TERRAINS = exports.STYLE_POI_CATEGORIES = exports.STATIC_MAP_STYLES = exports.SPRITE_VARIANTS = exports.SCALE_BAR_UNITS = exports.POI_DENSITIES = exports.MAP_STYLES = exports.MAP_FEATURE_MODES = exports.LABEL_SIZES = exports.CONTOUR_DENSITIES = exports.COLOR_SCHEMES = exports.BUILDINGS = exports.staticMapAccept = exports.fetchStaticMap = exports.buildStaticMapUrl = exports.refreshTokenOnUnauthorized = exports.fetchMapStyle = exports.buildMapStyleUrl = exports.setPoiVisibility = exports.setAllPoiVisibility = exports.POI_CATEGORIES = exports.applyMapLanguage = exports.createTransformRequest = exports.GeoPlaces = exports.VerifyAddressCommand = exports.SuggestCommand = exports.SearchTextCommand = exports.SearchNearbyCommand = exports.ReverseGeocodeCommand = exports.GetPlaceCommand = exports.GeocodeCommand = exports.AutocompleteCommand = exports.LocationServiceException = exports.FEATURE_NOT_ENTITLED = exports.readTokenExpiry = exports.TOKEN_REFRESH_BUFFER_SECONDS = exports.DEFAULT_TIMEOUT_MS = exports.DEFAULT_OVERALL_TIMEOUT_MS = exports.DEFAULT_MAX_ATTEMPTS = exports.GeoPlacesClient = void 0;
 // Client (Custom - uses our auth instead of AWS SigV4)
 var GeoPlacesClient_js_1 = require("./client/GeoPlacesClient.js");
 Object.defineProperty(exports, "GeoPlacesClient", { enumerable: true, get: function () { return GeoPlacesClient_js_1.GeoPlacesClient; } });
@@ -31,11 +31,16 @@ Object.defineProperty(exports, "readTokenExpiry", { enumerable: true, get: funct
 var LocationServiceException_js_1 = require("./errors/LocationServiceException.js");
 Object.defineProperty(exports, "FEATURE_NOT_ENTITLED", { enumerable: true, get: function () { return LocationServiceException_js_1.FEATURE_NOT_ENTITLED; } });
 Object.defineProperty(exports, "LocationServiceException", { enumerable: true, get: function () { return LocationServiceException_js_1.LocationServiceException; } });
-// Re-export AWS SDK commands and types
-__exportStar(require("@aws-sdk/client-geo-places"), exports);
-// …except the seven Places commands and their inputs, which take neither
-// IntendedUse nor Key: the service strips both from every request (#40). A
-// named export wins over the `export *` above, as GeoPlacesClient's does.
+// The AWS SDK's commands and types, and AWS Location Utilities' converters
+// (#42): generated into ./aws.ts, values by name and types by `export type *`.
+// Not `export *` of the packages themselves, which kept ~93 KB of SDK in the
+// bundle of a consumer importing only a map helper — scripts/sdk-exports.mjs
+// says why. A name this file exports itself is left out of ./aws.ts.
+__exportStar(require("./aws.js"), exports);
+// The seven Places commands and their inputs are this package's own: they take
+// neither IntendedUse nor Key, which the service strips from every request
+// (#40). A named export wins over `export *`, as GeoPlacesClient's does, and
+// ./aws.ts leaves them out.
 // VerifyAddressCommand is this package's own: its route has no SDK command (#54).
 var commands_js_1 = require("./client/commands.js");
 Object.defineProperty(exports, "AutocompleteCommand", { enumerable: true, get: function () { return commands_js_1.AutocompleteCommand; } });
@@ -46,8 +51,6 @@ Object.defineProperty(exports, "SearchNearbyCommand", { enumerable: true, get: f
 Object.defineProperty(exports, "SearchTextCommand", { enumerable: true, get: function () { return commands_js_1.SearchTextCommand; } });
 Object.defineProperty(exports, "SuggestCommand", { enumerable: true, get: function () { return commands_js_1.SuggestCommand; } });
 Object.defineProperty(exports, "VerifyAddressCommand", { enumerable: true, get: function () { return commands_js_1.VerifyAddressCommand; } });
-// Re-export AWS Location Utilities (data type conversions)
-__exportStar(require("@aws/amazon-location-utilities-datatypes"), exports);
 // Adapters (Custom - for MapLibre integration)
 var GeoPlaces_js_1 = require("./adapters/GeoPlaces.js");
 Object.defineProperty(exports, "GeoPlaces", { enumerable: true, get: function () { return GeoPlaces_js_1.GeoPlaces; } });
@@ -63,6 +66,8 @@ Object.defineProperty(exports, "setPoiVisibility", { enumerable: true, get: func
 var mapStyle_js_1 = require("./maps/mapStyle.js");
 Object.defineProperty(exports, "buildMapStyleUrl", { enumerable: true, get: function () { return mapStyle_js_1.buildMapStyleUrl; } });
 Object.defineProperty(exports, "fetchMapStyle", { enumerable: true, get: function () { return mapStyle_js_1.fetchMapStyle; } });
+var mapToken_js_1 = require("./maps/mapToken.js");
+Object.defineProperty(exports, "refreshTokenOnUnauthorized", { enumerable: true, get: function () { return mapToken_js_1.refreshTokenOnUnauthorized; } });
 var staticMap_js_1 = require("./maps/staticMap.js");
 Object.defineProperty(exports, "buildStaticMapUrl", { enumerable: true, get: function () { return staticMap_js_1.buildStaticMapUrl; } });
 Object.defineProperty(exports, "fetchStaticMap", { enumerable: true, get: function () { return staticMap_js_1.fetchStaticMap; } });

package/dist/cjs/maps/createTransformRequest.d.ts

@@ -1,4 +1,29 @@
 import type { RequestTransformFunction } from 'maplibre-gl';
+/**
+ * Does this URL belong to our API?
+ *
+ * This decides who receives the customer's bearer token, and it used to be
+ * `url.startsWith(apiUrl)` — a string test standing in for a URL test. For
+ * `apiUrl = "https://api.example.com"`, the host `api.example.com.evil.test`
+ * is a prefix match, so a style referencing
+ * `https://api.example.com.evil.test/tiles/1/2/3` was handed
+ * `Authorization: Bearer <token>` and the token left the building (#34).
+ *
+ * That is reachable because a style descriptor is DATA: its `sprite`, `glyphs`
+ * and `sources` entries are URLs the style author chose, and MapLibre asks
+ * transformRequest about every one of them. Any style not wholly ours — a
+ * customer's own, or one edited through a tool — can name a host it likes.
+ *
+ * Compared as URLs instead, which also gets host case-folding, default ports
+ * (`https://api.test:443` === `https://api.test`) and userinfo right for free,
+ * and adds a path check so a shared host serving another tenant under a
+ * different base path is not "ours" either.
+ *
+ * Fails CLOSED: anything that will not parse gets no token. The only way to
+ * reach that is a relative `apiUrl` in a runtime with no `location` to resolve
+ * it against — i.e. not a browser, which is the only place MapLibre runs.
+ */
+export declare function isOurApi(url: string, apiUrl: string): boolean;
 /**
  * Creates a transformRequest function for MapLibre that adds authentication
  * and proper Accept headers for AWS Location Service API requests.

package/dist/cjs/maps/createTransformRequest.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isOurApi = isOurApi;
 exports.createTransformRequest = createTransformRequest;
 /**
  * Does this URL belong to our API?

package/dist/cjs/maps/mapPoi.d.ts

@@ -1,20 +1,25 @@
 import type { Map } from 'maplibre-gl';
 /**
  * Mapping of POI category names to their MapLibre layer IDs in AWS GeoMaps tiles.
- * Layer IDs are stable across Standard, Monochrome, and Hybrid map styles.
+ *
+ * Standard and Hybrid carry the same sixteen `poi*` layers; Monochrome carries
+ * only the three park layers, and Satellite none. A category whose layers a
+ * style does not carry is skipped. AWS publishes no list of these ids, so
+ * `test/map-poi-layers.test.ts` holds this map to each style's layers as the
+ * service served them: every `poi*` layer in exactly one category (#33).
  */
 export declare const POI_CATEGORIES: {
     readonly food_drink: readonly ["poi_100_food_drink"];
     readonly entertainment: readonly ["poi_200_going_out_entertainment"];
     readonly sights: readonly ["poi_300_sights_museums"];
-    readonly transit: readonly ["poi_400_transit"];
+    readonly transit: readonly ["poi_400_transit", "poi_400_transit_small"];
     readonly accommodations: readonly ["poi_500_accommodations"];
     readonly leisure: readonly ["poi_550_leisure_outdoor"];
     readonly shopping: readonly ["poi_600_shopping"];
-    readonly business: readonly ["poi_700_business_services"];
-    readonly facilities: readonly ["poi_800_facilities"];
+    readonly business: readonly ["poi_700_business_services", "poi_700_business_services_generic"];
+    readonly facilities: readonly ["poi_800_facilities", "poi_800_facilities_generic"];
     readonly areas: readonly ["poi_900_areas_buildings"];
-    readonly parks: readonly ["poi_landuse_park", "poi_landuse_public_complex"];
+    readonly parks: readonly ["poi_landuse_park", "poi_landuse_park_lowzoom", "poi_landuse_public_complex"];
 };
 export type PoiCategory = keyof typeof POI_CATEGORIES;
 /**

package/dist/cjs/maps/mapPoi.js

@@ -5,20 +5,29 @@ exports.setPoiVisibility = setPoiVisibility;
 exports.setAllPoiVisibility = setAllPoiVisibility;
 /**
  * Mapping of POI category names to their MapLibre layer IDs in AWS GeoMaps tiles.
- * Layer IDs are stable across Standard, Monochrome, and Hybrid map styles.
+ *
+ * Standard and Hybrid carry the same sixteen `poi*` layers; Monochrome carries
+ * only the three park layers, and Satellite none. A category whose layers a
+ * style does not carry is skipped. AWS publishes no list of these ids, so
+ * `test/map-poi-layers.test.ts` holds this map to each style's layers as the
+ * service served them: every `poi*` layer in exactly one category (#33).
  */
 exports.POI_CATEGORIES = {
     food_drink: ['poi_100_food_drink'],
     entertainment: ['poi_200_going_out_entertainment'],
     sights: ['poi_300_sights_museums'],
-    transit: ['poi_400_transit'],
+    transit: ['poi_400_transit', 'poi_400_transit_small'],
     accommodations: ['poi_500_accommodations'],
     leisure: ['poi_550_leisure_outdoor'],
     shopping: ['poi_600_shopping'],
-    business: ['poi_700_business_services'],
-    facilities: ['poi_800_facilities'],
+    business: ['poi_700_business_services', 'poi_700_business_services_generic'],
+    facilities: ['poi_800_facilities', 'poi_800_facilities_generic'],
     areas: ['poi_900_areas_buildings'],
-    parks: ['poi_landuse_park', 'poi_landuse_public_complex'],
+    parks: [
+        'poi_landuse_park',
+        'poi_landuse_park_lowzoom',
+        'poi_landuse_public_complex',
+    ],
 };
 /**
  * Set the visibility of one or more POI categories on the map.

package/dist/cjs/maps/mapStyle.d.ts

@@ -1,6 +1,7 @@
 import type { StyleSpecification } from 'maplibre-gl';
 import type { RequestOptions } from '../transport/http.js';
 import type { Buildings, ColorScheme, ContourDensity, MapStyle, PoiDensity, StylePoiCategory, Terrain, TrafficMode, TravelMode } from './mapEnums.js';
+import type { MapTokenSource } from './mapToken.js';
 /**
  * Options for building an AWS Location Service map style URL.
  * All parameters map directly to query parameters supported by the style descriptor endpoint.
@@ -137,10 +138,16 @@ export declare function buildMapStyleUrl(apiUrl: string, mapStyle: MapStyle, opt
  * `event.error.status` is 403, and `event.error.body` is a `Blob` holding the
  * same `{ message, code }` JSON.
  *
+ * A REFUSED TOKEN. Given `{ getToken, refreshToken }` in place of a bare
+ * `getToken`, a 401 asks `refreshToken` once and sends again when it brings a
+ * different token, within the same `signal` and `overallTimeoutMs` (#72). A
+ * 403 is never retried: a new token cannot change it.
+ *
  * @param apiUrl - Base URL of the Location Service API
  * @param mapStyle - Map style name: 'Standard' or 'Monochrome', or 'Satellite'
  *   or 'Hybrid', which need the `satellite` plan feature (see `MAP_STYLES`)
- * @param getToken - Callback returning the current auth token
+ * @param tokens - Callback returning the current auth token, or
+ *   `{ getToken, refreshToken }` to recover from a refused one
  * @param options - Style options; `language` is applied to the descriptor, all
  *   others become URL params. Those tagged `@planFeature` need that feature of
  *   the application's plan
@@ -151,6 +158,6 @@ export declare function buildMapStyleUrl(apiUrl: string, mapStyle: MapStyle, opt
  * const style = await fetchMapStyle(API_URL, 'Standard', getToken, { colorScheme: 'Dark', language: 'fr' })
  * const map = new maplibregl.Map({ style, transformRequest: createTransformRequest(API_URL, getToken) })
  */
-export declare function fetchMapStyle(apiUrl: string, mapStyle: MapStyle, getToken: () => string | undefined, options?: MapStyleOptions & {
+export declare function fetchMapStyle(apiUrl: string, mapStyle: MapStyle, tokens: MapTokenSource, options?: MapStyleOptions & {
     language?: string;
 }, request?: RequestOptions): Promise<StyleSpecification>;

package/dist/cjs/maps/mapStyle.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildMapStyleUrl = buildMapStyleUrl;
 exports.fetchMapStyle = fetchMapStyle;
-const errors_js_1 = require("../transport/errors.js");
 const http_js_1 = require("../transport/http.js");
 const mapLanguage_js_1 = require("./mapLanguage.js");
+const mapToken_js_1 = require("./mapToken.js");
 /**
  * Build a map style descriptor URL for the Location Service API.
  *
@@ -67,10 +67,16 @@ function buildMapStyleUrl(apiUrl, mapStyle, options = {}) {
  * `event.error.status` is 403, and `event.error.body` is a `Blob` holding the
  * same `{ message, code }` JSON.
  *
+ * A REFUSED TOKEN. Given `{ getToken, refreshToken }` in place of a bare
+ * `getToken`, a 401 asks `refreshToken` once and sends again when it brings a
+ * different token, within the same `signal` and `overallTimeoutMs` (#72). A
+ * 403 is never retried: a new token cannot change it.
+ *
  * @param apiUrl - Base URL of the Location Service API
  * @param mapStyle - Map style name: 'Standard' or 'Monochrome', or 'Satellite'
  *   or 'Hybrid', which need the `satellite` plan feature (see `MAP_STYLES`)
- * @param getToken - Callback returning the current auth token
+ * @param tokens - Callback returning the current auth token, or
+ *   `{ getToken, refreshToken }` to recover from a refused one
  * @param options - Style options; `language` is applied to the descriptor, all
  *   others become URL params. Those tagged `@planFeature` need that feature of
  *   the application's plan
@@ -81,16 +87,10 @@ function buildMapStyleUrl(apiUrl, mapStyle, options = {}) {
  * const style = await fetchMapStyle(API_URL, 'Standard', getToken, { colorScheme: 'Dark', language: 'fr' })
  * const map = new maplibregl.Map({ style, transformRequest: createTransformRequest(API_URL, getToken) })
  */
-async function fetchMapStyle(apiUrl, mapStyle, getToken, options = {}, request = {}) {
+async function fetchMapStyle(apiUrl, mapStyle, tokens, options = {}, request = {}) {
     const { language, ...styleOptions } = options;
     const url = buildMapStyleUrl(apiUrl, mapStyle, styleOptions);
-    const token = getToken();
-    // `Bearer undefined` used to go out here, and came back as a 401 the caller
-    // had to work backwards from — a whole round trip for a request that was
-    // never going to succeed (#37).
-    if (!token) {
-        throw (0, errors_js_1.noTokenAvailable)('getToken() returned nothing, so no style request was sent. Check the token provider has finished initialising.');
-    }
+    const call = (0, http_js_1.startCall)(request);
     // Through the shared transport, not a bare fetch: this gets the same
     // per-attempt timeout, overall budget, cancellation and retry as every other
     // call in the package, and the same error type on the way out. It also keeps
@@ -104,12 +104,16 @@ async function fetchMapStyle(apiUrl, mapStyle, getToken, options = {}, request =
     // This used to throw `Failed to fetch map style: 400`, discarding all of it
     // two lines before anyone could read it — the same defect #89 fixed in the
     // API, one layer up.
-    const style = await (0, http_js_1.requestJson)(url, {
+    //
+    // `Bearer undefined` used to go out here, and came back as a 401 the caller
+    // had to work backwards from — a whole round trip for a request that was
+    // never going to succeed (#37). `sendWithTokenRefresh` refuses first.
+    const style = await (0, mapToken_js_1.sendWithTokenRefresh)(tokens, 'getToken() returned nothing, so no style request was sent. Check the token provider has finished initialising.', call, (token) => (0, http_js_1.requestJson)(url, {
         headers: {
             Authorization: `Bearer ${token}`,
             Accept: 'application/json',
         },
-    }, request);
+    }, call));
     if (language) {
         applyLanguageToDescriptor(style, language);
     }