feat: use context requestlog for server logs

Author: shiftinv

src/main.ts

@@ -3,15 +3,17 @@ import { HTTPException } from "@hono/hono/http-exception";
 import { logger } from "@hono/hono/logger";
 
 import config from "./config.ts";
-import { contextMiddleware } from "./context.ts";
+import { contextMiddleware, getRequestLog } from "./context.ts";
 import { hasKey, verify } from "./crypto.ts";
 import handler from "./handler.ts";
 
 const app = new Hono();
 
-app.use(logger());
 app.use(contextMiddleware);
 
+// use context's requestlog for server logs
+app.use(logger((...args) => getRequestLog().log(...args)));
+
 if (config.mainRedirect) {
     app.get("/", (c) => {
         return c.redirect(config.mainRedirect!);

src/util.ts

@@ -32,14 +32,13 @@ export function wildcardMatch(pattern: string, target: string): boolean {
  * logging proxy that adds some metadata to log messages
  */
 export function requestLog(deliveryId: string | undefined) {
-    const prefix = deliveryId ? `[${deliveryId}] ` : "";
+    const prefix = deliveryId ? `[${deliveryId}]` : "";
 
     // ugh
     // is there a better way to do this? certainly.
     // does this work? also yes.
-    const proxyLog: (func: (s: any) => void) => (msg: any) => void = (func) => {
-        // FIXME: `String()` mangles objects
-        return (msg) => func(prefix + String(msg));
+    const proxyLog: (func: (...args: any[]) => void) => (...args: any[]) => void = (func) => {
+        return (...args) => func(prefix, ...args);
     };
 
     return {