@less-is-more/less-js 1.5.0-7 → 1.5.0-9

package/package.json

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

package/src/cache.js

@@ -74,29 +74,29 @@ 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;
       }

package/src/nas.js

@@ -89,7 +89,13 @@ class Nas {
       }
 
       // 读取缓存文件
-      const content = fs.readFileSync(filePath, "utf8");
+      let content;
+      try {
+        content = fs.readFileSync(filePath, "utf8");
+      } catch (e) {
+        console.warn("读取缓存文件失败:", filePath, e);
+        return null;
+      }
       const lines = content.split("\n");
 
       if (lines.length >= 2) {
@@ -184,12 +190,16 @@ class Nas {
             try {
               const content = fs.readFileSync(filePath, "utf8");
               const lines = content.split("\n");
-              
+
               if (lines.length >= 1) {
                 const expireTimeString = lines[0];
                 const expireTime = parseInt(expireTimeString);
-                
-                if (!isNaN(expireTime) && expireTime !== -1 && Date.now() > expireTime) {
+
+                if (
+                  !isNaN(expireTime) &&
+                  expireTime !== -1 &&
+                  Date.now() > expireTime
+                ) {
                   console.log("删除过期缓存文件:", filePath);
                   // 文件已过期，删除文件
                   fs.unlinkSync(filePath);