@basemaps/lambda-tiler 6.35.0 → 6.36.0

package/dist/node_modules/semver/package.json

@@ -1,24 +1,20 @@
 {
   "name": "semver",
-  "version": "7.3.7",
+  "version": "7.3.8",
   "description": "The semantic version parser used by npm.",
   "main": "index.js",
   "scripts": {
     "test": "tap",
     "snap": "tap",
-    "preversion": "npm test",
-    "postversion": "npm publish",
-    "postpublish": "git push origin --follow-tags",
     "lint": "eslint \"**/*.js\"",
     "postlint": "template-oss-check",
     "lintfix": "npm run lint -- --fix",
-    "prepublishOnly": "git push origin --follow-tags",
     "posttest": "npm run lint",
     "template-oss-apply": "template-oss-apply --force"
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.0.1",
-    "@npmcli/template-oss": "3.3.2",
+    "@npmcli/template-oss": "4.4.4",
     "tap": "^16.0.0"
   },
   "license": "ISC",
@@ -31,6 +27,7 @@
   },
   "files": [
     "bin/",
+    "lib/",
     "classes/",
     "functions/",
     "internal/",
@@ -41,7 +38,11 @@
   ],
   "tap": {
     "check-coverage": true,
-    "coverage-map": "map.js"
+    "coverage-map": "map.js",
+    "nyc-arg": [
+      "--exclude",
+      "tap-snapshots/**"
+    ]
   },
   "engines": {
     "node": ">=10"
@@ -52,17 +53,18 @@
   "author": "GitHub Inc.",
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.3.2",
+    "version": "4.4.4",
     "engines": ">=10",
+    "content": "./scripts",
     "ciVersions": [
       "10.0.0",
       "10.x",
       "12.x",
       "14.x",
-      "16.x"
+      "16.x",
+      "18.x"
     ],
     "distPaths": [
-      "bin/",
       "classes/",
       "functions/",
       "internal/",
@@ -70,6 +72,15 @@
       "index.js",
       "preload.js",
       "range.bnf"
+    ],
+    "allowPaths": [
+      "/classes/",
+      "/functions/",
+      "/internal/",
+      "/ranges/",
+      "/index.js",
+      "/preload.js",
+      "/range.bnf"
     ]
   }
 }

package/dist/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.35.0",
+  "version": "6.36.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@basemaps/lambda-tiler",
-      "version": "6.35.0",
+      "version": "6.36.0",
       "license": "MIT",
       "dependencies": {
         "sharp": "0.30.7"
@@ -222,9 +222,12 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/mkdirp-classic": {
       "version": "0.5.3",
@@ -237,9 +240,9 @@
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
     },
     "node_modules/node-abi": {
-      "version": "3.24.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.24.0.tgz",
-      "integrity": "sha512-YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw==",
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz",
+      "integrity": "sha512-jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg==",
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -341,9 +344,9 @@
       ]
     },
     "node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -632,9 +635,9 @@
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
     },
     "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
     },
     "mkdirp-classic": {
       "version": "0.5.3",
@@ -647,9 +650,9 @@
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
     },
     "node-abi": {
-      "version": "3.24.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.24.0.tgz",
-      "integrity": "sha512-YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw==",
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz",
+      "integrity": "sha512-jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg==",
       "requires": {
         "semver": "^7.3.5"
       }
@@ -722,9 +725,9 @@
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
     "semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "requires": {
         "lru-cache": "^6.0.0"
       }

package/dist/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.35.0",
+  "version": "6.36.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,9 +22,9 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^6.35.0",
+    "@basemaps/config": "^6.36.0",
     "@basemaps/geo": "^6.32.1",
-    "@basemaps/shared": "^6.35.0",
+    "@basemaps/shared": "^6.36.0",
     "@basemaps/tiler": "^6.35.0",
     "@basemaps/tiler-sharp": "^6.35.0",
     "@chunkd/fs": "^8.5.1",
@@ -58,5 +58,5 @@
     "@types/sharp": "^0.30.3",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "dcebd7149ab318ea979b5d1ba34a9f82fc41b935"
+  "gitHead": "c232694ad1f1186b7b56a8af1def56ef165df8fd"
 }

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

@@ -1,9 +1,11 @@
 import { base58, ConfigProviderMemory } from '@basemaps/config';
-import { Env, getDefaultConfig } from '@basemaps/shared';
+import { getDefaultConfig } from '@basemaps/shared';
 import { fsa } from '@chunkd/fs';
 import o from 'ospec';
+import { createSandbox } from 'sinon';
 import { handler } from '../../index.js';
 import { CachedConfig } from '../../util/config.cache.js';
+import { ConfigLoader } from '../../util/config.loader.js';
 import { CoSources } from '../../util/source.cache.js';
 import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
 import { fontList } from '../fonts.js';
