@basemaps/lambda-tiler 6.16.0 → 6.19.0

package/CHANGELOG.md

@@ -3,6 +3,51 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.19.0](https://github.com/linz/basemaps/compare/v6.18.1...v6.19.0) (2021-12-20)
+
+
+### Bug Fixes
+
+* **lambda-tiler:** remove the host check to add api keys for all stylejson sources. ([#2032](https://github.com/linz/basemaps/issues/2032)) ([beab64c](https://github.com/linz/basemaps/commit/beab64c7f747dd5c1be06877b05b1173a95b1537))
+
+
+### Features
+
+* **lambda-tiler:** compress geojson output to prevent overflowing lambda ([#2034](https://github.com/linz/basemaps/issues/2034)) ([5d48524](https://github.com/linz/basemaps/commit/5d48524c0bf03c40e85cd661fd7f609bbdeed3dd))
+* **tiler:** expose some of the metadata geojson via a /v1/imagery endpoint ([#2033](https://github.com/linz/basemaps/issues/2033)) ([b471209](https://github.com/linz/basemaps/commit/b471209a381dfdab1a25be4882e464c8ddea9064))
+
+
+
+
+
+# [6.18.0](https://github.com/linz/basemaps/compare/v6.17.0...v6.18.0) (2021-12-14)
+
+**Note:** Version bump only for package @basemaps/lambda-tiler
+
+
+
+
+
+# [6.17.0](https://github.com/linz/basemaps/compare/v6.16.1...v6.17.0) (2021-12-05)
+
+
+### Features
+
+* **lambda-tiler:** Stop caching for the stylejson. ([#2011](https://github.com/linz/basemaps/issues/2011)) ([f29ae16](https://github.com/linz/basemaps/commit/f29ae16cd0b858fd9929a8cbcefa1c5113687bc9))
+* **landing:** use topographic name not topolike ([#2008](https://github.com/linz/basemaps/issues/2008)) ([a281d87](https://github.com/linz/basemaps/commit/a281d874ae8211447282ad41dd497e96689ceb88))
+
+
+
+
+
+## [6.16.1](https://github.com/linz/basemaps/compare/v6.16.0...v6.16.1) (2021-11-30)
+
+**Note:** Version bump only for package @basemaps/lambda-tiler
+
+
+
+
+
 # [6.16.0](https://github.com/linz/basemaps/compare/v6.15.0...v6.16.0) (2021-11-29)
 
 

package/build/__test__/xyz.test.js

@@ -172,14 +172,14 @@ o.spec('LambdaXyz', () => {
         o('should serve tile json for tile_set', async () => {
             var _a;
             process.env[Env.PublicUrlBase] = 'https://tiles.test';
-            const request = mockRequest('/v1/tiles/topolike/Google/tile.json', 'get', apiKeyHeader);
+            const request = mockRequest('/v1/tiles/topographic/Google/tile.json', 'get', apiKeyHeader);
             const res = await handleRequest(request);
             o(res.status).equals(200);
             o(res.header('content-type')).equals('application/json');
             o(res.header('cache-control')).equals('max-age=120');
             const body = Buffer.from((_a = res.body) !== null && _a !== void 0 ? _a : '', 'base64').toString();
             o(JSON.parse(body)).deepEquals({
-                tiles: [`https://tiles.test/v1/tiles/topolike/Google/{z}/{x}/{y}.pbf?api=${apiKey}`],
+                tiles: [`https://tiles.test/v1/tiles/topographic/Google/{z}/{x}/{y}.pbf?api=${apiKey}`],
                 minzoom: 0,
                 maxzoom: 15,
                 format: 'pbf',
@@ -194,7 +194,7 @@ o.spec('LambdaXyz', () => {
         });
         o('should not found style json', async () => {
             process.env[Env.PublicUrlBase] = 'https://tiles.test';
-            const request = mockRequest('/v1/tiles/topolike/Google/style/topolike.json', 'get', apiKeyHeader);
+            const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', apiKeyHeader);
             sandbox.stub(Config.Style, 'get').resolves(null);
             const res = await handleRequest(request);
             o(res.status).equals(404);
@@ -203,23 +203,23 @@ o.spec('LambdaXyz', () => {
             var _a;
             const host = 'https://tiles.test';
             process.env[Env.PublicUrlBase] = host;
-            const request = mockRequest('/v1/tiles/topolike/Google/style/topolike.json', 'get', apiKeyHeader);
+            const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', apiKeyHeader);
             const fakeStyle = {
                 version: 8,
                 id: 'test',
-                name: 'topolike',
+                name: 'topographic',
                 sources: {
                     basemaps_vector: {
                         type: 'vector',
-                        url: `${host}/vector`,
+                        url: `/vector`,
                     },
                     basemaps_raster: {
                         type: 'raster',
-                        tiles: [`${host}/raster`],
+                        tiles: [`/raster`],
                     },
                     basemaps_raster_encode: {
                         type: 'raster',
-                        tiles: [`${host}/raster/{z}/{x}/{y}.webp`], // Shouldn't encode the {}
+                        tiles: [`/raster/{z}/{x}/{y}.webp`], // Shouldn't encode the {}
                     },
                     test_vector: {
                         type: 'vector',
@@ -248,15 +248,15 @@ o.spec('LambdaXyz', () => {
                 metadata: { id: 'test' },
             };
             const fakeRecord = {
-                id: 'st_topolike_production',
-                name: 'topolike',
+                id: 'st_topographic_production',
+                name: 'topographic',
                 style: fakeStyle,
             };
             sandbox.stub(Config.Style, 'get').resolves(fakeRecord);
             const res = await handleRequest(request);
             o(res.status).equals(200);
             o(res.header('content-type')).equals('application/json');
-            o(res.header('cache-control')).equals('max-age=120');
+            o(res.header('cache-control')).equals('no-store');
             const body = Buffer.from((_a = res.body) !== null && _a !== void 0 ? _a : '', 'base64').toString();
             fakeStyle.sources.basemaps_vector = {
                 type: 'vector',

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;AAe3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAavF;AAED,eAAO,MAAM,OAAO,2LAA0C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAkB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkBvF;AAED,eAAO,MAAM,OAAO,2LAA0C,CAAC"}

package/build/index.js

@@ -4,11 +4,14 @@ 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';
 const app = new Router();
 app.get('ping', Ping);
 app.get('health', Health);
 app.get('version', Version);
 app.get('tiles', Tiles);
+app.get('imagery', Imagery);
 let slowTimer = null;
 export async function handleRequest(req) {
     // Warn if a request takes more than 10 seconds to process
@@ -18,6 +21,11 @@ export async function handleRequest(req) {
     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);
+        }
         return await app.handle(req);
     }
     finally {

package/build/routes/imagery.d.ts

@@ -0,0 +1,8 @@
+import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+/**
+ * Get metadata around the imagery such as the source bounding box or the bounding box of the COGS
+ * - /v1/imagery/:imageryId/source.geojson
+ * - /v1/imagery/:imageryId/covering.geojson
+ */
+export declare function Imagery(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
+//# sourceMappingURL=imagery.d.ts.map

package/build/routes/imagery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"imagery.d.ts","sourceRoot":"","sources":["../../src/routes/imagery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAgBnF;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0BjF"}

package/build/routes/imagery.js

@@ -0,0 +1,48 @@
+import { Config } from '@basemaps/config';
+import { fsa } from '@basemaps/shared';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
+import { createHash } from 'crypto';
+import { promisify } from 'util';
+import { gzip } from 'zlib';
+import { Router } from '../router.js';
+import { TileEtag } from './tile.etag.js';
+import { NotModified } from './tile.js';
+const gzipP = promisify(gzip);
+function isAllowedFile(f) {
+    if (f.endsWith('.geojson'))
+        return true;
+    if (f.endsWith('.json'))
+        return true;
+    return false;
+}
+/**
+ * Get metadata around the imagery such as the source bounding box or the bounding box of the COGS
+ * - /v1/imagery/:imageryId/source.geojson
+ * - /v1/imagery/:imageryId/covering.geojson
+ */
+export async function Imagery(req) {
+    const { rest } = Router.action(req);
+    const [imageryId, requestType] = rest;
+    if (!isAllowedFile(requestType))
+        return new LambdaHttpResponse(404, 'Not found');
+    const imagery = await Config.Imagery.get(imageryId);
+    if (imagery == null)
+        return new LambdaHttpResponse(404, 'Not found');
+    const targetPath = fsa.join(imagery.uri, requestType);
+    try {
+        const buf = await fsa.read(targetPath);
+        const cacheKey = createHash('sha256').update(buf).digest('base64');
+        if (TileEtag.isNotModified(req, cacheKey))
+            return NotModified;
+        const response = new LambdaHttpResponse(200, 'ok');
+        response.header(HttpHeader.ETag, cacheKey);
+        response.header(HttpHeader.ContentEncoding, 'gzip');
+        response.buffer(await gzipP(buf), 'application/json');
+        req.set('bytes', buf.byteLength);
+        return response;
+    }
+    catch (e) {
+        req.log.warn({ targetPath }, 'ImageryMetadata:Failed');
+        return new LambdaHttpResponse(404, 'Not found');
+    }
+}

package/build/routes/tile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tile.d.ts","sourceRoot":"","sources":["../../src/routes/tile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEnF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAQtD,eAAO,MAAM,YAAY,gBAA0B,CAAC;AAEpD,eAAO,MAAM,QAAQ,oBAA2C,CAAC;AACjE,eAAO,MAAM,WAAW,oBAA8C,CAAC;AAEvE,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,SAAS;cACJ,iBAAiB,GAAG,QAAQ,kBAAkB,CAAC;2BAelC,MAAM,cAAc,aAAa,GAAG,IAAI,GAAG,QAAQ,aAAa,EAAE,CAAC;cAUhF,iBAAiB,GAAG,QAAQ,kBAAkB,CAAC;kBAiC3C,iBAAiB,GAAG,QAAQ,kBAAkB,CAAC;mBA8B9C,iBAAiB,YAAY,MAAM,GAAG,QAAQ,kBAAkB,CAAC;CA8DvF,CAAC;AACF,wBAAsB,KAAK,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgB/E"}
+{"version":3,"file":"tile.d.ts","sourceRoot":"","sources":["../../src/routes/tile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEnF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAStD,eAAO,MAAM,YAAY,gBAA0B,CAAC;AAEpD,eAAO,MAAM,QAAQ,oBAA2C,CAAC;AACjE,eAAO,MAAM,WAAW,oBAA8C,CAAC;AAEvE,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,SAAS;cACJ,iBAAiB,GAAG,QAAQ,kBAAkB,CAAC;2BAelC,MAAM,cAAc,aAAa,GAAG,IAAI,GAAG,QAAQ,aAAa,EAAE,CAAC;cAUhF,iBAAiB,GAAG,QAAQ,kBAAkB,CAAC;kBAiC3C,iBAAiB,GAAG,QAAQ,kBAAkB,CAAC;mBA8B9C,iBAAiB,YAAY,MAAM,GAAG,QAAQ,kBAAkB,CAAC;CA8DvF,CAAC;AACF,wBAAsB,KAAK,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAY/E"}

package/build/routes/tile.js

@@ -10,6 +10,7 @@ import { TileEtag } from './tile.etag.js';
 import { Router } from '../router.js';
 import { ValidateTilePath } from '../validate.js';
 import { URL } from 'url';
+import { fsa } from '@chunkd/fs';
 export const TileComposer = new TileMakerSharp(256);
 export const NotFound = new LambdaHttpResponse(404, 'Not Found');
 export const NotModified = new LambdaHttpResponse(304, 'Not modified');
@@ -113,8 +114,8 @@ export const TileRoute = {
         const sources = {};
         for (const [key, value] of Object.entries(style.sources)) {
             if (value.type === 'vector') {
-                if (value.url.includes(host)) {
-                    const url = new URL(value.url);
+                if (value.url.startsWith('/')) {
+                    const url = new URL(fsa.join(host, value.url));
                     url.searchParams.set('api', apiKey);
                     value.url = url.toString().replace(/%7B/g, '{').replace(/%7D/g, '}');
                 }
@@ -122,8 +123,8 @@ export const TileRoute = {
             else if (value.type === 'raster' && Array.isArray(value.tiles)) {
                 for (let i = 0; i < value.tiles.length; i++) {
                     const tile = value.tiles[i];
-                    if (tile.includes(host)) {
-                        const url = new URL(tile);
+                    if (tile.startsWith('/')) {
+                        const url = new URL(fsa.join(host, tile));
                         url.searchParams.set('api', apiKey);
                         value.tiles[i] = url.toString().replace(/%7B/g, '{').replace(/%7D/g, '}');
                     }
@@ -150,7 +151,7 @@ export const TileRoute = {
             return NotModified;
         const response = new LambdaHttpResponse(200, 'ok');
         response.header(HttpHeader.ETag, cacheKey);
-        response.header(HttpHeader.CacheControl, 'max-age=120');
+        response.header(HttpHeader.CacheControl, 'no-store');
         response.buffer(data, 'application/json');
         req.set('bytes', data.byteLength);
         return response;
@@ -161,10 +162,6 @@ export async function Tiles(req) {
     if (rest.length < 1)
         return NotFound;
     const apiKey = Router.apiKey(req);
-    const apiKeyHash = createHash('sha256')
-        .update(apiKey !== null && apiKey !== void 0 ? apiKey : '')
-        .digest('base64');
-    req.set('api', apiKeyHash);
     if (!isValidApiKey(apiKey))
         return new LambdaHttpResponse(400, 'Invalid API Key');
     const fileName = rest[rest.length - 1].toLowerCase();