@basemaps/lambda-tiler 6.28.0 → 6.30.0

package/src/cotar.cache.ts

@@ -0,0 +1,54 @@
+import { fsa } from '@chunkd/fs';
+import { Cotar } from '@cotar/core';
+import { LambdaHttpResponse } from '@linzjs/lambda';
+import { NotFound } from './routes/response.js';
+import { St } from './source.tracer.js';
+
+export class CotarCache {
+  static cache = new Map<string, Promise<Cotar | null>>();
+
+  static get(uri: string): Promise<Cotar | null> {
+    let existing = CotarCache.cache.get(uri);
+    if (existing == null) {
+      const source = fsa.source(uri);
+      St.trace(source);
+      existing = Cotar.fromTar(source);
+      CotarCache.cache.set(uri, existing);
+    }
+    return existing;
+  }
+}
+
+/**
+ *  Load a cotar and look for a file inside the cotar returning the file back as a LambdaResponse
+ *
+ * This will also set two headers
+ * - Content-Encoding if the file starts with gzip magic
+ * - Content-Type from the parameter contentType
+ */
+export async function serveFromCotar(
+  cotarPath: string,
+  assetPath: string,
+  contentType: string,
+): Promise<LambdaHttpResponse> {
+  const cotar = await CotarCache.get(cotarPath);
+  if (cotar == null) return NotFound;
+  const fileData = await cotar.get(assetPath);
+  if (fileData == null) return NotFound;
+  const buf = Buffer.from(fileData);
+  const ret = LambdaHttpResponse.ok().buffer(buf, contentType);
+  if (isGzip(buf)) ret.header('content-encoding', 'gzip');
+  return ret;
+}
+
+/**
+ * Does a buffer look like a gzipped document instead of raw json
+ *
+ * Determined by checking the first two bytes are the gzip magic bytes `0x1f 0x8b`
+ *
+ * @see https://en.wikipedia.org/wiki/Gzip
+ *
+ */
+export function isGzip(b: Buffer): boolean {
+  return b[0] === 0x1f && b[1] === 0x8b;
+}

package/src/index.ts

@@ -1,52 +1,56 @@
-import { lf, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { LogConfig } from '@basemaps/shared';
+import { LambdaHttpRequest, LambdaHttpResponse, lf } from '@linzjs/lambda';
+import { createHash } from 'crypto';
+import { Router } from './router.js';
 import { Ping, Version } from './routes/api.js';
+import { fontGet, fontList } from './routes/fonts.js';
 import { Health } from './routes/health.js';
+import { imageryGet } from './routes/imagery.js';
+import { spriteGet } from './routes/sprites.js';
 import { Tiles } from './routes/tile.js';
-import { Router } from './router.js';
-import { createHash } from 'crypto';
-import { Imagery } from './routes/imagery.js';
-import { Esri } from './routes/esri/rest.js';
 import { St } from './source.tracer.js';
 
 const app = new Router();
 
-app.get('ping', Ping);
-app.get('health', Health);
-app.get('version', Version);
 app.get('tiles', Tiles);
-app.get('imagery', Imagery);
-app.get('esri', Esri);
 
-let slowTimer: NodeJS.Timer | null = null;
 export async function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpResponse> {
-  // Reset the request tracing
-  St.reset();
+  const apiKey = Router.apiKey(req);
+  if (apiKey != null) {
+    const apiKeyHash = createHash('sha256').update(apiKey).digest('base64');
+    req.set('api', apiKeyHash);
+  }
+  return await app.handle(req);
+}
 
-  // Warn if a request takes more than 10 seconds to process
-  if (slowTimer) clearTimeout(slowTimer);
-  slowTimer = setTimeout(() => req.log.warn(req.logContext, 'Lambda:Slow'), 10_000);
-  slowTimer.unref();
+export const handler = lf.http(LogConfig.get());
 
+handler.router.hook('request', (req) => {
   req.set('name', 'LambdaTiler');
-  try {
-    const apiKey = Router.apiKey(req);
-    if (apiKey != null) {
-      const apiKeyHash = createHash('sha256').update(apiKey).digest('base64');
-      req.set('api', apiKeyHash);
-    }
-    const ret = await app.handle(req);
+  // Reset the request tracing before every request
+  St.reset();
+});
 
+handler.router.hook('response', (req) => {
+  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)
     req.set('requestCount', St.requests.length);
-
-    return ret;
-  } finally {
-    if (slowTimer) clearTimeout(slowTimer);
-    slowTimer = null;
   }
-}
-
-export const handler = lf.http(LogConfig.get());
+});
+// TODO some internal health checks hit these routes, we should change them all to point at /v1/
+handler.router.get('/ping', Ping);
+handler.router.get('/health', Health);
+handler.router.get('/version', Version);
+
+handler.router.get('/v1/ping', Ping);
+handler.router.get('/v1/health', Health);
+handler.router.get('/v1/version', Version);
+
+handler.router.get('/v1/imagery/:imageryId/:fileName', imageryGet);
+handler.router.get('/v1/sprites/:spriteName', spriteGet);
+handler.router.get('/v1/fonts.json', fontList);
+handler.router.get('/v1/fonts/:fontStack/:range.pbf', fontGet);
+
+// Catch all for old requests
 handler.router.get('*', handleRequest);

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