@@ -11,18 +13,20 @@ import { FsMemory } from './memory.fs.js';
 
 o.spec('/v1/fonts', () => {
   const memory = new FsMemory();
+  const sandbox = createSandbox();
+  const config = new ConfigProviderMemory();
+
   o.before(() => {
     fsa.register('memory://', memory);
   });
-  const assetLocation = process.env[Env.AssetLocation];
 
   o.beforeEach(() => {
-    process.env[Env.AssetLocation] = 'memory://config';
-    getDefaultConfig().assets = 'memory://';
+    config.assets = 'memory://';
+    sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
   });
 
   o.afterEach(() => {
-    getDefaultConfig().assets = assetLocation;
+    sandbox.restore();
     CachedConfig.cache.clear();
     CoSources.cache.clear();
     memory.files.clear();
@@ -34,7 +38,7 @@ o.spec('/v1/fonts', () => {
   });
 
   o('should return a list of fonts found', async () => {
-    await fsa.write('memory://fonts.json', Buffer.from(JSON.stringify(['Roboto Black', 'Roboto Thin'])));
+    await fsa.write('memory://fonts/fonts.json', Buffer.from(JSON.stringify(['Roboto Black', 'Roboto Thin'])));
     const res = await fontList(mockRequest('/v1/fonts.json'));
     o(res.status).equals(200);
     o(res.header('content-type')).equals('application/json');
@@ -44,7 +48,6 @@ o.spec('/v1/fonts', () => {
 
   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('/v1/fonts/Roboto Thin/0-255.pbf'));
     o(res255.status).equals(200);
     o(res255.header('content-type')).equals('application/x-protobuf');
@@ -58,7 +61,6 @@ o.spec('/v1/fonts', () => {
 
   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('/v1/fonts/🦄 🌈/0-255.pbf'));
     o(res255.status).equals(200);
     o(res255.header('content-type')).equals('application/x-protobuf');
@@ -74,14 +76,12 @@ o.spec('/v1/fonts', () => {
   });
 
   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),
-    );
+    getDefaultConfig().assets = undefined;
+    sandbox
+      .stub(config.ConfigBundle, 'get')
+      .resolves({ id: 'cb_latest', name: 'latest', path: 'latest', hash: 'hash', assets: 'memory://' });
+    await fsa.write('memory://fonts/Roboto Thin/0-255.pbf', Buffer.from(''));
+    const res255 = await handler.router.handle(mockRequest('/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);

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

@@ -1,35 +1,31 @@
-import { Env, getDefaultConfig } from '@basemaps/shared';
+import { ConfigProviderMemory } from '@basemaps/config';
 import { fsa } from '@chunkd/fs';
 import o from 'ospec';
 import { createSandbox } from 'sinon';
 import { gunzipSync, gzipSync } from 'zlib';
 import { handler } from '../../index.js';
+import { ConfigLoader } from '../../util/config.loader.js';
 import { mockRequest } from '../../__tests__/xyz.util.js';
 import { FsMemory } from './memory.fs.js';
 
 o.spec('/v1/sprites', () => {
   const memory = new FsMemory();
   const sandbox = createSandbox();
+  const config = new ConfigProviderMemory();
+
   o.before(() => {
     fsa.register('memory://', memory);
   });
-  const assetLocation = process.env[Env.AssetLocation];
 
   o.beforeEach(() => {
-    process.env[Env.AssetLocation] = 'memory://';
-    getDefaultConfig().assets = 'memory://';
+    config.assets = 'memory://';
+    sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
   });
 
   o.afterEach(() => {
-    getDefaultConfig().assets = assetLocation;
     memory.files.clear();
     sandbox.restore();
   });
-  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([

package/src/routes/fonts.ts

@@ -12,5 +12,5 @@ export async function fontGet(req: LambdaHttpRequest<FontGet>): Promise<LambdaHt
 }
 
 export async function fontList(req: LambdaHttpRequest): Promise<LambdaHttpResponse> {
-  return assetProvider.serve(req, 'fonts.json', 'application/json');
+  return assetProvider.serve(req, path.join('fonts', 'fonts.json'), 'application/json');
 }

package/src/util/assets.provider.ts

@@ -1,4 +1,3 @@
-import { Env } from '@basemaps/shared';
 import { fsa } from '@chunkd/fs';
 import { LambdaHttpResponse, LambdaHttpRequest, HttpHeader } from '@linzjs/lambda';
 import { ConfigLoader } from './config.loader.js';
@@ -46,11 +45,9 @@ export class AssetProvider {
    */
   async serve(req: LambdaHttpRequest, file: string, contentType: string): Promise<LambdaHttpResponse> {
     const config = await ConfigLoader.load(req);
-    let assetLocation = Env.get(Env.AssetLocation);
     if (config == null) return NotFound();
-    if (config.assets != null) assetLocation = config.assets;
-    if (assetLocation == null) return NotFound();
-    const buf = await assetProvider.get(assetLocation, file);
+    if (config.assets == null) return NotFound();
+    const buf = await assetProvider.get(config.assets, file);
     if (buf == null) return NotFound();
     const cacheKey = Etag.key(buf);
     if (Etag.isNotModified(req, cacheKey)) return NotModified();

package/src/util/config.loader.ts

@@ -12,7 +12,13 @@ const SafeProtocols = new Set(['s3', 'memory']);
 export class ConfigLoader {
   /** Exposed for testing */
   static async getDefaultConfig(): Promise<BasemapsConfigProvider> {
-    return getDefaultConfig();
+    const config = getDefaultConfig();
+    if (config.assets == null) {
+      const cb = await config.ConfigBundle.get(config.ConfigBundle.id('latest'));
+      if (cb == null) throw new LambdaHttpResponse(400, 'Unable to get lastest config bundle for asset.');
+      config.assets = cb.assets;
+    }
+    return config;
   }
 
   /** Lookup the config path from a request and return a standardized location */