Skip to content

Commit 9cbbebe

Browse files
committed
Code cleanup, adding logger to dev
1 parent dbed5da commit 9cbbebe

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

src/worker/index.ts

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { forceRelativeRedirects } from "./middleware/force-relative-redirects";
1010
import { every } from "hono/combine";
1111
import { hyperdriveMysql } from "./middleware/hyperdrive-mysql";
1212
import { bearerAuth } from "hono/bearer-auth";
13+
import { logger } from "hono/logger";
1314

1415
async function verifyTokenAndLicense(token: string, c: Context) {
1516
const db = c.get('db');
@@ -72,21 +73,29 @@ app.get("/api/v2/convert/url/to/zpl/:url{.+}", async (c) => proxy(c.req.param('u
7273
//#endregion
7374

7475
//#region All other conversions
75-
app.use("/api/v2/convert/:sourceFormat/to/:targetFormat", requestId({
76-
headerName: 'X-LZ-Request-Id',
77-
generator: () => new Date().toISOString().substring(0, 19).replaceAll('-', '/').replaceAll('T', '/').replaceAll(':', '') + '--' + crypto.randomUUID(),
78-
}));
7976
app.use("/api/v2/convert/:sourceFormat/to/:targetFormat", async (c, next) => {
80-
return logToR2({
81-
...c.req.param(),
82-
r2Bucket: c.env.LZ_R2_BUCKET,
83-
sampleRate: c.env.LZ_LOG_SAMPLE_RATE,
84-
})(c, next);
77+
return every(
78+
requestId({
79+
headerName: 'X-LZ-Request-Id',
80+
generator: () => new Date().toISOString().substring(0, 19).replaceAll('-', '/').replaceAll('T', '/').replaceAll(':', '') + '--' + crypto.randomUUID(),
81+
}),
82+
logToR2({
83+
...c.req.param(),
84+
r2Bucket: c.env.LZ_R2_BUCKET,
85+
sampleRate: c.env.LZ_LOG_SAMPLE_RATE,
86+
})
87+
)(c, next);
8588
});
8689
//#endregion
8790

8891
//#region All other requests
8992
app.use(forceRelativeRedirects());
93+
app.use(async (c, next) => {
94+
if (c.env.ENVIRONMENT === 'dev') {
95+
return logger()(c, next);
96+
}
97+
await next();
98+
});
9099
app.notFound(async (c) => {
91100
return proxyToBackend({
92101
baseUrl: c.env.LZ_PROD_API_BASE_URL,

worker-configuration.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// Runtime types generated with [email protected] 2025-04-01 nodejs_compat
44
declare namespace Cloudflare {
55
interface Env {
6+
ENVIRONMENT: string;
67
LZ_ALLOWED_ORIGINS: string[];
78
LZ_LOG_SAMPLE_RATE: number;
89
LZ_ERROR_SAMPLE_RATE: number;

0 commit comments

Comments
 (0)