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

package/package.json

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

package/src/cache.js

@@ -103,10 +103,14 @@ module.exports = class Cache {
     } else {
       console.log("Found cache" + (hasLocal ? " local" : ""), fullKey);
       savedData = Cache._unzip(savedData);
-      // 优先转成json
-      try {
-        return JSON.parse(savedData);
-      } catch (e) {
+      if (typeof savedData === "string") {
+        // 优先转成json
+        try {
+          return JSON.parse(savedData);
+        } catch (e) {
+          return savedData;
+        }
+      } else {
         return savedData;
       }
     }
@@ -118,16 +122,19 @@ module.exports = class Cache {
   }
 
   static _unzip(content) {
-    // 判断content是否是buffer
-    let text = "";
-    const buffer = Buffer.from(content, "base64");
-    // 判断是否gzip
-    if (buffer.length > 2 && buffer[0] === 0x1f && buffer[1] === 0x8b) {
-      text = zlib.gunzipSync(buffer).toString();
+    if (typeof content === "string") {
+      let text = "";
+      const buffer = Buffer.from(content, "base64");
+      // 判断是否gzip
+      if (buffer.length > 2 && buffer[0] === 0x1f && buffer[1] === 0x8b) {
+        text = zlib.gunzipSync(buffer).toString();
+      } else {
+        text = content;
+      }
+      return text;
     } else {
-      text = content;
+      return content;
     }
-    return text;
   }
 
   static _needZip(text, zip) {

package/src/nas.js

@@ -115,8 +115,6 @@ class Nas {
               return valueStr;
             }
           } else {
-            // 文件已过期，删除文件
-            Nas._deleteCacheFile(key);
             return null;
           }
         }
@@ -141,11 +139,25 @@ class Nas {
     const filePath = Nas._getFilePath(key);
 
     try {
+      // 创建临时文件名，避免写入过程中的并发问题
+      const timestamp = Date.now();
+      const randomSuffix = Math.random().toFixed(4) * 10000;
+      const tempFilePath = `${filePath}.tmp.${timestamp}.${randomSuffix}`;
       // 写入过期时间戳和值，用换行符分隔
       const fileContent = `${expireTime}\n${content}`;
-      fs.writeFileSync(filePath, fileContent, "utf8");
+      fs.writeFileSync(tempFilePath, fileContent, "utf8");
+      // 原子性地替换原文件
+      fs.renameSync(tempFilePath, filePath);
     } catch (e) {
       console.error("保存缓存文件失败:", filePath, e);
+      // 如果临时文件创建失败，清理临时文件
+      try {
+        if (fs.existsSync(tempFilePath)) {
+          fs.unlinkSync(tempFilePath);
+        }
+      } catch (cleanupError) {
+        // 忽略清理错误
+      }
     }
   }
 
@@ -186,23 +198,25 @@ class Nas {
         for (const file of files) {
           if (file.endsWith(".cache")) {
             const filePath = path.join(cacheDir, file);
-            // 检查文件是否过期，如果过期则删除
+            // 检查文件是否过期超过一分钟，如果超过则删除
             try {
-              const content = fs.readFileSync(filePath, "utf8");
-              const lines = content.split("\n");
+              if (fs.existsSync(filePath)) {
+                const content = fs.readFileSync(filePath, "utf8");
+                const lines = content.split("\n");
 
-              if (lines.length >= 1) {
-                const expireTimeString = lines[0];
-                const expireTime = parseInt(expireTimeString);
+                if (lines.length >= 1) {
+                  const expireTimeString = lines[0];
+                  const expireTime = parseInt(expireTimeString);
 
-                if (
-                  !isNaN(expireTime) &&
-                  expireTime !== -1 &&
-                  Date.now() > expireTime
-                ) {
-                  console.log("删除过期缓存文件:", filePath);
-                  // 文件已过期，删除文件
-                  fs.unlinkSync(filePath);
+                  if (
+                    !isNaN(expireTime) &&
+                    expireTime !== -1 &&
+                    // 仅删除过期超过一分钟的文件
+                    Date.now() > expireTime + 60 * 1000
+                  ) {
+                    console.log("删除过期缓存文件:", filePath);
+                    fs.unlinkSync(filePath);
+                  }
                 }
               }
             } catch (e) {
@@ -268,8 +282,6 @@ class Nas {
             const remainingTime = Math.floor((expireTime - Date.now()) / 1000);
             return Math.max(0, remainingTime); // 确保返回非负值
           } else {
-            // 文件已过期，删除文件
-            Nas._deleteCacheFile(key);
             return -1;
           }
         }

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());
+  }
 };