@@ -9,10 +9,11 @@ import sinon from 'sinon';
 const sandbox = sinon.createSandbox();
 import { TileSets } from '../../tile.set.cache.js';
 import { TileSetRaster } from '../../tile.set.raster.js';
-import { FakeTileSet, mockRequest, Provider } from '../../__tests__/xyz.util.js';
+import { FakeTileSet, mockRequest } from '../../__tests__/xyz.util.js';
 import { attribution, createAttributionCollection } from '../attribution.js';
 import { TileEtag } from '../tile.etag.js';
 import { Attribution } from '@basemaps/attribution';
+import { Provider } from '../../__tests__/config.data.js';
 
 const ExpectedJson = {
   id: 'aerial_WebMercatorQuad',
@@ -279,7 +280,6 @@ function makeImageRecord(id: string, name: string, x = 10): ConfigImagery {
       b.x += i * b.width;
       return b;
     }),
-    createdAt: Date.now(),
     updatedAt: Date.now(),
   };
 }
@@ -364,7 +364,7 @@ o.spec('attribution', () => {
       const res = await attribution(request);
 
       o(res.status).equals(200);
-      o(res.header(HttpHeader.ETag)).equals('3edkgmltK4/LUyTCTYU9MeiNSwlfUvJAx/qORSisUzM=');
+      o(res.header(HttpHeader.ETag)).equals('GAwx9M7X1ygnn2kr9KPCin2gcaGq7DwYMY1dCpJj3no=');
       o(res.header(HttpHeader.CacheControl)).equals('public, max-age=86400, stale-while-revalidate=604800');
 
       const body = round(JSON.parse(res.body as string), 4);
@@ -373,10 +373,9 @@ o.spec('attribution', () => {
 
     o('should 304 with etag match', async () => {
       const request = mockRequest(`/v1/attribution/aerial/EPSG:3857/summary.json`, 'get', {
-        [HttpHeader.IfNoneMatch]: '3edkgmltK4/LUyTCTYU9MeiNSwlfUvJAx/qORSisUzM=',
+        [HttpHeader.IfNoneMatch]: 'GAwx9M7X1ygnn2kr9KPCin2gcaGq7DwYMY1dCpJj3no=',
       });
       const res = await attribution(request);
-
       o(res.status).equals(304);
     });
 

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

@@ -0,0 +1,80 @@
+import { Env } from '@basemaps/shared';
+import { fsa } from '@chunkd/fs';
+import o from 'ospec';
+import { handler } from '../../index.js';
+import { mockRequest } from '../../__tests__/xyz.util.js';
+import { fontList, getFonts } from '../fonts.js';
+import { FsMemory } from './memory.fs.js';
+
+o.spec('/v1/fonts', () => {
+  const memory = new FsMemory();
+  o.before(() => {
+    fsa.register('memory://', memory);
+  });
+
+  o.beforeEach(() => {
+    process.env[Env.AssetLocation] = 'memory://';
+  });
+
+  o.afterEach(() => {
+    delete process.env[Env.AssetLocation];
+    memory.files.clear();
+  });
+
+  o('should list font types', async () => {
+    await Promise.all([
+      fsa.write('memory://fonts/Roboto Thin/0-255.pbf', Buffer.from('')),
+      fsa.write('memory://fonts/Roboto Thin/256-512.pbf', Buffer.from('')),
+      fsa.write('memory://fonts/Roboto Black/0-255.pbf', Buffer.from('')),
+    ]);
+
+    const fonts = await getFonts('memory://fonts/');
+    o(fonts).deepEquals(['Roboto Black', 'Roboto Thin']);
+  });
+
+  o('should return empty list if no fonts found', async () => {
+    const res = await fontList();
+    o(res.status).equals(200);
+    o(res.body).equals('[]');
+  });
+
+  o('should return 404 if no assets defined', async () => {
+    delete process.env[Env.AssetLocation];
+    const res = await fontList();
+    o(res.status).equals(404);
+  });
+
+  o('should return a list of fonts found', async () => {
+    await Promise.all([
+      fsa.write('memory://fonts/Roboto Thin/0-255.pbf', Buffer.from('')),
+      fsa.write('memory://fonts/Roboto Thin/256-512.pbf', Buffer.from('')),
+      fsa.write('memory://fonts/Roboto Black/0-255.pbf', Buffer.from('')),
+    ]);
+    const res = await fontList();
+    o(res.status).equals(200);
+    o(res.header('content-type')).equals('application/json');
+    o(res.header('content-encoding')).equals(undefined);
+    o(res.body).equals(JSON.stringify(['Roboto Black', 'Roboto Thin']));
+  });
+
+  o('should get the correct font', async () => {
+    await fsa.write('memory://fonts/Roboto Thin/0-255.pbf', Buffer.from(''));
+
+    const res255 = await handler.router.handle(mockRequest(encodeURI('/v1/fonts/Roboto Thin/0-255.pbf')));
+    o(res255.status).equals(200);
+    o(res255.header('content-type')).equals('application/x-protobuf');
+    o(res255.header('content-encoding')).equals(undefined);
+
+    const res404 = await handler.router.handle(mockRequest('/v1/fonts/Roboto Thin/256-512.pbf'));
+    o(res404.status).equals(404);
+  });
+
+  o('should get the correct utf8 font', async () => {
+    await fsa.write('memory://fonts/🦄 🌈/0-255.pbf', Buffer.from(''));
+
+    const res255 = await handler.router.handle(mockRequest(encodeURI('/v1/fonts/🦄 🌈/0-255.pbf')));
+    o(res255.status).equals(200);
+    o(res255.header('content-type')).equals('application/x-protobuf');
+    o(res255.header('content-encoding')).equals(undefined);
+  });
+});

package/src/routes/__tests__/memory.fs.ts

@@ -0,0 +1,77 @@
+import { ChunkSource, CompositeError, FileInfo, FileSystem } from '@chunkd/core';
+import { Readable } from 'stream';
+
+export async function toBuffer(stream: Readable): Promise<Buffer> {
+  return new Promise<Buffer>((resolve, reject) => {
+    const buf: Buffer[] = [];
+
+    stream.on('data', (chunk) => buf.push(chunk));
+    stream.on('end', () => resolve(Buffer.concat(buf)));
+    stream.on('error', (err) => reject(`error converting stream - ${err}`));
+  });
+}
+export function toReadable(r: string | Buffer | Readable): Readable {
+  if (typeof r === 'string') r = Buffer.from(r);
+  return Readable.from(r);
+}
+
+// TODO this should be provided by @chunkd/fs as it already provides a memory source
+export class FsMemory implements FileSystem {
+  protocol = 'memory';
+
+  files: Map<string, Buffer> = new Map();
+
+  async read(filePath: string): Promise<Buffer> {
+    const data = this.files.get(filePath);
+    if (data == null) throw new CompositeError('Not found', 404, new Error());
+    return data;
+  }
+
+  stream(filePath: string): Readable {
+    const buf = this.files.get(filePath);
+    if (buf == null) throw new CompositeError('Not found', 404, new Error());
+    return toReadable(buf);
+  }
+
+  async write(filePath: string, buffer: string | Buffer | Readable): Promise<void> {
+    if (typeof buffer === 'string') {
+      this.files.set(filePath, Buffer.from(buffer));
+      return;
+    }
+    if (Buffer.isBuffer(buffer)) {
+      this.files.set(filePath, buffer);
+      return;
+    }
+    const buf = await toBuffer(buffer);
+    this.files.set(filePath, buf);
+  }
+
+  async *list(filePath: string): AsyncGenerator<string> {
+    for (const file of this.files.keys()) {
+      if (file.startsWith(filePath)) yield file;
+    }
+  }
+
+  async *details(filePath: string): AsyncGenerator<FileInfo> {
+    for await (const file of this.list(filePath)) {
+      const data = await this.head(file);
+      if (data == null) continue;
+      yield data;
+    }
+  }
+
+  async exists(filePath: string): Promise<boolean> {
+    const dat = await this.head(filePath);
+    return dat != null;
+  }
+
+  async head(filePath: string): Promise<FileInfo | null> {
+    const buf = this.files.get(filePath);
+    if (buf == null) return null;
+    return { path: filePath, size: buf.length };
+  }
+
+  source(): ChunkSource {
+    throw new Error('Method not implemented.');
+  }
+}

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

@@ -0,0 +1,64 @@
+import { Env } from '@basemaps/shared';
+import { fsa } from '@chunkd/fs';
+import o from 'ospec';
+import { gunzipSync, gzipSync } from 'zlib';
+import { handler } from '../../index.js';
+import { mockRequest } from '../../__tests__/xyz.util.js';
+import { FsMemory } from './memory.fs.js';
+
+o.spec('/v1/sprites', () => {
+  const memory = new FsMemory();
+  o.before(() => {
+    fsa.register('memory://', memory);
+  });
+
+  o.beforeEach(() => {
+    process.env[Env.AssetLocation] = 'memory://';
+  });
+
+  o.afterEach(() => {
+    delete process.env[Env.AssetLocation];
+    memory.files.clear();
+  });
+
+  o('should return 404 if no assets defined', async () => {
+    delete process.env[Env.AssetLocation];
+    const res404 = await handler.router.handle(mockRequest('/v1/sprites/topographic.json'));
+    o(res404.status).equals(404);
+  });
+
+  o('should fetch a json document', async () => {
+    await Promise.all([
+      fsa.write('memory://sprites/topographic.json', Buffer.from(JSON.stringify({ test: true }))),
+      fsa.write('memory://sprites/topographic.png', Buffer.from('')),
+    ]);
+    const res = await handler.router.handle(mockRequest('/v1/sprites/topographic.json'));
+    o(res.status).equals(200);
+    o(res.header('content-type')).equals('application/json');
+    o(res.header('content-encoding')).equals(undefined);
+
+    o(JSON.parse(Buffer.from(res.body, 'base64').toString())).deepEquals({ test: true });
+  });
+
+  o('should fetch a png', async () => {
+    await Promise.all([
+      fsa.write('memory://sprites/topographic.json', Buffer.from(JSON.stringify({ test: true }))),
+      fsa.write('memory://sprites/topographic@2x.png', Buffer.from('')),
+    ]);
+    const res = await handler.router.handle(mockRequest('/v1/sprites/topographic@2x.png'));
+    o(res.status).equals(200);
+    o(res.header('content-type')).equals('image/png');
+  });
+
+  o('should detect gziped files and set content-encoding', async () => {
+    await Promise.all([
+      fsa.write('memory://sprites/topographic.json', gzipSync(Buffer.from(JSON.stringify({ test: true })))),
+    ]);
+    const res = await handler.router.handle(mockRequest('/v1/sprites/topographic.json'));
+    o(res.status).equals(200);
+    o(res.header('content-type')).equals('application/json');
+    o(res.header('content-encoding')).equals('gzip');
+
+    o(JSON.parse(gunzipSync(Buffer.from(res.body, 'base64')).toString())).deepEquals({ test: true });
+  });
+});

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

@@ -1,25 +1,29 @@
 import { ImageFormat } from '@basemaps/geo';
-import { LogConfig } from '@basemaps/shared';
+import { Config, LogConfig } from '@basemaps/shared';
 import { LambdaHttpRequest, LambdaUrlRequest } from '@linzjs/lambda';
 import { Context } from 'aws-lambda';
 import o from 'ospec';
+import { handleRequest } from '../../index.js';
+import { ulid } from 'ulid';
 import { getImageFormats } from '../tile.wmts.js';
+import { createSandbox } from 'sinon';
+import { Imagery2193, Imagery3857, Provider, TileSetAerial } from '../../__tests__/config.data.js';
 
-o.spec('GetImageFormats', () => {
-  function newRequest(path: string, query: string): LambdaHttpRequest {
-    return new LambdaUrlRequest(
-      {
-        requestContext: { http: { method: 'GET' } },
-        headers: {},
-        rawPath: path,
-        rawQueryString: query,
-        isBase64Encoded: false,
-      } as any,
-      {} as Context,
-      LogConfig.get(),
-    );
-  }
+function newRequest(path: string, query: string): LambdaHttpRequest {
+  return new LambdaUrlRequest(
+    {
+      requestContext: { http: { method: 'GET' } },
+      headers: {},
+      rawPath: path,
+      rawQueryString: query,
+      isBase64Encoded: false,
+    } as any,
+    {} as Context,
+    LogConfig.get(),
+  );
+}
 
+o.spec('GetImageFormats', () => {
   o('should parse all formats', () => {
     const req = newRequest('/v1/blank', 'format=png&format=jpeg');
     const formats = getImageFormats(req);
@@ -37,4 +41,60 @@ o.spec('GetImageFormats', () => {
     const formats = getImageFormats(req);
     o(formats).deepEquals([ImageFormat.Png, ImageFormat.Jpeg]);
   });
+
+  o('should support "tileFormat" Alias all formats', () => {
+    const req = newRequest('/v1/blank', 'tileFormat=png&format=jpeg');
+    const formats = getImageFormats(req);
+    o(formats).deepEquals([ImageFormat.Jpeg, ImageFormat.Png]);
+  });
+
+  o('should not duplicate "tileFormat" alias all formats', () => {
+    const req = newRequest('/v1/blank', 'tileFormat=jpeg&format=jpeg');
+    const formats = getImageFormats(req);
+    o(formats).deepEquals([ImageFormat.Jpeg]);
+  });
+});
+
+o.spec('WMTSRouting', () => {
+  const sandbox = createSandbox();
+  o.afterEach(() => {
+    sandbox.restore();
+  });
+
+  o('should default to the aerial layer', async () => {
+    const imagery = new Map();
+    imagery.set(Imagery3857.id, Imagery3857);
+    imagery.set(Imagery2193.id, Imagery2193);
+
+    const tileSetStub = sandbox.stub(Config.TileSet, 'get').returns(Promise.resolve(TileSetAerial));
+    const imageryStub = sandbox.stub(Config.Imagery, 'getAll').returns(Promise.resolve(imagery));
+    const providerStub = sandbox.stub(Config.Provider, 'get').returns(Promise.resolve(Provider));
+
+    const req = newRequest('/v1/tiles/WMTSCapabilities.xml', 'format=png&api=c' + ulid());
+    const res = await handleRequest(req);
+
+    o(tileSetStub.calledOnce).equals(true);
+    o(tileSetStub.args[0][0]).equals('ts_aerial');
+
+    o(providerStub.calledOnce).equals(true);
+    o(providerStub.args[0][0]).equals('pv_linz');
+
+    o(imageryStub.calledOnce).equals(true);
+    o([...imageryStub.args[0][0].values()]).deepEquals([
+      'im_01FYWKATAEK2ZTJQ2PX44Y0XNT',
+      'im_01FYWKAJ86W9P7RWM1VB62KD0H',
+    ]);
+
+    o(res.status).equals(200);
+    const lines = Buffer.from(res.body, 'base64').toString().split('\n');
+
+    const titles = lines.filter((f) => f.startsWith('      <ows:Title>')).map((f) => f.trim());
+
+    o(titles).deepEquals([
+      '<ows:Title>Aerial Imagery</ows:Title>',
+      '<ows:Title>Ōtorohanga 0.1m Urban Aerial Photos (2021)</ows:Title>',
+      '<ows:Title>Google Maps Compatible for the World</ows:Title>',
+      '<ows:Title>LINZ NZTM2000 Map Tile Grid V2</ows:Title>',
+    ]);
+  });
 });

package/src/routes/api.ts

@@ -3,10 +3,6 @@ import { LambdaHttpResponse, HttpHeader } from '@linzjs/lambda';
 const OkResponse = new LambdaHttpResponse(200, 'ok');
 OkResponse.header(HttpHeader.CacheControl, 'no-store');
 
-export async function Health(): Promise<LambdaHttpResponse> {
-  return OkResponse;
-}
-
 export async function Ping(): Promise<LambdaHttpResponse> {
   return OkResponse;
 }

package/src/routes/fonts.ts

@@ -0,0 +1,62 @@
+import { Env } from '@basemaps/shared';
+import { fsa } from '@chunkd/fs';
+import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import path from 'path';
+import { serveFromCotar } from '../cotar.cache.js';
+import { NotFound } from './response.js';
+
+interface FontGet {
+  Params: { fontStack: string; range: string };
+}
+
+export async function fontGet(req: LambdaHttpRequest<FontGet>): Promise<LambdaHttpResponse> {
+  const assetLocation = Env.get(Env.AssetLocation);
+  if (assetLocation == null) return NotFound;
+
+  const fontStack = decodeURIComponent(req.params.fontStack);
+  const targetFile = path.join('fonts', fontStack, req.params.range) + '.pbf';
+
+  if (assetLocation.endsWith('.tar.co')) return serveFromCotar(assetLocation, targetFile, 'application/x-protobuf');
+
+  try {
+    const filePath = fsa.join(assetLocation, targetFile);
+    const buf = await fsa.read(filePath);
+
+    return LambdaHttpResponse.ok().buffer(buf, 'application/x-protobuf');
+  } catch (e: any) {
+    if (e.code === 404) return NotFound;
+    throw e;
+  }
+}
+
+/** Get the unique name of folders is a path that contain .pbf files */
+export async function getFonts(fontPath: string): Promise<string[]> {
+  const fonts = new Set<string>();
+
+  // TODO use {recursive: false}
+  for await (const font of fsa.list(fontPath)) {
+    if (!font.endsWith('.pbf')) continue;
+    const dirName = path.basename(path.dirname(font)); // TODO this only works for /a/b.pbf and not /a/b/c.pbf
+    if (dirName.includes('/')) continue;
+    fonts.add(dirName);
+  }
+  // Ensure the fonts are alphabetical
+  return [...fonts].sort();
+}
+
+export async function fontList(): Promise<LambdaHttpResponse> {
+  const assetLocation = Env.get(Env.AssetLocation);
+  if (assetLocation == null) return NotFound;
+
+  if (assetLocation.endsWith('.tar.co')) return serveFromCotar(assetLocation, 'fonts.json', 'application/json');
+
+  try {
+    const filePath = fsa.join(assetLocation, '/fonts');
+    const fonts = await getFonts(filePath);
+
+    return LambdaHttpResponse.ok().buffer(JSON.stringify(fonts), 'application/json');
+  } catch (e: any) {
+    if (e.code === 404) return NotFound;
+    throw e;
+  }
+}

package/src/routes/imagery.ts

@@ -4,7 +4,6 @@ import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambd
 import { createHash } from 'crypto';
 import { promisify } from 'util';
 import { gzip } from 'zlib';
-import { Router } from '../router.js';
 import { NotModified } from './response.js';
 import { TileEtag } from './tile.etag.js';
 
@@ -17,6 +16,10 @@ export function isAllowedFile(f: string): boolean {
   return false;
 }
 
+interface ImageryGet {
+  Params: { imageryId: string; fileName: string };
+}
+
 /**
  * Get metadata around the imagery such as the source bounding box or the bounding box of the COGS
  *
@@ -27,15 +30,14 @@ export function isAllowedFile(f: string): boolean {
  * - /v1/imagery/:imageryId/collection.json - STAC Collection
  * - /v1/imagery/:imageryId/15-32659-21603.json - STAC Item
  */
-export async function Imagery(req: LambdaHttpRequest): Promise<LambdaHttpResponse> {
-  const { rest } = Router.action(req);
-  const [imageryId, requestType] = rest;
-  if (!isAllowedFile(requestType)) return new LambdaHttpResponse(404, 'Not found');
+export async function imageryGet(req: LambdaHttpRequest<ImageryGet>): Promise<LambdaHttpResponse> {
+  const requestedFile = req.params.fileName;
+  if (!isAllowedFile(requestedFile)) return new LambdaHttpResponse(404, 'Not found');
 
-  const imagery = await Config.Imagery.get(Config.Imagery.id(imageryId));
+  const imagery = await Config.Imagery.get(Config.Imagery.id(req.params.imageryId));
   if (imagery == null) return new LambdaHttpResponse(404, 'Not found');
 
-  const targetPath = fsa.join(imagery.uri, requestType);
+  const targetPath = fsa.join(imagery.uri, requestedFile);
 
   try {
     const buf = await fsa.read(targetPath);

package/src/routes/sprites.ts

@@ -0,0 +1,41 @@
+import { Env } from '@basemaps/shared';
+import { fsa } from '@chunkd/fs';
+import path from 'path';
+import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import { NotFound } from './response.js';
+import { isGzip, serveFromCotar } from '../cotar.cache.js';
+
+interface SpriteGet {
+  Params: {
+    spriteName: string;
+  };
+}
+
+const Extensions = new Map();
+Extensions.set('.png', 'image/png');
+Extensions.set('.json', 'application/json');
+
+export async function spriteGet(req: LambdaHttpRequest<SpriteGet>): Promise<LambdaHttpResponse> {
+  const assetLocation = Env.get(Env.AssetLocation);
+  if (assetLocation == null) return NotFound;
+
+  const extension = path.extname(req.params.spriteName);
+  const mimeType = Extensions.get(extension);
+  if (mimeType == null) return NotFound;
+
+  const targetFile = fsa.join('sprites', req.params.spriteName);
+  if (assetLocation.endsWith('.tar.co')) return serveFromCotar(assetLocation, targetFile, mimeType);
+
+  try {
+    const filePath = fsa.join(assetLocation, targetFile);
+    req.set('target', filePath);
+
+    const buf = await fsa.read(filePath);
+    const res = LambdaHttpResponse.ok().buffer(buf, mimeType);
+    if (isGzip(buf)) res.header('content-encoding', 'gzip');
+    return res;
+  } catch (e: any) {
+    if (e.code === 404) return NotFound;
+    throw e;
+  }
+}