@lensjs/fastify 1.1.1 → 1.1.3

package/dist/adapter.cjs

@@ -176,7 +176,7 @@ var FastifyAdapter = class extends import_core.LensAdapter {
           headers: request.headers,
           body: request.body ?? {},
           status: reply.statusCode,
-          ip: request.ip ?? "",
+          ip: this.config.getRequestIp?.(request) ?? this.getIp(request),
           createdAt: (0, import_date.nowISO)()
         },
         response: {
@@ -229,6 +229,27 @@ var FastifyAdapter = class extends import_core.LensAdapter {
       return body;
     }
   }
+  getIp(req) {
+    if (req.ip) return this.normalizeIp(req.ip);
+    const xff = req.headers["x-forwarded-for"];
+    if (typeof xff === "string") {
+      const [ip] = xff.split(",");
+      return this.normalizeIp(ip?.trim() ?? "");
+    }
+    if (Array.isArray(xff) && xff.length > 0) {
+      const ips = xff[0]?.split(",");
+      if (ips && ips.length > 0) {
+        return this.normalizeIp(ips[0]?.trim() ?? "");
+      }
+    }
+    return this.normalizeIp(req.socket?.remoteAddress ?? "");
+  }
+  normalizeIp(ip) {
+    if (ip.startsWith("::ffff:")) {
+      return ip.replace("::ffff:", "");
+    }
+    return ip;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/adapter.d.cts

@@ -21,6 +21,8 @@ declare class FastifyAdapter extends LensAdapter {
     private parseResponsePayload;
     private normalizePath;
     private parseBody;
+    private getIp;
+    private normalizeIp;
 }
 
 export { FastifyAdapter };

package/dist/adapter.d.ts

@@ -21,6 +21,8 @@ declare class FastifyAdapter extends LensAdapter {
     private parseResponsePayload;
     private normalizePath;
     private parseBody;
+    private getIp;
+    private normalizeIp;
 }
 
 export { FastifyAdapter };

package/dist/adapter.js

@@ -148,7 +148,7 @@ var FastifyAdapter = class extends LensAdapter {
           headers: request.headers,
           body: request.body ?? {},
           status: reply.statusCode,
-          ip: request.ip ?? "",
+          ip: this.config.getRequestIp?.(request) ?? this.getIp(request),
           createdAt: nowISO()
         },
         response: {
@@ -201,6 +201,27 @@ var FastifyAdapter = class extends LensAdapter {
       return body;
     }
   }
+  getIp(req) {
+    if (req.ip) return this.normalizeIp(req.ip);
+    const xff = req.headers["x-forwarded-for"];
+    if (typeof xff === "string") {
+      const [ip] = xff.split(",");
+      return this.normalizeIp(ip?.trim() ?? "");
+    }
+    if (Array.isArray(xff) && xff.length > 0) {
+      const ips = xff[0]?.split(",");
+      if (ips && ips.length > 0) {
+        return this.normalizeIp(ips[0]?.trim() ?? "");
+      }
+    }
+    return this.normalizeIp(req.socket?.remoteAddress ?? "");
+  }
+  normalizeIp(ip) {
+    if (ip.startsWith("::ffff:")) {
+      return ip.replace("::ffff:", "");
+    }
+    return ip;
+  }
 };
 export {
   FastifyAdapter

package/dist/index.cjs

@@ -180,7 +180,7 @@ var FastifyAdapter = class extends import_core.LensAdapter {
           headers: request.headers,
           body: request.body ?? {},
           status: reply.statusCode,
-          ip: request.ip ?? "",
+          ip: this.config.getRequestIp?.(request) ?? this.getIp(request),
           createdAt: (0, import_date.nowISO)()
         },
         response: {
@@ -233,6 +233,27 @@ var FastifyAdapter = class extends import_core.LensAdapter {
       return body;
     }
   }
+  getIp(req) {
+    if (req.ip) return this.normalizeIp(req.ip);
+    const xff = req.headers["x-forwarded-for"];
+    if (typeof xff === "string") {
+      const [ip] = xff.split(",");
+      return this.normalizeIp(ip?.trim() ?? "");
+    }
+    if (Array.isArray(xff) && xff.length > 0) {
+      const ips = xff[0]?.split(",");
+      if (ips && ips.length > 0) {
+        return this.normalizeIp(ips[0]?.trim() ?? "");
+      }
+    }
+    return this.normalizeIp(req.socket?.remoteAddress ?? "");
+  }
+  normalizeIp(ip) {
+    if (ip.startsWith("::ffff:")) {
+      return ip.replace("::ffff:", "");
+    }
+    return ip;
+  }
 };
 
 // src/index.ts

