abler-api 0.2.0 → 0.2.4

package/dist/cjs/pp-util.js

@@ -27,7 +27,7 @@ var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 const fs$1 = require$$0__default["default"];
 const path = require$$1__default["default"];
 const {
-  t_f: t_f$3,
+  t_f: t_f$4,
   t: t$1
 } = require$$2__default["default"];
 const ppUtil$4 = require$$3__default["default"].ppUtil;
@@ -108,7 +108,7 @@ class preconditions$2 {
     }
     let text = "";
     if (preconditions$2.messages) {
-      text = t_f$3("*** 由于以下原因，%s 尚不能正常提供服务：\n\n", preconditions$2.appName) + preconditions$2.messages.join("\n\n") + t$1("\n\n*** 请检查以上各项条件，修复后重新启动服务");
+      text = t_f$4("*** 由于以下原因，%s 尚不能正常提供服务：\n\n", preconditions$2.appName) + preconditions$2.messages.join("\n\n") + t$1("\n\n*** 请检查以上各项条件，修复后重新启动服务");
       console.log("\n" + text);
       // for (let i = 0; i < preconditions.messages.length; i++) {
       //     console.log(preconditions.messages[i]);
@@ -162,17 +162,20 @@ async function createEnvSettingFile(fileName, lastEnvSettingEx) {
   try {
     const cfgText = await ppUtil$4.doCreateEnvSettingFile(fileName, lastEnvSettingEx);
     if (cfgText.indexOf(`cfgVersion: "${conf$3._envSetting.cfgVersion}"`) > 0) {
-      console.log(t_f$3("\n*** 已創建新的本機環境配置文件\n%s\n请檢查各項內容是否正确(此项更新服务可正常运行)\n\n", fileName));
+      console.log(t_f$4("\n*** 已創建新的本機環境配置文件\n%s\n请檢查各項內容是否正确(此项更新服务可正常运行)\n\n", fileName));
       return "";
     }
-    return t_f$3("已創建新的本機環境配置文件\n%s\n请檢查並正確設置各項內容，然後將配置版本號修改為%s", fileName, conf$3._envSettings.default.cfgVersion);
+    return t_f$4("已創建新的本機環境配置文件\n%s\n请檢查並正確設置各項內容，然後將配置版本號修改為%s", fileName, conf$3._envSettings.default.cfgVersion);
   } catch (e) {
-    return t_f$3("創建本機環境配置文件失敗\n《%s》\n%s", fileName, err$1.ERROR(e).message);
+    return t_f$4("創建本機環境配置文件失敗\n《%s》\n%s", fileName, err$1.ERROR(e).message);
   }
 }
 async function checkExEnvSetting(loadjs) {
   if (conf$3._envSetting.localSettingImported) return "";
   try {
+    if (typeof conf$3.getEnvSettingFileName !== "function") {
+      throw new Error("必须在 config 中定义 getEnvSettingFileName 方法获取本地配置文件名");
+    }
     let fileName = conf$3.getEnvSettingFileName();
     if (!fs$1.existsSync(fileName)) {
       return await createEnvSettingFile(fileName);
@@ -194,7 +197,7 @@ async function checkExEnvSetting(loadjs) {
     }
     ppUtil$4.importExEnvSetting(conf$3._envSetting, fileName, loadjs);
   } catch (e) {
-    return t_f$3("导入本机环境配置失败\n%s", e.stack);
+    return t_f$4("导入本机环境配置失败\n%s", e.stack);
   }
 }
 
@@ -214,8 +217,8 @@ async function checkRedis() {
     redis.error = e;
   });
   if (redis.error) {
-    console.log(t_f$3("未能成功連接 redis： %s，請檢查相關設置", redis.error));
-    return t_f$3("未能成功連接 redis： %s，請檢查相關設置", redis.error);
+    console.log(t_f$4("未能成功連接 redis： %s，請檢查相關設置", redis.error));
+    return t_f$4("未能成功連接 redis： %s，請檢查相關設置", redis.error);
   }
   // console.log(`checkRedis done：`);
   // console.log(redis);
@@ -225,12 +228,12 @@ async function initDb(dbSql) {
     dbUtil$1.config(conf$3, err$1, dbSql);
   } catch (e) {
     if (e.reason === 'bad decrypt') {
-      e = new Error(t_f$3("解密数据库密码(%s)失败", conf$3.dbconn.dbpwd));
+      e = new Error(t_f$4("解密数据库密码(%s)失败", conf$3.dbconn.dbpwd));
     }
     // if (e.reason === 'bad decrypt') {
     //     e = new Error(`解密Redis密码(${conf.redis.password})失败`);
     // }
-    return t_f$3("初始化数据库连接失败(%s)", e.message);
+    return t_f$4("初始化数据库连接失败(%s)", e.message);
   }
 }
 async function initKvStorage(dbSql) {
@@ -245,7 +248,7 @@ async function initKvStorage(dbSql) {
     // if (e.reason === 'bad decrypt') {
     //     e = new Error(`解密Redis密码(${conf.redis.password})失败`);
     // }
-    return t_f$3("初始化键值对存储器失败(%s)", e.message);
+    return t_f$4("初始化键值对存储器失败(%s)", e.message);
   }
 }
 var ppPrecond = preconditions$2;
