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

package/package.json

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

package/src/cache.js

@@ -40,10 +40,10 @@ module.exports = class Cache {
    * @param {*} args 直接传arguments，用于拼接缓存key
    * @param {function} fn 没有缓存的实现
    * @param {boolean} zip 是否压缩
-   * @param {boolean} nas 是否使用Nas缓存
+   * @param {boolean} useNas 是否使用Nas缓存
    * @returns 优先返回对象
    */
-  static async auto(keyPrefix, timeSecond, args, fn, zip = false, nas = 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();
@@ -52,7 +52,7 @@ module.exports = class Cache {
     let savedData = Cache._getLocal(fullKey);
     let hasLocal = false;
     if (Param.isBlank(savedData)) {
-      if (nas) {
+      if (useNas) {
         savedData = Nas.get(fullKey);
       } else {
         savedData = await Redis.exec("get", fullKey);
@@ -82,7 +82,7 @@ module.exports = class Cache {
           if (Cache._needZip(redisContent, zip)) {
             redisContent = Cache._zip(redisContent);
           }
-          if (nas) {
+          if (useNas) {
             Nas.set(fullKey, result, timeSecond);
           } else {
             await Redis.exec("setex", fullKey, timeSecond + "", redisContent);

package/src/nas.js

@@ -101,7 +101,13 @@ class Nas {
         if (!isNaN(expireTime)) {
           if (expireTime === -1 || Date.now() < expireTime) {
             // 文件未过期，返回值
-            return Buffer.from(value, "base64").toString("utf8");
+            let valueStr = Buffer.from(value, "base64").toString("utf8");
+            try {
+              return JSON.parse(valueStr);
+            } catch (e) {
+              // 如果解析JSON失败，则返回原始字符串
+              return valueStr;
+            }
           } else {
             // 文件已过期，删除文件
             Nas._deleteCacheFile(key);
@@ -124,7 +130,8 @@ class Nas {
    */
   static _saveToDisk(key, value, expireTime) {
     // 将值转换为字符串，如果是对象则转换为JSON字符串
-    const content = Buffer.from(value, "utf8").toString("base64");
+    const valueStr = typeof value === "object" ? JSON.stringify(value) : value;
+    const content = Buffer.from(valueStr, "utf8").toString("base64");
     const filePath = Nas._getFilePath(key);
 
     try {

package/test/test-nas.js

@@ -8,6 +8,20 @@ describe("Nas Class Tests", function () {
     assert.equal(value, "testValue");
   });
 
+  it("should set and get a string object", function () {
+    const target = [
+      {
+        id: 128910,
+        supplierCode: "9c6d1ab7ff7a440eba1516b164c06632",
+        status: 1,
+        city: "",
+      },
+    ];
+    Nas.set("testObject", target);
+    const value = Nas.get("testObject");
+    assert.deepStrictEqual(value, target);
+  });
+
   it("should handle expiration correctly", function (done) {
     Nas.set("expiringKey", "expiringValue", 1); // 1秒后过期