@kiyasov/platform-hono 1.5.1 → 1.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kiyasov/platform-hono",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "Nest adapter for Hono",
   "author": "Islam Kiiasov",
   "repository": {
@@ -28,38 +28,43 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/server": "^4.12.0",
-    "@hono/node-server": "^1.14.1",
+    "@apollo/server": "^4.12.2",
+    "@hono/node-server": "^1.17.1",
     "@nestjs/apollo": "^13.1.0",
     "@nestjs/graphql": "^13.1.0",
-    "hono": "^4.7.9"
+    "hono": "^4.8.7"
   },
   "devDependencies": {
-    "@eslint/js": "^9.26.0",
+    "@eslint/js": "^9.31.0",
     "@nestjs/cli": "^11.0.7",
-    "@nestjs/common": "^11.1.1",
-    "@nestjs/core": "^11.1.1",
+    "@nestjs/common": "^11.1.3",
+    "@nestjs/core": "^11.1.3",
+    "@nestjs/swagger": "^11.2.0",
     "@swc/cli": "^0.7.7",
-    "@swc/core": "^1.11.24",
+    "@swc/core": "^1.12.1",
     "@types/autocannon": "^7.12.7",
-    "@types/bun": "^1.2.13",
+    "@types/bun": "^1.2.16",
     "@types/busboy": "^1.5.4",
     "autocannon": "^8.0.0",
-    "bun": "^1.2.13",
-    "eslint": "^9.26.0",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-perfectionist": "^4.13.0",
-    "eslint-plugin-prettier": "^5.4.0",
-    "globals": "^16.1.0",
+    "bun": "^1.2.19",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.2",
+    "eslint": "^9.31.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-perfectionist": "^4.15.0",
+    "eslint-plugin-prettier": "^5.5.3",
+    "globals": "^16.3.0",
     "graphql": "^16.11.0",
     "graphql-subscriptions": "^3.0.0",
-    "prettier": "^3.5.3",
+    "prettier": "^3.6.2",
     "reflect-metadata": "^0.2.2",
     "rimraf": "^6.0.1",
     "rxjs": "^7.8.2",
+    "sharp": "^0.34.3",
     "tsc": "^2.0.4",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.1"
+    "typescript-eslint": "^8.38.0",
+    "undici": "^7.12.0"
   },
   "scripts": {
     "build:esm": "bun ./node_modules/typescript/bin/tsc --p tsconfig.esm.json",
@@ -73,7 +78,9 @@
     "benchmark:node:file": "bun run dev  & ( sleep 5 && node ./benchmarks/benchmark.mjs)"
   },
   "trustedDependencies": [
+    "@apollo/protobufjs",
     "@nestjs/core",
-    "@swc/core"
+    "@swc/core",
+    "bun"
   ]
 }

package/src/adapters/hono-adapter.ts

@@ -70,10 +70,15 @@ export class HonoAdapter extends AbstractHttpAdapter<
     };
   }
 
