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

package/package.json

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

package/src/cache.js

@@ -2,32 +2,32 @@ const Redis = require("./redis");
 const Param = require("./param");
 
 module.exports = class Cache {
-	/**
-	 * 缓存并获取结果
-	 * @param {*} key 缓存关键词，拼接参数
-	 * @param {number} timeSecond 缓存秒数
-	 * @param {object} thisObject this指向的对象
-	 * @param {function} targetMethod 没有缓存时，执行目标。暂时支持返回文本、对象、数组
-	 * @param  {...any} args 没有缓存时，参数
-	 * @returns
-	 */
-	static async get(key, timeSecond, thisObject, targetMethod, ...args) {
-		let fullKey = key;
-		args.forEach((nArg) => (fullKey += ":" + nArg));
-		let savedData = await Redis.exec("get", fullKey);
-		if (savedData == null) {
-			let result = await targetMethod.apply(thisObject, args);
-			if (!Param.isBlank(result)) {
-				if (typeof result === "string") {
-					await Redis.exec("setex", fullKey, timeSecond, result);
-					return result;
-				} else {
-					throw new Error("只支持返回值是文本的方法");
-				}
-			}
-		} else {
-			console.log("Found cache", fullKey);
-			return savedData;
-		}
-	}
+  /**
+   * 缓存并获取结果
+   * @param {*} key 缓存关键词，拼接参数
+   * @param {number} timeSecond 缓存秒数
+   * @param {object} thisObject this指向的对象
+   * @param {function} targetMethod 没有缓存时，执行目标。暂时支持返回文本、对象、数组
+   * @param  {...any} args 没有缓存时，参数
+   * @returns
+   */
+  static async get(key, timeSecond, thisObject, targetMethod, ...args) {
+    let fullKey = key;
+    args.forEach((nArg) => (fullKey += ":" + nArg));
+    let savedData = await Redis.exec("get", fullKey);
+    if (savedData == null) {
+      let result = await targetMethod.apply(thisObject, args);
+      if (!Param.isBlank(result)) {
+        if (typeof result === "string") {
+          await Redis.exec("setex", fullKey, timeSecond + "", result);
+          return result;
+        } else {
+          throw new Error("只支持返回值是文本的方法");
+        }
+      }
+    } else {
+      console.log("Found cache", fullKey);
+      return savedData;
+    }
+  }
 };

package/src/redis.js

@@ -33,7 +33,8 @@ module.exports = class Redis {
 
   static async exec(name, ...args) {
     let client = await Redis.getInstance();
-    return await client[name].bind(client).apply(undefined, args);
+    args.unshift(name);
+    return await client.sendCommand(args);
   }
 
   static formatKey(name, params = {}) {

package/test/test-redis.js

@@ -2,42 +2,53 @@ const assert = require("assert");
 const Redis = require("../src/redis.js");
 
 describe("redis.js", () => {
-	before(() => {
-		console.log("init");
-		Redis.init("127.0.0.1", "default", "KS5UggH4LNyyLBdr");
-	});
-	describe("getInstance()", () => {
-		it("connect", async () => {
-			try {
-				let result = await Redis.exec("get", "test");
-				console.log(result);
-				console.log("Connection has been established successfully.");
-				assert.ok(true);
-			} catch (error) {
-				console.error("Unable to connect to the redis:", error);
-				assert.ok(false);
-			}
-		});
-		it("set", async () => {
-			try {
-				await Redis.exec("set", "test", "OK");
-				let reply = await Redis.exec("get", "test");
-				console.log(reply);
-				assert.ok(true);
-			} catch (error) {
-				assert.ok(false);
-			}
-		});
-	});
-	describe("formatKey()", () => {
-		it("no params", async () => {
-			let result = await Redis.formatKey("order", {});
-			assert(result == "order");
-		});
-		it("has params", async () => {
-			let result = await Redis.formatKey("order", { code: "123" });
-			console.log(result);
-			assert(result == "order:code:123");
-		});
-	});
+  before(() => {
+    console.log("init");
+    Redis.init("127.0.0.1", "default", "KS5UggH4LNyyLBdr");
+  });
+  describe("getInstance()", () => {
+    it("connect", async () => {
+      try {
+        let result = await Redis.exec("get", "test");
+        console.log(result);
+        console.log("Connection has been established successfully.");
+        assert.ok(true);
+      } catch (error) {
+        console.error("Unable to connect to the redis:", error);
+        assert.ok(false);
+      }
+    });
+    it("set", async () => {
+      try {
+        await Redis.exec("set", "test", "OK");
+        let reply = await Redis.exec("get", "test");
+        console.log(reply);
+        assert.ok(true);
+      } catch (error) {
+        assert.ok(false);
+      }
+    });
+    it("set ex", async () => {
+      try {
+        await Redis.exec("setex", "test", "100", "OK");
+        let reply = await Redis.exec("get", "test");
+        console.log(reply);
+        assert.ok(true);
+      } catch (error) {
+        console.log(error);
+        assert.ok(false);
+      }
+    });
+  });
+  describe("formatKey()", () => {
+    it("no params", async () => {
+      let result = await Redis.formatKey("order", {});
+      assert(result == "order");
+    });
+    it("has params", async () => {
+      let result = await Redis.formatKey("order", { code: "123" });
+      console.log(result);
+      assert(result == "order:code:123");
+    });
+  });
 });