package/dist/index.js

@@ -159,7 +159,7 @@ var FastifyAdapter = class extends LensAdapter {
           headers: request.headers,
           body: request.body ?? {},
           status: reply.statusCode,
-          ip: request.ip ?? "",
+          ip: this.config.getRequestIp?.(request) ?? this.getIp(request),
           createdAt: nowISO()
         },
         response: {
@@ -212,6 +212,27 @@ var FastifyAdapter = class extends LensAdapter {
       return body;
     }
   }
+  getIp(req) {
+    if (req.ip) return this.normalizeIp(req.ip);
+    const xff = req.headers["x-forwarded-for"];
+    if (typeof xff === "string") {
+      const [ip] = xff.split(",");
+      return this.normalizeIp(ip?.trim() ?? "");
+    }
+    if (Array.isArray(xff) && xff.length > 0) {
+      const ips = xff[0]?.split(",");
+      if (ips && ips.length > 0) {
+        return this.normalizeIp(ips[0]?.trim() ?? "");
+      }
+    }
+    return this.normalizeIp(req.socket?.remoteAddress ?? "");
+  }
+  normalizeIp(ip) {
+    if (ip.startsWith("::ffff:")) {
+      return ip.replace("::ffff:", "");
+    }
+    return ip;
+  }
 };
 
 // src/index.ts

package/dist/types.d.cts

@@ -17,11 +17,13 @@ type FastifyAdapterConfig = {
     };
     isAuthenticated?: (request: FastifyRequest) => Promise<boolean>;
     getUser?: (request: FastifyRequest) => Promise<UserEntry>;
+    getRequestIp?: (request: FastifyRequest) => string;
 } & Partial<LensConfig>;
 type RequiredFastifyAdapterConfig = Required<FastifyAdapterConfig> & {
     queryWatcher?: FastifyAdapterConfig["queryWatcher"];
     isAuthenticated?: FastifyAdapterConfig["isAuthenticated"];
     getUser?: FastifyAdapterConfig["getUser"];
+    getRequestIp?: (request: FastifyRequest) => string;
 };
 declare module "fastify" {
     interface FastifyReply {

package/dist/types.d.ts

@@ -17,11 +17,13 @@ type FastifyAdapterConfig = {
     };
     isAuthenticated?: (request: FastifyRequest) => Promise<boolean>;
     getUser?: (request: FastifyRequest) => Promise<UserEntry>;
+    getRequestIp?: (request: FastifyRequest) => string;
 } & Partial<LensConfig>;
 type RequiredFastifyAdapterConfig = Required<FastifyAdapterConfig> & {
     queryWatcher?: FastifyAdapterConfig["queryWatcher"];
     isAuthenticated?: FastifyAdapterConfig["isAuthenticated"];
     getUser?: FastifyAdapterConfig["getUser"];
+    getRequestIp?: (request: FastifyRequest) => string;
 };
 declare module "fastify" {
     interface FastifyReply {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lensjs/fastify",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Fastify adapter for LensJs",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -18,19 +18,20 @@
     "dist"
   ],
   "dependencies": {
-    "@fastify/static": "8.2.0",
-    "@lensjs/core": "2.3.1",
-    "@lensjs/typescript-config": "1.0.12",
+    "@lensjs/core": "2.4.0",
     "@lensjs/date": "1.0.12",
-    "@lensjs/watchers": "1.1.1"
+    "@lensjs/typescript-config": "1.0.12",
+    "@lensjs/watchers": "1.1.3"
+  },
+  "peerDependencies": {
+    "fastify": "^5.2.1",
+    "@fastify/static": "^8.2.0"
   },
   "devDependencies": {
-    "fastify": "^5.6.0",
+    "fastify": "^5.7.4",
+    "@fastify/static": "^8.2.0",
     "vitest": "^3.2.4"
   },
-  "peerDependencies": {
-    "fastify": "^5.2.1"
-  },
   "scripts": {
     "build": "tsup --clean",
     "test": "vitest run"