@basemaps/server 6.34.0 → 6.36.0

package/build/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAW,MAAM,oCAAoC,CAAC;AAO9E,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,MAAM,kEAIH;IACH,MAAM,kEAIH;IACH,IAAI,mEAKD;;IASG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAsBjC"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAW,MAAM,oCAAoC,CAAC;AAO9E,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,MAAM,kEAIH;IACH,MAAM,kEAIH;IACH,IAAI,mEAKD;;IASG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAkBjC"}

package/build/cli.js

@@ -38,14 +38,8 @@ export class BasemapsServerCommand extends BaseCommandLine {
         // Force a default url base so WMTS requests know their relative url
         process.env[Env.PublicUrlBase] = ServerUrl;
         const server = await createServer({ config, assets }, logger);
-        await new Promise((resolve, reject) => {
-            server.listen(port !== null && port !== void 0 ? port : DefaultPort, '0.0.0.0', (err) => {
-                if (err)
-                    reject(err);
-                logger.info({ url: ServerUrl }, 'ServerStarted');
-                resolve();
-            });
-        });
+        await server.listen({ port: port !== null && port !== void 0 ? port : DefaultPort, host: '0.0.0.0' });
+        logger.info({ url: ServerUrl }, 'ServerStarted');
     }
 }
 //# sourceMappingURL=cli.js.map

package/build/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,CAAC,OAAO,GAAG,iBAAiB,CAAC;AAEpC,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,MAAM,OAAO,qBAAsB,SAAQ,eAAe;IAkBxD;QACE,KAAK,CAAC;YACJ,YAAY,EAAE,iBAAiB;YAC/B,eAAe,EAAE,oDAAoD;SACtE,CAAC,CAAC;QArBL,WAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YAClC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,6BAA6B;SAC3C,CAAC,CAAC;QACH,WAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YAClC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,+CAA+C;SAC7D,CAAC,CAAC;QACH,SAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC;YACjC,YAAY,EAAE,MAAM;YACpB,iBAAiB,EAAE,QAAQ;YAC3B,WAAW,EAAE,aAAa;YAC1B,YAAY,EAAE,WAAW;SAC1B,CAAC,CAAC;IAOH,CAAC;IAED,KAAK,CAAC,SAAS;;QACb,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC;QAExB,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC;QACvB,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,mCAAI,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC;QACjF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAEjC,MAAM,SAAS,GAAG,MAAA,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,mCAAI,oBAAoB,IAAI,EAAE,CAAC;QAC3E,oEAAoE;QACpE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;QAE3C,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;QAC9D,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,CAAC,MAAM,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,WAAW,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;gBACpD,IAAI,GAAG;oBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;gBACrB,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,eAAe,CAAC,CAAC;gBACjD,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,CAAC,OAAO,GAAG,iBAAiB,CAAC;AAEpC,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,MAAM,OAAO,qBAAsB,SAAQ,eAAe;IAkBxD;QACE,KAAK,CAAC;YACJ,YAAY,EAAE,iBAAiB;YAC/B,eAAe,EAAE,oDAAoD;SACtE,CAAC,CAAC;QArBL,WAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YAClC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,6BAA6B;SAC3C,CAAC,CAAC;QACH,WAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YAClC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,+CAA+C;SAC7D,CAAC,CAAC;QACH,SAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC;YACjC,YAAY,EAAE,MAAM;YACpB,iBAAiB,EAAE,QAAQ;YAC3B,WAAW,EAAE,aAAa;YAC1B,YAAY,EAAE,WAAW;SAC1B,CAAC,CAAC;IAOH,CAAC;IAED,KAAK,CAAC,SAAS;;QACb,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC;QAExB,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC;QACvB,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,mCAAI,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC;QACjF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAEjC,MAAM,SAAS,GAAG,MAAA,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,mCAAI,oBAAoB,IAAI,EAAE,CAAC;QAC3E,oEAAoE;QACpE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;QAE3C,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;QAE9D,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACpE,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,eAAe,CAAC,CAAC;IACnD,CAAC;CACF"}

package/build/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAIrD,OAAgB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AA4BnD,MAAM,WAAW,aAAa;IAC5B,qBAAqB;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CA2EjG"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,OAAO,EAAoB,MAAM,kBAAkB,CAAC;AAKpF,OAAgB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAqBnD,MAAM,WAAW,aAAa;IAC5B,qBAAqB;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CA8EjG"}

package/build/server.js

@@ -1,21 +1,14 @@
-import { Config, ConfigJson, ConfigProviderDynamo, ConfigProviderMemory } from '@basemaps/config';
+import { ConfigJson, ConfigPrefix, ConfigProviderDynamo, ConfigProviderMemory } from '@basemaps/config';
 import { handler } from '@basemaps/lambda-tiler';
-import { Env, fsa } from '@basemaps/shared';
+import { fsa, getDefaultConfig, setDefaultConfig } from '@basemaps/shared';
+import formBodyPlugin from '@fastify/formbody';
 import fastifyStatic from '@fastify/static';
-import { lf } from '@linzjs/lambda';
+import { LambdaUrlRequest } from '@linzjs/lambda';
 import fastify from 'fastify';
-import formBodyPlugin from '@fastify/formbody';
 import { createRequire } from 'module';
 import path from 'path';
 import ulid from 'ulid';
 import { URL } from 'url';
