@less-is-more/less-js 1.2.35 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.2.35",
+  "version": "1.3.1",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {
@@ -18,16 +18,17 @@
   "license": "MIT",
   "dependencies": {
     "@alicloud/pop-core": "^1.7.10",
+    "axios": "^0.27.2",
+    "body": "^5.1.0",
     "ejs": "^3.1.6",
     "fs-extra": "^10.0.0",
     "inquirer": "^8.2.0",
     "multiparty": "^4.2.2",
     "mysql2": "^2.3.3",
     "pg-hstore": "^2.3.4",
-    "querystring": "^0.2.1",
+    "qs": "^6.11.0",
     "redis": "^4.0.1",
     "sequelize": "^6.13.0",
-    "body": "^5.1.0",
     "validator": "^13.7.0"
   },
   "devDependencies": {

package/src/index.js

@@ -5,12 +5,14 @@ var Redis = require("./redis.js");
 var Param = require("./param.js");
 var Sms = require("./sms.js");
 var Cache = require("./cache.js");
+var Service = require("./service.js");
 module.exports = {
-	Ret: Ret,
-	Router: Router,
-	Db: Db,
-	Redis: Redis,
-	Param: Param,
-	Sms: Sms,
-	Cache: Cache,
+  Ret,
+  Router,
+  Db,
+  Redis,
+  Param,
+  Sms,
+  Cache,
+  Service,
 };

package/src/redis.js

@@ -14,23 +14,34 @@ module.exports = class Redis {
 
   static async getInstance() {
     if (!this.#client) {
-      if (this.#host) {
-        let params = {
-          socket: { host: this.#host },
-        };
-        if (this.#password) {
-          params.username = this.#user;
-          params.password = this.#password;
-        }
-        this.#client = await redis.createClient(params);
-        await this.#client.connect();
-      } else {
-        throw new Error("Redis not init");
+      await Redis.connect();
+    } else {
+      // 旧的实例判断一下是否可以链接，不能就重新建一个
+      try {
+        await this.#client.ping();
+      } catch (e) {
+        await Redis.connect();
       }
     }
     return this.#client;
   }
 
+  static async connect() {
+    if (this.#host) {
+      let params = {
+        socket: { host: this.#host },
+      };
+      if (this.#password) {
+        params.username = this.#user;
+        params.password = this.#password;
+      }
+      this.#client = redis.createClient(params);
+      await this.#client.connect();
+    } else {
+      throw new Error("Redis not init");
+    }
+  }
+
   static async exec(name, ...args) {
     let client = await Redis.getInstance();
     args.unshift(name);

package/src/router.js

@@ -1,6 +1,6 @@
 const Ret = require("./ret.js");
 const Param = require("./param.js");
-const querystring = require("querystring");
+const qs = require("qs");
 const body = require("body");
 const multiparty = require("multiparty");
 const { promisify } = require("util");
@@ -92,7 +92,7 @@ module.exports = class Router {
       } else {
         const data = await promisify(body)(req);
         console.log("body: " + decodeURIComponent(data));
-        req.body = querystring.parse(decodeURIComponent(data));
+        req.body = qs.parse(decodeURIComponent(data));
       }
     }
     if (req.params == undefined) {

package/src/service.js

@@ -0,0 +1,68 @@
+const { default: axios } = require("axios");
+const qs = require("qs");
+const Ret = require("./ret");
+
+module.exports = class Service {
+  static #domain;
+  static #isTest;
+  static #urlPrefix;
+
+  static init(domain, isTest) {
+    this.#domain = domain;
+    this.#isTest = isTest;
+    this.#urlPrefix =
+      "http://SERVICE" + (this.#isTest ? ".test" : ".prod") + "." + domain;
+  }
+
+  static setDelay(async = false, asyncDelayScond = 0) {
+    let headers = {};
+    if (async) {
+      headers["X-Fc-Invocation-Type"] = "Async";
+    }
+    if (asyncDelayScond > 0) {
+      headers["x-fc-async-delay"] = asyncDelayScond;
+    }
+    return headers;
+  }
+
+  static async get(
+    serviceName,
+    path,
+    params,
+    async = false,
+    asyncDelayScond = 0
+  ) {
+    let url = this.#urlPrefix.replace("SERVICE", serviceName) + path;
+    try {
+      if (params) {
+        url += "?" + qs.stringify(params);
+      }
+      const headers = this.setDelay(async, asyncDelayScond);
+      const result = await axios.get(url, { headers });
+      return result.data;
+    } catch (e) {
+      console.error("获取失败", url, e.message);
+      return new Ret(false, "获取失败", Ret.CODE_SYSTEM);
+    }
+  }
+
+  static async post(
+    serviceName,
+    path,
+    params = {},
+    async = false,
+    asyncDelayScond = 0
+  ) {
+    let url = this.#urlPrefix.replace("SERVICE", serviceName) + path;
+    try {
+      const headers = this.setDelay(async, asyncDelayScond);
+      const result = await axios.post(url, qs.stringify(params), {
+        headers,
+      });
+      return result.data;
+    } catch (e) {
+      console.error("获取失败", url, e.message);
+      return new Ret(false, "获取失败", Ret.CODE_SYSTEM);
+    }
+  }
+};

package/test/test-service.js

@@ -0,0 +1,41 @@
+const assert = require("assert");
+const Service = require("../src/service.js");
+
+describe("service.js", () => {
+  before(() => {
+    console.log("init");
+    Service.init("shenga.co", true);
+  });
+
+  describe("get()", () => {
+    it("ok", async () => {
+      const result = await Service.get("supplier", "/");
+      console.log(result);
+      assert(result.code == 1004);
+    });
+
+    it("async", async () => {
+      const result = await Service.get("supplier", "/", null, true, 2);
+      console.log(result);
+    });
+
+    it("fail", async () => {
+      const result = await Service.get("a", "/");
+      console.log(result);
+      assert(result.code == 1004);
+    });
+  });
+
+  describe("post()", () => {
+    it("ok", async () => {
+      const result = await Service.post("supplier", "/");
+      console.log(result);
+      assert(result.code == 1004);
+    });
+
+    it("async", async () => {
+      const result = await Service.get("supplier", "/", null, true, 2);
+      console.log(result);
+    });
+  });
+});