@less-is-more/less-js 1.5.0-8 → 1.5.0

package/package.json

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

package/src/cache.js

@@ -74,39 +74,43 @@ module.exports = class Cache {
     if (savedData == null) {
       let result = await fn();
       if (!Param.isBlank(result)) {
-        let redisContent = "";
+        let saveContent = "";
         // 处理JSON
         if (result instanceof Object) {
           if (result.success === false) {
             console.log("Do not cache fail result");
           } else {
-            redisContent = JSON.stringify(result);
+            saveContent = JSON.stringify(result);
           }
         } else {
-          redisContent = result.toString();
+          saveContent = result.toString();
         }
-        if (redisContent != "") {
-          if (Cache._needZip(redisContent, zip)) {
-            redisContent = Cache._zip(redisContent);
+        if (saveContent != "") {
+          if (Cache._needZip(saveContent, zip)) {
+            saveContent = Cache._zip(saveContent);
           }
           if (useNas) {
-            Nas.set(fullKey, result, timeSecond);
+            Nas.set(fullKey, saveContent, timeSecond);
           } else {
-            await Redis.exec("setex", fullKey, timeSecond + "", redisContent);
+            await Redis.exec("setex", fullKey, timeSecond + "", saveContent);
           }
 
           // 本地缓存1分钟
-          Cache._setLocal(fullKey, redisContent, 60000);
+          Cache._setLocal(fullKey, saveContent, 60000);
         }
         return result;
       }
     } 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;
           }
         }