@basemaps/lambda-tiler 6.34.0 → 6.35.0

package/dist/node_modules/.package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.34.0",
+  "version": "6.35.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

package/dist/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.34.0",
+  "version": "6.35.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@basemaps/lambda-tiler",
-      "version": "6.34.0",
+      "version": "6.35.0",
       "license": "MIT",
       "dependencies": {
         "sharp": "0.30.7"

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.34.0",
+  "version": "6.35.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.34.0",
+  "version": "6.35.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,17 +22,16 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^6.34.0",
+    "@basemaps/config": "^6.35.0",
     "@basemaps/geo": "^6.32.1",
-    "@basemaps/lambda": "^6.7.0",
-    "@basemaps/shared": "^6.34.0",
-    "@basemaps/tiler": "^6.32.1",
-    "@basemaps/tiler-sharp": "^6.32.1",
-    "@chunkd/fs": "^8.4.0",
+    "@basemaps/shared": "^6.35.0",
+    "@basemaps/tiler": "^6.35.0",
+    "@basemaps/tiler-sharp": "^6.35.0",
+    "@chunkd/fs": "^8.5.1",
     "@cogeotiff/core": "^7.0.0",
     "@cotar/core": "^5.4.0",
     "@linzjs/geojson": "^6.32.1",
-    "@linzjs/lambda": "^3.2.1",
+    "@linzjs/lambda": "^4.0.0",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.1.0",
     "pixelmatch": "^5.1.0",
@@ -59,5 +58,5 @@
     "@types/sharp": "^0.30.3",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "1685fa12be66df74bc64d7f76b7355390980a43f"
+  "gitHead": "dcebd7149ab318ea979b5d1ba34a9f82fc41b935"
 }

package/src/__tests__/config.data.ts

@@ -1,5 +1,16 @@
-import { ConfigImagery, ConfigProvider, ConfigTileSetRaster, ConfigTileSetVector, TileSetType } from '@basemaps/config';
+import {
+  base58,
+  BaseConfig,
+  ConfigImagery,
+  ConfigProvider,
+  ConfigProviderMemory,
+  ConfigTileSetRaster,
+  ConfigTileSetVector,
+  TileSetType,
+} from '@basemaps/config';
 import { ImageFormat, VectorFormat } from '@basemaps/geo';
+import { fsa } from '@basemaps/shared';
+import { FsMemory } from '../routes/__tests__/memory.fs.js';
 
 export const TileSetAerial: ConfigTileSetRaster = {
   id: 'ts_aerial',
@@ -117,4 +128,17 @@ export class FakeData {
 
     return tileSet;
   }
+
+  static bundle(configs: BaseConfig[]): string {
+    const cfg = new ConfigProviderMemory();
+    for (const rec of configs) cfg.put(rec);
+    const output = cfg.toJson();
+    const fsMemory = new FsMemory();
+
+    const configPath = `memory://linz-basemaps/${output.hash}.json`;
+    fsMemory.files.set(configPath, Buffer.from(JSON.stringify(output)));
+    fsa.register(configPath, fsMemory);
+
+    return base58.encode(Buffer.from(configPath));
+  }
 }

package/src/__tests__/tile.style.json.test.ts

