@vasrefil/api-toolkit 1.8.3 → 1.9.0

package/dist/index.js

@@ -14,6 +14,7 @@ const logger_util_1 = require("./utilities/logger.util");
 // import { airbrake, airbrakeExpress } from './app-middlewares/airbrake';
 const port = process.env.PORT || 8012;
 const app = (0, express_1.default)();
+app.set('trust proxy', true);
 //configure application
 app.use(express_1.default.static(path_1.default.join(__dirname, "public")));
 //mount json form parser

package/dist/utilities/index.d.ts

@@ -5,3 +5,4 @@ export * from './log.util';
 export * from './go-mailer.util';
 export * from './report.util';
 export * from './email.util';
+export * from './ip.util';

package/dist/utilities/index.js

@@ -21,3 +21,4 @@ __exportStar(require("./log.util"), exports);
 __exportStar(require("./go-mailer.util"), exports);
 __exportStar(require("./report.util"), exports);
 __exportStar(require("./email.util"), exports);
+__exportStar(require("./ip.util"), exports);

package/dist/utilities/ip.util.d.ts

@@ -0,0 +1,2 @@
+import { Request } from 'express';
+export declare const getClientIp: (req: Request) => string;

package/dist/utilities/ip.util.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getClientIp = void 0;
+const getClientIp = (req) => {
+    // Use req.ip (which Express populates if 'trust proxy' is set)
+    // or fallback to headers/connection
+    let ip = req.ip || req.headers['x-forwarded-for'] || req.connection.remoteAddress || '';
+    // If x-forwarded-for contains multiple IPs, the first one is the client
+    if (Array.isArray(ip)) {
+        ip = ip[0];
+    }
+    else if (typeof ip === 'string' && ip.includes(',')) {
+        ip = ip.split(',')[0].trim();
+    }
+    // Handle IPv6 mapped IPv4 (e.g., ::ffff:127.0.0.1 -> 127.0.0.1)
+    if (typeof ip === 'string' && ip.startsWith('::ffff:')) {
+        ip = ip.substring(7);
+    }
+    return ip;
+};
+exports.getClientIp = getClientIp;

package/dist/utilities/log.util.d.ts

@@ -80,7 +80,7 @@ declare class LogUtil_ {
         statusCode: number | undefined;
         originalUrl: string;
         baseUrl: string;
-        ip: string | undefined;
+        ip: string;
         body: any;
     };
     private get_user_event_response;

package/dist/utilities/log.util.js

@@ -8,6 +8,7 @@ const airbrake_1 = require("../app-middlewares/airbrake");
 const api_request_util_1 = require("./api-request.util");
 const json_stringify_safe = require('json-stringify-safe');
 const env_1 = __importDefault(require("../env"));
+const ip_util_1 = require("./ip.util");
 class LogUtil_ {
     constructor() {
         this.user_event = async (dto) => {
@@ -61,7 +62,7 @@ class LogUtil_ {
             const { password, pin, old_pin, new_pin, bvn, nin, file, ...body_ } = req.body;
             const { params, query, method, url, statusCode, hostname, originalUrl, baseUrl } = req;
             delete headers_['pin-token'];
-            const ip = req.headers["x-forwarded-for"]?.split(",")[0]?.trim() || req.socket.remoteAddress;
+            const ip = (0, ip_util_1.getClientIp)(req);
             const request = {
                 params,
                 query,
@@ -99,6 +100,9 @@ class LogUtil_ {
             // if(this.cronjobs_events.includes(actionType)) {
             //     distinct_id = 'cron-job.org';
             // }
+            if (req.user_token_data) {
+                distinct_id = req.user_token_data.email;
+            }
             if (actionType.toLowerCase().includes('webhook')) {
                 distinct_id = actionType.toLowerCase();
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vasrefil/api-toolkit",
   "description": "This is Vasrefil API toolkit",
-  "version": "1.8.3",
+  "version": "1.9.0",
   "author": "Sodiq Alabi",
   "main": "dist/public-api.js",
   "types": "dist/public-api.d.ts",