@less-is-more/less-js 1.2.21 → 1.2.22

package/package.json

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

package/src/cache.js

@@ -3,7 +3,7 @@ const Param = require("./param");
 
 module.exports = class Cache {
   /**
-   * 缓存并获取结果
+   * 缓存并获取结果（调用方）
    * @param {*} key 缓存关键词，拼接参数
    * @param {number} timeSecond 缓存秒数
    * @param {object} thisObject this指向的对象
@@ -30,4 +30,50 @@ module.exports = class Cache {
       return savedData;
     }
   }
+
+  /**
+   *
+   * @param {string} keyPrefix 缓存前缀
+   * @param {number} timeSecond 缓存时间
+   * @param {*} args 直接传arguments，用于拼接缓存key
+   * @param {function} fn 没有缓存的实现
+   * @returns 优先返回对象
+   */
+  static async auto(keyPrefix, timeSecond, args, fn) {
+    let fullKey = keyPrefix;
+    for (let i = 0; i < args.length; i++) {
+      fullKey += ":" + args[i].toString();
+    }
+    let savedData = await Redis.exec("get", fullKey);
+    if (savedData == null) {
+      let result = await fn();
+      if (!Param.isBlank(result)) {
+        // 处理JSON
+        if (result instanceof Object) {
+          await Redis.exec(
+            "setex",
+            fullKey,
+            timeSecond + "",
+            JSON.stringify(result)
+          );
+        } else {
+          await Redis.exec(
+            "setex",
+            fullKey,
+            timeSecond + "",
+            result.toString()
+          );
+        }
+        return result;
+      }
+    } else {
+      console.log("Found cache", fullKey);
+      // 优先转成json
+      if (savedData.startsWith("{")) {
+        return JSON.parse(savedData);
+      } else {
+        return savedData;
+      }
+    }
+  }
 };

package/src/ret.js

@@ -20,14 +20,23 @@ module.exports = class Ret {
     this.#instance.success = true;
     return this;
   }
+  isOk(){
+    return this.#instance.success;
+  }
   fail() {
     this.#instance.success = false;
     return this;
   }
+  isFail(){
+    return !this.#instance.success;
+  }
   setMessage(message) {
     this.#instance.message = message;
     return this;
   }
+  getMessage() {
+    return this.#instance.message;
+  }
   setCode(code) {
     this.#instance.code = code;
     return this;
@@ -36,6 +45,9 @@ module.exports = class Ret {
     this.#instance.data = data;
     return this;
   }
+  getData() {
+    return this.#instance.data;
+  }
   toString() {
     return JSON.stringify(this.#instance);
   }

package/test/test-cache.js

@@ -3,45 +3,83 @@ const Cache = require("../src/cache.js");
 const Redis = require("../src/redis.js");
 
 describe("cache.js", () => {
-	before(() => {
-		console.log("init");
-		Redis.init("127.0.0.1", "default", "KS5UggH4LNyyLBdr");
-	});
+  before(() => {
+    console.log("init");
+    Redis.init("127.0.0.1", "default", "KS5UggH4LNyyLBdr");
+  });
 
-	describe("get()", () => {
-		it("return string", async () => {
-			let testFunction = (a, b) => {
-				console.log(a + b);
-				return a + b + "";
-			};
-			let result = await Cache.get(
-				"test",
-				20,
-				testFunction,
-				testFunction,
-				1,
-				2
-			);
-			console.log("result", result);
-			assert(result === "3");
-		});
-		it("return object", async () => {
-			let testFunction = (a, b) => {
-				console.log(a + b);
-				return { r: a + b };
-			};
-			try {
-				let result = await Cache.get(
-					"test2",
-					20,
-					testFunction,
-					testFunction,
-					1,
-					2
-				);
-			} catch (e) {
-				assert(e.message === "只支持返回值是文本的方法");
-			}
-		});
-	});
+  describe("get()", () => {
+    it("return string", async () => {
+      let testFunction = (a, b) => {
+        console.log(a + b);
+        return a + b + "";
+      };
+      let result = await Cache.get(
+        "test",
+        20,
+        testFunction,
+        testFunction,
+        1,
+        2
+      );
+      console.log("result", result);
+      assert(result === "3");
+    });
+    it("return object", async () => {
+      let testFunction = (a, b) => {
+        console.log(a + b);
+        return { r: a + b };
+      };
+      try {
+        let result = await Cache.get(
+          "test2",
+          20,
+          testFunction,
+          testFunction,
+          1,
+          2
+        );
+      } catch (e) {
+        assert(e.message === "只支持返回值是文本的方法");
+      }
+    });
+  });
+
+  describe("auto()", () => {
+    it("return string", async () => {
+      async function test(a, b) {
+        return await Cache.auto("test", 20, arguments, () => {
+          console.log(a + b);
+          return a + b + "";
+        });
+      }
+      const result = await test(1, 2);
+      console.log("result", result);
+      assert(result === "3");
+    });
+    it("return int", async () => {
+      async function test(a, b) {
+        let r = await Cache.auto("test2", 20, arguments, () => {
+          console.log(a + b);
+          return a + b;
+        });
+        return r;
+      }
+      const result = await test(1, 2);
+      console.log("result", result);
+      assert(result == 3);
+    });
+    it("return object", async () => {
+      async function test(a, b) {
+        return await Cache.auto("test3", 20, arguments, () => {
+          console.log(a, b);
+          return { a, b };
+        });
+      }
+      const result = await test(1, 2);
+      console.log("result", JSON.stringify(result));
+      const compare = { a: 1, b: 2 };
+      assert(result.a === compare.a);
+    });
+  });
 });