@@ -55,7 +55,7 @@ o.spec('TileStyleJson', () => {
 
   o('should not destroy the original configuration', () => {
     const apiKey = 'abc123';
-    const converted = convertStyleJson(baseStyleJson, apiKey);
+    const converted = convertStyleJson(baseStyleJson, apiKey, null);
 
     o(converted.sources.vector).deepEquals({
       type: 'vector',
@@ -68,7 +68,7 @@ o.spec('TileStyleJson', () => {
 
     o(JSON.stringify(baseStyleJson).includes(apiKey)).equals(false);
 
-    const convertedB = convertStyleJson(baseStyleJson, '0x1234');
+    const convertedB = convertStyleJson(baseStyleJson, '0x1234', null);
     o(convertedB.sources.vector).deepEquals({
       type: 'vector',
       url: 'https://tiles.test/v1/tiles/topographic/EPSG:3857/tile.json?api=0x1234',
@@ -85,11 +85,27 @@ o.spec('TileStyleJson', () => {
 
   o('should convert relative glyphs and sprites', () => {
     const apiKey = '0x9f9f';
-    const converted = convertStyleJson(baseStyleJson, apiKey);
+    const converted = convertStyleJson(baseStyleJson, apiKey, null);
     o(converted.sprite).equals('https://tiles.test/v1/sprites');
     o(converted.glyphs).equals('https://tiles.test/v1/glyphs');
 
     o(JSON.stringify(baseStyleJson).includes(apiKey)).equals(false);
     o(JSON.stringify(baseStyleJson).includes('?api=')).equals(false);
   });
+
+  o('should convert with config', () => {
+    const apiKey = '0x9f9f';
+    const converted = convertStyleJson(baseStyleJson, apiKey, 'config.json');
+    o(converted.sprite).equals('https://tiles.test/v1/sprites?config=config.json');
+    o(converted.glyphs).equals('https://tiles.test/v1/glyphs?config=config.json');
+
+    o(converted.sources.vector).deepEquals({
+      type: 'vector',
+      url: 'https://tiles.test/v1/tiles/topographic/EPSG:3857/tile.json?api=0x9f9f&config=config.json',
+    });
+    o(converted.sources.raster).deepEquals({
+      type: 'raster',
+      tiles: ['https://tiles.test/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.webp?api=0x9f9f&config=config.json'],
+    });
+  });
 });

package/src/__tests__/wmts.capability.test.ts

@@ -41,6 +41,27 @@ o.spec('WmtsCapabilities', () => {
     );
   });
 
+  o('should include config location', () => {
+    const wmts = new WmtsCapabilities({
+      httpBase: 'https://basemaps.test',
+      provider: Provider,
+      tileMatrix: [GoogleTms],
+      tileSet: TileSetAerial,
+      imagery: allImagery,
+      apiKey,
+      config: 's3://linz-basemaps/config.json',
+      formats: [ImageFormat.Avif],
+      isIndividualLayers: false,
+    }).toVNode();
+
+    const urls = tags(wmts, 'ResourceURL');
+    o(urls.length).equals(1);
+    o(urls[0].attrs.format).equals('image/avif');
+    o(urls[0].attrs.template).equals(
+      'https://basemaps.test/v1/tiles/aerial/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.avif?api=secret1234&config=s3%3A%2F%2Flinz-basemaps%2Fconfig.json',
+    );
+  });
+
   o('should be seting encoding to utf-8', () => {
     const xml = new WmtsCapabilities({
       httpBase: 'https://basemaps.test',

package/src/arcgis/__tests__/arcgis.style.json.test.ts

@@ -1,33 +1,40 @@
-import { Config, StyleJson } from '@basemaps/config';
+import { BaseConfig, ConfigProviderMemory, StyleJson } from '@basemaps/config';
 import { Env } from '@basemaps/shared';
 import o from 'ospec';
 import { createSandbox } from 'sinon';
 import { handler } from '../../index.js';
+import { ConfigLoader } from '../../util/config.loader.js';
 import { FakeData } from '../../__tests__/config.data.js';
 import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
 
-o.spec('v1/arcgis/rest/services/', () => {
+o.spec('arcgis/stylejson', () => {
   const host = 'https://tiles.test';
   const sandbox = createSandbox();
+  const config = new ConfigProviderMemory();
 
   o.before(() => {
     process.env[Env.PublicUrlBase] = host;
   });
-  o.afterEach(() => sandbox.restore());
+
+  o.beforeEach(() => {
+    sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
+    config.objects.clear();
+  });
+
+  o.afterEach(() => {
+    sandbox.restore();
+  });
+
   o('should not found tile set', async () => {
     const request = mockRequest('/v1/arcgis/rest/services/topographic/VectorTileServer/root.json', 'get', Api.header);
 
-    sandbox.stub(Config.TileSet, 'get').resolves(null);
-
     const res = await handler.router.handle(request);
     o(res.status).equals(404);
   });
 
   o('should not found style', async () => {
     const request = mockRequest('/v1/arcgis/rest/services/topographic/VectorTileServer/root.json', 'get', Api.header);
-
-    sandbox.stub(Config.TileSet, 'get').resolves(FakeData.tileSetVector('topographic'));
-    sandbox.stub(Config.Style, 'get').resolves(null);
+    config.put(FakeData.tileSetVector('topographic'));
 
     const res = await handler.router.handle(request);
     o(res.status).equals(404);
@@ -87,8 +94,8 @@ o.spec('v1/arcgis/rest/services/', () => {
   o('should serve style json and remove the raster source and layers, then replace the vector url', async () => {
     const request = mockRequest('/v1/arcgis/rest/services/topographic/VectorTileServer/root.json', 'get', Api.header);
 
-    sandbox.stub(Config.TileSet, 'get').resolves(FakeData.tileSetVector('topographic'));
-    sandbox.stub(Config.Style, 'get').resolves(fakeRecord as any);
+    config.put(FakeData.tileSetVector('topographic'));
+    config.put(fakeRecord);
 
     const res = await handler.router.handle(request);
     o(res.status).equals(200);
@@ -112,8 +119,8 @@ o.spec('v1/arcgis/rest/services/', () => {
   o('should not found for raster tileset', async () => {
     const request = mockRequest('/v1/arcgis/rest/services/raster/VectorTileServer/root.json', 'get', Api.header);
 
-    sandbox.stub(Config.TileSet, 'get').resolves(FakeData.tileSetRaster('raster'));
-    sandbox.stub(Config.Style, 'get').resolves(fakeRecord as any);
+    config.put(FakeData.tileSetRaster('raster'));
+    config.put(fakeRecord);
 
     const res = await handler.router.handle(request);
     o(res.status).equals(404);
@@ -126,11 +133,8 @@ o.spec('v1/arcgis/rest/services/', () => {
       Api.header,
     );
 
-    sandbox.stub(Config.TileSet, 'get').resolves(FakeData.tileSetVector('topographic'));
-    sandbox
-      .stub(Config.Style, 'get')
-      .withArgs('st_topolite')
-      .resolves(fakeRecord as any);
+    config.put({ id: 'st_topolite', name: 'topographic', style: fakeStyle } as BaseConfig);
+    config.put(FakeData.tileSetVector('topographic'));
 
     const res = await handler.router.handle(request);
     o(res.status).equals(200);

package/src/arcgis/__tests__/vector.tiler.server.test.ts

@@ -1,31 +1,40 @@
-import { Config } from '@basemaps/config';
+import { ConfigProviderMemory } from '@basemaps/config';
 import { Env } from '@basemaps/shared';
 import o from 'ospec';
 import { createSandbox } from 'sinon';
 import { handler } from '../../index.js';
+import { ConfigLoader } from '../../util/config.loader.js';
 import { FakeData } from '../../__tests__/config.data.js';
 import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
 
-o.spec('v1/arcgis/rest/services/', () => {
+o.spec('arcgis/VectorTileServer', () => {
   const host = 'https://tiles.test';
   const sandbox = createSandbox();
+  const config = new ConfigProviderMemory();
 
   o.before(() => {
     process.env[Env.PublicUrlBase] = host;
   });
-  o.afterEach(() => sandbox.restore());
+
+  o.beforeEach(() => {
+    sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
+    config.objects.clear();
+  });
+
+  o.afterEach(() => {
+    sandbox.restore();
+  });
+
   o('should not found tile set', async () => {
     const request = mockUrlRequest('/v1/arcgis/rest/services/topographic/VectorTileServer', 'f=json', Api.header);
 
-    sandbox.stub(Config.TileSet, 'get').resolves(null);
-
     const res = await handler.router.handle(request);
     o(res.status).equals(404);
   });
   o('should return the vector tile server', async () => {
     const request = mockUrlRequest('/v1/arcgis/rest/services/topographic/VectorTileServer', 'f=json', Api.header);
 
-    sandbox.stub(Config.TileSet, 'get').resolves(FakeData.tileSetVector('topographic'));
+    config.put(FakeData.tileSetVector('topographic'));
 
     const res = await handler.router.handle(request);
     o(res.status).equals(200);
@@ -39,7 +48,7 @@ o.spec('v1/arcgis/rest/services/', () => {
   o('should not return with no f=json query', async () => {
     const request = mockRequest('/v1/arcgis/rest/services/topographic/VectorTileServer', 'get', Api.header);
 
-    sandbox.stub(Config.TileSet, 'get').resolves(FakeData.tileSetVector('topographic'));
+    config.put(FakeData.tileSetVector('topographic'));
 
     const res = await handler.router.handle(request);
     o(res.status).equals(404);
@@ -52,7 +61,7 @@ o.spec('v1/arcgis/rest/services/', () => {
       'POST',
     );
 
-    sandbox.stub(Config.TileSet, 'get').resolves(FakeData.tileSetVector('topographic'));
+    config.put(FakeData.tileSetVector('topographic'));
 
     const res = await handler.router.handle(request);
     o(res.status).equals(200);

package/src/arcgis/arcgis.style.json.ts

@@ -1,7 +1,8 @@
-import { Config, Sources, StyleJson, TileSetType } from '@basemaps/config';
+import { Sources, StyleJson, TileSetType } from '@basemaps/config';
 import { Env, fsa } from '@basemaps/shared';
 import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { convertRelativeUrl } from '../routes/tile.style.json.js';
+import { ConfigLoader } from '../util/config.loader.js';
 import { Etag } from '../util/etag.js';
 import { NotFound, NotModified } from '../util/response.js';
 import { Validate } from '../util/validate.js';
@@ -54,15 +55,16 @@ function convertStyleJson(tileSet: string, style: StyleJson, apiKey: string): St
 
 export async function arcgisStyleJsonGet(req: LambdaHttpRequest<StyleGet>): Promise<LambdaHttpResponse> {
   const apiKey = Validate.apiKey(req);
-  const tileSet = await Config.TileSet.get(Config.TileSet.id(req.params.tileSet));
+  const config = await ConfigLoader.load(req);
+  const tileSet = await config.TileSet.get(config.TileSet.id(req.params.tileSet));
   if (tileSet?.type !== TileSetType.Vector) return NotFound();
 
   const style = req.query.get('style');
   const styleName = style ? style : 'topographic'; // Defalut to topographic style
 
   // Get style Config from db
-  const dbId = Config.Style.id(styleName);
-  const styleConfig = await Config.Style.get(dbId);
+  const dbId = config.Style.id(styleName);
+  const styleConfig = await config.Style.get(dbId);
   if (styleConfig == null) return NotFound();
 
   // Prepare sources and add linz source

package/src/arcgis/vector.tile.server.ts

@@ -1,7 +1,8 @@
-import { Config, TileSetType } from '@basemaps/config';
+import { TileSetType } from '@basemaps/config';
 import { GoogleTms } from '@basemaps/geo';
 import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { convertRelativeUrl } from '../routes/tile.style.json.js';
+import { ConfigLoader } from '../util/config.loader.js';
 import { NotFound } from '../util/response.js';
 import { Validate } from '../util/validate.js';
 
@@ -16,7 +17,9 @@ export interface VectorTileServer {
 }
 
 export async function arcgisTileServerGet(req: LambdaHttpRequest<VectorTileServer>): Promise<LambdaHttpResponse> {
-  const tileSet = await Config.TileSet.get(Config.TileSet.id(req.params.tileSet));
+  const config = await ConfigLoader.load(req);
+
+  const tileSet = await config.TileSet.get(config.TileSet.id(req.params.tileSet));
   if (tileSet?.type !== TileSetType.Vector) return NotFound();
   const apiKey = Validate.apiKey(req);
   const f = req.query.get('f');

package/src/index.ts

@@ -1,9 +1,10 @@
-import { Env, LogConfig } from '@basemaps/shared';
+import { LogConfig } from '@basemaps/shared';
 import { LambdaHttpResponse, lf } from '@linzjs/lambda';
 import { arcgisInfoGet } from './arcgis/arcgis.info.js';
 import { arcgisStyleJsonGet } from './arcgis/arcgis.style.json.js';
 import { arcgisTileServerGet } from './arcgis/vector.tile.server.js';
 import { tileAttributionGet } from './routes/attribution.js';
+import { configImageryGet, configTileSetGet } from './routes/config.js';
 import { fontGet, fontList } from './routes/fonts.js';
 import { healthGet } from './routes/health.js';
 import { imageryGet } from './routes/imagery.js';
@@ -14,29 +15,23 @@ import { styleJsonGet } from './routes/tile.style.json.js';
 import { wmtsCapabilitiesGet } from './routes/tile.wmts.js';
 import { tileXyzGet } from './routes/tile.xyz.js';
 import { versionGet } from './routes/version.js';
-import { assetProvider } from './util/assets.provider.js';
 import { NotFound, OkResponse } from './util/response.js';
 import { CoSources } from './util/source.cache.js';
 import { St } from './util/source.tracer.js';
 
 export const handler = lf.http(LogConfig.get());
 
+/** If the request takes too long, respond with a 408 timeout when there is approx 1 second remaining */
+handler.router.timeoutEarlyMs = 1_000;
+
 handler.router.hook('request', (req) => {
   req.set('name', 'LambdaTiler');
 
-  // Set the asset location for asset provider
-  const assetLocation = Env.get(Env.AssetLocation);
-  assetProvider.set(assetLocation);
-
   // Reset the request tracing before every request
   St.reset();
 });
 
-let totalRequests = 0;
 handler.router.hook('response', (req, res) => {
-  totalRequests++;
-  req.set('requestsTotal', totalRequests); // Number of requests served by this lambda
-
   if (St.requests.length > 0) {
     // TODO this could be relaxed to every say 5% of requests if logging gets too verbose.
     req.set('requests', St.requests.slice(0, 100)); // limit to 100 requests (some tiles need 100s of requests)
@@ -76,6 +71,10 @@ handler.router.get('/v1/version', versionGet);
 // Image Metadata
 handler.router.get('/v1/imagery/:imageryId/:fileName', imageryGet);
 
+// Config
+handler.router.get('/v1/config/:tileSet.json', configTileSetGet);
+handler.router.get('/v1/config/:tileSet/:imageryId.json', configImageryGet);
+
 // Sprites
 handler.router.get('/v1/sprites/:spriteName', spriteGet);
 

package/src/routes/__tests__/attribution.test.ts

@@ -1,11 +1,12 @@
 import { Attribution } from '@basemaps/attribution';
-import { Config, ConfigProviderMemory } from '@basemaps/config';
+import { ConfigProviderMemory } from '@basemaps/config';
 import { Nztm2000QuadTms } from '@basemaps/geo';
 import { LogConfig } from '@basemaps/shared';
 import { HttpHeader } from '@linzjs/lambda';
 import o from 'ospec';
 import sinon from 'sinon';
 import { handler } from '../../index.js';
+import { ConfigLoader } from '../../util/config.loader.js';
 import { FakeData, Imagery2193, Imagery3857, Provider, TileSetAerial } from '../../__tests__/config.data.js';
 import { mockUrlRequest } from '../../__tests__/xyz.util.js';
 
@@ -283,7 +284,8 @@ o.spec('/v1/attribution', () => {
 
   o.beforeEach(() => {
     LogConfig.get().level = 'silent';
-    Config.setConfigProvider(config);
+    sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
+
     config.objects.clear();
 
     config.put(TileSetAerial);

package/src/routes/__tests__/fonts.test.ts

@@ -1,9 +1,11 @@
-import { Env } from '@basemaps/shared';
+import { base58, ConfigProviderMemory } from '@basemaps/config';
+import { Env, getDefaultConfig } from '@basemaps/shared';
 import { fsa } from '@chunkd/fs';
 import o from 'ospec';
 import { handler } from '../../index.js';
-import { assetProvider } from '../../util/assets.provider.js';
-import { mockRequest } from '../../__tests__/xyz.util.js';
+import { CachedConfig } from '../../util/config.cache.js';
+import { CoSources } from '../../util/source.cache.js';
+import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
 import { fontList } from '../fonts.js';
 import { FsMemory } from './memory.fs.js';
 
@@ -15,12 +17,14 @@ o.spec('/v1/fonts', () => {
   const assetLocation = process.env[Env.AssetLocation];
 
   o.beforeEach(() => {
-    process.env[Env.AssetLocation] = 'memory://';
-    assetProvider.set('memory://');
+    process.env[Env.AssetLocation] = 'memory://config';
+    getDefaultConfig().assets = 'memory://';
   });
 
   o.afterEach(() => {
-    assetProvider.set(assetLocation);
+    getDefaultConfig().assets = assetLocation;
+    CachedConfig.cache.clear();
+    CoSources.cache.clear();
     memory.files.clear();
   });
 
@@ -64,8 +68,41 @@ o.spec('/v1/fonts', () => {
   });
 
   o('should return 404 if no asset location set', async () => {
-    assetProvider.set(undefined);
+    getDefaultConfig().assets = undefined;
     const res = await fontList(mockRequest('/v1/fonts.json'));
     o(res.status).equals(404);
   });
+
+  o('should get the correct utf8 font with default assets', async () => {
+    const cfgBundle = new ConfigProviderMemory();
+    await fsa.write('memory://linz-basemaps/bar.json', JSON.stringify(cfgBundle.toJson()));
+    await fsa.write('memory://config/fonts/🦄 🌈/0-255.pbf', Buffer.from(''));
+
+    const configLocation = base58.encode(Buffer.from('memory://linz-basemaps/bar.json'));
+    const res255 = await handler.router.handle(
+      mockUrlRequest('/v1/fonts/🦄 🌈/0-255.pbf', `?config=${configLocation}`, Api.header),
+    );
+    o(res255.status).equals(200);
+    o(res255.header('content-type')).equals('application/x-protobuf');
+    o(res255.header('content-encoding')).equals(undefined);
+    o(res255.header('etag')).notEquals(undefined);
+    o(res255.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
+  });
+
+  o('should get the correct utf8 font with config assets', async () => {
+    const cfgBundle = new ConfigProviderMemory();
+    cfgBundle.assets = 'memory://config/assets';
+    await fsa.write('memory://linz-basemaps/bar.json', JSON.stringify(cfgBundle.toJson()));
+    await fsa.write('memory://config/assets/fonts/🦄 🌈/0-255.pbf', Buffer.from(''));
+
+    const configLocation = base58.encode(Buffer.from('memory://linz-basemaps/bar.json'));
+    const res255 = await handler.router.handle(
+      mockUrlRequest('/v1/fonts/🦄 🌈/0-255.pbf', `?config=${configLocation}`, Api.header),
+    );
+    o(res255.status).equals(200);
+    o(res255.header('content-type')).equals('application/x-protobuf');
+    o(res255.header('content-encoding')).equals(undefined);
+    o(res255.header('etag')).notEquals(undefined);
+    o(res255.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
+  });
 });

package/src/routes/__tests__/health.test.ts

@@ -1,9 +1,10 @@
-import { Config, ConfigProviderMemory } from '@basemaps/config';
+import { ConfigProviderMemory } from '@basemaps/config';
 import { LogConfig } from '@basemaps/shared';
 import { LambdaAlbRequest, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { Context } from 'aws-lambda';
 import o from 'ospec';
 import sinon from 'sinon';
+import { ConfigLoader } from '../../util/config.loader.js';
 import { FakeData } from '../../__tests__/config.data.js';
 
 import { getTestBuffer, healthGet, TestTiles } from '../health.js';
@@ -29,11 +30,12 @@ o.spec('/v1/health', async () => {
   const fakeTileSet = FakeData.tileSetRaster('health');
   o.beforeEach(() => {
     config.objects.clear();
-    Config.setConfigProvider(config);
+    sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
     config.put(fakeTileSet);
   });
 
   o.afterEach(() => {
+    config.objects.clear();
     sandbox.restore();
   });
 

package/src/routes/__tests__/sprites.test.ts

@@ -1,10 +1,9 @@
-import { Env } from '@basemaps/shared';
+import { Env, getDefaultConfig } from '@basemaps/shared';
 import { fsa } from '@chunkd/fs';
 import o from 'ospec';
 import { createSandbox } from 'sinon';
 import { gunzipSync, gzipSync } from 'zlib';
 import { handler } from '../../index.js';
-import { assetProvider } from '../../util/assets.provider.js';
 import { mockRequest } from '../../__tests__/xyz.util.js';
 import { FsMemory } from './memory.fs.js';
 
@@ -18,11 +17,11 @@ o.spec('/v1/sprites', () => {
 
   o.beforeEach(() => {
     process.env[Env.AssetLocation] = 'memory://';
-    assetProvider.set('memory://');
+    getDefaultConfig().assets = 'memory://';
   });
 
   o.afterEach(() => {
-    assetProvider.set(assetLocation);
+    getDefaultConfig().assets = assetLocation;
     memory.files.clear();
     sandbox.restore();
   });

package/src/routes/__tests__/tile.json.test.ts

@@ -1,23 +1,33 @@
-import { Config, ConfigProviderMemory } from '@basemaps/config';
+import { base58, ConfigProviderMemory } from '@basemaps/config';
 import { Env } from '@basemaps/shared';
+import { fsa } from '@chunkd/fs';
 import o from 'ospec';
+import sinon from 'sinon';
 import { handler } from '../../index.js';
+import { ConfigLoader } from '../../util/config.loader.js';
 import { CoSources } from '../../util/source.cache.js';
 import { FakeData } from '../../__tests__/config.data.js';
 import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
+import { FsMemory } from './memory.fs.js';
 
 o.spec('/v1/tiles/:tileSet/:tileMatrix/tile.json', () => {
   const config = new ConfigProviderMemory();
+  const sandbox = sinon.createSandbox();
+
   o.before(() => {
     process.env[Env.PublicUrlBase] = 'https://tiles.test';
-    Config.setConfigProvider(config);
   });
 
   o.beforeEach(() => {
+    sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
     config.objects.clear();
     CoSources.cache.clear();
   });
 
+  o.afterEach(() => {
+    sandbox.restore();
+  });
+
   o('should 404 if invalid url is given', async () => {
     const request = mockRequest('/v1/tiles/tile.json', 'get', Api.header);
 
@@ -123,6 +133,24 @@ o.spec('/v1/tiles/:tileSet/:tileMatrix/tile.json', () => {
     });
   });
 
+  o('should load from config bundle', async () => {
+    const memoryFs = new FsMemory();
+    fsa.register('memory://', memoryFs);
+    const fakeTileSet = FakeData.tileSetRaster('🦄 🌈');
+
+    const cfgBundle = new ConfigProviderMemory();
+    cfgBundle.put(fakeTileSet);
+    memoryFs.write('memory://linz-basemaps/bar.json', JSON.stringify(cfgBundle.toJson()));
+
+    const configLocation = base58.encode(Buffer.from('memory://linz-basemaps/bar.json'));
+    const request = mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=${configLocation}`, Api.header);
+    const res = await handler.router.handle(request);
+    o(res.status).equals(200);
+
+    const body = JSON.parse(Buffer.from(res.body, 'base64').toString());
+    o(body.tiles[0].includes(`config=${configLocation}`)).equals(true);
+  });
+
   o('should serve convert zoom to tile matrix', async () => {
     const fakeTileSet = FakeData.tileSetVector('fake-vector');
     fakeTileSet.maxZoom = 15;