@less-is-more/less-js 1.5.0-4 → 1.5.0-6

package/package.json

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

package/src/cache.js

@@ -43,7 +43,14 @@ module.exports = class Cache {
    * @param {boolean} useNas 是否使用Nas缓存
    * @returns 优先返回对象
    */
-  static async auto(keyPrefix, timeSecond, args, fn, zip = false, useNas = false) {
+  static async auto(
+    keyPrefix,
+    timeSecond,
+    args,
+    fn,
+    zip = false,
+    useNas = false
+  ) {
     let fullKey = keyPrefix;
     for (let i = 0; i < args.length; i++) {
       fullKey += ":" + args[i].toString();
@@ -97,9 +104,9 @@ module.exports = class Cache {
       console.log("Found cache" + (hasLocal ? " local" : ""), fullKey);
       savedData = Cache._unzip(savedData);
       // 优先转成json
-      if (savedData.startsWith("{") || savedData.startsWith("[")) {
+      try {
         return JSON.parse(savedData);
-      } else {
+      } catch (e) {
         return savedData;
       }
     }

package/src/nas.js

@@ -170,7 +170,7 @@ class Nas {
   }
 
   /**
-   * 清空所有缓存
+   * 清空所有过期缓存
    */
   static flushAll() {
     try {
@@ -180,7 +180,29 @@ class Nas {
         for (const file of files) {
           if (file.endsWith(".cache")) {
             const filePath = path.join(cacheDir, file);
-            fs.unlinkSync(filePath);
+            // 检查文件是否过期，如果过期则删除
+            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) {
+                  // 文件已过期，删除文件
+                  fs.unlinkSync(filePath);
+                }
+              }
+            } catch (e) {
+              console.warn("检查缓存文件过期时间失败:", filePath, e);
+              // 如果检查失败，尝试直接删除文件
+              try {
+                fs.unlinkSync(filePath);
+              } catch (deleteError) {
+                console.warn("删除缓存文件失败:", filePath, deleteError);
+              }
+            }
           }
         }
       }

package/test/test-nas.js

@@ -92,17 +92,26 @@ describe("Nas Class Tests", function () {
     }, 1100);
   });
 
-  it("should flush all cache entries", function () {
-    Nas.set("flushTest1", "value1");
-    Nas.set("flushTest2", "value2");
+  it("should flush only expired cache entries", function (done) {
+    // 设置一个永不过期的键
+    Nas.set("permanentKey", "permanentValue", -1);
+    // 设置一个会过期的键
+    Nas.set("expiringKey", "expiringValue", 0.5); // 0.5秒后过期
 
-    assert.isTrue(Nas.exists("flushTest1"));
-    assert.isTrue(Nas.exists("flushTest2"));
+    setTimeout(() => {
+      // 此时expiringKey已经过期，但是permanentKey仍然有效
+      Nas.flushAll(); // 应该只清除过期的键
 
-    Nas.flushAll();
+      // 永不过期的键应该仍然存在
+      assert(Nas.get("permanentKey") == "permanentValue");
+      // 过期的键应该已经被清除
+      assert(Nas.get("expiringKey") == null);
+      assert(Nas.exists("expiringKey") == false);
 
-    assert.isFalse(Nas.exists("flushTest1"));
-    assert.isFalse(Nas.exists("flushTest2"));
+      // 清理测试数据
+      Nas.del("permanentKey");
+      done();
+    }, 1000); // 等待expiringKey过期后再测试
   });
 
   it("should handle non-expiring keys (timeout = -1)", function () {