@basemaps/server 6.9.1 → 6.10.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.10.0](https://github.com/linz/basemaps/compare/v6.9.1...v6.10.0) (2021-09-22)
+
+
+### Bug Fixes
+
+* **lambda-tiler:** move to NZTM2000Quad for health check endpoint ([#1867](https://github.com/linz/basemaps/issues/1867)) ([d4613f0](https://github.com/linz/basemaps/commit/d4613f04f1081f785831488ea53bc8d8da7aae70))
+
+
+### Features
+
+* replace s3fs with chunkd/fs ([#1859](https://github.com/linz/basemaps/issues/1859)) ([9b6f2d3](https://github.com/linz/basemaps/commit/9b6f2d3609c336f96c2ae32246f241cb396e71c8))
+* switch to esm modules ([#1857](https://github.com/linz/basemaps/issues/1857)) ([75bdff8](https://github.com/linz/basemaps/commit/75bdff8da35104f10f6b6ecf58a2c6006245af6e))
+
+
+
+
+
 ## [6.9.1](https://github.com/linz/basemaps/compare/v6.9.0...v6.9.1) (2021-09-09)
 
 **Note:** Version bump only for package @basemaps/server

package/bin/basemaps-server.js

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+
+import { BasemapsServerCommand } from '../build/cli.js';
+import Errors from '@oclif/errors/handle.js';
+BasemapsServerCommand.run().catch((error) => {
+  if (error.oclif) return Errors(error);
+  console.log(error);
+});

package/build/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,gBAAgB,CAAC;AAShD,qBAAa,qBAAsB,SAAQ,OAAO;IAC9C,MAAM,CAAC,WAAW,SAAuD;IACzE,MAAM,CAAC,KAAK;;;MAAwE;IAEpF,MAAM,CAAC,IAAI;;;QAA4C;IAEjD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAuC7B"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,gBAAgB,CAAC;AAShD,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;CAuC3B"}

package/build/cli.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasemapsServerCommand = void 0;
-const config_1 = require("@basemaps/config");
-const shared_1 = require("@basemaps/shared");
-const s3fs_1 = require("@linzjs/s3fs");
-const command_1 = require("@oclif/command");
-const pretty_json_log_1 = require("pretty-json-log");
-const config_2 = require("@basemaps/config");
-const server_1 = require("./server");
+import { ConfigProviderMemory, parseRgba } from '@basemaps/config';
+import { Config, Env, LogConfig } from '@basemaps/shared';
+import { fsa } from '@linzjs/s3fs';
+import { Command, flags } from '@oclif/command';
+import { PrettyTransform } from 'pretty-json-log';
+import { ConfigPrefix } from '@basemaps/config';
+import { BasemapsServer } from './server.js';
 if (process.stdout.isTTY)
-    shared_1.LogConfig.setOutputStream(pretty_json_log_1.PrettyTransform.stream());
-const logger = shared_1.LogConfig.get();
-class BasemapsServerCommand extends command_1.Command {
+    LogConfig.setOutputStream(PrettyTransform.stream());
+const logger = LogConfig.get();
+export class BasemapsServerCommand extends Command {
     async run() {
         var _a;
         const { args, flags } = this.parse(BasemapsServerCommand);
@@ -19,15 +16,15 @@ class BasemapsServerCommand extends command_1.Command {
             logger.level = 'debug';
         const ServerUrl = `http://localhost:${flags.port}`;
         // Force a default url base so WMTS requests know their relative url
-        process.env[shared_1.Env.PublicUrlBase] = (_a = process.env[shared_1.Env.PublicUrlBase]) !== null && _a !== void 0 ? _a : `http://localhost:${flags.port}`;
+        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');
-        const config = new config_1.ConfigProviderMemory();
-        shared_1.Config.setConfigProvider(config);
-        for await (const file of s3fs_1.fsa.listDetails(args.configPath)) {
+        const config = new ConfigProviderMemory();
+        Config.setConfigProvider(config);
+        for await (const file of fsa.listDetails(args.configPath)) {
             if (!file.path.endsWith('.json'))
                 continue;
             logger.trace({ path: file.path, size: file.size }, 'Config:Load');
-            const jsonData = await s3fs_1.fsa.read(file.path).then((c) => JSON.parse(c.toString()));
+            const jsonData = await fsa.read(file.path).then((c) => JSON.parse(c.toString()));
             if (jsonData.id == null) {
                 logger.warn({ path: file.path }, 'Config:Invalid Missing "id"');
                 continue;
@@ -36,22 +33,21 @@ class BasemapsServerCommand extends command_1.Command {
             jsonData.updatedAt = Date.now();
             // TODO we should really use something like zod to validate this
             config.put(jsonData);
-            if (!shared_1.Config.TileSet.is(jsonData) || !shared_1.Config.isTileSetRaster(jsonData))
+            if (!Config.TileSet.is(jsonData) || !Config.isTileSetRaster(jsonData))
                 continue;
             if (typeof jsonData.background === 'string')
-                jsonData.background = config_1.parseRgba(jsonData.background);
-            const tileSet = shared_1.Config.unprefix(config_2.ConfigPrefix.TileSet, jsonData.id);
+                jsonData.background = parseRgba(jsonData.background);
+            const tileSet = Config.unprefix(ConfigPrefix.TileSet, jsonData.id);
             if (jsonData.name == null)
                 jsonData.name = tileSet;
             const wmtsUrl = `${ServerUrl}/v1/tiles/${tileSet}/WMTSCapabilities.xml`;
             logger.info({ tileSetId: jsonData.id, wmtsUrl }, 'TileSet:Loaded');
         }
-        server_1.BasemapsServer.listen(flags.port, () => {
+        BasemapsServer.listen(flags.port, () => {
             logger.info({ url: ServerUrl }, 'ServerStarted');
         });
     }
 }
-exports.BasemapsServerCommand = BasemapsServerCommand;
 BasemapsServerCommand.description = 'Create a WMTS/XYZ Tile server for basemaps config';
-BasemapsServerCommand.flags = { verbose: command_1.flags.boolean(), port: command_1.flags.integer({ default: 5000 }) };
+BasemapsServerCommand.flags = { verbose: flags.boolean(), port: flags.integer({ default: 5000 }) };
 BasemapsServerCommand.args = [{ name: 'configPath', required: true }];

package/build/index.d.ts

@@ -1,2 +1,2 @@
-export { BasemapsServer } from './server';
+export { BasemapsServer } from './server.js';
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC"}

package/build/index.js

@@ -1,5 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasemapsServer = void 0;
-var server_1 = require("./server");
-Object.defineProperty(exports, "BasemapsServer", { enumerable: true, get: function () { return server_1.BasemapsServer; } });
+export { BasemapsServer } from './server.js';

package/build/server.js

@@ -1,31 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasemapsServer = void 0;
-const tslib_1 = require("tslib");
-const lambda_1 = require("@linzjs/lambda");
-const lambda_tiler_1 = require("@basemaps/lambda-tiler");
-const ulid = tslib_1.__importStar(require("ulid"));
-const express_1 = tslib_1.__importDefault(require("express"));
-const shared_1 = require("@basemaps/shared");
-exports.BasemapsServer = express_1.default();
-exports.BasemapsServer.get('/v1/*', async (req, res) => {
+import { HttpHeader, HttpHeaderRequestId, LambdaAlbRequest } from '@linzjs/lambda';
+import { handleRequest } from '@basemaps/lambda-tiler';
+import * as ulid from 'ulid';
+import express from 'express';
+import { LogConfig } from '@basemaps/shared';
+export const BasemapsServer = express();
+BasemapsServer.get('/v1/*', async (req, res) => {
     const startTime = Date.now();
     const requestId = ulid.ulid();
-    const logger = shared_1.LogConfig.get().child({ id: requestId });
-    const ctx = new lambda_1.LambdaAlbRequest({
+    const logger = LogConfig.get().child({ id: requestId });
+    const ctx = new LambdaAlbRequest({
         httpMethod: 'get',
         path: req.path,
         queryStringParameters: req.query,
     }, {}, logger);
-    if (ctx.header(lambda_1.HttpHeaderRequestId.RequestId) == null) {
-        ctx.headers.set(lambda_1.HttpHeaderRequestId.RequestId, 'c' + requestId);
+    if (ctx.header(HttpHeaderRequestId.RequestId) == null) {
+        ctx.headers.set(HttpHeaderRequestId.RequestId, 'c' + requestId);
     }
-    const ifNoneMatch = req.header(lambda_1.HttpHeader.IfNoneMatch);
+    const ifNoneMatch = req.header(HttpHeader.IfNoneMatch);
     if (ifNoneMatch != null && !Array.isArray(ifNoneMatch)) {
-        ctx.headers.set(lambda_1.HttpHeader.IfNoneMatch.toLowerCase(), ifNoneMatch);
+        ctx.headers.set(HttpHeader.IfNoneMatch.toLowerCase(), ifNoneMatch);
     }
     try {
-        const data = await lambda_tiler_1.handleRequest(ctx);
+        const data = await handleRequest(ctx);
         res.status(data.status);
         if (data.headers) {
             for (const [header, value] of data.headers) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/server",
-  "version": "6.9.1",
+  "version": "6.10.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -11,6 +11,10 @@
     "url": "https://linz.govt.nz",
     "organization": true
   },
+  "type": "module",
+  "engines": {
+    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+  },
   "license": "MIT",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -21,24 +25,24 @@
     "access": "public"
   },
   "bin": {
-    "basemaps-server": "./bin/basemaps-server"
+    "basemaps-server": "./bin/basemaps-server.js"
   },
   "files": [
     "build/",
     "bin/"
   ],
   "dependencies": {
-    "@basemaps/config": "^6.9.1",
-    "@basemaps/geo": "^6.9.1",
-    "@basemaps/lambda-tiler": "^6.9.1",
-    "@basemaps/shared": "^6.9.1",
-    "@linzjs/lambda": "^1.1.0",
+    "@basemaps/config": "^6.10.0",
+    "@basemaps/geo": "^6.10.0",
+    "@basemaps/lambda-tiler": "^6.10.0",
+    "@basemaps/shared": "^6.10.0",
+    "@linzjs/lambda": "^2.0.0",
     "@oclif/command": "^1.8.0",
     "express": "^4.17.1",
-    "pretty-json-log": "^0.3.2"
+    "pretty-json-log": "^1.0.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.13"
   },
-  "gitHead": "ba0ad6055255b611b6e3e292cf4f4dee617661ee"
+  "gitHead": "c88706ff58f4dfe83bf2b757d1483194accdb4c9"
 }

package/bin/basemaps-server

@@ -1,8 +0,0 @@
-#!/usr/bin/env node
-
-require('../build/cli.js')
-    .BasemapsServerCommand.run()
-    .catch((error) => {
-        if (error.oclif) return require('@oclif/errors/handle')(error);
-        console.log(error);
-    });