-function isAlbResult(r) {
-    if (typeof r !== 'object')
-        return false;
-    if (r == null)
-        return false;
-    return 'statusCode' in r;
-}
 const instanceId = ulid.ulid();
 function getLandingLocation() {
     try {
@@ -38,17 +31,17 @@ export async function createServer(opts, logger) {
         // Load config from dynamodb table
         const table = opts.config.slice('dynamodb://'.length);
         logger.info({ path: opts.config, table, mode: 'dynamo' }, 'Starting Server');
-        Config.setConfigProvider(new ConfigProviderDynamo(table));
+        setDefaultConfig(new ConfigProviderDynamo(table));
     }
-    else if (opts.config.startsWith(Config.ConfigBundle.prefix)) {
+    else if (opts.config.startsWith(ConfigPrefix.ConfigBundle)) {
         // Load Bundled config by dynamo refference
-        const cb = await Config.ConfigBundle.get(opts.config);
+        const cb = await getDefaultConfig().ConfigBundle.get(opts.config);
         if (cb == null)
             throw new Error(`Config bunble not exists for ${opts.config}`);
         const configJson = await fsa.readJson(cb.path);
         const mem = ConfigProviderMemory.fromJson(configJson);
         mem.createVirtualTileSets();
-        Config.setConfigProvider(mem);
+        setDefaultConfig(mem);
     }
     else if (opts.config.endsWith('.json') || opts.config.endsWith('.json.gz')) {
         // Bundled config
@@ -56,20 +49,20 @@ export async function createServer(opts, logger) {
         const configJson = await fsa.readJson(opts.config);
         const mem = ConfigProviderMemory.fromJson(configJson);
         mem.createVirtualTileSets();
-        Config.setConfigProvider(mem);
+        setDefaultConfig(mem);
     }
     else {
         const mem = await ConfigJson.fromPath(opts.config, logger);
         logger.info({ path: opts.config, mode: 'config' }, 'Starting Server');
         mem.createVirtualTileSets();
-        Config.setConfigProvider(mem);
+        setDefaultConfig(mem);
     }
     if (opts.assets) {
         const isExists = await fsa.exists(opts.assets);
         if (!isExists)
             throw new Error(`--assets path "${opts.assets}" does not exist`);
         logger.info({ path: opts.assets }, 'Config:Assets');
-        process.env[Env.AssetLocation] = opts.assets;
+        getDefaultConfig().assets = opts.assets;
     }
     const landingLocation = getLandingLocation();
     if (landingLocation == null) {
@@ -82,31 +75,27 @@ export async function createServer(opts, logger) {
     }
     BasemapsServer.all('/v1/*', (req, res) => {
         const url = new URL(`${req.protocol}://${req.hostname}${req.url}`);
-        const event = {
-            httpMethod: req.method,
-            requestContext: { elb: { targetGroupArn: 'arn:fake' } },
-            path: url.pathname,
-            headers: req.headers,
-            queryStringParameters: req.query,
-            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');
-                res.send(err);
-                return;
-            }
-            res.status(r.statusCode);
-            for (const [key, value] of Object.entries((_a = r.headers) !== null && _a !== void 0 ? _a : {}))
+        const request = new LambdaUrlRequest({
+            requestContext: { http: { method: req.method.toUpperCase() } },
+            headers: req.headers,
+            rawPath: url.pathname,
+            rawQueryString: new URLSearchParams(req.query).toString(),
+            isBase64Encoded: false,
+        }, {}, logger);
+        handler.router
+            .handle(request)
+            .then((r) => {
+            res.status(r.status);
+            for (const [key, value] of r.headers.entries())
                 res.header(key, String(value));
-            if (r.body)
-                res.send(Buffer.from(r.body, r.isBase64Encoded ? 'base64' : 'utf8'));
-            else
-                res.send('Not found');
+            res.send(Buffer.from(r.body, r.isBase64Encoded ? 'base64' : undefined));
+        })
+            .catch((e) => {
+            request.log.fatal({ err: e }, 'RequestFailed');
+            res.status(500);
+            res.send(e);
         });
     });
     return BasemapsServer;

package/build/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/server",
-  "version": "6.34.0",
+  "version": "6.36.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -44,21 +44,21 @@
     "bin/"
   ],
   "optionalDependencies": {
-    "@basemaps/landing": "^6.34.0"
+    "@basemaps/landing": "^6.36.0"
   },
   "dependencies": {
     "sharp": "^0.30.7"
   },
   "devDependencies": {
-    "@basemaps/config": "^6.34.0",
+    "@basemaps/config": "^6.36.0",
     "@basemaps/geo": "^6.32.1",
-    "@basemaps/lambda-tiler": "^6.34.0",
+    "@basemaps/lambda-tiler": "^6.36.0",
     "@basemaps/landing": "^6.27.0",
-    "@basemaps/shared": "^6.34.0",
+    "@basemaps/shared": "^6.36.0",
     "@fastify/formbody": "^7.0.1",
     "@fastify/static": "^6.5.0",
     "fastify": "^4.3.0",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "1685fa12be66df74bc64d7f76b7355390980a43f"
+  "gitHead": "c232694ad1f1186b7b56a8af1def56ef165df8fd"
 }