@basemaps/lambda-tiler 6.32.1 → 6.34.0
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 +49 -0
- package/build/__tests__/xyz.util.d.ts +1 -1
- package/build/__tests__/xyz.util.d.ts.map +1 -1
- package/build/__tests__/xyz.util.js +2 -2
- package/build/__tests__/xyz.util.js.map +1 -1
- package/build/arcgis/__tests__/arcgis.style.json.test.d.ts +2 -0
- package/build/arcgis/__tests__/arcgis.style.json.test.d.ts.map +1 -0
- package/build/arcgis/__tests__/arcgis.style.json.test.js +128 -0
- package/build/arcgis/__tests__/arcgis.style.json.test.js.map +1 -0
- package/build/arcgis/__tests__/vector.tiler.server.test.d.ts +2 -0
- package/build/arcgis/__tests__/vector.tiler.server.test.d.ts.map +1 -0
- package/build/arcgis/__tests__/vector.tiler.server.test.js +47 -0
- package/build/arcgis/__tests__/vector.tiler.server.test.js.map +1 -0
- package/build/arcgis/arcgis.info.d.ts +3 -0
- package/build/arcgis/arcgis.info.d.ts.map +1 -0
- package/build/arcgis/arcgis.info.js +25 -0
- package/build/arcgis/arcgis.info.js.map +1 -0
- package/build/arcgis/arcgis.style.json.d.ts +9 -0
- package/build/arcgis/arcgis.style.json.d.ts.map +1 -0
- package/build/arcgis/arcgis.style.json.js +73 -0
- package/build/arcgis/arcgis.style.json.js.map +1 -0
- package/build/arcgis/vector.tile.server.d.ts +8 -0
- package/build/arcgis/vector.tile.server.d.ts.map +1 -0
- package/build/arcgis/vector.tile.server.js +71 -0
- package/build/arcgis/vector.tile.server.js.map +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +22 -8
- package/build/index.js.map +1 -1
- package/build/routes/__tests__/fonts.test.js +14 -26
- package/build/routes/__tests__/fonts.test.js.map +1 -1
- package/build/routes/__tests__/sprites.test.js +7 -1
- package/build/routes/__tests__/sprites.test.js.map +1 -1
- package/build/routes/__tests__/xyz.test.js +1 -2
- package/build/routes/__tests__/xyz.test.js.map +1 -1
- package/build/routes/fonts.d.ts +0 -2
- package/build/routes/fonts.d.ts.map +1 -1
- package/build/routes/fonts.js +3 -66
- package/build/routes/fonts.js.map +1 -1
- package/build/routes/sprites.d.ts.map +1 -1
- package/build/routes/sprites.js +3 -29
- package/build/routes/sprites.js.map +1 -1
- package/build/routes/tile.xyz.vector.js +2 -2
- package/build/routes/tile.xyz.vector.js.map +1 -1
- package/build/util/assets.provider.d.ts +27 -0
- package/build/util/assets.provider.d.ts.map +1 -0
- package/build/util/assets.provider.js +56 -0
- package/build/util/assets.provider.js.map +1 -0
- package/build/util/config.cache.d.ts +16 -0
- package/build/util/config.cache.d.ts.map +1 -0
- package/build/util/config.cache.js +41 -0
- package/build/util/config.cache.js.map +1 -0
- package/build/util/response.d.ts +3 -1
- package/build/util/response.d.ts.map +1 -1
- package/build/util/response.js +2 -0
- package/build/util/response.js.map +1 -1
- package/build/util/source.cache.d.ts +1 -0
- package/build/util/source.cache.d.ts.map +1 -1
- package/build/util/source.cache.js +2 -1
- package/build/util/source.cache.js.map +1 -1
- package/build/util/swapping.lru.d.ts +1 -0
- package/build/util/swapping.lru.d.ts.map +1 -1
- package/build/util/swapping.lru.js +7 -0
- package/build/util/swapping.lru.js.map +1 -1
- package/build/util/validate.d.ts +0 -5
- package/build/util/validate.d.ts.map +1 -1
- package/build/util/validate.js +1 -23
- package/build/util/validate.js.map +1 -1
- package/dist/index.js +52 -52
- package/dist/node_modules/.package-lock.json +4 -4
- package/dist/node_modules/node-abi/abi_registry.json +8 -1
- package/dist/node_modules/node-abi/package.json +1 -1
- package/dist/package-lock.json +8 -8
- package/dist/package.json +1 -1
- package/package.json +4 -4
- package/src/__tests__/xyz.util.ts +7 -2
- package/src/arcgis/__tests__/arcgis.style.json.test.ts +153 -0
- package/src/arcgis/__tests__/vector.tiler.server.test.ts +61 -0
- package/src/arcgis/arcgis.info.ts +26 -0
- package/src/arcgis/arcgis.style.json.ts +81 -0
- package/src/arcgis/vector.tile.server.ts +78 -0
- package/src/index.ts +25 -8
- package/src/routes/__tests__/fonts.test.ts +14 -29
- package/src/routes/__tests__/sprites.test.ts +7 -2
- package/src/routes/__tests__/xyz.test.ts +2 -2
- package/src/routes/fonts.ts +4 -64
- package/src/routes/sprites.ts +4 -27
- package/src/routes/tile.xyz.vector.ts +2 -2
- package/src/util/assets.provider.ts +67 -0
- package/src/util/config.cache.ts +44 -0
- package/src/util/response.ts +4 -1
- package/src/util/source.cache.ts +2 -1
- package/src/util/swapping.lru.ts +7 -0
- package/src/util/validate.ts +1 -27
- package/tsconfig.json +1 -0
- package/tsconfig.tsbuildinfo +1 -1
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,53 +2,36 @@ import { Env } from '@basemaps/shared';
|
|
|
2
2
|
import { fsa } from '@chunkd/fs';
|
|
3
3
|
import o from 'ospec';
|
|
4
4
|
import { handler } from '../../index.js';
|
|
5
|
+
import { assetProvider } from '../../util/assets.provider.js';
|
|
5
6
|
import { mockRequest } from '../../__tests__/xyz.util.js';
|
|
6
|
-
import { fontList
|
|
7
|
+
import { fontList } from '../fonts.js';
|
|
7
8
|
import { FsMemory } from './memory.fs.js';
|
|
8
9
|
o.spec('/v1/fonts', () => {
|
|
9
10
|
const memory = new FsMemory();
|
|
10
11
|
o.before(() => {
|
|
11
12
|
fsa.register('memory://', memory);
|
|
12
13
|
});
|
|
14
|
+
const assetLocation = process.env[Env.AssetLocation];
|
|
13
15
|
o.beforeEach(() => {
|
|
14
16
|
process.env[Env.AssetLocation] = 'memory://';
|
|
17
|
+
assetProvider.set('memory://');
|
|
15
18
|
});
|
|
16
19
|
o.afterEach(() => {
|
|
17
|
-
|
|
20
|
+
assetProvider.set(assetLocation);
|
|
18
21
|
memory.files.clear();
|
|
19
22
|
});
|
|
20
|
-
o('should
|
|
21
|
-
await Promise.all([
|
|
22
|
-
fsa.write('memory://fonts/Roboto Thin/0-255.pbf', Buffer.from('')),
|
|
23
|
-
fsa.write('memory://fonts/Roboto Thin/256-512.pbf', Buffer.from('')),
|
|
24
|
-
fsa.write('memory://fonts/Roboto Black/0-255.pbf', Buffer.from('')),
|
|
25
|
-
]);
|
|
26
|
-
const fonts = await getFonts('memory://fonts/');
|
|
27
|
-
o(fonts).deepEquals(['Roboto Black', 'Roboto Thin']);
|
|
28
|
-
});
|
|
29
|
-
o('should return empty list if no fonts found', async () => {
|
|
30
|
-
const res = await fontList(mockRequest('/v1/fonts.json'));
|
|
31
|
-
o(res.status).equals(200);
|
|
32
|
-
o(res.body).equals('[]');
|
|
33
|
-
o(res.header('etag')).notEquals(undefined);
|
|
34
|
-
o(res.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
|
|
35
|
-
});
|
|
36
|
-
o('should return 404 if no assets defined', async () => {
|
|
37
|
-
delete process.env[Env.AssetLocation];
|
|
23
|
+
o('should return 404 if no font found', async () => {
|
|
38
24
|
const res = await fontList(mockRequest('/v1/fonts.json'));
|
|
39
25
|
o(res.status).equals(404);
|
|
40
26
|
});
|
|
41
27
|
o('should return a list of fonts found', async () => {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
fsa.write('memory://fonts/Roboto Thin/256-512.pbf', Buffer.from('')),
|
|
45
|
-
fsa.write('memory://fonts/Roboto Black/0-255.pbf', Buffer.from('')),
|
|
46
|
-
]);
|
|
28
|
+
var _a;
|
|
29
|
+
await fsa.write('memory://fonts.json', Buffer.from(JSON.stringify(['Roboto Black', 'Roboto Thin'])));
|
|
47
30
|
const res = await fontList(mockRequest('/v1/fonts.json'));
|
|
48
31
|
o(res.status).equals(200);
|
|
49
32
|
o(res.header('content-type')).equals('application/json');
|
|
50
33
|
o(res.header('content-encoding')).equals(undefined);
|
|
51
|
-
o(res.
|
|
34
|
+
o((_a = res._body) === null || _a === void 0 ? void 0 : _a.toString()).equals(JSON.stringify(['Roboto Black', 'Roboto Thin']));
|
|
52
35
|
});
|
|
53
36
|
o('should get the correct font', async () => {
|
|
54
37
|
await fsa.write('memory://fonts/Roboto Thin/0-255.pbf', Buffer.from(''));
|
|
@@ -70,5 +53,10 @@ o.spec('/v1/fonts', () => {
|
|
|
70
53
|
o(res255.header('etag')).notEquals(undefined);
|
|
71
54
|
o(res255.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
|
|
72
55
|
});
|
|
56
|
+
o('should return 404 if no asset location set', async () => {
|
|
57
|
+
assetProvider.set(undefined);
|
|
58
|
+
const res = await fontList(mockRequest('/v1/fonts.json'));
|
|
59
|
+
o(res.status).equals(404);
|
|
60
|
+
});
|
|
73
61
|
});
|
|
74
62
|
//# sourceMappingURL=fonts.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fonts.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/fonts.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"fonts.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/fonts.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,27 @@
|
|
|
1
1
|
import { Env } from '@basemaps/shared';
|
|
2
2
|
import { fsa } from '@chunkd/fs';
|
|
3
3
|
import o from 'ospec';
|
|
4
|
+
import { createSandbox } from 'sinon';
|
|
4
5
|
import { gunzipSync, gzipSync } from 'zlib';
|
|
5
6
|
import { handler } from '../../index.js';
|
|
7
|
+
import { assetProvider } from '../../util/assets.provider.js';
|
|
6
8
|
import { mockRequest } from '../../__tests__/xyz.util.js';
|
|
7
9
|
import { FsMemory } from './memory.fs.js';
|
|
8
10
|
o.spec('/v1/sprites', () => {
|
|
9
11
|
const memory = new FsMemory();
|
|
12
|
+
const sandbox = createSandbox();
|
|
10
13
|
o.before(() => {
|
|
11
14
|
fsa.register('memory://', memory);
|
|
12
15
|
});
|
|
16
|
+
const assetLocation = process.env[Env.AssetLocation];
|
|
13
17
|
o.beforeEach(() => {
|
|
14
18
|
process.env[Env.AssetLocation] = 'memory://';
|
|
19
|
+
assetProvider.set('memory://');
|
|
15
20
|
});
|
|
16
21
|
o.afterEach(() => {
|
|
17
|
-
|
|
22
|
+
assetProvider.set(assetLocation);
|
|
18
23
|
memory.files.clear();
|
|
24
|
+
sandbox.restore();
|
|
19
25
|
});
|
|
20
26
|
o('should return 404 if no assets defined', async () => {
|
|
21
27
|
delete process.env[Env.AssetLocation];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sprites.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/sprites.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC9B,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;QACZ,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"sprites.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/sprites.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,13 +52,12 @@ o.spec('/v1/tiles', () => {
|
|
|
52
52
|
});
|
|
53
53
|
['png', 'webp', 'jpeg', 'avif'].forEach((fmt) => {
|
|
54
54
|
o(`should 200 with empty ${fmt} if a tile is out of bounds`, async () => {
|
|
55
|
-
|
|
55
|
+
o.timeout(1000);
|
|
56
56
|
const res = await handler.router.handle(mockRequest(`/v1/tiles/aerial/global-mercator/0/0/0.${fmt}`, 'get', Api.header));
|
|
57
57
|
o(res.status).equals(200);
|
|
58
58
|
o(res.header('content-type')).equals(`image/${fmt}`);
|
|
59
59
|
o(res.header('etag')).notEquals(undefined);
|
|
60
60
|
o(res.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
|
|
61
|
-
// o(rasterMock.calls.length).equals(1);
|
|
62
61
|
});
|
|
63
62
|
});
|
|
64
63
|
o('should 304 if a tile is not modified', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xyz.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/xyz.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"xyz.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/xyz.test.ts"],"names":[],"mappings":"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"}
|
package/build/routes/fonts.d.ts
CHANGED
|
@@ -6,8 +6,6 @@ interface FontGet {
|
|
|
6
6
|
};
|
|
7
7
|
}
|
|
8
8
|
export declare function fontGet(req: LambdaHttpRequest<FontGet>): Promise<LambdaHttpResponse>;
|
|
9
|
-
/** Get the unique name of folders is a path that contain .pbf files */
|
|
10
|
-
export declare function getFonts(fontPath: string): Promise<string[]>;
|
|
11
9
|
export declare function fontList(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
|
|
12
10
|
export {};
|
|
13
11
|
//# sourceMappingURL=fonts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fonts.d.ts","sourceRoot":"","sources":["../../src/routes/fonts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fonts.d.ts","sourceRoot":"","sources":["../../src/routes/fonts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAIvE,UAAU,OAAO;IACf,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9C;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,iBAAiB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAG1F;AAED,wBAAsB,QAAQ,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAElF"}
|
package/build/routes/fonts.js
CHANGED
|
@@ -1,73 +1,10 @@
|
|
|
1
|
-
import { Env } from '@basemaps/shared';
|
|
2
|
-
import { fsa } from '@chunkd/fs';
|
|
3
|
-
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
4
1
|
import path from 'path';
|
|
5
|
-
import {
|
|
6
|
-
import { Etag } from '../util/etag.js';
|
|
7
|
-
import { NotFound, NotModified } from '../util/response.js';
|
|
2
|
+
import { assetProvider } from '../util/assets.provider.js';
|
|
8
3
|
export async function fontGet(req) {
|
|
9
|
-
const assetLocation = Env.get(Env.AssetLocation);
|
|
10
|
-
if (assetLocation == null)
|
|
11
|
-
return NotFound();
|
|
12
4
|
const targetFile = path.join('fonts', req.params.fontStack, req.params.range) + '.pbf';
|
|
13
|
-
|
|
14
|
-
return serveFromCotar(req, assetLocation, targetFile, 'application/x-protobuf');
|
|
15
|
-
}
|
|
16
|
-
try {
|
|
17
|
-
const filePath = fsa.join(assetLocation, targetFile);
|
|
18
|
-
const buf = await fsa.read(filePath);
|
|
19
|
-
const cacheKey = Etag.key(buf);
|
|
20
|
-
if (Etag.isNotModified(req, cacheKey))
|
|
21
|
-
return NotModified();
|
|
22
|
-
const response = LambdaHttpResponse.ok().buffer(buf, 'application/x-protobuf');
|
|
23
|
-
response.header(HttpHeader.ETag, cacheKey);
|
|
24
|
-
response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
|
|
25
|
-
if (isGzip(buf))
|
|
26
|
-
response.header(HttpHeader.ContentEncoding, 'gzip');
|
|
27
|
-
return response;
|
|
28
|
-
}
|
|
29
|
-
catch (e) {
|
|
30
|
-
if (e.code === 404)
|
|
31
|
-
return NotFound();
|
|
32
|
-
throw e;
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
/** Get the unique name of folders is a path that contain .pbf files */
|
|
36
|
-
export async function getFonts(fontPath) {
|
|
37
|
-
const fonts = new Set();
|
|
38
|
-
// TODO use {recursive: false}
|
|
39
|
-
for await (const font of fsa.list(fontPath)) {
|
|
40
|
-
if (!font.endsWith('.pbf'))
|
|
41
|
-
continue;
|
|
42
|
-
const dirName = path.basename(path.dirname(font)); // TODO this only works for /a/b.pbf and not /a/b/c.pbf
|
|
43
|
-
if (dirName.includes('/'))
|
|
44
|
-
continue;
|
|
45
|
-
fonts.add(dirName);
|
|
46
|
-
}
|
|
47
|
-
// Ensure the fonts are alphabetical
|
|
48
|
-
return [...fonts].sort();
|
|
5
|
+
return assetProvider.serve(req, targetFile, 'application/x-protobuf');
|
|
49
6
|
}
|
|
50
7
|
export async function fontList(req) {
|
|
51
|
-
|
|
52
|
-
if (assetLocation == null)
|
|
53
|
-
return NotFound();
|
|
54
|
-
if (assetLocation.endsWith('.tar.co'))
|
|
55
|
-
return serveFromCotar(req, assetLocation, 'fonts.json', 'application/json');
|
|
56
|
-
try {
|
|
57
|
-
const filePath = fsa.join(assetLocation, '/fonts');
|
|
58
|
-
const fonts = await getFonts(filePath);
|
|
59
|
-
const cacheKey = Etag.key(fonts);
|
|
60
|
-
if (Etag.isNotModified(req, cacheKey))
|
|
61
|
-
return NotModified();
|
|
62
|
-
const response = LambdaHttpResponse.ok().buffer(JSON.stringify(fonts), 'application/json');
|
|
63
|
-
response.header(HttpHeader.ETag, cacheKey);
|
|
64
|
-
response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
|
|
65
|
-
return response;
|
|
66
|
-
}
|
|
67
|
-
catch (e) {
|
|
68
|
-
if (e.code === 404)
|
|
69
|
-
return NotFound();
|
|
70
|
-
throw e;
|
|
71
|
-
}
|
|
8
|
+
return assetProvider.serve(req, 'fonts.json', 'application/json');
|
|
72
9
|
}
|
|
73
10
|
//# sourceMappingURL=fonts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fonts.js","sourceRoot":"","sources":["../../src/routes/fonts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fonts.js","sourceRoot":"","sources":["../../src/routes/fonts.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAM3D,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,GAA+B;IAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;IACvF,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,wBAAwB,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,GAAsB;IACnD,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sprites.d.ts","sourceRoot":"","sources":["../../src/routes/sprites.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sprites.d.ts","sourceRoot":"","sources":["../../src/routes/sprites.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAIvE,UAAU,SAAS;IACjB,MAAM,EAAE;QACN,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAMD,wBAAsB,SAAS,CAAC,GAAG,EAAE,iBAAiB,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAO9F"}
|
package/build/routes/sprites.js
CHANGED
|
@@ -1,42 +1,16 @@
|
|
|
1
|
-
import { Env } from '@basemaps/shared';
|
|
2
1
|
import { fsa } from '@chunkd/fs';
|
|
3
2
|
import path from 'path';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import { isGzip, serveFromCotar } from '../util/cotar.serve.js';
|
|
7
|
-
import { Etag } from '../util/etag.js';
|
|
3
|
+
import { NotFound } from '../util/response.js';
|
|
4
|
+
import { assetProvider } from '../util/assets.provider.js';
|
|
8
5
|
const Extensions = new Map();
|
|
9
6
|
Extensions.set('.png', 'image/png');
|
|
10
7
|
Extensions.set('.json', 'application/json');
|
|
11
8
|
export async function spriteGet(req) {
|
|
12
|
-
const assetLocation = Env.get(Env.AssetLocation);
|
|
13
|
-
if (assetLocation == null)
|
|
14
|
-
return NotFound();
|
|
15
9
|
const extension = path.extname(req.params.spriteName);
|
|
16
10
|
const mimeType = Extensions.get(extension);
|
|
17
11
|
if (mimeType == null)
|
|
18
12
|
return NotFound();
|
|
19
13
|
const targetFile = fsa.join('sprites', req.params.spriteName);
|
|
20
|
-
|
|
21
|
-
return serveFromCotar(req, assetLocation, targetFile, mimeType);
|
|
22
|
-
try {
|
|
23
|
-
const filePath = fsa.join(assetLocation, targetFile);
|
|
24
|
-
req.set('target', filePath);
|
|
25
|
-
const buf = await fsa.read(filePath);
|
|
26
|
-
const cacheKey = Etag.key(buf);
|
|
27
|
-
if (Etag.isNotModified(req, cacheKey))
|
|
28
|
-
return NotModified();
|
|
29
|
-
const response = LambdaHttpResponse.ok().buffer(buf, mimeType);
|
|
30
|
-
response.header(HttpHeader.ETag, cacheKey);
|
|
31
|
-
response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
|
|
32
|
-
if (isGzip(buf))
|
|
33
|
-
response.header(HttpHeader.ContentEncoding, 'gzip');
|
|
34
|
-
return response;
|
|
35
|
-
}
|
|
36
|
-
catch (e) {
|
|
37
|
-
if (e.code === 404)
|
|
38
|
-
return NotFound();
|
|
39
|
-
throw e;
|
|
40
|
-
}
|
|
14
|
+
return assetProvider.serve(req, targetFile, mimeType);
|
|
41
15
|
}
|
|
42
16
|
//# sourceMappingURL=sprites.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sprites.js","sourceRoot":"","sources":["../../src/routes/sprites.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"sprites.js","sourceRoot":"","sources":["../../src/routes/sprites.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAQ3D,MAAM,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;AAC7B,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AACpC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAiC;IAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3C,IAAI,QAAQ,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAExC,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9D,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { GoogleTms, VectorFormat } from '@basemaps/geo';
|
|
|
2
2
|
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
3
3
|
import { isGzip } from '../util/cotar.serve.js';
|
|
4
4
|
import { Etag } from '../util/etag.js';
|
|
5
|
-
import { NotFound, NotModified } from '../util/response.js';
|
|
5
|
+
import { NoContent, NotFound, NotModified } from '../util/response.js';
|
|
6
6
|
import { CoSources } from '../util/source.cache.js';
|
|
7
7
|
export const tileXyzVector = {
|
|
8
8
|
/** Serve a MVT vector tile */
|
|
@@ -32,7 +32,7 @@ export const tileXyzVector = {
|
|
|
32
32
|
req.timer.start('cotar:tile');
|
|
33
33
|
const tile = await cotar.get(tilePath);
|
|
34
34
|
if (tile == null)
|
|
35
|
-
return
|
|
35
|
+
return NoContent();
|
|
36
36
|
req.timer.end('cotar:tile');
|
|
37
37
|
const tileBuffer = Buffer.from(tile);
|
|
38
38
|
const response = LambdaHttpResponse.ok().buffer(tileBuffer, 'application/x-protobuf');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.xyz.vector.js","sourceRoot":"","sources":["../../src/routes/tile.xyz.vector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,UAAU,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"tile.xyz.vector.js","sourceRoot":"","sources":["../../src/routes/tile.xyz.vector.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { LambdaHttpResponse, LambdaHttpRequest } from '@linzjs/lambda';
|
|
3
|
+
export declare class AssetProvider {
|
|
4
|
+
/**
|
|
5
|
+
* Assets can be ready from the following locations.
|
|
6
|
+
*
|
|
7
|
+
* /home/blacha/config/build/assets # Local File
|
|
8
|
+
* /home/blacha/config/build/assets.tar.co # Local Cotar
|
|
9
|
+
* s3://linz-baesmaps/assets/ # Remote location
|
|
10
|
+
* s3://linz-basemaps/assets/assets-b4ff211a.tar.co # Remote Cotar
|
|
11
|
+
*/
|
|
12
|
+
/** Path of the assets location */
|
|
13
|
+
path: string | undefined;
|
|
14
|
+
set(path?: string): void;
|
|
15
|
+
get(fileName: string): Promise<Buffer | null>;
|
|
16
|
+
getFromCotar(path: string, fileName: string): Promise<Buffer | null>;
|
|
17
|
+
/**
|
|
18
|
+
* Load a assets from local path or cotar returning the file back as a LambdaResponse
|
|
19
|
+
*
|
|
20
|
+
* This will also set two headers
|
|
21
|
+
* - Content-Encoding if the file starts with gzip magic
|
|
22
|
+
* - Content-Type from the parameter contentType
|
|
23
|
+
*/
|
|
24
|
+
serve(req: LambdaHttpRequest, file: string, contentType: string): Promise<LambdaHttpResponse>;
|
|
25
|
+
}
|
|
26
|
+
export declare const assetProvider: AssetProvider;
|
|
27
|
+
//# sourceMappingURL=assets.provider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"assets.provider.d.ts","sourceRoot":"","sources":["../../src/util/assets.provider.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAc,MAAM,gBAAgB,CAAC;AAMnF,qBAAa,aAAa;IACxB;;;;;;;OAOG;IAEH,kCAAkC;IAClC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAEzB,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAIlB,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAe7C,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAM1E;;;;;;OAMG;IACG,KAAK,CAAC,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAYpG;AAED,eAAO,MAAM,aAAa,eAAsB,CAAC"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { fsa } from '@chunkd/fs';
|
|
2
|
+
import { LambdaHttpResponse, HttpHeader } from '@linzjs/lambda';
|
|
3
|
+
import { isGzip } from './cotar.serve.js';
|
|
4
|
+
import { Etag } from './etag.js';
|
|
5
|
+
import { NotFound, NotModified } from './response.js';
|
|
6
|
+
import { CoSources } from './source.cache.js';
|
|
7
|
+
export class AssetProvider {
|
|
8
|
+
set(path) {
|
|
9
|
+
this.path = path;
|
|
10
|
+
}
|
|
11
|
+
async get(fileName) {
|
|
12
|
+
if (this.path == null)
|
|
13
|
+
return null;
|
|
14
|
+
// get assets file from cotar
|
|
15
|
+
if (this.path.endsWith('.tar.co'))
|
|
16
|
+
return await this.getFromCotar(this.path, fileName);
|
|
17
|
+
// get assets file for directory
|
|
18
|
+
try {
|
|
19
|
+
const filePath = fsa.join(this.path, fileName);
|
|
20
|
+
return await fsa.read(filePath);
|
|
21
|
+
}
|
|
22
|
+
catch (e) {
|
|
23
|
+
if (e.code === 404)
|
|
24
|
+
return null;
|
|
25
|
+
throw e;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
async getFromCotar(path, fileName) {
|
|
29
|
+
const cotar = await CoSources.getCotar(path);
|
|
30
|
+
const data = await cotar.get(fileName);
|
|
31
|
+
return data ? Buffer.from(data) : data;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Load a assets from local path or cotar returning the file back as a LambdaResponse
|
|
35
|
+
*
|
|
36
|
+
* This will also set two headers
|
|
37
|
+
* - Content-Encoding if the file starts with gzip magic
|
|
38
|
+
* - Content-Type from the parameter contentType
|
|
39
|
+
*/
|
|
40
|
+
async serve(req, file, contentType) {
|
|
41
|
+
const buf = await assetProvider.get(file);
|
|
42
|
+
if (buf == null)
|
|
43
|
+
return NotFound();
|
|
44
|
+
const cacheKey = Etag.key(buf);
|
|
45
|
+
if (Etag.isNotModified(req, cacheKey))
|
|
46
|
+
return NotModified();
|
|
47
|
+
const response = LambdaHttpResponse.ok().buffer(buf, contentType);
|
|
48
|
+
response.header(HttpHeader.ETag, cacheKey);
|
|
49
|
+
response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
|
|
50
|
+
if (isGzip(buf))
|
|
51
|
+
response.header(HttpHeader.ContentEncoding, 'gzip');
|
|
52
|
+
return response;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
export const assetProvider = new AssetProvider();
|
|
56
|
+
//# sourceMappingURL=assets.provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"assets.provider.js","sourceRoot":"","sources":["../../src/util/assets.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAqB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,MAAM,OAAO,aAAa;IAaxB,GAAG,CAAC,IAAa;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,QAAgB;QACxB,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QACnC,6BAA6B;QAC7B,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAEvF,gCAAgC;QAChC,IAAI;YACF,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC/C,OAAO,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACjC;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,CAAC,IAAI,KAAK,GAAG;gBAAE,OAAO,IAAI,CAAC;YAChC,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAY,EAAE,QAAgB;QAC/C,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,KAAK,CAAC,GAAsB,EAAE,IAAY,EAAE,WAAmB;QACnE,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,GAAG,IAAI,IAAI;YAAE,OAAO,QAAQ,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC;YAAE,OAAO,WAAW,EAAE,CAAC;QAE5D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAClE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC3C,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,sDAAsD,CAAC,CAAC;QACjG,IAAI,MAAM,CAAC,GAAG,CAAC;YAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACrE,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { ConfigBundled, ConfigProviderMemory } from '@basemaps/config';
|
|
2
|
+
import { SwappingLru } from './swapping.lru.js';
|
|
3
|
+
declare class LruConfig {
|
|
4
|
+
configProvider: Promise<ConfigProviderMemory>;
|
|
5
|
+
constructor(config: Promise<ConfigBundled>);
|
|
6
|
+
get size(): number;
|
|
7
|
+
}
|
|
8
|
+
export declare class ConfigCache {
|
|
9
|
+
cache: SwappingLru<LruConfig>;
|
|
10
|
+
constructor(maxSize: number);
|
|
11
|
+
getConfig(location: string): Promise<ConfigProviderMemory | null>;
|
|
12
|
+
}
|
|
13
|
+
/** Cache 20 configs(Around 500KB each)*/
|
|
14
|
+
export declare const CachedConfig: ConfigCache;
|
|
15
|
+
export {};
|
|
16
|
+
//# sourceMappingURL=config.cache.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.cache.d.ts","sourceRoot":"","sources":["../../src/util/config.cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,cAAM,SAAS;IACb,cAAc,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;gBAElC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC;IAQ1C,IAAI,IAAI,IAAI,MAAM,CAGjB;CACF;AAED,qBAAa,WAAW;IACtB,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;gBAClB,OAAO,EAAE,MAAM;IAI3B,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;CAalE;AAED,yCAAyC;AACzC,eAAO,MAAM,YAAY,aAAsB,CAAC"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { ConfigProviderMemory } from '@basemaps/config';
|
|
2
|
+
import { fsa } from '@chunkd/fs';
|
|
3
|
+
import { SwappingLru } from './swapping.lru.js';
|
|
4
|
+
class LruConfig {
|
|
5
|
+
constructor(config) {
|
|
6
|
+
this.configProvider = config.then((c) => {
|
|
7
|
+
const configProvider = ConfigProviderMemory.fromJson(c);
|
|
8
|
+
configProvider.createVirtualTileSets();
|
|
9
|
+
return configProvider;
|
|
10
|
+
});
|
|
11
|
+
}
|
|
12
|
+
get size() {
|
|
13
|
+
// Return size 1 for the config and cache the number of configs based on size number.
|
|
14
|
+
return 1;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
export class ConfigCache {
|
|
18
|
+
constructor(maxSize) {
|
|
19
|
+
this.cache = new SwappingLru(maxSize);
|
|
20
|
+
}
|
|
21
|
+
getConfig(location) {
|
|
22
|
+
var _a;
|
|
23
|
+
const existing = (_a = this.cache.get(location)) === null || _a === void 0 ? void 0 : _a.configProvider;
|
|
24
|
+
if (existing != null)
|
|
25
|
+
return existing;
|
|
26
|
+
try {
|
|
27
|
+
const configJson = fsa.readJson(location);
|
|
28
|
+
const config = new LruConfig(configJson);
|
|
29
|
+
this.cache.set(location, config);
|
|
30
|
+
return config.configProvider;
|
|
31
|
+
}
|
|
32
|
+
catch (e) {
|
|
33
|
+
if (e.code === 404)
|
|
34
|
+
return Promise.resolve(null);
|
|
35
|
+
throw e;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
/** Cache 20 configs(Around 500KB each)*/
|
|
40
|
+
export const CachedConfig = new ConfigCache(20);
|
|
41
|
+
//# sourceMappingURL=config.cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.cache.js","sourceRoot":"","sources":["../../src/util/config.cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,SAAS;IAGb,YAAY,MAA8B;QACxC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACtC,MAAM,cAAc,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACxD,cAAc,CAAC,qBAAqB,EAAE,CAAC;YACvC,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,IAAI;QACN,qFAAqF;QACrF,OAAO,CAAC,CAAC;IACX,CAAC;CACF;AAED,MAAM,OAAO,WAAW;IAEtB,YAAY,OAAe;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,WAAW,CAAY,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,SAAS,CAAC,QAAgB;;QACxB,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,0CAAE,cAAc,CAAC;QAC1D,IAAI,QAAQ,IAAI,IAAI;YAAE,OAAO,QAAQ,CAAC;QACtC,IAAI;YACF,MAAM,UAAU,GAAG,GAAG,CAAC,QAAQ,CAAgB,QAAQ,CAAC,CAAC;YACzD,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC;YACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACjC,OAAO,MAAM,CAAC,cAAc,CAAC;SAC9B;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,CAAC,IAAI,KAAK,GAAG;gBAAE,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,CAAC,CAAC;SACT;IACH,CAAC;CACF;AAED,yCAAyC;AACzC,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC"}
|
package/build/util/response.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import { LambdaHttpResponse } from '@linzjs/lambda';
|
|
1
|
+
import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
|
|
2
2
|
export declare const NotFound: () => LambdaHttpResponse;
|
|
3
3
|
export declare const NotModified: () => LambdaHttpResponse;
|
|
4
|
+
export declare const NoContent: () => LambdaHttpResponse;
|
|
5
|
+
export declare const OkResponse: (req: LambdaHttpRequest) => LambdaHttpResponse;
|
|
4
6
|
//# sourceMappingURL=response.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../src/util/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../src/util/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEvE,eAAO,MAAM,QAAQ,QAAO,kBAA8D,CAAC;AAC3F,eAAO,MAAM,WAAW,QAAO,kBAAiE,CAAC;AACjG,eAAO,MAAM,SAAS,QAAO,kBAA+D,CAAC;AAC7F,eAAO,MAAM,UAAU,QAAS,iBAAiB,KAAG,kBACqD,CAAC"}
|
package/build/util/response.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { LambdaHttpResponse } from '@linzjs/lambda';
|
|
2
2
|
export const NotFound = () => new LambdaHttpResponse(404, 'Not Found');
|
|
3
3
|
export const NotModified = () => new LambdaHttpResponse(304, 'Not modified');
|
|
4
|
+
export const NoContent = () => new LambdaHttpResponse(204, 'No Content');
|
|
5
|
+
export const OkResponse = (req) => new LambdaHttpResponse(200, 'ok').json({ id: req.id, correlationId: req.correlationId, message: 'ok' });
|
|
4
6
|
//# sourceMappingURL=response.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/util/response.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/util/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEvE,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAuB,EAAE,CAAC,IAAI,kBAAkB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;AAC3F,MAAM,CAAC,MAAM,WAAW,GAAG,GAAuB,EAAE,CAAC,IAAI,kBAAkB,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;AACjG,MAAM,CAAC,MAAM,SAAS,GAAG,GAAuB,EAAE,CAAC,IAAI,kBAAkB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAC7F,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAsB,EAAsB,EAAE,CACvE,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,aAAa,EAAE,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC"}
|