@basemaps/server 6.39.0 → 6.40.0

package/build/bin.js

@@ -1,4 +1,11 @@
 Error.stackTraceLimit = 100;
+import { LogConfig } from '@basemaps/shared';
+import { run } from 'cmd-ts';
 import { BasemapsServerCommand } from './cli.js';
-new BasemapsServerCommand().run();
+run(BasemapsServerCommand, process.argv.slice(2)).catch((err) => {
+    const logger = LogConfig.get();
+    logger.fatal({ err }, 'Command:Failed');
+    // Give the logger some time to flush before exiting
+    setTimeout(() => process.exit(1), 25);
+});
 //# sourceMappingURL=bin.js.map

package/build/bin.js.map

@@ -1 +1 @@
-{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":"AAAA,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC;AAE5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD,IAAI,qBAAqB,EAAE,CAAC,GAAG,EAAE,CAAC"}
+{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":"AAAA,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IAC9D,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;IAC/B,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAExC,oDAAoD;IACpD,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC,CAAC"}

package/build/cli.d.ts

@@ -1,9 +1,18 @@
-import { BaseCommandLine } from '@basemaps/shared/build/cli/base.js';
-export declare class BasemapsServerCommand extends BaseCommandLine {
-    config: import("@rushstack/ts-command-line").CommandLineStringParameter;
-    assets: import("@rushstack/ts-command-line").CommandLineStringParameter;
-    port: import("@rushstack/ts-command-line").CommandLineIntegerParameter;
-    constructor();
-    onExecute(): Promise<void>;
-}
+export declare const BasemapsServerCommand: Partial<import("cmd-ts/dist/cjs/argparser.js").Register> & {
+    parse(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
+        config: string | undefined;
+        port: number | undefined;
+        verbose: boolean;
+        assets: string | undefined;
+        paths: string[];
+    }>>;
+} & import("cmd-ts/dist/cjs/helpdoc.js").PrintHelp & import("cmd-ts/dist/cjs/helpdoc.js").ProvidesHelp & import("cmd-ts/dist/cjs/helpdoc.js").Named & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned> & import("cmd-ts/dist/cjs/argparser.js").Register & import("cmd-ts/dist/cjs/runner.js").Handling<{
+    config: string | undefined;
+    port: number | undefined;
+    verbose: boolean;
+    assets: string | undefined;
+    paths: string[];
+}, Promise<void>> & {
+    run(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<Promise<void>>>;
+} & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned & import("cmd-ts/dist/cjs/helpdoc.js").Descriptive & import("cmd-ts/dist/cjs/helpdoc.js").Aliased>;
 //# 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":"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"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;6JAyChC,CAAC"}

package/build/cli.js

@@ -1,45 +1,48 @@
-import { Const, Env, LogConfig } from '@basemaps/shared';
-import { BaseCommandLine, CliInfo } from '@basemaps/shared/build/cli/base.js';
+import { Env, LogConfig } from '@basemaps/shared';
+import { CliInfo } from '@basemaps/shared/build/cli/info.js';
+import { command, flag, number, option, optional, restPositionals, string } from 'cmd-ts';
 import { createServer } from './server.js';
 CliInfo.package = 'basemaps/server';
 const DefaultPort = 5000;
-export class BasemapsServerCommand extends BaseCommandLine {
-    constructor() {
-        super({
-            toolFilename: 'basemaps-server',
-            toolDescription: 'Create a WMTS/XYZ Tile server from basemaps config',
-        });
-        this.config = this.defineStringParameter({
-            argumentName: 'CONFIG',
-            parameterLongName: '--config',
-            description: 'Configuration source to use',
-        });
-        this.assets = this.defineStringParameter({
-            argumentName: 'ASSETS',
-            parameterLongName: '--assets',
+export const BasemapsServerCommand = command({
+    name: 'basemaps-server',
+    version: CliInfo.version,
+    description: 'Create a basemaps server',
+    args: {
+        config: option({ type: optional(string), long: 'config', description: 'Configuration to use' }),
+        port: option({
+            type: optional(number),
+            long: 'port',
+            description: 'Port to use',
+            defaultValue: () => DefaultPort,
+            env: 'PORT',
+        }),
+        verbose: flag({ long: 'verbose', description: 'Enable verbose logging' }),
+        assets: option({
+            type: optional(string),
+            long: 'assets',
             description: 'Where the assets (sprites, fonts) are located',
-        });
-        this.port = this.defineIntegerParameter({
-            argumentName: 'PORT',
-            parameterLongName: '--port',
-            description: 'port to use',
-            defaultValue: DefaultPort,
-        });
-    }
-    async onExecute() {
-        var _a, _b;
-        await super.onExecute();
+        }),
+        paths: restPositionals({ type: string, displayName: 'path', description: 'Path to imagery' }),
+    },
+    handler: async (args) => {
+        var _a;
         const logger = LogConfig.get();
-        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}`;
+        if (args.verbose)
+            logger.level = 'debug';
+        if (args.paths.length === 0 && args.config == null) {
+            throw new Error('Either --config or paths must be used. see --help');
+        }
+        logger.info({ package: CliInfo, cli: 'server' }, 'Cli:Start');
+        const ServerUrl = (_a = Env.get(Env.PublicUrlBase)) !== null && _a !== void 0 ? _a : `http://localhost:${args.port}`;
         // 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 server.listen({ port: port !== null && port !== void 0 ? port : DefaultPort, host: '0.0.0.0' });
+        const serverOptions = args.config
+            ? { assets: args.assets, config: args.config }
+            : { assets: args.assets, paths: args.paths };
+        const server = await createServer(serverOptions, logger);
+        await server.listen({ port: args.port, 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;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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/build/config.d.ts

@@ -0,0 +1,22 @@
+import { BasemapsConfigProvider } from '@basemaps/config';
+import { LogType } from '@basemaps/shared';
+export type ServerOptions = ServerOptionsTiffs | ServerOptionsConfig;
+/** Load configuration from folders */
+export interface ServerOptionsTiffs {
+    assets?: string;
+    paths: string[];
+}
+/** Load configuration from a config file/dynamodb */
+export interface ServerOptionsConfig {
+    assets?: string;
+    config: string;
+}
+/**
+ * Attempt to load a configuration file from a number of sources
+ *
+ * @param configPath Location to where the configuration is stored
+ * @param noConfig Whether to generate a config directly from the source imagery
+ *
+ */
+export declare function loadConfig(opts: ServerOptions, logger: LogType): Promise<BasemapsConfigProvider>;
+//# sourceMappingURL=config.d.ts.map

package/build/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAMvB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAyB,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElE,MAAM,MAAM,aAAa,GAAG,kBAAkB,GAAG,mBAAmB,CAAC;AAErE,sCAAsC;AACtC,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,qDAAqD;AACrD,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CA6CtG"}

package/build/config.js

@@ -0,0 +1,52 @@
+import { ConfigJson, ConfigPrefix, ConfigProviderDynamo, ConfigProviderMemory, } from '@basemaps/config';
+import { initConfigFromPaths } from '@basemaps/config/build/json/tiff.config.js';
+import { fsa, getDefaultConfig } from '@basemaps/shared';
+/**
+ * Attempt to load a configuration file from a number of sources
+ *
+ * @param configPath Location to where the configuration is stored
+ * @param noConfig Whether to generate a config directly from the source imagery
+ *
+ */
+export async function loadConfig(opts, logger) {
+    // Load the config directly from the source tiff files
+    if ('paths' in opts) {
+        const mem = new ConfigProviderMemory();
+        const ret = await initConfigFromPaths(mem, opts.paths);
+        logger.info({ tileSet: ret.tileSet.name, layers: ret.tileSet.layers.length }, 'TileSet:Loaded');
+        for (const im of ret.imagery) {
+            logger.info({ imagery: im.uri, title: im.title, tileMatrix: im.tileMatrix, files: im.files.length }, 'Imagery:Loaded');
+        }
+        return mem;
+    }
+    const configPath = opts.config;
+    // Load config from dynamodb table
+    if (configPath.startsWith('dynamodb://')) {
+        const table = configPath.slice('dynamodb://'.length);
+        logger.info({ path: configPath, table, mode: 'dynamo' }, 'Starting Server');
+        return new ConfigProviderDynamo(table);
+    }
+    // Load a bundled config by loading it from the default dynamo reference
+    if (configPath.startsWith(ConfigPrefix.ConfigBundle)) {
+        const cb = await getDefaultConfig().ConfigBundle.get(configPath);
+        if (cb == null)
+            throw new Error(`Config bundle does not exist ${configPath}`);
+        const configJson = await fsa.readJson(cb.path);
+        const mem = ConfigProviderMemory.fromJson(configJson);
+        mem.createVirtualTileSets();
+        return mem;
+    }
+    // Read a bundled config directly from a JSON file.
+    if (configPath.endsWith('.json') || configPath.endsWith('.json.gz')) {
+        logger.info({ path: configPath, mode: 'config:bundle' }, 'Starting Server');
+        const configJson = await fsa.readJson(configPath);
+        const mem = ConfigProviderMemory.fromJson(configJson);
+        mem.createVirtualTileSets();
+        return mem;
+    }
+    const mem = await ConfigJson.fromPath(configPath, logger);
+    logger.info({ path: configPath, mode: 'config:json' }, 'Starting Server');
+    mem.createVirtualTileSets();
+    return mem;
+}
+//# sourceMappingURL=config.js.map

package/build/config.js.map

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

package/build/server.d.ts

@@ -1,10 +1,5 @@
 import { LogType } from '@basemaps/shared';
 import { FastifyInstance } from 'fastify';
-export interface ServerOptions {
-    /** Path to assets */
-    assets?: string;
-    /** Path to configuration or a dynamdb table */
-    config: string;
-}
+import { ServerOptions } from './config.js';
 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":"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"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,OAAO,EAAoB,MAAM,kBAAkB,CAAC;AAKpF,OAAgB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAKnD,OAAO,EAAc,aAAa,EAAE,MAAM,aAAa,CAAC;AAiBxD,wBAAsB,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAsDjG"}

package/build/server.js

@@ -1,4 +1,3 @@
-import { ConfigJson, ConfigPrefix, ConfigProviderDynamo, ConfigProviderMemory } from '@basemaps/config';
 import { handler } from '@basemaps/lambda-tiler';
 import { fsa, getDefaultConfig, setDefaultConfig } from '@basemaps/shared';
 import formBodyPlugin from '@fastify/formbody';
@@ -9,6 +8,7 @@ import { createRequire } from 'module';
 import path from 'path';
 import ulid from 'ulid';
 import { URL } from 'url';
+import { loadConfig } from './config.js';
 const instanceId = ulid.ulid();
 function getLandingLocation() {
     try {
@@ -27,36 +27,8 @@ function getLandingLocation() {
 export async function createServer(opts, logger) {
     const BasemapsServer = fastify({});
     BasemapsServer.register(formBodyPlugin);
-    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');
-        setDefaultConfig(new ConfigProviderDynamo(table));
-    }
-    else if (opts.config.startsWith(ConfigPrefix.ConfigBundle)) {
-        // Load Bundled config by dynamo reference
-        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();
-        setDefaultConfig(mem);
-    }
-    else if (opts.config.endsWith('.json') || opts.config.endsWith('.json.gz')) {
-        // Bundled config
-        logger.info({ path: opts.config, mode: 'config:bundle' }, 'Starting Server');
-        const configJson = await fsa.readJson(opts.config);
-        const mem = ConfigProviderMemory.fromJson(configJson);
-        mem.createVirtualTileSets();
-        setDefaultConfig(mem);
-    }
-    else {
-        const mem = await ConfigJson.fromPath(opts.config, logger);
-        logger.info({ path: opts.config, mode: 'config' }, 'Starting Server');
-        mem.createVirtualTileSets();
-        setDefaultConfig(mem);
-    }
+    const cfg = await loadConfig(opts, logger);
+    setDefaultConfig(cfg);
     if (opts.assets) {
         const isExists = await fsa.exists(opts.assets);
         if (!isExists)
@@ -76,7 +48,7 @@ export async function createServer(opts, logger) {
     BasemapsServer.all('/v1/*', (req, res) => {
         const url = new URL(`${req.protocol}://${req.hostname}${req.url}`);
         if (!url.searchParams.has('api'))
-            url.searchParams.set('api', 'c' + instanceId);
+            url.searchParams.set('api', 'd' + instanceId);
         const request = new LambdaUrlRequest({
             requestContext: { http: { method: req.method.toUpperCase() } },
             headers: req.headers,

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.39.0",
+  "version": "6.40.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -44,21 +44,22 @@
     "bin/"
   ],
   "optionalDependencies": {
-    "@basemaps/landing": "^6.39.0"
+    "@basemaps/landing": "^6.40.0"
   },
   "dependencies": {
     "sharp": "^0.30.7"
   },
   "devDependencies": {
-    "@basemaps/config": "^6.39.0",
-    "@basemaps/geo": "^6.37.0",
-    "@basemaps/lambda-tiler": "^6.39.0",
-    "@basemaps/landing": "^6.27.0",
-    "@basemaps/shared": "^6.39.0",
+    "@basemaps/config": "^6.40.0",
+    "@basemaps/geo": "^6.40.0",
+    "@basemaps/lambda-tiler": "^6.40.0",
+    "@basemaps/landing": "^6.39.0",
+    "@basemaps/shared": "^6.40.0",
     "@fastify/formbody": "^7.0.1",
     "@fastify/static": "^6.5.0",
+    "cmd-ts": "^0.12.1",
     "fastify": "^4.9.2",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "e57a89e05a2bae5db4a0afb7f5ba0c864f6f35e1"
+  "gitHead": "029c1e511531064dbf87b2b5204a50fe840daa79"
 }