@basemaps/lambda-tiler 6.29.0 → 6.32.0

package/build/__tests__/xyz.util.js

@@ -1,54 +1,26 @@
 import { LogConfig } from '@basemaps/shared';
-import { LambdaAlbRequest } from '@linzjs/lambda';
-import { TileSetRaster } from '../tile.set.raster.js';
-import { TileSetVector } from '../tile.set.vector.js';
+import { LambdaAlbRequest, LambdaUrlRequest } from '@linzjs/lambda';
 export function mockRequest(path, method = 'get', headers = {}) {
     return new LambdaAlbRequest({
         requestContext: null,
         httpMethod: method.toUpperCase(),
-        path,
+        path: encodeURI(path),
         headers,
         body: null,
         isBase64Encoded: false,
     }, {}, LogConfig.get());
 }
-export class FakeTileSet extends TileSetRaster {
-    constructor(name, tileMatrix, title = `${name}:title`, description = `${name}:description`) {
-        super(name, tileMatrix);
-        this.tileSet = { title, description };
-    }
-}
-export class FakeTileSetVector extends TileSetVector {
-    constructor(name, tileMatrix) {
-        super(name, tileMatrix);
-        this.tileSet = {};
-    }
+export function mockUrlRequest(path, query = '', headers = {}) {
+    return new LambdaUrlRequest({
+        requestContext: { http: { method: 'GET' } },
+        headers,
+        rawPath: encodeURI(path),
+        rawQueryString: query,
+        isBase64Encoded: false,
+    }, {}, LogConfig.get());
 }
-export const Provider = {
-    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' },
 };
+//# sourceMappingURL=xyz.util.js.map

package/build/__tests__/xyz.util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"xyz.util.js","sourceRoot":"","sources":["../../src/__tests__/xyz.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAqB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGvF,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,MAAM,GAAG,KAAK,EAAE,UAAkC,EAAE;IAC5F,OAAO,IAAI,gBAAgB,CACzB;QACE,cAAc,EAAE,IAAW;QAC3B,UAAU,EAAE,MAAM,CAAC,WAAW,EAAE;QAChC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC;QACrB,OAAO;QACP,IAAI,EAAE,IAAI;QACV,eAAe,EAAE,KAAK;KACvB,EACD,EAAa,EACb,SAAS,CAAC,GAAG,EAAE,CAChB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,KAAK,GAAG,EAAE,EAAE,UAAmC,EAAE;IAC5F,OAAO,IAAI,gBAAgB,CACzB;QACE,cAAc,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;QAC3C,OAAO;QACP,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC;QACxB,cAAc,EAAE,KAAK;QACrB,eAAe,EAAE,KAAK;KAChB,EACR,EAAa,EACb,SAAS,CAAC,GAAG,EAAE,CAChB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,GAAG,GAAG;IACjB,GAAG,EAAE,6BAA6B;IAClC,MAAM,EAAE,EAAE,gBAAgB,EAAE,6BAA6B,EAAE;CAC5D,CAAC"}

package/build/index.d.ts

@@ -1,5 +1,3 @@
-import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
-export declare function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
 export declare const handler: import("@linzjs/lambda/build/src/function").LambdaHandler<import("@linzjs/lambda/build/src/http/request.http").HttpRequestEvent, import("@linzjs/lambda/build/src/http/request.http").HttpResponse> & {
     router: import("@linzjs/lambda/build/src/http/router").Router;
 };

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAuB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BvF;AAED,eAAO,MAAM,OAAO;;CAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,OAAO;;CAA2B,CAAC"}

package/build/index.js

@@ -1,52 +1,79 @@
-import { lf } 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';
-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 = null;
-export async function handleRequest(req) {
-    // Reset the request tracing
-    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'), 10000);
-    slowTimer.unref();
+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';
+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, 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);
-        return ret;
     }
-    finally {
-        if (slowTimer)
-            clearTimeout(slowTimer);
-        slowTimer = null;
+    // 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,
+    });
+    // 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);
+//# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}