@basemaps/server 6.21.1 → 6.23.0

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.23.0](https://github.com/linz/basemaps/compare/v6.22.1...v6.23.0) (2022-04-04)
+
+**Note:** Version bump only for package @basemaps/server
+
+
+
+
+
+## [6.22.1](https://github.com/linz/basemaps/compare/v6.22.0...v6.22.1) (2022-03-23)
+
+**Note:** Version bump only for package @basemaps/server
+
+
+
+
+
+# [6.22.0](https://github.com/linz/basemaps/compare/v6.21.1...v6.22.0) (2022-03-20)
+
+
+### Features
+
+* **server:** support loading config from dynamodb ([#2119](https://github.com/linz/basemaps/issues/2119)) ([e550505](https://github.com/linz/basemaps/commit/e550505193df3cf148313e364c7c0670e16756e2))
+
+
+
+
+
 ## [6.21.1](https://github.com/linz/basemaps/compare/v6.21.0...v6.21.1) (2022-03-17)
 
 **Note:** Version bump only for package @basemaps/server

package/bin/basemaps-server.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+if (process.env.AWS_REGION == null) process.env.AWS_REGION = process.env.AWS_DEFAULT_REGION;
+
 import { BasemapsServerCommand } from '../build/cli.js';
 import Errors from '@oclif/errors/handle.js';
 

package/build/cli.d.ts

@@ -1,14 +1,14 @@
-import { Command } from '@oclif/command';
+import { Command, flags } from '@oclif/command';
 export declare class BasemapsServerCommand extends Command {
     static description: string;
     static flags: {
         verbose: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
         port: import("@oclif/parser/lib/flags").IOptionFlag<number>;
+        dynamo: flags.IOptionFlag<string | undefined>;
+        config: flags.IOptionFlag<string | undefined>;
     };
-    static args: {
-        name: string;
-        required: boolean;
-    }[];
+    static args: never[];
+    loadFromPath(configPath: string, serverUrl: string): Promise<void>;
     run(): Promise<void>;
 }
 //# sourceMappingURL=cli.d.ts.map

package/build/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAS,MAAM,gBAAgB,CAAC;AAkBhD,qBAAa,qBAAsB,SAAQ,OAAO;IAChD,MAAM,CAAC,WAAW,SAAuD;IACzE,MAAM,CAAC,KAAK;;;MAAwE;IAEpF,MAAM,CAAC,IAAI;;;QAA4C;IAEjD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA0D3B"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAkBhD,qBAAa,qBAAsB,SAAQ,OAAO;IAChD,MAAM,CAAC,WAAW,SAAuD;IACzE,MAAM,CAAC,KAAK;;;;;MAKV;IAEF,MAAM,CAAC,IAAI,UAAM;IAEX,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8ClE,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAsB3B"}

package/build/cli.js

@@ -1,5 +1,5 @@
 // Configure the logging before importing everything
-import { ConfigPrefix, ConfigProviderMemory, parseRgba } from '@basemaps/config';
+import { ConfigPrefix, ConfigProviderDynamo, ConfigProviderMemory, parseRgba } from '@basemaps/config';
 import { TileSetLocal } from '@basemaps/lambda-tiler/build/cli/tile.set.local.js';
 import { TileSets } from '@basemaps/lambda-tiler/build/tile.set.cache.js';
 import { Config, Env, LogConfig } from '@basemaps/shared';
@@ -20,19 +20,11 @@ const BaseProvider = {
     },
 };
 export class BasemapsServerCommand extends Command {
-    async run() {
-        var _a;
-        const { args, flags } = this.parse(BasemapsServerCommand);
-        if (flags.verbose)
-            logger.level = 'debug';
-        const ServerUrl = `http://localhost:${flags.port}`;
-        // Force a default url base so WMTS requests know their relative url
-        process.env[Env.PublicUrlBase] = (_a = process.env[Env.PublicUrlBase]) !== null && _a !== void 0 ? _a : `http://localhost:${flags.port}`;
-        logger.info({ path: args.configPath }, 'Starting Server');
+    async loadFromPath(configPath, serverUrl) {
         const config = new ConfigProviderMemory();
         Config.setConfigProvider(config);
         const tifSets = new Map();
-        for await (const file of fsa.listDetails(args.configPath)) {
+        for await (const file of fsa.listDetails(configPath)) {
             const lowerPath = file.path.toLowerCase();
             if (lowerPath.endsWith('.tiff') || lowerPath.endsWith('.tif')) {
                 const tiffPath = dirname(file.path);
@@ -42,7 +34,7 @@ export class BasemapsServerCommand extends Command {
                 const tsl = new TileSetLocal(tileSet, tiffPath);
                 await tsl.load();
                 TileSets.add(tsl, new Date('3000-01-01').getTime());
-                const wmtsUrl = `${ServerUrl}/v1/tiles/${tileSet}/WMTSCapabilities.xml`;
+                const wmtsUrl = `${serverUrl}/v1/tiles/${tileSet}/WMTSCapabilities.xml`;
                 logger.info({ tileSetId: tileSet, wmtsUrl }, 'TileSet:Loaded');
                 if (!config.objects.has('pv_linz'))
                     config.put(BaseProvider);
@@ -66,14 +58,39 @@ export class BasemapsServerCommand extends Command {
             const tileSet = Config.unprefix(ConfigPrefix.TileSet, jsonData.id);
             if (jsonData.name == null)
                 jsonData.name = tileSet;
-            const wmtsUrl = `${ServerUrl}/v1/tiles/${tileSet}/WMTSCapabilities.xml`;
+            const wmtsUrl = `${serverUrl}/v1/tiles/${tileSet}/WMTSCapabilities.xml`;
             logger.info({ tileSetId: jsonData.id, wmtsUrl }, 'TileSet:Loaded');
         }
+    }
+    async run() {
+        var _a;
+        const { flags } = this.parse(BasemapsServerCommand);
+        if (flags.verbose)
+            logger.level = 'debug';
+        const ServerUrl = `http://localhost:${flags.port}`;
+        if (flags.config != null) {
+            logger.info({ path: flags.config }, 'Starting Server');
+            await this.loadFromPath(flags.config, ServerUrl);
+        }
+        else if (flags.dynamo != null) {
+            logger.info({ dynamo: flags.dynamo }, 'Starting Server');
+            Config.setConfigProvider(new ConfigProviderDynamo(flags.dynamo));
+        }
+        else {
+            throw new Error('Either a configuration path or dynamodb table name must be supplied');
+        }
+        // Force a default url base so WMTS requests know their relative url
+        process.env[Env.PublicUrlBase] = (_a = process.env[Env.PublicUrlBase]) !== null && _a !== void 0 ? _a : `http://localhost:${flags.port}`;
         BasemapsServer.listen(flags.port, () => {
             logger.info({ url: ServerUrl }, 'ServerStarted');
         });
     }
 }
 BasemapsServerCommand.description = 'Create a WMTS/XYZ Tile server for basemaps config';
-BasemapsServerCommand.flags = { verbose: flags.boolean(), port: flags.integer({ default: 5000 }) };
-BasemapsServerCommand.args = [{ name: 'configPath', required: true }];
+BasemapsServerCommand.flags = {
+    verbose: flags.boolean(),
+    port: flags.integer({ default: 5000 }),
+    dynamo: flags.string({ description: 'Dynamodb table', required: false }),
+    config: flags.string({ description: 'Configuration path', required: false }),
+};
+BasemapsServerCommand.args = [];

package/build/server.d.ts

@@ -1,2 +1,3 @@
-export declare const BasemapsServer: import("express-serve-static-core").Express;
+/// <reference types="node" />
+export declare const BasemapsServer: import("fastify").FastifyInstance<import("http").Server, import("http").IncomingMessage, import("http").ServerResponse, import("fastify").FastifyLoggerInstance> & PromiseLike<import("fastify").FastifyInstance<import("http").Server, import("http").IncomingMessage, import("http").ServerResponse, import("fastify").FastifyLoggerInstance>>;
 //# sourceMappingURL=server.d.ts.map

package/build/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc,6CAAY,CAAC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";AAMA,eAAO,MAAM,cAAc,kVAAY,CAAC"}

package/build/server.js

@@ -1,8 +1,8 @@
 import { handler } from '@basemaps/lambda-tiler';
-import ulid from 'ulid';
-import express from 'express';
 import { lf } from '@linzjs/lambda';
-export const BasemapsServer = express();
+import fastify from 'fastify';
+import ulid from 'ulid';
+export const BasemapsServer = fastify();
 function isAlbResult(r) {
     if (typeof r !== 'object')
         return false;
@@ -15,25 +15,27 @@ BasemapsServer.get('/v1/*', async (req, res) => {
     const event = {
         httpMethod: 'GET',
         requestContext: { elb: { targetGroupArn: 'arn:fake' } },
-        path: req.path,
+        path: req.url,
         headers: req.headers,
         queryStringParameters: req.query,
         body: null,
         isBase64Encoded: false,
     };
-    if (req.query['api'] == null)
-        req.query['api'] = 'c' + instanceId;
+    if (req.query.api == null)
+        req.query.api = 'c' + instanceId;
     handler(event, {}, (err, r) => {
         var _a;
         if (err || !isAlbResult(r)) {
             lf.Logger.fatal({ err }, 'RequestFailed');
-            return res.end(err);
+            res.send(err);
+            return;
         }
         res.status(r.statusCode);
         for (const [key, value] of Object.entries((_a = r.headers) !== null && _a !== void 0 ? _a : {}))
             res.header(key, String(value));
         if (r.body)
             res.send(Buffer.from(r.body, r.isBase64Encoded ? 'base64' : 'utf8'));
-        res.end();
+        else
+            res.send('Not found');
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/server",
-  "version": "6.21.1",
+  "version": "6.23.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -34,15 +34,12 @@
   "dependencies": {
     "@basemaps/config": "^6.21.1",
     "@basemaps/geo": "^6.21.1",
-    "@basemaps/lambda-tiler": "^6.21.1",
-    "@basemaps/shared": "^6.21.1",
+    "@basemaps/lambda-tiler": "^6.23.0",
+    "@basemaps/shared": "^6.23.0",
     "@linzjs/lambda": "^2.0.0",
     "@oclif/command": "^1.8.0",
-    "express": "^4.17.1",
+    "fastify": "^3.27.4",
     "pretty-json-log": "^1.0.0"
   },
-  "devDependencies": {
-    "@types/express": "^4.17.13"
-  },
-  "gitHead": "69d69648ab7b37623ab14f70d29b449d14db5a7f"
+  "gitHead": "5c956ba1b1f87c1712fcc4f9d4afc20e7a427285"
 }