@lensjs/express 1.4.1 → 1.4.2

package/dist/adapter.cjs

@@ -188,7 +188,7 @@ var ExpressAdapter = class extends import_core.LensAdapter {
           headers: req.headers,
           body: req.body ?? {},
           status: res.statusCode,
-          ip: req.socket?.remoteAddress ?? "",
+          ip: this.config.getRequestIp?.(req) ?? this.getIp(req),
           createdAt: (0, import_date.nowISO)()
         },
         response: {
@@ -215,6 +215,27 @@ var ExpressAdapter = 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

@@ -20,6 +20,8 @@ declare class ExpressAdapter extends LensAdapter {
     private finalizeRequestLog;
     private normalizePath;
     private parseBody;
+    private getIp;
+    private normalizeIp;
 }
 
 export { ExpressAdapter };

package/dist/adapter.d.ts

@@ -20,6 +20,8 @@ declare class ExpressAdapter extends LensAdapter {
     private finalizeRequestLog;
     private normalizePath;
     private parseBody;
+    private getIp;
+    private normalizeIp;
 }
 
 export { ExpressAdapter };

package/dist/adapter.js

@@ -160,7 +160,7 @@ var ExpressAdapter = class extends LensAdapter {
           headers: req.headers,
           body: req.body ?? {},
           status: res.statusCode,
-          ip: req.socket?.remoteAddress ?? "",
+          ip: this.config.getRequestIp?.(req) ?? this.getIp(req),
           createdAt: nowISO()
         },
         response: {
@@ -187,6 +187,27 @@ var ExpressAdapter = 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 {
   ExpressAdapter

package/dist/index.cjs

@@ -193,7 +193,7 @@ var ExpressAdapter = class extends import_core.LensAdapter {
           headers: req.headers,
           body: req.body ?? {},
           status: res.statusCode,
-          ip: req.socket?.remoteAddress ?? "",
+          ip: this.config.getRequestIp?.(req) ?? this.getIp(req),
           createdAt: (0, import_date.nowISO)()
         },
         response: {
@@ -220,6 +220,27 @@ var ExpressAdapter = 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

@@ -170,7 +170,7 @@ var ExpressAdapter = class extends LensAdapter {
           headers: req.headers,
           body: req.body ?? {},
           status: res.statusCode,
-          ip: req.socket?.remoteAddress ?? "",
+          ip: this.config.getRequestIp?.(req) ?? this.getIp(req),
           createdAt: nowISO()
         },
         response: {
@@ -197,6 +197,27 @@ var ExpressAdapter = 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/index.d.cts

@@ -15,11 +15,13 @@ type ExpressAdapterConfig = {
     };
     isAuthenticated?: (request: Request) => Promise<boolean>;
     getUser?: (request: Request) => Promise<UserEntry>;
+    getRequestIp?: (request: Request) => string;
 } & Partial<LensConfig>;
 type RequiredExpressAdapterConfig = Required<ExpressAdapterConfig> & {
     queryWatcher?: ExpressAdapterConfig["queryWatcher"];
     isAuthenticated?: ExpressAdapterConfig["isAuthenticated"];
     getUser?: ExpressAdapterConfig["getUser"];
+    getRequestIp?: (request: Request) => string;
 };
 
 export type { ExpressAdapterConfig, RequiredExpressAdapterConfig };

package/dist/types/index.d.ts

@@ -15,11 +15,13 @@ type ExpressAdapterConfig = {
     };
     isAuthenticated?: (request: Request) => Promise<boolean>;
     getUser?: (request: Request) => Promise<UserEntry>;
+    getRequestIp?: (request: Request) => string;
 } & Partial<LensConfig>;
 type RequiredExpressAdapterConfig = Required<ExpressAdapterConfig> & {
     queryWatcher?: ExpressAdapterConfig["queryWatcher"];
     isAuthenticated?: ExpressAdapterConfig["isAuthenticated"];
     getUser?: ExpressAdapterConfig["getUser"];
+    getRequestIp?: (request: Request) => string;
 };
 
 export type { ExpressAdapterConfig, RequiredExpressAdapterConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lensjs/express",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Express adapter for LensJs",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -39,10 +39,10 @@
   ],
   "dependencies": {
     "express": "^5.1.0",
-    "@lensjs/core": "2.3.1",
+    "@lensjs/core": "2.3.2",
     "@lensjs/typescript-config": "1.0.12",
-    "@lensjs/watchers": "1.1.1",
-    "@lensjs/date": "1.0.12"
+    "@lensjs/date": "1.0.12",
+    "@lensjs/watchers": "1.1.2"
   },
   "devDependencies": {
     "@types/express": "^5.0.3",