@@ -254,7 +257,7 @@ const fs = require$$0__default["default"];
 const crypto = require$$1__default$1["default"];
 const getBasicAuthorization = require$$2__default$1["default"];
 const {
-  t_f: t_f$2,
+  t_f: t_f$3,
   t
 } = require$$2__default["default"];
 const {
@@ -407,7 +410,7 @@ class apiUtil$2 {
       if (this[name] === undefined) return defaultValue;
       let result = +this[name];
       if (typeof result !== "number" || result < minValue || result > maxValue) {
-        throw [errCfg.INVALID_PARAM, t_f$2("参数 %s 必须是 %s ~ %s 之间的数字", name, minValue, maxValue)];
+        throw [errCfg.INVALID_PARAM, t_f$3("参数 %s 必须是 %s ~ %s 之间的数字", name, minValue, maxValue)];
       }
       return result;
     });
@@ -519,7 +522,7 @@ class apiUtil$2 {
         try {
           response.send(data);
         } catch (e) {
-          console.log(t_f$2("response.send 出错了，req.url: %s, response：", response.req.url), response);
+          console.log(t_f$3("response.send 出错了，req.url: %s, response：", response.req.url), response);
           console.log("异常信息", e);
         }
       }
@@ -996,7 +999,7 @@ class apiUtil$2 {
       return certInfo;
     }).catch(e => {
       console.log('获取企业证书失败:\n', e);
-      throw [errCfg.ACCESS_REFUSED, t_f$2("获取企业证书失败：%s", errCfg.ERROR(e).message)];
+      throw [errCfg.ACCESS_REFUSED, t_f$3("获取企业证书失败：%s", errCfg.ERROR(e).message)];
     });
   }
 
