abler-api 1.0.19 → 1.0.20

package/README.md

@@ -22,4 +22,11 @@ apiUtil.config(conf,errCfg,dbSql);
 
 ### preconditions
 
-API服务启动时前置条件检查，使用
+API服务启动时检查前置条件
+
+### 更新日志
+
+#### 1.0.20
+
+- preconditions.checkAll(saveFile) 增加参数saveFile，指定保存检查结果的文件，若未指定或值为 undefined，则为保持和老版本兼容自动设置为 "../log/preconditions"，若值为 “”， 则不保存文件
+

package/dist/cjs/pp-util.js

@@ -65,7 +65,8 @@ class preconditions$2 {
     preconditions$2.checkPromises.push(p);
     return preconditions$2;
   }
-  static addChecker(checkFunc, args, blocked) {
+  static addChecker(checkFunc, ...args) {
+    const blocked = args.pop();
     preconditions$2.checkFunctions.push({
       check: checkFunc,
       args: args,
@@ -82,7 +83,7 @@ class preconditions$2 {
     }
     return msg;
   }
-  static async checkAll() {
+  static async checkAll(saveFile) {
     try {
       // for (let i = 0; i < preconditions.checkFunctions.length; i++) {
       //     const f = preconditions.checkFunctions[i];
@@ -91,7 +92,7 @@ class preconditions$2 {
       // }
       while (preconditions$2.checkFunctions.length > 0) {
         const f = preconditions$2.checkFunctions.shift();
-        if (preconditions$2.pushMessage(await f.check(f.args)) && f.blocked) {
+        if (preconditions$2.pushMessage(await f.check(...f.args)) && f.blocked) {
           break;
         }
       }
@@ -114,10 +115,16 @@ class preconditions$2 {
       //     console.log(preconditions.messages[i]);
       // }
     }
-    if (!(await fs$1.async_exists("../log"))) {
-      await fs$1.async_mkdir("../log");
+    if (saveFile === undefined) {
+      saveFile = path.join(process.cwd(), "..", "log", "preconditions"); // 兼容老版本
+    }
+    if (saveFile) {
+      const dir = path.dirname(saveFile);
+      if (!(await fs$1.async_exists(dir))) {
+        await fs$1.async_mkdir(dir);
+      }
+      await fs$1.async_writeFile(saveFile, text);
     }
-    await fs$1.async_writeFile(`../log/preconditions`, text);
     return !text;
   }
 
@@ -150,8 +157,8 @@ class preconditions$2 {
   static async initKvStorage(dbSql) {
     return await initKvStorage(dbSql);
   }
-  static async checkAppDbVersion() {
-    const dbVersionManager = new DbVersionManager();
+  static async checkAppDbVersion(...args) {
+    const dbVersionManager = new DbVersionManager(...args);
     const updateInfo = await dbVersionManager.checkAppDbVersion();
     return updateInfo.updateMessage;
   }
@@ -344,18 +351,18 @@ class apiUtil$2 {
    */
   static extractParams(req) {
     if (!req._requestParams) {
-      if (req.method === "POST" || req.method === "PUT") {
-        let contentType = req.headers["content-type"] || "application/json";
-        if (contentType.startsWith("multipart/form-data")) {
-          req._requestParams = new Object();
-          for (let k in req.body) {
-            req._requestParams[k] = req.body[k];
-          }
-        } else {
-          req._requestParams = req.body;
+      const contentType = req.headers["content-type"] || "application/json";
+      if (contentType.startsWith("multipart/form-data")) {
+        req._requestParams = new Object();
+        for (let k in req.body) {
+          req._requestParams[k] = req.body[k];
         }
       } else {
-        req._requestParams = req.query;
+        if (req.method === "POST" || req.method === "PUT") {
+          req._requestParams = req.body;
+        } else {
+          req._requestParams = req.query;
+        }
       }
       if (req.headers["content-type"] !== "application/json") {
         const obj = req._requestParams;
@@ -1934,7 +1941,7 @@ let conf$1;
  */
 class commonMessenger$2 {
   static myMsgAddr = "";
-  static redisMessenger = null;
+  static redisMessenger = RedisMessenger; // 假的，initMessenger 将设置真实的
   static onMessage = [];
   static initMessenger(appConfig, appErrCfg, msgChannel) {
     conf$1 = appConfig;

package/package.json

@@ -1,46 +1,46 @@
-{
-  "name": "abler-api",
-  "version": "1.0.19",
-  "description": "API服务相关工具",
-  "main": "./dist/cjs/pp-util.js",
-  "-module": "./dist/es/pp-util.js",
-  "scripts": {
-    "build": "npx rollup -c rollup.config.js",
-    "postbuild": "node ..\\postbuild.js",
-    "test": "echo \"Skip tests for this package\" && exit 0"
-  },
-  "files": [
-    "dist"
-  ],
-  "author": "peng_peng",
-  "license": "ISC",
-  "dependencies": {
-    "abler-db": "^1.0.19",
-    "abler-i18n": "^1.0.2",
-    "abler-messenger": "^1.0.18",
-    "abler-net": "^1.0.5",
-    "abler-util": "^1.0.4",
-    "basic-auth": "^2.0.1",
-    "node-cron": "^3.0.1",
-    "q": "^1.5.1"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.18.5",
-    "@babel/eslint-parser": "^7.18.2",
-    "@babel/plugin-transform-runtime": "^7.18.0",
-    "@babel/preset-env": "^7.18.2",
-    "@babel/runtime": "^7.18.0",
-    "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^22.0.0",
-    "@rollup/plugin-eslint": "^8.0.2",
-    "@rollup/plugin-node-resolve": "^13.3.0",
-    "@typescript-eslint/eslint-plugin": "^5.25.0",
-    "@typescript-eslint/parser": "^5.25.0",
-    "eslint": "^8.16.0",
-    "eslint-plugin-react": "^7.30.0",
-    "rollup-plugin-filesize": "^9.1.2",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-terser": "^7.0.2"
-  },
-  "gitHead": "8f522223e74a945df64dee1f61986415ad93724b"
-}
+{
+  "name": "abler-api",
+  "version": "1.0.20",
+  "description": "API服务相关工具",
+  "main": "./dist/cjs/pp-util.js",
+  "-module": "./dist/es/pp-util.js",
+  "scripts": {
+    "build": "npx rollup -c rollup.config.js",
+    "postbuild": "node ..\\postbuild.js",
+    "test": "echo \"Skip tests for this package\" && exit 0"
+  },
+  "files": [
+    "dist"
+  ],
+  "author": "peng_peng",
+  "license": "ISC",
+  "dependencies": {
+    "abler-db": "^1.0.20",
+    "abler-i18n": "^1.0.2",
+    "abler-messenger": "^1.0.18",
+    "abler-net": "^1.0.5",
+    "abler-util": "^1.0.4",
+    "basic-auth": "^2.0.1",
+    "node-cron": "^3.0.1",
+    "proxy-agent": "6.5.0",
+    "q": "^1.5.1"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.18.5",
+    "@babel/eslint-parser": "^7.18.2",
+    "@babel/plugin-transform-runtime": "^7.18.0",
+    "@babel/preset-env": "^7.18.2",
+    "@babel/runtime": "^7.18.0",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-eslint": "^8.0.2",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@typescript-eslint/eslint-plugin": "^5.25.0",
+    "@typescript-eslint/parser": "^5.25.0",
+    "eslint": "^8.16.0",
+    "eslint-plugin-react": "^7.30.0",
+    "rollup-plugin-filesize": "^10.0.0",
+    "rollup-plugin-json": "^4.0.0",
+    "rollup-plugin-terser": "^7.0.2"
+  }
+}