@basemaps/server 6.22.0 → 6.24.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.24.0](https://github.com/linz/basemaps/compare/v6.23.0...v6.24.0) (2022-04-05)
+
+**Note:** Version bump only for package @basemaps/server
+
+
+
+
+
+# [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)
 
 

package/build/cli.d.ts

@@ -5,11 +5,9 @@ export declare class BasemapsServerCommand extends Command {
         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>;
 }

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,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAkBhD,qBAAa,qBAAsB,SAAQ,OAAO;IAChD,MAAM,CAAC,WAAW,SAAuD;IACzE,MAAM,CAAC,KAAK;;;;MAIV;IAEF,MAAM,CAAC,IAAI;;;QAA6C;IAElD,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8ClE,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA0B3B"}
+{"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

@@ -64,15 +64,13 @@ export class BasemapsServerCommand extends Command {
     }
     async run() {
         var _a;
-        const { args, flags } = this.parse(BasemapsServerCommand);
+        const { flags } = this.parse(BasemapsServerCommand);
         if (flags.verbose)
             logger.level = 'debug';
-        if (args.configPath == null && flags.dynamo == null) {
-        }
         const ServerUrl = `http://localhost:${flags.port}`;
-        if (args.configPath != null) {
-            logger.info({ path: args.configPath }, 'Starting Server');
-            await this.loadFromPath(args.configPath, ServerUrl);
+        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');
@@ -93,5 +91,6 @@ 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 = [{ name: 'configPath', 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.22.0",
+  "version": "6.24.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.22.0",
-    "@basemaps/shared": "^6.22.0",
+    "@basemaps/lambda-tiler": "^6.24.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": "b85a4a628bcdfea657a37de97faa23dde5c34798"
+  "gitHead": "8cfdb4b9821ae3e35e1fd56a551ed489817422a9"
 }