-  private async getBody(ctx: Ctx, body?: Data) {
+  private async normalizeContext(ctx: Ctx): Promise<Context> {
     if (typeof ctx === 'function') {
-      ctx = await ctx();
+      return await ctx();
     }
+    return ctx;
+  }
+
+  private async getBody(ctx: Ctx, body?: Data) {
+    ctx = await this.normalizeContext(ctx);
 
     let responseContentType = await this.getHeader(ctx, 'Content-Type');
 
@@ -99,76 +104,88 @@ export class HonoAdapter extends AbstractHttpAdapter<
     return ctx.body(body);
   }
 
-  public all(pathOrHandler: string | HonoHandler, handler?: HonoHandler) {
+  private registerRoute(
+    method:
+      | 'all'
+      | 'get'
+      | 'post'
+      | 'put'
+      | 'delete'
+      | 'use'
+      | 'patch'
+      | 'options',
+    pathOrHandler: string | HonoHandler,
+    handler?: HonoHandler,
+  ) {
     const [routePath, routeHandler] = this.getRouteAndHandler(
       pathOrHandler,
       handler,
     );
-    this.instance.all(routePath, this.createRouteHandler(routeHandler));
+    const routeHandler2 = this.createRouteHandler(routeHandler);
+
+    switch (method) {
+      case 'all':
+        this.instance.all(routePath, routeHandler2);
+        break;
+      case 'get':
+        this.instance.get(routePath, routeHandler2);
+        break;
+      case 'post':
+        this.instance.post(routePath, routeHandler2);
+        break;
+      case 'put':
+        this.instance.put(routePath, routeHandler2);
+        break;
+      case 'delete':
+        this.instance.delete(routePath, routeHandler2);
+        break;
+      case 'use':
+        this.instance.use(routePath, routeHandler2);
+        break;
+      case 'patch':
+        this.instance.patch(routePath, routeHandler2);
+        break;
+      case 'options':
+        this.instance.options(routePath, routeHandler2);
+        break;
+    }
   }
 
-  public get(pathOrHandler: string | HonoHandler, handler?: HonoHandler) {
-    const [routePath, routeHandler] = this.getRouteAndHandler(
-      pathOrHandler,
-      handler,
-    );
+  public all(pathOrHandler: string | HonoHandler, handler?: HonoHandler) {
+    this.registerRoute('all', pathOrHandler, handler);
+  }
 
-    this.instance.get(routePath, this.createRouteHandler(routeHandler));
+  public get(pathOrHandler: string | HonoHandler, handler?: HonoHandler) {
+    this.registerRoute('get', pathOrHandler, handler);
   }
 
   public post(pathOrHandler: string | HonoHandler, handler?: HonoHandler) {
-    const [routePath, routeHandler] = this.getRouteAndHandler(
-      pathOrHandler,
-      handler,
-    );
-    this.instance.post(routePath, this.createRouteHandler(routeHandler));
+    this.registerRoute('post', pathOrHandler, handler);
   }
 
   public put(pathOrHandler: string | HonoHandler, handler?: HonoHandler) {
-    const [routePath, routeHandler] = this.getRouteAndHandler(
-      pathOrHandler,
-      handler,
-    );
-    this.instance.put(routePath, this.createRouteHandler(routeHandler));
+    this.registerRoute('put', pathOrHandler, handler);
   }
 
   public delete(pathOrHandler: string | HonoHandler, handler?: HonoHandler) {
-    const [routePath, routeHandler] = this.getRouteAndHandler(
-      pathOrHandler,
-      handler,
-    );
-    this.instance.delete(routePath, this.createRouteHandler(routeHandler));
+    this.registerRoute('delete', pathOrHandler, handler);
   }
 
   public use(pathOrHandler: string | HonoHandler, handler?: HonoHandler) {
-    const [routePath, routeHandler] = this.getRouteAndHandler(
-      pathOrHandler,
-      handler,
-    );
-    this.instance.use(routePath, this.createRouteHandler(routeHandler));
+    this.registerRoute('use', pathOrHandler, handler);
   }
 
   public patch(pathOrHandler: string | HonoHandler, handler?: HonoHandler) {
-    const [routePath, routeHandler] = this.getRouteAndHandler(
-      pathOrHandler,
-      handler,
-    );
-    this.instance.patch(routePath, this.createRouteHandler(routeHandler));
+    this.registerRoute('patch', pathOrHandler, handler);
   }
 
   public options(pathOrHandler: string | HonoHandler, handler?: HonoHandler) {
-    const [routePath, routeHandler] = this.getRouteAndHandler(
-      pathOrHandler,
-      handler,
-    );
-    this.instance.options(routePath, this.createRouteHandler(routeHandler));
+    this.registerRoute('options', pathOrHandler, handler);
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   public async reply(ctx: Ctx, body: any, statusCode?: StatusCode) {
-    if (typeof ctx === 'function') {
-      ctx = await ctx();
-    }
+    ctx = await this.normalizeContext(ctx);
 
     if (statusCode) {
       ctx.status(statusCode);
@@ -190,10 +207,7 @@ export class HonoAdapter extends AbstractHttpAdapter<
   }
 
   public async status(ctx: Ctx, statusCode: StatusCode) {
-    if (typeof ctx === 'function') {
-      ctx = await ctx();
-    }
-
+    ctx = await this.normalizeContext(ctx);
     return ctx.status(statusCode);
   }
 
@@ -206,10 +220,7 @@ export class HonoAdapter extends AbstractHttpAdapter<
   }
 
   public async redirect(ctx: Ctx, statusCode: RedirectStatusCode, url: string) {
-    if (typeof ctx === 'function') {
-      ctx = await ctx();
-    }
-
+    ctx = await this.normalizeContext(ctx);
     ctx.res = ctx.redirect(url, statusCode);
   }
 
@@ -224,8 +235,9 @@ export class HonoAdapter extends AbstractHttpAdapter<
   public setNotFoundHandler(handler: RequestHandler) {
     this.instance.notFound(async (ctx: Context) => {
       await handler(ctx.req, ctx);
+      await this.status(ctx, HttpStatus.NOT_FOUND);
 
-      return this.getBody(ctx);
+      return this.getBody(ctx, 'Not Found');
     });
   }
 
@@ -239,42 +251,27 @@ export class HonoAdapter extends AbstractHttpAdapter<
   }
 
   public async isHeadersSent(ctx: Ctx): Promise<boolean> {
-    if (typeof ctx === 'function') {
-      ctx = await ctx();
-    }
-
+    ctx = await this.normalizeContext(ctx);
     return ctx.finalized;
   }
 
   public async getHeader(ctx: Ctx, name: string) {
-    if (typeof ctx === 'function') {
-      ctx = await ctx();
-    }
-
+    ctx = await this.normalizeContext(ctx);
     return ctx.res.headers.get(name);
   }
 
   public async setHeader(ctx: Ctx, name: string, value: string) {
-    if (typeof ctx === 'function') {
-      ctx = await ctx();
-    }
-
+    ctx = await this.normalizeContext(ctx);
     ctx.res.headers.set(name, value);
   }
 
   public async appendHeader(ctx: Ctx, name: string, value: string) {
-    if (typeof ctx === 'function') {
-      ctx = await ctx();
-    }
-
+    ctx = await this.normalizeContext(ctx);
     ctx.res.headers.append(name, value);
   }
 
   public async getRequestHostname(ctx: Ctx): Promise<string> {
-    if (typeof ctx === 'function') {
-      ctx = await ctx();
-    }
-
+    ctx = await this.normalizeContext(ctx);
     return ctx.req.header().host;
   }
 
@@ -319,46 +316,58 @@ export class HonoAdapter extends AbstractHttpAdapter<
     return new Promise((resolve) => this.httpServer.close(() => resolve()));
   }
 
+  private extractClientIp(ctx: Context): string {
+    return (
+      ctx.req.header('cf-connecting-ip') ??
+      ctx.req.header('x-forwarded-for') ??
+      ctx.req.header('x-real-ip') ??
+      ctx.req.header('forwarded') ??
+      ctx.req.header('true-client-ip') ??
+      ctx.req.header('x-client-ip') ??
+      ctx.req.header('x-cluster-client-ip') ??
+      ctx.req.header('x-forwarded') ??
+      ctx.req.header('forwarded-for') ??
+      ctx.req.header('via')
+    );
+  }
+
+  private async parseRequestBody(
+    ctx: Context,
+    contentType: string,
+    rawBody: boolean,
+  ): Promise<void> {
+    if (
+      contentType?.startsWith('multipart/form-data') ||
+      contentType?.startsWith('application/x-www-form-urlencoded')
+    ) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (ctx.req as any).body = await ctx.req
+        .parseBody({
+          all: true,
+        })
+        .catch(() => {});
+    } else if (
+      contentType?.startsWith('application/json') ||
+      contentType?.startsWith('text/plain')
+    ) {
+      if (rawBody) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (ctx.req as any).rawBody = Buffer.from(await ctx.req.text());
+      }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (ctx.req as any).body = await ctx.req.json().catch(() => {});
+    }
+  }
+
   public initHttpServer(options: NestApplicationOptions) {
     this.instance.use(async (ctx, next) => {
-      ctx.req['ip'] =
-        ctx.req.header('cf-connecting-ip') ??
-        ctx.req.header('x-forwarded-for') ??
-        ctx.req.header('x-real-ip') ??
-        ctx.req.header('forwarded') ??
-        ctx.req.header('true-client-ip') ??
-        ctx.req.header('x-client-ip') ??
-        ctx.req.header('x-cluster-client-ip') ??
-        ctx.req.header('x-forwarded') ??
-        ctx.req.header('forwarded-for') ??
-        ctx.req.header('via');
+      ctx.req['ip'] = this.extractClientIp(ctx);
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       ctx.req['query'] = ctx.req.query() as any;
       ctx.req['headers'] = Object.fromEntries(ctx.req.raw.headers);
 
       const contentType = ctx.req.header('content-type');
-
-      if (
-        contentType?.startsWith('multipart/form-data') ||
-        contentType?.startsWith('application/x-www-form-urlencoded')
-      ) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (ctx.req as any).body = await ctx.req
-          .parseBody({
-            all: true,
-          })
-          .catch(() => {});
-      } else if (
-        contentType?.startsWith('application/json') ||
-        contentType?.startsWith('text/plain')
-      ) {
-        if (options.rawBody) {
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          (ctx.req as any).rawBody = Buffer.from(await ctx.req.text());
-        }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (ctx.req as any).body = await ctx.req.json().catch(() => {});
-      }
+      await this.parseRequestBody(ctx, contentType, options.rawBody);
 
       await next();
     });
@@ -424,8 +433,9 @@ export class HonoAdapter extends AbstractHttpAdapter<
   public bodyLimit(maxSize: number) {
     return bodyLimit({
       maxSize,
-      onError: () => {
-        throw new Error('Body too large');
+      onError: (ctx) => {
+        const errorMessage = `Body size  exceeded: ${maxSize} bytes. Size: ${ctx.req.header('Content-Length')} bytes. Method: ${ctx.req.method}. Path: ${ctx.req.path}`;
+        throw new Error(errorMessage);
       },
     });
   }