@basemaps/server 6.30.0 → 6.32.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +32 -0
- package/bin/basemaps-server.cjs +288 -215
- package/build/bin.d.ts +2 -0
- package/build/bin.d.ts.map +1 -0
- package/build/bin.js +4 -0
- package/build/bin.js.map +1 -0
- package/build/server.d.ts.map +1 -1
- package/build/server.js +13 -3
- package/build/server.js.map +1 -1
- package/package.json +8 -8
package/build/bin.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":""}
|
package/build/bin.js
ADDED
package/build/bin.js.map
ADDED
|
@@ -0,0 +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"}
|
package/build/server.d.ts.map
CHANGED
|
@@ -1 +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;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,
|
|
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;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,CA0EjG"}
|
package/build/server.js
CHANGED
|
@@ -38,11 +38,21 @@ export async function createServer(opts, logger) {
|
|
|
38
38
|
logger.info({ path: opts.config, table, mode: 'dynamo' }, 'Starting Server');
|
|
39
39
|
Config.setConfigProvider(new ConfigProviderDynamo(table));
|
|
40
40
|
}
|
|
41
|
-
else if (opts.config.
|
|
41
|
+
else if (opts.config.startsWith(Config.ConfigBundle.prefix)) {
|
|
42
|
+
// Load Bundled config by dynamo refference
|
|
43
|
+
const cb = await Config.ConfigBundle.get(opts.config);
|
|
44
|
+
if (cb == null)
|
|
45
|
+
throw new Error(`Config bunble not exists for ${opts.config}`);
|
|
46
|
+
const configJson = await fsa.readJson(cb.path);
|
|
47
|
+
const mem = ConfigProviderMemory.fromJson(configJson);
|
|
48
|
+
mem.createVirtualTileSets();
|
|
49
|
+
Config.setConfigProvider(mem);
|
|
50
|
+
}
|
|
51
|
+
else if (opts.config.endsWith('.json') || opts.config.endsWith('.json.gz')) {
|
|
42
52
|
// Bundled config
|
|
43
53
|
logger.info({ path: opts.config, mode: 'config:bundle' }, 'Starting Server');
|
|
44
|
-
const configJson = await fsa.
|
|
45
|
-
const mem = ConfigProviderMemory.fromJson(
|
|
54
|
+
const configJson = await fsa.readJson(opts.config);
|
|
55
|
+
const mem = ConfigProviderMemory.fromJson(configJson);
|
|
46
56
|
mem.createVirtualTileSets();
|
|
47
57
|
Config.setConfigProvider(mem);
|
|
48
58
|
}
|
package/build/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basemaps/server",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.32.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/linz/basemaps.git",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
},
|
|
31
31
|
"bundle": [
|
|
32
32
|
{
|
|
33
|
-
"entry": "src/
|
|
33
|
+
"entry": "src/bin.ts",
|
|
34
34
|
"outfile": "bin/basemaps-server.cjs",
|
|
35
35
|
"executable": true,
|
|
36
36
|
"external": [
|
|
@@ -44,20 +44,20 @@
|
|
|
44
44
|
"bin/"
|
|
45
45
|
],
|
|
46
46
|
"optionalDependencies": {
|
|
47
|
-
"@basemaps/landing": "^6.
|
|
47
|
+
"@basemaps/landing": "^6.32.1"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"sharp": "^0.30.7"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
-
"@basemaps/config": "^6.
|
|
54
|
-
"@basemaps/geo": "^6.
|
|
55
|
-
"@basemaps/lambda-tiler": "^6.
|
|
53
|
+
"@basemaps/config": "^6.32.1",
|
|
54
|
+
"@basemaps/geo": "^6.32.1",
|
|
55
|
+
"@basemaps/lambda-tiler": "^6.32.1",
|
|
56
56
|
"@basemaps/landing": "^6.27.0",
|
|
57
|
-
"@basemaps/shared": "^6.
|
|
57
|
+
"@basemaps/shared": "^6.32.1",
|
|
58
58
|
"@fastify/static": "^5.0.2",
|
|
59
59
|
"fastify": "^3.27.4",
|
|
60
60
|
"pretty-json-log": "^1.0.0"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "4544a7d98667c5274142f1bb6bf61f02e4e5f618"
|
|
63
63
|
}
|