@kiyasov/platform-hono 1.3.1 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kiyasov/platform-hono",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Nest adapter for Hono",
   "author": "Islam Kiiasov",
   "repository": {

package/src/adapters/hono-adapter.ts

@@ -218,39 +218,7 @@ export class HonoAdapter extends AbstractHttpAdapter<
     Logger.log(
       `Registering body parser middleware for type: ${type} | bodyLimit: ${bodyLimit}`
     );
-    this.instance.use(this.bodyLimit(bodyLimit), async (ctx, next) => {
-      const contentType = ctx.req.header("content-type");
-
-      if (
-        contentType?.startsWith("application/json") ||
-        contentType?.startsWith("text/plain")
-      ) {
-        if (rawBody) {
-          (ctx.req as any).rawBody = Buffer.from(await ctx.req.text());
-        }
-        (ctx.req as any).body = await ctx.req.json();
-
-        return await next();
-      }
-
-      if (contentType !== type) {
-        return await next();
-      }
-
-      if (contentType?.startsWith("application/json")) {
-        if (rawBody) {
-          (ctx.req as any).rawBody = Buffer.from(await ctx.req.text());
-        }
-        (ctx.req as any).body = await ctx.req.json();
-      } else if (contentType?.startsWith("text/plain")) {
-        if (rawBody) {
-          (ctx.req as any).rawBody = Buffer.from(await ctx.req.text());
-        }
-        (ctx.req as any).body = await ctx.req.json();
-      }
-
-      return await next();
-    });
+    this.instance.use(this.bodyLimit(bodyLimit));
 
     // To avoid the Nest application init to override our custom
     // body parser, we mark the parsers as registered.
@@ -262,10 +230,38 @@ export class HonoAdapter extends AbstractHttpAdapter<
   }
 
   public initHttpServer(options: NestApplicationOptions) {
-    this.instance.use((ctx, next) => {
+    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["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")
+      ) {
+        (ctx.req as any).body = await ctx.req.parseBody();
+      } else if (
+        contentType?.startsWith("application/json") ||
+        contentType?.startsWith("text/plain")
+      ) {
+        if (options.rawBody) {
+          (ctx.req as any).rawBody = Buffer.from(await ctx.req.text());
+        }
+        (ctx.req as any).body = await ctx.req.json();
+      }
+
       return next();
     });
     const isHttpsEnabled = options?.httpsOptions;