@basemaps/server 6.10.0 → 6.15.0

package/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.15.0](https://github.com/linz/basemaps/compare/v6.14.2...v6.15.0) (2021-11-28)
+
+**Note:** Version bump only for package @basemaps/server
+
+
+
+
+
+## [6.12.1](https://github.com/linz/basemaps/compare/v6.12.0...v6.12.1) (2021-10-19)
+
+**Note:** Version bump only for package @basemaps/server
+
+
+
+
+
+# [6.12.0](https://github.com/linz/basemaps/compare/v6.11.0...v6.12.0) (2021-10-05)
+
+**Note:** Version bump only for package @basemaps/server
+
+
+
+
+
+# [6.11.0](https://github.com/linz/basemaps/compare/v6.10.1...v6.11.0) (2021-10-03)
+
+
+### Features
+
+* **server:** add ability to serve a folder full of tiffs ([#1889](https://github.com/linz/basemaps/issues/1889)) ([adefde1](https://github.com/linz/basemaps/commit/adefde176ce03db5c6c978d8b85a11fc7cd15693))
+* **server:** use the lambda handler directly ([#1870](https://github.com/linz/basemaps/issues/1870)) ([408ff56](https://github.com/linz/basemaps/commit/408ff5654cc04aae35d05eb5bbc47a51f99ec5b2))
+
+
+
+
+
 # [6.10.0](https://github.com/linz/basemaps/compare/v6.9.1...v6.10.0) (2021-09-22)
 
 

package/bin/basemaps-server.js

@@ -2,7 +2,8 @@
 
 import { BasemapsServerCommand } from '../build/cli.js';
 import Errors from '@oclif/errors/handle.js';
-BasemapsServerCommand.run().catch((error) => {
+
+BasemapsServerCommand.run(void 0, import.meta.url).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;IAChD,MAAM,CAAC,WAAW,SAAuD;IACzE,MAAM,CAAC,KAAK;;;MAAwE;IAEpF,MAAM,CAAC,IAAI;;;QAA4C;IAEjD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAuC3B"}
+{"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"}

package/build/cli.js

@@ -1,13 +1,24 @@
-import { ConfigProviderMemory, parseRgba } from '@basemaps/config';
+// Configure the logging before importing everything
+import { ConfigPrefix, 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';
 import { fsa } from '@linzjs/s3fs';
 import { Command, flags } from '@oclif/command';
-import { PrettyTransform } from 'pretty-json-log';
-import { ConfigPrefix } from '@basemaps/config';
+import { basename, dirname } from 'path';
 import { BasemapsServer } from './server.js';
-if (process.stdout.isTTY)
-    LogConfig.setOutputStream(PrettyTransform.stream());
 const logger = LogConfig.get();
+const BaseProvider = {
+    id: 'pv_linz',
+    version: 1,
+    serviceIdentification: {},
+    serviceProvider: {
+        name: 'basemaps/server',
+        contact: {
+            address: {},
+        },
+    },
+};
 export class BasemapsServerCommand extends Command {
     async run() {
         var _a;
@@ -20,8 +31,23 @@ export class BasemapsServerCommand extends Command {
         logger.info({ path: args.configPath }, 'Starting Server');
         const config = new ConfigProviderMemory();
         Config.setConfigProvider(config);
+        const tifSets = new Map();
         for await (const file of fsa.listDetails(args.configPath)) {
-            if (!file.path.endsWith('.json'))
+            const lowerPath = file.path.toLowerCase();
+            if (lowerPath.endsWith('.tiff') || lowerPath.endsWith('.tif')) {
+                const tiffPath = dirname(file.path);
+                if (tifSets.has(tiffPath))
+                    continue;
+                const tileSet = basename(tiffPath);
+                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`;
+                logger.info({ tileSetId: tileSet, wmtsUrl }, 'TileSet:Loaded');
+                if (!config.objects.has('pv_linz'))
+                    config.put(BaseProvider);
+            }
+            if (!lowerPath.endsWith('.json'))
                 continue;
             logger.trace({ path: file.path, size: file.size }, 'Config:Load');
             const jsonData = await fsa.read(file.path).then((c) => JSON.parse(c.toString()));

package/build/server.d.ts.map

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

package/build/server.js

@@ -1,43 +1,39 @@
-import { HttpHeader, HttpHeaderRequestId, LambdaAlbRequest } from '@linzjs/lambda';
-import { handleRequest } from '@basemaps/lambda-tiler';
-import * as ulid from 'ulid';
+import { handler } from '@basemaps/lambda-tiler';
+import ulid from 'ulid';
 import express from 'express';
-import { LogConfig } from '@basemaps/shared';
+import { lf } from '@linzjs/lambda';
 export const BasemapsServer = express();
+function isAlbResult(r) {
+    if (typeof r !== 'object')
+        return false;
+    if (r == null)
+        return false;
+    return 'statusCode' in r;
+}
+const instanceId = ulid.ulid();
 BasemapsServer.get('/v1/*', async (req, res) => {
-    const startTime = Date.now();
-    const requestId = ulid.ulid();
-    const logger = LogConfig.get().child({ id: requestId });
-    const ctx = new LambdaAlbRequest({
-        httpMethod: 'get',
+    const event = {
+        httpMethod: 'GET',
+        requestContext: { elb: { targetGroupArn: 'arn:fake' } },
         path: req.path,
+        headers: req.headers,
         queryStringParameters: req.query,
-    }, {}, logger);
-    if (ctx.header(HttpHeaderRequestId.RequestId) == null) {
-        ctx.headers.set(HttpHeaderRequestId.RequestId, 'c' + requestId);
-    }
-    const ifNoneMatch = req.header(HttpHeader.IfNoneMatch);
-    if (ifNoneMatch != null && !Array.isArray(ifNoneMatch)) {
-        ctx.headers.set(HttpHeader.IfNoneMatch.toLowerCase(), ifNoneMatch);
-    }
-    try {
-        const data = await handleRequest(ctx);
-        res.status(data.status);
-        if (data.headers) {
-            for (const [header, value] of data.headers) {
-                res.header(header, String(value));
-            }
+        body: null,
+        isBase64Encoded: false,
+    };
+    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);
         }
-        if (data.status < 299 && data.status > 199)
-            res.end(data.body);
-        else
-            res.end();
-        const duration = Date.now() - startTime;
-        logger.info({ ...ctx.logContext, metrics: ctx.timer.metrics, status: data.status, duration }, 'Request:Done');
-    }
-    catch (e) {
-        logger.fatal({ ...ctx.logContext, err: e }, 'Request:Failed');
-        res.status(500);
+        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();
-    }
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/server",
-  "version": "6.10.0",
+  "version": "6.15.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -34,8 +34,8 @@
   "dependencies": {
     "@basemaps/config": "^6.10.0",
     "@basemaps/geo": "^6.10.0",
-    "@basemaps/lambda-tiler": "^6.10.0",
-    "@basemaps/shared": "^6.10.0",
+    "@basemaps/lambda-tiler": "^6.15.0",
+    "@basemaps/shared": "^6.12.0",
     "@linzjs/lambda": "^2.0.0",
     "@oclif/command": "^1.8.0",
     "express": "^4.17.1",
@@ -44,5 +44,5 @@
   "devDependencies": {
     "@types/express": "^4.17.13"
   },
-  "gitHead": "c88706ff58f4dfe83bf2b757d1483194accdb4c9"
+  "gitHead": "69cf1c417a9de62e7ac38b8a4d9309a1359260fa"
 }