@basemaps/server 6.28.0 → 6.30.0

package/build/cli.d.ts

@@ -1,13 +1,9 @@
-import { LogType } from '@basemaps/shared';
 import { BaseCommandLine } from '@basemaps/shared/build/cli/base.js';
 export declare class BasemapsServerCommand extends BaseCommandLine {
     config: import("@rushstack/ts-command-line").CommandLineStringParameter;
-    ignoreConfig: import("@rushstack/ts-command-line").CommandLineFlagParameter;
-    bundle: import("@rushstack/ts-command-line").CommandLineStringParameter;
+    assets: import("@rushstack/ts-command-line").CommandLineStringParameter;
     port: import("@rushstack/ts-command-line").CommandLineIntegerParameter;
     constructor();
-    static args: never[];
-    loadTiffs(tiffPath: string, serverUrl: string, logger: LogType): Promise<void>;
     onExecute(): 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":"AAGA,OAAO,EAAsC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAW,MAAM,oCAAoC,CAAC;AAoB9E,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,MAAM,kEAIH;IACH,YAAY,gEAGT;IACH,MAAM,kEAIH;IACH,IAAI,mEAKD;;IASH,MAAM,CAAC,IAAI,UAAM;IAEX,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B9E,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAkDjC"}
+{"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

@@ -1,27 +1,12 @@
-import { ConfigJson, ConfigProviderDynamo, ConfigProviderMemory } 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, Const, Env, fsa, LogConfig } from '@basemaps/shared';
+import { Const, Env, LogConfig } from '@basemaps/shared';
 import { BaseCommandLine, CliInfo } from '@basemaps/shared/build/cli/base.js';
-import { basename, dirname } from 'path';
 import { createServer } from './server.js';
 CliInfo.package = 'basemaps/server';
-const BaseProvider = {
-    id: 'pv_linz',
-    version: 1,
-    serviceIdentification: {},
-    serviceProvider: {
-        name: 'basemaps/server',
-        contact: {
-            address: {},
-        },
-    },
-};
 const DefaultPort = 5000;
 export class BasemapsServerCommand extends BaseCommandLine {
     constructor() {
         super({
-            toolFilename: 'bms',
+            toolFilename: 'basemaps-server',
             toolDescription: 'Create a WMTS/XYZ Tile server from basemaps config',
         });
         this.config = this.defineStringParameter({
@@ -29,14 +14,10 @@ export class BasemapsServerCommand extends BaseCommandLine {
             parameterLongName: '--config',
             description: 'Configuration source to use',
         });
-        this.ignoreConfig = this.defineFlagParameter({
-            parameterLongName: '--no-config',
-            description: 'Assume no config and just load tiffs from the configuration path',
-        });
-        this.bundle = this.defineStringParameter({
-            argumentName: 'BUNDLE',
-            parameterLongName: '--bundle',
-            description: 'Compile the configuration into a bundle and output path',
+        this.assets = this.defineStringParameter({
+            argumentName: 'ASSETS',
+            parameterLongName: '--assets',
+            description: 'Where the assets (sprites, fonts) are located',
         });
         this.port = this.defineIntegerParameter({
             argumentName: 'PORT',
@@ -45,28 +26,6 @@ export class BasemapsServerCommand extends BaseCommandLine {
             defaultValue: DefaultPort,
         });
     }
-    async loadTiffs(tiffPath, serverUrl, logger) {
-        const config = new ConfigProviderMemory();
-        Config.setConfigProvider(config);
-        const tifSets = new Map();
-        for await (const file of fsa.details(tiffPath)) {
-            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);
-                tifSets.set(tiffPath, tsl);
-                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);
-            }
-        }
-    }
     async onExecute() {
         var _a, _b;
         await super.onExecute();
@@ -74,49 +33,14 @@ export class BasemapsServerCommand extends BaseCommandLine {
         logger.level = 'debug';
         const config = (_a = this.config.value) !== null && _a !== void 0 ? _a : 'dynamodb://' + Const.TileMetadata.TableName;
         const port = this.port.value;
+        const assets = this.assets.value;
         const ServerUrl = (_b = Env.get(Env.PublicUrlBase)) !== null && _b !== void 0 ? _b : `http://localhost:${port}`;
         // Force a default url base so WMTS requests know their relative url
         process.env[Env.PublicUrlBase] = ServerUrl;
-        if (config.startsWith('dynamodb://')) {
-            // Load config from dynamodb table
-            const table = config.slice('dynamodb://'.length);
-            logger.info({ path: config, table, mode: 'dynamo' }, 'Starting Server');
-            Config.setConfigProvider(new ConfigProviderDynamo(table));
-        }
-        else if (config.endsWith('.json')) {
-            // Bundled config
-            logger.info({ path: config, mode: 'config' }, 'Starting Server');
-            const configJson = await fsa.read(config);
-            const mem = ConfigProviderMemory.fromJson(JSON.parse(configJson.toString()));
-            Config.setConfigProvider(mem);
-        }
-        else if (this.ignoreConfig.value) {
-            // Load config directly from tiff files
-            logger.info({ path: config, mode: 'tiffs' }, 'Starting Server');
-            await this.loadTiffs(config, ServerUrl, logger);
-        }
-        else {
-            const mem = await ConfigJson.fromPath(config, logger);
-            const bundlePath = this.bundle.value;
-            if (bundlePath) {
-                await fsa.writeJson(bundlePath, mem.toJson());
-                logger.info({ path: bundlePath }, 'ConfigBundled');
-                return;
-            }
-            // Assume the folder is a collection of config files
-            logger.info({ path: config, mode: 'config' }, 'Starting Server');
-            mem.createVirtualTileSets();
-            Config.setConfigProvider(mem);
-        }
-        if (this.bundle.value != null) {
-            throw new Error('--bundle path provided without providing a configuration path');
-        }
-        createServer(logger).listen(port !== null && port !== void 0 ? port : DefaultPort, '0.0.0.0', () => {
+        const server = await createServer({ config, assets }, logger);
+        server.listen(port !== null && port !== void 0 ? port : DefaultPort, '0.0.0.0', () => {
             logger.info({ url: ServerUrl }, 'ServerStarted');
         });
     }
 }
-BasemapsServerCommand.args = [];
-new BasemapsServerCommand().executeWithoutErrorHandling().catch((c) => {
-    console.error(c);
-});
+//# sourceMappingURL=cli.js.map

package/build/cli.js.map

@@ -0,0 +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,CAAC,MAAM,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE;YACjD,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,eAAe,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

package/build/index.js

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

package/build/index.js.map

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

package/build/server.d.ts

@@ -1,4 +1,10 @@
 import { LogType } from '@basemaps/shared';
 import { FastifyInstance } from 'fastify';
-export declare function createServer(logger: LogType): FastifyInstance;
+export interface ServerOptions {
+    /** Path to assets */
+    assets?: string;
+    /** Path to configuration or a dynamdb table */
+    config: string;
+}
+export declare function createServer(opts: ServerOptions, logger: LogType): Promise<FastifyInstance>;
 //# 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":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAI3C,OAAgB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAuBnD,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,GAAG,eAAe,CAwC7D"}
+{"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;AA2BnD,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,CAkEjG"}

package/build/server.js

@@ -1,4 +1,6 @@
+import { Config, ConfigJson, ConfigProviderDynamo, ConfigProviderMemory } from '@basemaps/config';
 import { handler } from '@basemaps/lambda-tiler';
+import { Env, fsa } from '@basemaps/shared';
 import fastifyStatic from '@fastify/static';
 import { lf } from '@linzjs/lambda';
 import fastify from 'fastify';
@@ -15,16 +17,48 @@ function isAlbResult(r) {
 }
 const instanceId = ulid.ulid();
 function getLandingLocation() {
-    if (typeof require !== 'undefined' && typeof require.resolve === 'function') {
-        return require.resolve('@basemaps/landing/dist');
+    try {
+        if (typeof require !== 'undefined' && typeof require.resolve === 'function') {
+            return require.resolve('@basemaps/landing/dist');
+        }
+        else {
+            const require = createRequire(import.meta.url);
+            return require.resolve('@basemaps/landing/dist');
+        }
     }
-    else {
-        const require = createRequire(import.meta.url);
-        return require.resolve('@basemaps/landing/dist');
+    catch (e) {
+        return null;
     }
 }
-export function createServer(logger) {
+export async function createServer(opts, logger) {
     const BasemapsServer = fastify();
+    if (opts.config.startsWith('dynamodb://')) {
+        // 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));
+    }
+    else if (opts.config.endsWith('.json')) {
+        // Bundled config
+        logger.info({ path: opts.config, mode: 'config:bundle' }, 'Starting Server');
+        const configJson = await fsa.read(opts.config);
+        const mem = ConfigProviderMemory.fromJson(JSON.parse(configJson.toString()));
+        mem.createVirtualTileSets();
+        Config.setConfigProvider(mem);
+    }
+    else {
+        const mem = await ConfigJson.fromPath(opts.config, logger);
+        logger.info({ path: opts.config, mode: 'config' }, 'Starting Server');
+        mem.createVirtualTileSets();
+        Config.setConfigProvider(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;
+    }
     const landingLocation = getLandingLocation();
     if (landingLocation == null) {
         logger.warn('Server:Landing:Failed');
@@ -65,3 +99,4 @@ export function createServer(logger) {
     });
     return BasemapsServer;
 }
+//# sourceMappingURL=server.js.map

package/build/server.js.map

@@ -0,0 +1 @@
+{"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.28.0",
+  "version": "6.30.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -44,20 +44,20 @@
     "bin/"
   ],
   "optionalDependencies": {
-    "@basemaps/landing": "^6.28.0"
+    "@basemaps/landing": "^6.30.0"
   },
   "dependencies": {
-    "sharp": "^0.30.2"
+    "sharp": "^0.30.7"
   },
   "devDependencies": {
-    "@basemaps/config": "^6.28.0",
-    "@basemaps/geo": "^6.26.0",
-    "@basemaps/lambda-tiler": "^6.28.0",
+    "@basemaps/config": "^6.30.0",
+    "@basemaps/geo": "^6.28.1",
+    "@basemaps/lambda-tiler": "^6.30.0",
     "@basemaps/landing": "^6.27.0",
-    "@basemaps/shared": "^6.28.0",
+    "@basemaps/shared": "^6.30.0",
     "@fastify/static": "^5.0.2",
     "fastify": "^3.27.4",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "c9e62ec8f9cf5aa1dd79305575fdd1708835e0d9"
+  "gitHead": "c4858d318fd769e086a11e8b2a8f052b54964aab"
 }