diff --git a/benchmarks/current-regional/tsconfig.worker.json b/benchmarks/current-regional/tsconfig.worker.json new file mode 100644 index 0000000..7f68bb0 --- /dev/null +++ b/benchmarks/current-regional/tsconfig.worker.json @@ -0,0 +1,10 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "noEmit": true + }, + "include": [ + "./scenario.ts", + "./worker.ts" + ] +} diff --git a/benchmarks/current-regional/worker.ts b/benchmarks/current-regional/worker.ts index c78ea44..54f71be 100644 --- a/benchmarks/current-regional/worker.ts +++ b/benchmarks/current-regional/worker.ts @@ -591,26 +591,6 @@ function withColo(response: Response, request: Request): Response { request as Request & { cf?: { colo?: string }; } - - function withStorageMetrics( - response: Response, - metrics: StoreCounters, - ): Response { - const headers = new Headers(response.headers); - headers.set( - "x-benchmark-storage-reads", - String(metrics.reads), - ); - headers.set( - "x-benchmark-storage-bytes", - String(metrics.readBytes), - ); - return new Response(response.body, { - status: response.status, - statusText: response.statusText, - headers, - }); - } ).cf?.colo ?? "unknown"; const headers = new Headers(response.headers); headers.set("x-benchmark-colo", colo); @@ -621,6 +601,26 @@ function withColo(response: Response, request: Request): Response { }); } +function withStorageMetrics( + response: Response, + metrics: StoreCounters, +): Response { + const headers = new Headers(response.headers); + headers.set( + "x-benchmark-storage-reads", + String(metrics.reads), + ); + headers.set( + "x-benchmark-storage-bytes", + String(metrics.readBytes), + ); + return new Response(response.body, { + status: response.status, + statusText: response.statusText, + headers, + }); +} + function json(value: unknown, status = 200): Response { return Response.json(value, { status, diff --git a/package.json b/package.json index a17d600..2f3061d 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "benchmark:s3": "tsx src/cli.ts --provider s3 --profile tiny", "benchmark:compare:local": "tsx benchmarks/comparative/run.mjs", "benchmark:current-regional:generate": "tsx benchmarks/current-regional/generate-data.mjs", - "benchmark:current-regional:build": "vite build --config benchmarks/current-regional/vite.config.ts", + "benchmark:current-regional:build": "tsc -p benchmarks/current-regional/tsconfig.worker.json --noEmit && vite build --config benchmarks/current-regional/vite.config.ts", "benchmark:current-regional:aggregate": "tsx benchmarks/current-regional/aggregate.mjs", "benchmark:current-regional:publish": "tsx benchmarks/current-regional/publish.mjs", "benchmark:write-scaling": "tsx benchmarks/write-scaling/local.mjs", @@ -136,7 +136,7 @@ "auth:roles:entra": "node scripts/generate-entra-roles.mjs", "maintain:retention": "tsx src/retention-maintain.ts", "fixtures:generate": "tsx scripts/generate-protocol-fixtures.ts", - "check": "tsc --noEmit && tsc -p studio/tsconfig.json", + "check": "tsc --noEmit && tsc -p studio/tsconfig.json && tsc -p benchmarks/current-regional/tsconfig.worker.json", "test": "vitest run", "test:e2e": "playwright test", "verify:package": "node scripts/verify-package.mjs",