@basemaps/lambda-tiler 6.29.0 → 6.32.0

package/src/__tests__/xyz.util.ts

@@ -1,17 +1,13 @@
-import { ConfigProvider } from '@basemaps/config';
-import { TileMatrixSet } from '@basemaps/geo';
 import { LogConfig } from '@basemaps/shared';
-import { LambdaAlbRequest, LambdaHttpRequest } from '@linzjs/lambda';
+import { LambdaAlbRequest, LambdaHttpRequest, LambdaUrlRequest } from '@linzjs/lambda';
 import { Context } from 'aws-lambda';
-import { TileSetRaster } from '../tile.set.raster.js';
-import { TileSetVector } from '../tile.set.vector.js';
 
 export function mockRequest(path: string, method = 'get', headers: Record<string, string> = {}): LambdaHttpRequest {
   return new LambdaAlbRequest(
     {
       requestContext: null as any,
       httpMethod: method.toUpperCase(),
-      path,
+      path: encodeURI(path),
       headers,
       body: null,
       isBase64Encoded: false,
@@ -21,45 +17,21 @@ export function mockRequest(path: string, method = 'get', headers: Record<string
   );
 }
 
-export class FakeTileSet extends TileSetRaster {
-  constructor(name: string, tileMatrix: TileMatrixSet, title = `${name}:title`, description = `${name}:description`) {
-    super(name, tileMatrix);
-    this.tileSet = { title, description } as any;
-  }
-}
-
-export class FakeTileSetVector extends TileSetVector {
-  constructor(name: string, tileMatrix: TileMatrixSet) {
-    super(name, tileMatrix);
-    this.tileSet = {} as any;
-  }
+export function mockUrlRequest(path: string, query = '', headers: Record<string, unknown> = {}): LambdaHttpRequest {
+  return new LambdaUrlRequest(
+    {
+      requestContext: { http: { method: 'GET' } },
+      headers,
+      rawPath: encodeURI(path),
+      rawQueryString: query,
+      isBase64Encoded: false,
+    } as any,
+    {} as Context,
+    LogConfig.get(),
+  );
 }
 
-export const Provider: ConfigProvider = {
-  name: 'main',
-  id: 'pv_main_production',
-  updatedAt: Date.now(),
-  version: 1,
-  serviceIdentification: {
-    accessConstraints: 'the accessConstraints',
-    description: 'the description',
-    fees: 'the fees',
-    title: 'the title',
-  },
-  serviceProvider: {
-    contact: {
-      address: {
-        city: 'the city',
-        country: 'the country',
-        deliveryPoint: 'the deliveryPoint',
-        email: 'email address',
-        postalCode: 'the postalCode',
-      },
-      individualName: 'the contact name',
-      phone: 'the phone',
-      position: 'the position',
-    },
-    name: 'the name',
-    site: 'https://example.provider.com',
-  },
+export const Api = {
+  key: 'd01f7w7rnhdzg0p7fyrc9v9ard1',
+  header: { 'x-linz-api-key': 'd01f7w7rnhdzg0p7fyrc9v9ard1' },
 };

package/src/index.ts

@@ -1,59 +1,93 @@
-import { lf, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { LogConfig } from '@basemaps/shared';
-import { Ping, Version } from './routes/api.js';
-import { Health } from './routes/health.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';
-import { spriteGet } from './routes/sprites.js';
+import { LambdaHttpResponse, LambdaUrlRequest, lf } from '@linzjs/lambda';
+import { tileAttributionGet } from './routes/attribution.js';
 import { fontGet, fontList } from './routes/fonts.js';
+import { healthGet } from './routes/health.js';
+import { imageryGet } from './routes/imagery.js';
+import { pingGet } from './routes/ping.js';
+import { spriteGet } from './routes/sprites.js';
+import { tileJsonGet } from './routes/tile.json.js';
+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 { NotFound } from './util/response.js';
+import { CoSources } from './util/source.cache.js';
+import { St } from './util/source.tracer.js';
 
-const app = new Router();
+export const handler = lf.http(LogConfig.get());
 
-app.get('ping', Ping);
-app.get('health', Health);
-app.get('version', Version);
-app.get('tiles', Tiles);
-app.get('imagery', Imagery);
-app.get('esri', Esri);
+handler.router.hook('request', (req) => {
+  req.set('name', 'LambdaTiler');
 
-let slowTimer: NodeJS.Timer | null = null;
-export async function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpResponse> {
-  // Reset the request tracing
+  // Reset the request tracing before every request
   St.reset();
+});
 
-  // 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();
-
-  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);
-
+handler.router.hook('response', (req, res) => {
+  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);
+  }
+  // Log the source cache hit/miss ratio
+  req.set('sources', {
+    hits: CoSources.cache.hits,
+    misses: CoSources.cache.misses,
+    size: CoSources.cache.currentSize,
+    resets: CoSources.cache.resets,
+    cacheA: CoSources.cache.cacheA.size,
+    cacheB: CoSources.cache.cacheB.size,
+  });
 
-    return ret;
-  } finally {
-    if (slowTimer) clearTimeout(slowTimer);
-    slowTimer = null;
+  // FunctionURLs automatically inject CORS responses for us
+  if (!(req instanceof LambdaUrlRequest) && req.headers.has('origin')) {
+    res.header('access-control-allow-origin', '*');
   }
-}
+});
 
-export const handler = lf.http(LogConfig.get());
+// CORS is handled by function url hook so just return ok if the route exists
+handler.router.options('*', (req) => {
+  const route = handler.router.router.find('GET', req.path);
+  if (route == null) return NotFound();
+  return LambdaHttpResponse.ok();
+});
 
+// TODO some internal health checks hit these routes, we should change them all to point at /v1/
+handler.router.get('/ping', pingGet);
+handler.router.get('/health', healthGet);
+handler.router.get('/version', versionGet);
+
+handler.router.get('/v1/ping', pingGet);
+handler.router.get('/v1/health', healthGet);
+handler.router.get('/v1/version', versionGet);
+
+// Image Metadata
+handler.router.get('/v1/imagery/:imageryId/:fileName', imageryGet);
+
+// Sprites
 handler.router.get('/v1/sprites/:spriteName', spriteGet);
+
+// Fonts
 handler.router.get('/v1/fonts.json', fontList);
 handler.router.get('/v1/fonts/:fontStack/:range.pbf', fontGet);
 
-handler.router.get('*', handleRequest);
+// StyleJSON
+handler.router.get('/v1/styles/:styleName.json', styleJsonGet);
+/** @deprecated 2022-07-22 all styles should be being served from /v1/styles/:styleName.json */
+handler.router.get('/v1/tiles/:tileSet/:tileMatrix/style/:styleName.json', styleJsonGet);
+
+// TileJSON
+handler.router.get('/v1/tiles/:tileSet/:tileMatrix/tile.json', tileJsonGet);
+
+// Tiles
+handler.router.get('/v1/tiles/:tileSet/:tileMatrix/:z/:x/:y.:tileType', tileXyzGet);
+
+// Attribution
+handler.router.get('/v1/tiles/:tileSet/:tileMatrix/attribution.json', tileAttributionGet);
+handler.router.get('/v1/attribution/:tileSet/:tileMatrix/summary.json', tileAttributionGet);
+
+// WMTS Capabilities
+handler.router.get('/v1/tiles/:tileSet/:tileMatrix/WMTSCapabilities.xml', wmtsCapabilitiesGet);
+handler.router.get('/v1/tiles/:tileSet/WMTSCapabilities.xml', wmtsCapabilitiesGet);
+handler.router.get('/v1/tiles/WMTSCapabilities.xml', wmtsCapabilitiesGet);