Merge pull request #13 from vansergen/fix/error

Fix ESLint errors

Author: vansergen

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: push
+on: [push, pull_request]
 
 jobs:
   test:

package-lock.json

@@ -1,44 +1,15 @@
 import http, { STATUS_CODES } from "node:http";
 import https from "node:https";
 import { isDeepStrictEqual } from "node:util";
-import { Context, IBindenResponse } from "./context.js";
+import { Context } from "./context.js";
 import { BindenError } from "./error.js";
 import { Middleware } from "./middleware.js";
 import { BindenRequest } from "./request.js";
 import { BindenResponse, ct_text, ct_json } from "./response.js";
 import { Router } from "./router.js";
 
-type BindenRequestListener = (
-  request: BindenRequest,
-  response: IBindenResponse
-) => void;
-
 type IUseOptions = IStackItem | RegExp | string | null | undefined;
 
-interface IBindenServerOptions extends http.ServerOptions {
-  IncomingMessage: typeof BindenRequest;
-  ServerResponse: typeof BindenResponse;
-}
-
-interface IBindenSecureServerOptions extends https.ServerOptions {
-  IncomingMessage: typeof BindenRequest;
-  ServerResponse: typeof BindenResponse;
-}
-
-declare module "http" {
-  export function createServer(
-    options: IBindenServerOptions,
-    requestListener?: BindenRequestListener
-  ): Server;
-}
-
-declare module "https" {
-  function createServer(
-    options: IBindenSecureServerOptions,
-    requestListener?: BindenRequestListener
-  ): Server;
-}
-
 export type IStackItem = Middleware | Router;
 export type IStack = [IStackItem[], RegExp | string | null];
 
@@ -67,20 +38,24 @@ export class Binden {
     ]);
   }
 
-  public createServer(options: http.ServerOptions = {}): http.Server {
+  public createServer(
+    options: http.ServerOptions = {}
+  ): http.Server<typeof BindenRequest, typeof BindenResponse> {
     return http.createServer(
       {
         ...options,
         IncomingMessage: BindenRequest,
         ServerResponse: BindenResponse,
       },
-      (request: BindenRequest, response: IBindenResponse) => {
+      (request, response) => {
         this.#requestListener(request, response);
       }
     );
   }
 
-  public createSecureServer(options: https.ServerOptions = {}): https.Server {
+  public createSecureServer(
+    options: https.ServerOptions = {}
+  ): https.Server<typeof BindenRequest, typeof BindenResponse> {
     return https.createServer(
       {
         ...options,
@@ -184,7 +159,10 @@ export class Binden {
     return removed;
   }
 
-  #requestListener(request: BindenRequest, response: IBindenResponse): void {
+  #requestListener(
+    request: BindenRequest,
+    response: BindenResponse<BindenRequest>
+  ): void {
     const context = new Context({ request, response });
     this.#handle(context).catch((error: unknown) => {
       this.#errorHandler(context, error);

src/binden.ts

@@ -6,18 +6,14 @@ import type { Readable } from "node:stream";
 import type { BindenRequest } from "./request.js";
 import type { IHeadersValue, BindenResponse } from "./response.js";
 
-export interface IBindenResponse extends BindenResponse {
-  req: BindenRequest;
-}
-
 export interface IBaseContext {
   readonly request: BindenRequest;
-  readonly response: IBindenResponse;
+  readonly response: BindenResponse<BindenRequest>;
 }
 
 export class Context implements IBaseContext {
   readonly #request: BindenRequest;
-  readonly #response: IBindenResponse;
+  readonly #response: BindenResponse<BindenRequest>;
   readonly #logger: Logger;
   #done: boolean;
 
@@ -47,7 +43,7 @@ export class Context implements IBaseContext {
     return this.#request;
   }
 
-  public get response(): IBindenResponse {
+  public get response(): BindenResponse<BindenRequest> {
     return this.#response;
   }
 

src/context.ts

@@ -28,7 +28,11 @@ export class BindenError extends Error {
       throw new RangeError("Status code is less than 400");
     }
 
-    super(message, cause ? { cause } : {});
+    if (typeof cause === "undefined") {
+      super(message);
+    } else {
+      super(message, { cause });
+    }
 
     this.name = "BindenError";
     this.#expose = Boolean(expose);

src/error.ts

@@ -1,6 +1,6 @@
 import { createReadStream } from "node:fs";
 import { stat } from "node:fs/promises";
-import { ServerResponse, STATUS_CODES } from "node:http";
+import { IncomingMessage, ServerResponse, STATUS_CODES } from "node:http";
 import { Readable } from "node:stream";
 import { pathToFileURL } from "node:url";
 import ContentRange from "./headers/content-range.js";
@@ -18,7 +18,9 @@ export type IHeadersValue = number | string | readonly string[];
 
 export type IHeaders = Record<string, IHeadersValue>;
 
-export class BindenResponse extends ServerResponse {
+export class BindenResponse<
+  Request extends IncomingMessage = IncomingMessage
+> extends ServerResponse<Request> {
   #cookies?: Set<Cookie>;
 
   public get cookies(): Set<Cookie> {

src/response.ts

@@ -69,25 +69,17 @@ suite("Binden", () => {
   test(".createSecureServer()", async () => {
     const newApp = new Binden();
     const path = new URL(url);
-    const agent = new Agent({
-      rejectUnauthorized: false,
-    });
+    const agent = new Agent({ rejectUnauthorized: false });
     path.port = `${Number(path.port) + 1}`;
     path.protocol = "https:";
 
-    const key = await readFile("./test/cert/key.pem", {
-      encoding: "utf-8",
-    });
-    const cert = await readFile("./test/cert/cert.pem", {
-      encoding: "utf-8",
-    });
+    const key = await readFile("./test/cert/key.pem", { encoding: "utf-8" });
+    const cert = await readFile("./test/cert/cert.pem", { encoding: "utf-8" });
+
+    const newServer = newApp.createSecureServer({ key, cert });
 
-    const newServer = await new Promise<Server>((resolve) => {
-      const s = newApp
-        .createSecureServer({ key, cert })
-        .listen(port + 1, () => {
-          resolve(s);
-        });
+    await new Promise<void>((resolve) => {
+      newServer.listen(port + 1, resolve);
     });
 
     const m = new SendMiddleware();
@@ -267,10 +259,10 @@ suite("Binden", () => {
     const path = new URL(url);
     path.port = `${Number(path.port) + 1}`;
 
-    const newServer = await new Promise<Server>((resolve) => {
-      const s = newApp.createServer().listen(port + 1, () => {
-        resolve(s);
-      });
+    const newServer = newApp.createServer();
+
+    await new Promise<void>((resolve) => {
+      newServer.listen(port + 1, resolve);
     });
 
     const m = new CustomMiddleware();
@@ -297,10 +289,10 @@ suite("Binden", () => {
       const path = new URL(url);
       path.port = `${Number(path.port) + 1}`;
 
-      const newServer = await new Promise<Server>((resolve) => {
-        const s = newApp.createServer().listen(port + 1, () => {
-          resolve(s);
-        });
+      const newServer = newApp.createServer();
+
+      await new Promise<void>((resolve) => {
+        newServer.listen(port + 1, resolve);
       });
 
       const status = 405;