@less-is-more/less-js 1.5.0 → 1.5.1-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.5.0",
+  "version": "1.5.1-1",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {

package/src/router.js

@@ -71,6 +71,7 @@ module.exports = class Router {
     // 兼容非阿里云
     await this._handleParams(req);
     console.log(
+      req.sourceIp,
       "p:",
       req.method,
       req.path,
@@ -184,6 +185,11 @@ module.exports = class Router {
       delete req.params[0];
     }
 
+    // 处理IP
+    if (Param.isBlank(req.sourceIp)) {
+      req.sourceIp = this._getRealIP(req);
+    }
+
     if (!Param.isBlank(req.queries)) {
       Object.keys(req.queries).forEach((n) => (req.params[n] = req.queries[n]));
     }
@@ -274,4 +280,52 @@ module.exports = class Router {
   static useDefaultFormat(isUse) {
     this.#defaultFormat = isUse;
   }
+
+  /**
+   * 获取真实IP地址
+   * @param {object} req 请求对象
+   * @returns {string} IP地址
+   */
+  static _getRealIP(req) {
+    // 检查常用的HTTP头字段来获取原始IP地址
+    const forwardedIP =
+      req.headers["x-forwarded-for"] ||
+      req.headers["x-real-ip"] ||
+      req.headers["x-client-ip"] ||
+      req.headers["x-cluster-client-ip"];
+
+    if (forwardedIP) {
+      // x-forwarded-for 可能包含多个IP地址，第一个通常是真实的客户端IP
+      const ipList = forwardedIP.split(",");
+      const clientIP = ipList[0].trim();
+      if (clientIP && this.isValidIP(clientIP)) {
+        return clientIP;
+      }
+    }
+
+    // fallback到连接级别的IP
+    return req.connection
+      ? req.connection.remoteAddress
+      : req.socket
+        ? req.socket.remoteAddress
+        : "";
+  }
+
+  /**
+   * 验证IP地址格式是否有效
+   * @param {string} ip IP地址字符串
+   * @returns {boolean} 是否为有效的IP地址
+   */
+  static isValidIP(ip) {
+    // 简单验证IP格式，支持IPv4和基本的IPv6格式
+    if (!ip || typeof ip !== "string") return false;
+
+    // IPv4 正则表达式
+    const ipv4Regex =
+      /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+    // IPv6 正则表达式（简化版）
+    const ipv6Regex = /^([0-9a-fA-F]{0,4}:){2,7}[0-9a-fA-F]{0,4}$/;
+
+    return ipv4Regex.test(ip.trim()) || ipv6Regex.test(ip.trim());
+  }
 };