@@ -1009,17 +1012,17 @@ class apiUtil$2 {
   static async verifyApiTokenSignature(tokenData, req) {
     try {
       if (!req.headers.timestamp) {
-        throw [errCfg.ACCESS_REFUSED, t_f$2("必须在请求头中设置时戳")];
+        throw [errCfg.ACCESS_REFUSED, t_f$3("必须在请求头中设置时戳")];
       }
       let timestamp = parseInt(req.headers.timestamp);
       let currentTime = new Date().valueOf();
       let maxTimeDiff = apiUtil$2.isDebugMode(req) ? 7 * 24 * 3600 : apiUtil$2.isTestMode(req) ? 4 * 3600 : 100; // 100
       if (timestamp.toString() == "NaN" || currentTime < timestamp - 5000 || currentTime - timestamp > maxTimeDiff * 1000) {
-        throw [errCfg.ACCESS_REFUSED, t_f$2("时戳(%s)无效，当前时戳：%s,时差 %s秒", timestamp, currentTime, (currentTime - timestamp) / 1000)];
+        throw [errCfg.ACCESS_REFUSED, t_f$3("时戳(%s)无效，当前时戳：%s,时差 %s秒", timestamp, currentTime, (currentTime - timestamp) / 1000)];
       }
       let signature = req.headers.signature;
       if (!signature) {
-        throw [errCfg.ACCESS_REFUSED, t_f$2("必须在请求头中提供签名")];
+        throw [errCfg.ACCESS_REFUSED, t_f$3("必须在请求头中提供签名")];
       }
       let signData = apiUtil$2.extractToken(req, null, true) || tokenData.apiKey;
       signData += timestamp;
@@ -1080,7 +1083,7 @@ class apiUtil$2 {
           verifyOK = verifySpare.verify(tokenData.certPublicKeySpare, signature, 'base64');
           if (verifyOK) {
             // 备用证书验证成功了，则将备用证书替换为正式证书
-            console.log(t_f$2("公司(%s)备用证书验签成功，正式启用...", tokenData.apiKey));
+            console.log(t_f$3("公司(%s)备用证书验签成功，正式启用...", tokenData.apiKey));
             return dbUtil.dbTrans(trans => {
               let p1 = dbUtil.dbExec(dbSql.deleteCertRecById, {
                 replacements: {
@@ -1104,7 +1107,7 @@ class apiUtil$2 {
               if (token) {
                 apiUtil$2.storeToken(apiUtil$2.apiTokenStoreKey(token), tokenData, tokenData.apiKey, req);
               }
-              console.log(t_f$2("公司(%s)备用证书成功转换为正式证书", tokenData.apiKey));
+              console.log(t_f$3("公司(%s)备用证书成功转换为正式证书", tokenData.apiKey));
             });
           }
         } catch (e) {
@@ -1161,10 +1164,10 @@ class apiUtil$2 {
    * @param token
    * @returns {*}
    */
-  static tokenDataExist(token) {
-    return kvStorage.stored(token);
+  static async tokenDataExist(token) {
+    return await kvStorage.stored(token);
   }
-  static parametersOK(params) {
+  static checkParametersOK(params) {
     configNeeded();
     let paramSufix = params._param_sufix || "";
     for (let i = 1; i < arguments.length; i++) {
@@ -1196,9 +1199,12 @@ class apiUtil$2 {
       } else {
         paramExists = typeof params[paramName] != 'undefined' || typeof params[paramName + paramSufix] != 'undefined';
       }
-      if (!paramExists) return ppUtil$3.errorPormise(errCfg.ERROR(errCfg.PARAMETER_NEEDED, paramName));
+      if (!paramExists) throw errCfg$1.ERROR(errCfg$1.PARAMETER_NEEDED, paramName);
     }
-    return Promise.resolve(paramSufix);
+    return paramSufix;
+  }
+  static async parametersOK(params) {
+    return await apiUtil$2.checkParametersOK(params);
   }
 
   /**
@@ -1262,7 +1268,7 @@ class apiUtil$2 {
     const myEnvHosts = apiUtil$2.getEnvHosts(params);
     const myIp = ppUtil$3.getMyIp();
     const host = params.host || myIp;
-    if (!myEnvHosts.hosts.contains(host)) throw [errCfg.ACCESS_REFUSED, t_f$2("环境%s貌似无此主机：%s", conf$2.envId, params.host)];
+    if (!myEnvHosts.hosts.contains(host)) throw [errCfg.ACCESS_REFUSED, t_f$3("环境%s貌似无此主机：%s", conf$2.envId, params.host)];
     if (!apiUtil$2.hostIsMySelf(host, options._res.req)) {
       let result = await apiUtil$2.forwardsTo(host, myEnvHosts.port, params, options._res.req, myIp);
       options._res.send(result);
@@ -1292,7 +1298,7 @@ class apiUtil$2 {
     };
     let result = await netUtil$1.apiRequest(reqOptions);
     if (result.status !== 200) {
-      console.log(t_f$2("访问 %s 出错", reqOptions.url), result.status, result.res.statusMessage);
+      console.log(t_f$3("访问 %s 出错", reqOptions.url), result.status, result.res.statusMessage);
       throw [errCfg.EXCEPTION, `[${result.status}] - ${result.res.statusMessage}`];
     }
     return result.data;
@@ -1315,7 +1321,7 @@ class apiUtil$2 {
       key = keys[i];
       value = parent[key];
       if (value === undefined) {
-        throw [errCfg.INVALID_PARAM, t_f$2("无此配置项: %s", key)];
+        throw [errCfg.INVALID_PARAM, t_f$3("无此配置项: %s", key)];
       }
     }
     return {
@@ -1410,7 +1416,7 @@ class apiUtil$2 {
     };
     if (appInfo) {
       // appInfo.cek = cek;
-      await kvStorage.storeObj(cekStoreKey(appInfo.apiKey, req), cek, appSetting.cekExpireTime);
+      await kvStorage.storeObj(this.cekStoreKey(appInfo.apiKey, req), cek, appSetting.cekExpireTime);
     }
     return cek;
   }
@@ -1471,7 +1477,7 @@ class apiUtil$2 {
     };
     const appInfo = await this.restoreAppInfo(params.apiKey, options._res.req);
     if (!appInfo) {
-      throw [errCfg.ACCESS_REFUSED, t_f$2("apiKey (%s) 无效", params.apiKey)];
+      throw [errCfg.ACCESS_REFUSED, t_f$3("apiKey (%s) 无效", params.apiKey)];
     }
     let content = '';
     if (appSetting.e2eEncryptionNeeded) {
@@ -1524,7 +1530,7 @@ class apiUtil$2 {
       }
       req.appInfo = await this.restoreAppInfo(apiKey, req);
       if (!req.appInfo) {
-        throw [errCfg.ACCESS_REFUSED, t_f$2("api-key (%s) 无效", apiKey)];
+        throw [errCfg.ACCESS_REFUSED, t_f$3("api-key (%s) 无效", apiKey)];
       }
     }
   }
@@ -1535,17 +1541,17 @@ class apiUtil$2 {
     await this.reqAppInfoNeeded(req);
     if (!appSetting.reqSignatureNeeded) return true;
     if (!req.headers.timestamp) {
-      throw [errCfg.ACCESS_REFUSED, t_f$2("必须在请求头中设置时戳")];
+      throw [errCfg.ACCESS_REFUSED, t_f$3("必须在请求头中设置时戳")];
     }
     let timestamp = parseInt(req.headers.timestamp);
     let currentTime = new Date().valueOf();
     let maxTimeDiff = apiUtil$2.isDebugMode(req) ? 7 * 24 * 3600 : apiUtil$2.isTestMode(req) ? 4 * 3600 : 300; // 100
     if (timestamp.toString() === "NaN" || currentTime < timestamp - 5000 || currentTime - timestamp > maxTimeDiff * 1000) {
-      throw [errCfg.ACCESS_REFUSED, t_f$2("时戳(%s)无效，当前时戳：%s,时差 %s秒", timestamp, currentTime, (currentTime - timestamp) / 1000)];
+      throw [errCfg.ACCESS_REFUSED, t_f$3("时戳(%s)无效，当前时戳：%s,时差 %s秒", timestamp, currentTime, (currentTime - timestamp) / 1000)];
     }
     let signature = req.headers.signature;
     if (!signature) {
-      throw [errCfg.ACCESS_REFUSED, t_f$2("必须在请求头中提供签名")];
+      throw [errCfg.ACCESS_REFUSED, t_f$3("必须在请求头中提供签名")];
     }
     const params = apiUtil$2.extractParams(req);
     const content = appSetting.e2eEncryptionNeeded ? params?.encryptedContent || '' : JSON.stringify(params || null);
@@ -1852,7 +1858,7 @@ class apiUtil$2 {
     await apiUtil$2.parametersOK(params, "value");
     let c = apiUtil$2.parseCfgPath(cfgItem);
     if (typeof c.value === "object") {
-      throw [errCfg.ACCESS_REFUSED, t_f$2("暂不支持修改复杂配置")];
+      throw [errCfg.ACCESS_REFUSED, t_f$3("暂不支持修改复杂配置")];
     }
     // c.oldValue = c.value;
     c.newValue = params.value;

package/package.json

@@ -1,45 +1,46 @@
-{
-  "name": "abler-api",
-  "version": "0.2.0",
-  "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 \"Error: no test specified\" && exit 1"
-  },
-  "files": [
-    "dist"
-  ],
-  "author": "peng_peng",
-  "license": "ISC",
-  "dependencies": {
-    "q": "^1.5.1",
-    "abler-util": ">=0.3.0",
-    "abler-db": ">=0.1.1",
-    "abler-i18n": "^0.1.20",
-    "abler-messenger": ">=0.1.1",
-    "abler-net": ">=0.1.1",
-    "basic-auth": "^2.0.1",
-    "node-cron": "^3.0.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"
-  }
-}
+{
+  "name": "abler-api",
+  "version": "0.2.4",
+  "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 \"Error: no test specified\" && exit 1"
+  },
+  "files": [
+    "dist"
+  ],
+  "author": "peng_peng",
+  "license": "ISC",
+  "dependencies": {
+    "abler-db": "^0.1.57",
+    "abler-i18n": "^0.1.25",
+    "abler-messenger": "^0.1.16",
+    "abler-net": "^0.1.13",
+    "abler-util": "^0.3.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": "b371a71a41ed24e889f0c35e51deb13916351ff6"
+}