Merge branch 'main' into auth

Author: zefir-git

src/Server.ts

@@ -56,7 +56,7 @@ class Server<A> {
         }
         catch (e) {
             if (e instanceof Request.BadUrlError) {
-                await this.errors._get(ServerErrorRegistry.ErrorCodes.BAD_URL)._send(res);
+                await this.errors._get(ServerErrorRegistry.ErrorCodes.BAD_URL, null)._send(res, this);
                 return;
             }
             if (e instanceof Request.SocketClosedError)
@@ -78,10 +78,10 @@ class Server<A> {
         }
         catch (e) {
             if (e instanceof RouteRegistry.NoRouteError)
-                response = this.errors._get(ServerErrorRegistry.ErrorCodes.NO_ROUTE);
+                response = this.errors._get(ServerErrorRegistry.ErrorCodes.NO_ROUTE, apiRequest);
             else {
                 console.error("Internal Server Error:", e);
-                response = this.errors._get(ServerErrorRegistry.ErrorCodes.INTERNAL);
+                response = this.errors._get(ServerErrorRegistry.ErrorCodes.INTERNAL, apiRequest);
             }
         }  
         await response._send(res, apiRequest);

src/ServerErrorRegistry.ts

@@ -1,11 +1,12 @@
 import {Response} from "./response/Response.js";
+import {Request} from "./Request.js";
 import {TextResponse} from "./response/TextResponse.js";
 
 /**
  * A registry for server errors.
  */
 class ServerErrorRegistry<A> {
-    private readonly responses: Record<ServerErrorRegistry.ErrorCodes, Response<A>>;
+    private readonly responses: Record<ServerErrorRegistry.ErrorCodes, Response<A> | ((req?: Request<A>) => Response<A>)>;
 
     /**
      * Create a new server error registry initialised with default responses.
@@ -28,13 +29,15 @@ class ServerErrorRegistry<A> {
      * @param code The server error code.
      * @param response The response to send.
      */
-    public register(code: ServerErrorRegistry.ErrorCodes, response: Response<A>) {
+    public register(code: ServerErrorRegistry.ErrorCodes, response: Response<A> | ((req?: Request<A>) => Response<A>)) {
         this.responses[code] = response;
     }
 
     /** @internal */
-    public _get(code: ServerErrorRegistry.ErrorCodes): Response<A> {
-        return this.responses[code];
+    public _get(code: ServerErrorRegistry.ErrorCodes, req: Request<A> | null): Response<A> {
+        const r = this.responses[code];
+        if (typeof r === "function") return r(req ?? void 0);
+        return r;
     }
 }
 

src/response/JsonResponse.ts

@@ -9,6 +9,7 @@ export class JsonResponse<T, A> extends TextResponse<A> {
      */
     public constructor(json: T, statusCode = 200, headers?: HeadersInit) {
         super(JsonResponse.serialise(json), statusCode, headers);
+        this.headers.set("content-type", "application/json");
     }
 
     protected static serialise(value: any): string {