mirror of
https://github.com/protomaps/PMTiles.git
synced 2026-02-04 10:51:07 +00:00
lint cloudflare implementation (#352)
Add linters to AWS and cloudflare implementations [#287]
This commit is contained in:
Brandon Liu
228
serverless/aws/package-lock.json
generated
228
serverless/aws/package-lock.json
generated
@@ -12,6 +12,7 @@
|
||||
"@aws-sdk/node-http-handler": "^3.360.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@biomejs/biome": "^1.5.3",
|
||||
"@types/aws-lambda": "^8.10.108",
|
||||
"@types/node": "^18.11.2",
|
||||
"esbuild": "^0.20.0",
|
||||
@@ -915,6 +916,161 @@
|
||||
"node": ">=14.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@biomejs/biome": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.5.3.tgz",
|
||||
"integrity": "sha512-yvZCa/g3akwTaAQ7PCwPWDCkZs3Qa5ONg/fgOUT9e6wAWsPftCjLQFPXBeGxPK30yZSSpgEmRCfpGTmVbUjGgg==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"bin": {
|
||||
"biome": "bin/biome"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.*"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/biome"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@biomejs/cli-darwin-arm64": "1.5.3",
|
||||
"@biomejs/cli-darwin-x64": "1.5.3",
|
||||
"@biomejs/cli-linux-arm64": "1.5.3",
|
||||
"@biomejs/cli-linux-arm64-musl": "1.5.3",
|
||||
"@biomejs/cli-linux-x64": "1.5.3",
|
||||
"@biomejs/cli-linux-x64-musl": "1.5.3",
|
||||
"@biomejs/cli-win32-arm64": "1.5.3",
|
||||
"@biomejs/cli-win32-x64": "1.5.3"
|
||||
}
|
||||
},
|
||||
"node_modules/@biomejs/cli-darwin-arm64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.5.3.tgz",
|
||||
"integrity": "sha512-ImU7mh1HghEDyqNmxEZBoMPr8SxekkZuYcs+gynKlNW+TALQs7swkERiBLkG9NR0K1B3/2uVzlvYowXrmlW8hw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=14.*"
|
||||
}
|
||||
},
|
||||
"node_modules/@biomejs/cli-darwin-x64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.5.3.tgz",
|
||||
"integrity": "sha512-vCdASqYnlpq/swErH7FD6nrFz0czFtK4k/iLgj0/+VmZVjineFPgevOb+Sr9vz0tk0GfdQO60bSpI74zU8M9Dw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=14.*"
|
||||
}
|
||||
},
|
||||
"node_modules/@biomejs/cli-linux-arm64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.5.3.tgz",
|
||||
"integrity": "sha512-cupBQv0sNF1OKqBfx7EDWMSsKwRrBUZfjXawT4s6hKV6ALq7p0QzWlxr/sDmbKMLOaLQtw2Qgu/77N9rm+f9Rg==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=14.*"
|
||||
}
|
||||
},
|
||||
"node_modules/@biomejs/cli-linux-arm64-musl": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.5.3.tgz",
|
||||
"integrity": "sha512-DYuMizUYUBYfS0IHGjDrOP1RGipqWfMGEvNEJ398zdtmCKLXaUvTimiox5dvx4X15mBK5M2m8wgWUgOP1giUpQ==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=14.*"
|
||||
}
|
||||
},
|
||||
"node_modules/@biomejs/cli-linux-x64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.5.3.tgz",
|
||||
"integrity": "sha512-YQrSArQvcv4FYsk7Q91Yv4uuu5F8hJyORVcv3zsjCLGkjIjx2RhjYLpTL733SNL7v33GmOlZY0eFR1ko38tuUw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=14.*"
|
||||
}
|
||||
},
|
||||
"node_modules/@biomejs/cli-linux-x64-musl": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.5.3.tgz",
|
||||
"integrity": "sha512-UUHiAnlDqr2Y/LpvshBFhUYMWkl2/Jn+bi3U6jKuav0qWbbBKU/ByHgR4+NBxpKBYoCtWxhnmatfH1bpPIuZMw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=14.*"
|
||||
}
|
||||
},
|
||||
"node_modules/@biomejs/cli-win32-arm64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.5.3.tgz",
|
||||
"integrity": "sha512-HxatYH7vf/kX9nrD+pDYuV2GI9GV8EFo6cfKkahAecTuZLPxryHx1WEfJthp5eNsE0+09STGkKIKjirP0ufaZA==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=14.*"
|
||||
}
|
||||
},
|
||||
"node_modules/@biomejs/cli-win32-x64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.5.3.tgz",
|
||||
"integrity": "sha512-fMvbSouZEASU7mZH8SIJSANDm5OqsjgtVXlbUqxwed6BP7uuHRSs396Aqwh2+VoW8fwTpp6ybIUoC9FrzB0kyA==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=14.*"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/aix-ppc64": {
|
||||
"version": "0.20.0",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz",
|
||||
@@ -3168,6 +3324,78 @@
|
||||
"tslib": "^2.5.0"
|
||||
}
|
||||
},
|
||||
"@biomejs/biome": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.5.3.tgz",
|
||||
"integrity": "sha512-yvZCa/g3akwTaAQ7PCwPWDCkZs3Qa5ONg/fgOUT9e6wAWsPftCjLQFPXBeGxPK30yZSSpgEmRCfpGTmVbUjGgg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@biomejs/cli-darwin-arm64": "1.5.3",
|
||||
"@biomejs/cli-darwin-x64": "1.5.3",
|
||||
"@biomejs/cli-linux-arm64": "1.5.3",
|
||||
"@biomejs/cli-linux-arm64-musl": "1.5.3",
|
||||
"@biomejs/cli-linux-x64": "1.5.3",
|
||||
"@biomejs/cli-linux-x64-musl": "1.5.3",
|
||||
"@biomejs/cli-win32-arm64": "1.5.3",
|
||||
"@biomejs/cli-win32-x64": "1.5.3"
|
||||
}
|
||||
},
|
||||
"@biomejs/cli-darwin-arm64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.5.3.tgz",
|
||||
"integrity": "sha512-ImU7mh1HghEDyqNmxEZBoMPr8SxekkZuYcs+gynKlNW+TALQs7swkERiBLkG9NR0K1B3/2uVzlvYowXrmlW8hw==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"@biomejs/cli-darwin-x64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.5.3.tgz",
|
||||
"integrity": "sha512-vCdASqYnlpq/swErH7FD6nrFz0czFtK4k/iLgj0/+VmZVjineFPgevOb+Sr9vz0tk0GfdQO60bSpI74zU8M9Dw==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"@biomejs/cli-linux-arm64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.5.3.tgz",
|
||||
"integrity": "sha512-cupBQv0sNF1OKqBfx7EDWMSsKwRrBUZfjXawT4s6hKV6ALq7p0QzWlxr/sDmbKMLOaLQtw2Qgu/77N9rm+f9Rg==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"@biomejs/cli-linux-arm64-musl": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.5.3.tgz",
|
||||
"integrity": "sha512-DYuMizUYUBYfS0IHGjDrOP1RGipqWfMGEvNEJ398zdtmCKLXaUvTimiox5dvx4X15mBK5M2m8wgWUgOP1giUpQ==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"@biomejs/cli-linux-x64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.5.3.tgz",
|
||||
"integrity": "sha512-YQrSArQvcv4FYsk7Q91Yv4uuu5F8hJyORVcv3zsjCLGkjIjx2RhjYLpTL733SNL7v33GmOlZY0eFR1ko38tuUw==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"@biomejs/cli-linux-x64-musl": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.5.3.tgz",
|
||||
"integrity": "sha512-UUHiAnlDqr2Y/LpvshBFhUYMWkl2/Jn+bi3U6jKuav0qWbbBKU/ByHgR4+NBxpKBYoCtWxhnmatfH1bpPIuZMw==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"@biomejs/cli-win32-arm64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.5.3.tgz",
|
||||
"integrity": "sha512-HxatYH7vf/kX9nrD+pDYuV2GI9GV8EFo6cfKkahAecTuZLPxryHx1WEfJthp5eNsE0+09STGkKIKjirP0ufaZA==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"@biomejs/cli-win32-x64": {
|
||||
"version": "1.5.3",
|
||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.5.3.tgz",
|
||||
"integrity": "sha512-fMvbSouZEASU7mZH8SIJSANDm5OqsjgtVXlbUqxwed6BP7uuHRSs396Aqwh2+VoW8fwTpp6ybIUoC9FrzB0kyA==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"@esbuild/aix-ppc64": {
|
||||
"version": "0.20.0",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz",
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
"name": "pmtiles-aws",
|
||||
"version": "0.0.0",
|
||||
"devDependencies": {
|
||||
"@biomejs/biome": "^1.5.3",
|
||||
"@types/aws-lambda": "^8.10.108",
|
||||
"@types/node": "^18.11.2",
|
||||
"esbuild": "^0.20.0",
|
||||
@@ -12,7 +13,9 @@
|
||||
"scripts": {
|
||||
"tsc": "tsc --noEmit --watch",
|
||||
"build": "esbuild src/index.ts --target=es2020 --outfile=dist/index.mjs --format=esm --bundle --platform=node --target=node18 --external:@aws-sdk/client-s3 --external:@aws-sdk/node-http-handler --banner:js=//$(git describe --always) && cd dist && zip lambda_function.zip index.mjs",
|
||||
"test": "tsx ../shared/index.test.ts"
|
||||
"test": "tsx ../shared/index.test.ts",
|
||||
"biome": "biome check --config-path=../../js/ src --apply",
|
||||
"biome-check": "biome check --config-path=../../js src"
|
||||
},
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "^3.360.0",
|
||||
|
||||
@@ -1,37 +1,37 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert";
|
||||
import { test } from "node:test";
|
||||
|
||||
import { get_region } from "./aws_region";
|
||||
import { getRegion } from "./aws_region";
|
||||
|
||||
test("one bucket", () => {
|
||||
let result = get_region(
|
||||
const result = getRegion(
|
||||
"us-west-1",
|
||||
{ bucket: "mybucket", region: "us-west-1" },
|
||||
[],
|
||||
[]
|
||||
);
|
||||
assert.deepEqual(result, { bucket: "mybucket", region: "us-west-1" });
|
||||
});
|
||||
|
||||
test("unknown region", () => {
|
||||
let result = get_region(
|
||||
const result = getRegion(
|
||||
"us-nullisland-1",
|
||||
{ bucket: "mybucket", region: "us-west-1" },
|
||||
[],
|
||||
[]
|
||||
);
|
||||
assert.deepEqual(result, { bucket: "mybucket", region: "us-west-1" });
|
||||
});
|
||||
|
||||
test("exact region match", () => {
|
||||
let result = get_region(
|
||||
let result = getRegion(
|
||||
"us-west-1",
|
||||
{ bucket: "mybucket", region: "us-west-1" },
|
||||
[{ bucket: "mybucket-ap-south-1", region: "ap-south-1" }],
|
||||
[{ bucket: "mybucket-ap-south-1", region: "ap-south-1" }]
|
||||
);
|
||||
assert.deepEqual(result, { bucket: "mybucket", region: "us-west-1" });
|
||||
result = get_region(
|
||||
result = getRegion(
|
||||
"ap-south-1",
|
||||
{ bucket: "mybucket", region: "us-west-1" },
|
||||
[{ bucket: "mybucket-ap-south-1", region: "ap-south-1" }],
|
||||
[{ bucket: "mybucket-ap-south-1", region: "ap-south-1" }]
|
||||
);
|
||||
assert.deepEqual(result, {
|
||||
bucket: "mybucket-ap-south-1",
|
||||
@@ -40,10 +40,10 @@ test("exact region match", () => {
|
||||
});
|
||||
|
||||
test("priority match", () => {
|
||||
let result = get_region(
|
||||
const result = getRegion(
|
||||
"us-west-1",
|
||||
{ bucket: "mybucket", region: "ap-south-1" },
|
||||
[{ bucket: "mybucket-us-west-2", region: "us-west-2" }],
|
||||
[{ bucket: "mybucket-us-west-2", region: "us-west-2" }]
|
||||
);
|
||||
assert.deepEqual(result, {
|
||||
bucket: "mybucket-us-west-2",
|
||||
|
||||
@@ -19,24 +19,24 @@ const REGION_MATRIX: Record<string, string[]> = {
|
||||
"sa-east-1": ["us-east-1", "us-east-2"], // sao paulo
|
||||
};
|
||||
|
||||
export let get_region = (
|
||||
exec_region: string,
|
||||
export const getRegion = (
|
||||
execRegion: string,
|
||||
primary: Bucket,
|
||||
replicas: Bucket[],
|
||||
replicas: Bucket[]
|
||||
): Bucket => {
|
||||
if (primary.region === exec_region) {
|
||||
if (primary.region === execRegion) {
|
||||
return primary;
|
||||
}
|
||||
|
||||
for (let replica of replicas) {
|
||||
if (replica.region === exec_region) {
|
||||
for (const replica of replicas) {
|
||||
if (replica.region === execRegion) {
|
||||
return replica;
|
||||
}
|
||||
}
|
||||
|
||||
if (exec_region in REGION_MATRIX) {
|
||||
for (let region of REGION_MATRIX[exec_region]) {
|
||||
for (let replica of replicas) {
|
||||
if (execRegion in REGION_MATRIX) {
|
||||
for (const region of REGION_MATRIX[execRegion]) {
|
||||
for (const replica of replicas) {
|
||||
if (replica.region === region) {
|
||||
return replica;
|
||||
}
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
import {
|
||||
Context,
|
||||
APIGatewayProxyResult,
|
||||
APIGatewayProxyEventV2,
|
||||
APIGatewayProxyResult,
|
||||
Context,
|
||||
} from "aws-lambda";
|
||||
import {
|
||||
PMTiles,
|
||||
ResolvedValueCache,
|
||||
RangeResponse,
|
||||
Source,
|
||||
Compression,
|
||||
PMTiles,
|
||||
RangeResponse,
|
||||
ResolvedValueCache,
|
||||
Source,
|
||||
TileType,
|
||||
} from "../../../js/index";
|
||||
import { pmtiles_path, tile_path, tileJSON } from "../../shared/index";
|
||||
import { pmtiles_path, tileJSON, tile_path } from "../../shared/index";
|
||||
|
||||
import { createHash } from "crypto";
|
||||
import zlib from "zlib";
|
||||
import { createHash } from "crypto"
|
||||
|
||||
import { S3Client, GetObjectCommand } from "@aws-sdk/client-s3";
|
||||
import { GetObjectCommand, S3Client } from "@aws-sdk/client-s3";
|
||||
import { NodeHttpHandler } from "@aws-sdk/node-http-handler";
|
||||
|
||||
// the region should default to the same one as the function
|
||||
@@ -33,37 +33,47 @@ async function nativeDecompress(
|
||||
): Promise<ArrayBuffer> {
|
||||
if (compression === Compression.None || compression === Compression.Unknown) {
|
||||
return buf;
|
||||
} else if (compression === Compression.Gzip) {
|
||||
return zlib.gunzipSync(buf);
|
||||
} else {
|
||||
throw Error("Compression method not supported");
|
||||
}
|
||||
if (compression === Compression.Gzip) {
|
||||
return zlib.gunzipSync(buf);
|
||||
}
|
||||
throw Error("Compression method not supported");
|
||||
}
|
||||
|
||||
// Lambda needs to run with 512MB, empty function takes about 70
|
||||
const CACHE = new ResolvedValueCache(undefined, undefined, nativeDecompress);
|
||||
|
||||
class S3Source implements Source {
|
||||
archive_name: string;
|
||||
archiveName: string;
|
||||
|
||||
constructor(archive_name: string) {
|
||||
this.archive_name = archive_name;
|
||||
constructor(archiveName: string) {
|
||||
this.archiveName = archiveName;
|
||||
}
|
||||
|
||||
getKey() {
|
||||
return this.archive_name;
|
||||
return this.archiveName;
|
||||
}
|
||||
|
||||
async getBytes(offset: number, length: number, signal?:AbortSignal, etag?: string): Promise<RangeResponse> {
|
||||
async getBytes(
|
||||
offset: number,
|
||||
length: number,
|
||||
signal?: AbortSignal,
|
||||
etag?: string
|
||||
): Promise<RangeResponse> {
|
||||
const resp = await s3client.send(
|
||||
new GetObjectCommand({
|
||||
// biome-ignore lint: aws api
|
||||
Bucket: process.env.BUCKET!,
|
||||
Key: pmtiles_path(this.archive_name, process.env.PMTILES_PATH),
|
||||
// biome-ignore lint: aws api
|
||||
Key: pmtiles_path(this.archiveName, process.env.PMTILES_PATH),
|
||||
// biome-ignore lint: aws api
|
||||
Range: "bytes=" + offset + "-" + (offset + length - 1),
|
||||
})
|
||||
);
|
||||
|
||||
const arr = await resp.Body!.transformToByteArray();
|
||||
const arr = await resp.Body?.transformToByteArray();
|
||||
|
||||
if (!arr) throw Error("Failed to read S3 response body");
|
||||
|
||||
return {
|
||||
data: arr.buffer,
|
||||
@@ -100,12 +110,12 @@ export const handlerRaw = async (
|
||||
_context: Context,
|
||||
tilePostprocess?: (a: ArrayBuffer, t: TileType) => ArrayBuffer
|
||||
): Promise<APIGatewayProxyResult> => {
|
||||
let path;
|
||||
let is_api_gateway;
|
||||
let path: string;
|
||||
let isApiGateway = false;
|
||||
if (event.pathParameters) {
|
||||
is_api_gateway = true;
|
||||
isApiGateway = true;
|
||||
if (event.pathParameters.proxy) {
|
||||
path = "/" + event.pathParameters.proxy;
|
||||
path = `/${event.pathParameters.proxy}`;
|
||||
} else {
|
||||
return apiResp(500, "Proxy integration missing tile_path parameter");
|
||||
}
|
||||
@@ -167,7 +177,7 @@ export const handlerRaw = async (
|
||||
[TileType.Avif, "avif"],
|
||||
]) {
|
||||
if (header.tileType === pair[0] && ext !== pair[1]) {
|
||||
if (header.tileType == TileType.Mvt && ext === "pbf") {
|
||||
if (header.tileType === TileType.Mvt && ext === "pbf") {
|
||||
// allow this for now. Eventually we will delete this in favor of .mvt
|
||||
continue;
|
||||
}
|
||||
@@ -180,8 +190,8 @@ export const handlerRaw = async (
|
||||
}
|
||||
}
|
||||
|
||||
const tile_result = await p.getZxy(tile[0], tile[1], tile[2]);
|
||||
if (tile_result) {
|
||||
const tileResult = await p.getZxy(tile[0], tile[1], tile[2]);
|
||||
if (tileResult) {
|
||||
switch (header.tileType) {
|
||||
case TileType.Mvt:
|
||||
// part of the list of Cloudfront compressible types.
|
||||
@@ -201,38 +211,35 @@ export const handlerRaw = async (
|
||||
break;
|
||||
}
|
||||
|
||||
let data = tile_result.data;
|
||||
let data = tileResult.data;
|
||||
|
||||
if (tilePostprocess) {
|
||||
data = tilePostprocess(data, header.tileType);
|
||||
}
|
||||
|
||||
headers["Cache-Control"] = `public, max-age=${process.env.CACHE_MAX_AGE || 86400}`;
|
||||
headers["ETag"] = `"${createHash("sha256").update(Buffer.from(data)).digest("hex")}"`
|
||||
headers["Cache-Control"] = `public, max-age=${
|
||||
process.env.CACHE_MAX_AGE || 86400
|
||||
}`;
|
||||
headers.ETag = `"${createHash("sha256")
|
||||
.update(Buffer.from(data))
|
||||
.digest("hex")}"`;
|
||||
|
||||
if (is_api_gateway) {
|
||||
if (isApiGateway) {
|
||||
// this is wasted work, but we need to force API Gateway to interpret the Lambda response as binary
|
||||
// without depending on clients sending matching Accept: headers in the request.
|
||||
const recompressed_data = zlib.gzipSync(data);
|
||||
const recompressedData = zlib.gzipSync(data);
|
||||
headers["Content-Encoding"] = "gzip";
|
||||
return apiResp(
|
||||
200,
|
||||
Buffer.from(recompressed_data).toString("base64"),
|
||||
true,
|
||||
headers
|
||||
);
|
||||
} else {
|
||||
// returns uncompressed response
|
||||
return apiResp(
|
||||
200,
|
||||
Buffer.from(data).toString("base64"),
|
||||
Buffer.from(recompressedData).toString("base64"),
|
||||
true,
|
||||
headers
|
||||
);
|
||||
}
|
||||
} else {
|
||||
return apiResp(204, "", false, headers);
|
||||
// returns uncompressed response
|
||||
return apiResp(200, Buffer.from(data).toString("base64"), true, headers);
|
||||
}
|
||||
return apiResp(204, "", false, headers);
|
||||
} catch (e) {
|
||||
if ((e as Error).name === "AccessDenied") {
|
||||
return apiResp(403, "Bucket access unauthorized", false, headers);
|
||||
|
||||
Reference in New Issue
Block a user