abler-api 0.1.73 → 0.1.74

package/dist/cjs/pp-util.js

@@ -3,11 +3,12 @@
 var require$$0 = require('fs');
 var require$$1$1 = require('crypto');
 var require$$2$1 = require('basic-auth');
-var require$$2 = require('abler-util');
-var require$$3 = require('abler-db');
-var require$$5 = require('abler-net');
+var require$$2 = require('abler-lang');
+var require$$3 = require('abler-util');
+var require$$4 = require('abler-db');
+var require$$6 = require('abler-net');
 var require$$1 = require('path');
-var require$$1$2 = require('abler-messenger');
+var require$$2$2 = require('abler-messenger');
 var require$$0$1 = require('node-cron');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -17,20 +18,24 @@ var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 var require$$2__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$2$1);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);
-var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
+var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
+var require$$6__default = /*#__PURE__*/_interopDefaultLegacy(require$$6);
 var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
-var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
+var require$$2__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$2$2);
 var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 
 const fs$1 = require$$0__default["default"];
 const path = require$$1__default["default"];
-const ppUtil$4 = require$$2__default["default"].ppUtil;
+const {
+  t_f: t_f$3
+} = require$$2__default["default"];
+const ppUtil$4 = require$$3__default["default"].ppUtil;
 const {
   dbUtil: dbUtil$1,
   ppRedis,
   kvStorage: kvStorage$1,
   redisSimulator
-} = require$$3__default["default"];
+} = require$$4__default["default"];
 let conf$3, err$2;
 // const dbCheck = require('../dbupdate/dd-version');
 
@@ -102,7 +107,7 @@ class preconditions$2 {
     }
     let text = "";
     if (preconditions$2.messages) {
-      text = `*** 由于以下原因，${preconditions$2.appName} 尚不能正常提供服务：\n\n` + preconditions$2.messages.join("\n\n") + "\n\n*** 请检查以上各项条件，修复后重新启动服务";
+      text = t_f$3("*** 由于以下原因，%s 尚不能正常提供服务：\n\n", preconditions$2.appName) + preconditions$2.messages.join("\n\n") + "\n\n*** 请检查以上各项条件，修复后重新启动服务";
       console.log("\n" + text);
       // for (let i = 0; i < preconditions.messages.length; i++) {
       //     console.log(preconditions.messages[i]);
@@ -156,12 +161,12 @@ 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(`\n*** 已創建新的本機環境配置文件\n${fileName}\n请檢查各項內容是否正确(此项更新服务可正常运行)\n\n`);
+      console.log(t_f$3("\n*** 已創建新的本機環境配置文件\n%s\n请檢查各項內容是否正确(此项更新服务可正常运行)\n\n", fileName));
       return "";
     }
-    return `已創建新的本機環境配置文件\n${fileName}\n请檢查並正確設置各項內容，然後將配置版本號修改為${conf$3._envSettings.default.cfgVersion}`;
+    return t_f$3("已創建新的本機環境配置文件\n%s\n请檢查並正確設置各項內容，然後將配置版本號修改為%s", fileName, conf$3._envSettings.default.cfgVersion);
   } catch (e) {
-    return `創建本機環境配置文件失敗\n《${fileName}》\n${err$2.ERROR(e).message}`;
+    return t_f$3("創建本機環境配置文件失敗\n《%s》\n%s", fileName, err$2.ERROR(e).message);
   }
 }
 async function checkExEnvSetting(loadjs) {
@@ -188,7 +193,7 @@ async function checkExEnvSetting(loadjs) {
     }
     ppUtil$4.importExEnvSetting(conf$3._envSetting, fileName, loadjs);
   } catch (e) {
-    return `导入本机环境配置失败\n${e.stack}`;
+    return t_f$3("导入本机环境配置失败\n%s", e.stack);
   }
 }
 
@@ -208,8 +213,8 @@ async function checkRedis() {
     redis.error = e;
   });
   if (redis.error) {
-    console.log(`未能成功連接 redis： ${redis.error}，請檢查相關設置`);
-    return `未能成功連接 redis： ${redis.error}，請檢查相關設置`;
+    console.log(t_f$3("未能成功連接 redis： %s，請檢查相關設置", redis.error));
+    return t_f$3("未能成功連接 redis： %s，請檢查相關設置", redis.error);
   }
   // console.log(`checkRedis done：`);
   // console.log(redis);
@@ -219,12 +224,12 @@ async function initDb() {
     dbUtil$1.config(conf$3, err$2);
   } catch (e) {
     if (e.reason === 'bad decrypt') {
-      e = new Error(`解密数据库密码(${conf$3.dbconn.dbpwd})失败`);
+      e = new Error(t_f$3("解密数据库密码(%s)失败", conf$3.dbconn.dbpwd));
     }
     // if (e.reason === 'bad decrypt') {
     //     e = new Error(`解密Redis密码(${conf.redis.password})失败`);
     // }
-    return `初始化数据库连接失败(${e.message})`;
+    return t_f$3("初始化数据库连接失败(%s)", e.message);
   }
 }
 async function initKvStorage(dbSql) {
@@ -239,7 +244,7 @@ async function initKvStorage(dbSql) {
     // if (e.reason === 'bad decrypt') {
     //     e = new Error(`解密Redis密码(${conf.redis.password})失败`);
     // }
-    return `初始化键值对存储器失败(${e.message})`;
+    return t_f$3("初始化键值对存储器失败(%s)", e.message);
   }
 }
 var ppPrecond = preconditions$2;
@@ -247,14 +252,18 @@ var ppPrecond = preconditions$2;
 const fs = require$$0__default["default"];
 const crypto = require$$1__default$1["default"];
 const getBasicAuthorization = require$$2__default$1["default"];
-const ppUtil$3 = require$$2__default["default"].ppUtil;
+const {
+  t_f: t_f$2,
+  t
+} = require$$2__default["default"];
+const ppUtil$3 = require$$3__default["default"].ppUtil;
 const {
   dbUtil,
   kvStorage
-} = require$$3__default["default"];
+} = require$$4__default["default"];
 const {
   netUtil: netUtil$1
-} = require$$5__default["default"];
+} = require$$6__default["default"];
 const preconditions$1 = ppPrecond;
 let conf$2, appSetting, err$1, dbSql;
 const pnToken = "access_token",
@@ -394,7 +403,7 @@ class apiUtil$2 {
       if (this[name] === undefined) return defaultValue;
       let result = +this[name];
       if (typeof result !== "number" || result < minValue || result > maxValue) {
-        throw [err$1.INVALID_PARAM, `参数 ${name} 必须是 ${minValue} ~ ${maxValue} 之间的数字`];
+        throw [err$1.INVALID_PARAM, t_f$2("参数 %s 必须是 %s ~ %s 之间的数字", name, minValue, maxValue)];
       }
       return result;
     });
@@ -506,7 +515,7 @@ class apiUtil$2 {
         try {
           response.send(data);
         } catch (e) {
-          console.log(`response.send 出错了，req.url: ${response.req.url}, response：`, response);
+          console.log(t_f$2("response.send 出错了，req.url: %s, response：", response.req.url), response);
           console.log("异常信息", e);
         }
       }
@@ -553,7 +562,7 @@ class apiUtil$2 {
 
   /**
    * 从请求参数中获取查询参数
-    * @param req
+      * @param req
    * @param res
    * @returns {*}
    */
@@ -983,7 +992,7 @@ class apiUtil$2 {
       return certInfo;
     }).catch(e => {
       console.log('获取企业证书失败:\n', e);
-      throw [err$1.ACCESS_REFUSED, `获取企业证书失败：${err$1.ERROR(e).message}`];
+      throw [err$1.ACCESS_REFUSED, t_f$2("获取企业证书失败：%s", err$1.ERROR(e).message)];
     });
   }
 
@@ -996,17 +1005,17 @@ class apiUtil$2 {
   static async verifyApiSignature(tokenData, req) {
     try {
       if (!req.headers.timestamp) {
-        throw [err$1.ACCESS_REFUSED, `必须在请求头中设置时戳`];
+        throw [err$1.ACCESS_REFUSED, t_f$2("必须在请求头中设置时戳")];
       }
       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 [err$1.ACCESS_REFUSED, `时戳(${timestamp})无效，当前时戳：${currentTime},时差 ${(currentTime - timestamp) / 1000}秒`];
+        throw [err$1.ACCESS_REFUSED, t_f$2("时戳(%s)无效，当前时戳：%s,时差 %s秒", timestamp, currentTime, (currentTime - timestamp) / 1000)];
       }
       let signature = req.headers.signature;
       if (!signature) {
-        throw [err$1.ACCESS_REFUSED, `必须在请求头中提供签名`];
+        throw [err$1.ACCESS_REFUSED, t_f$2("必须在请求头中提供签名")];
       }
       let signData = apiUtil$2.extractToken(req, null, true) || tokenData.apiKey;
       signData += timestamp;
@@ -1053,7 +1062,7 @@ class apiUtil$2 {
         if (!tokenData.certPublicKeySpare) {
           throw {
             eo: err$1.ACCESS_REFUSED,
-            msgArgv: "签名验证异常",
+            msgArgv: t("签名验证异常"),
             data: e
           };
         }
@@ -1067,7 +1076,7 @@ class apiUtil$2 {
           verifyOK = verifySpare.verify(tokenData.certPublicKeySpare, signature, 'base64');
           if (verifyOK) {
             // 备用证书验证成功了，则将备用证书替换为正式证书
-            console.log(`公司(${tokenData.apiKey})备用证书验签成功，正式启用...`);
+            console.log(t_f$2("公司(%s)备用证书验签成功，正式启用...", tokenData.apiKey));
             return dbUtil.dbTrans(trans => {
               let p1 = dbUtil.dbExec(dbSql.deleteCertRecById, {
                 replacements: {
@@ -1091,21 +1100,21 @@ class apiUtil$2 {
               if (token) {
                 apiUtil$2.storeToken(apiUtil$2.apiTokenStoreKey(token), tokenData, tokenData.apiKey, req);
               }
-              console.log(`公司(${tokenData.apiKey})备用证书成功转换为正式证书`);
+              console.log(t_f$2("公司(%s)备用证书成功转换为正式证书", tokenData.apiKey));
             });
           }
         } catch (e) {
           console.log("SPO服务签名验证异常(备用证书), ", e);
           throw {
             eo: err$1.ACCESS_REFUSED,
-            msgArgv: "签名验证异常(spare)",
+            msgArgv: t("签名验证异常(spare)"),
             data: e
           };
         }
       }
       if (!verifyOK) {
         console.log("SPO服务签名验证失败, tokenData: ", tokenData);
-        throw [err$1.ACCESS_REFUSED, "签名验证未通过"];
+        throw [err$1.ACCESS_REFUSED, t("签名验证未通过")];
       }
       return verifyOK;
     }
@@ -1121,7 +1130,7 @@ class apiUtil$2 {
     if (!tokenData.companyInfo) {
       tokenData.companyInfo = await apiUtil$2.queryCompanyInfo(tokenData.apiKey, true).catch(e => {
         console.log("执行企业信息查询发生异常", e);
-        throw [err$1.API_KEY_INVALID, "执行企业信息查询发生异常：" + e.message || ""];
+        throw [err$1.API_KEY_INVALID, t("执行企业信息查询发生异常：") + e.message || ""];
       });
     }
     const companyInfo = tokenData.companyInfo;
@@ -1179,7 +1188,7 @@ class apiUtil$2 {
             break;
           }
         }
-        paramName = `${paramName} 之一`;
+        paramName = t_f$2("%s 之一", paramName);
       } else {
         paramExists = typeof params[paramName] != 'undefined' || typeof params[paramName + paramSufix] != 'undefined';
       }
@@ -1249,7 +1258,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 [err$1.ACCESS_REFUSED, `环境${conf$2.envId}貌似无此主机：${params.host}`];
+    if (!myEnvHosts.hosts.contains(host)) throw [err$1.ACCESS_REFUSED, t_f$2("环境%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);
@@ -1279,7 +1288,7 @@ class apiUtil$2 {
     };
     let result = await netUtil$1.apiRequest(reqOptions);
     if (result.status !== 200) {
-      console.log(`访问 ${reqOptions.url} 出错`, result.status, result.res.statusMessage);
+      console.log(t_f$2("访问 %s 出错", reqOptions.url), result.status, result.res.statusMessage);
       throw [err$1.EXCEPTION, `[${result.status}] - ${result.res.statusMessage}`];
     }
     return result.data;
@@ -1302,7 +1311,7 @@ class apiUtil$2 {
       key = keys[i];
       value = parent[key];
       if (value === undefined) {
-        throw [err$1.INVALID_PARAM, `无此配置项: ${key}`];
+        throw [err$1.INVALID_PARAM, t_f$2("无此配置项: %s", key)];
       }
     }
     return {
@@ -1361,6 +1370,7 @@ class apiUtil$2 {
         await apiUtil$2.restoreTokenData(apiUtil$2.userTokenStoreKey(req.accessToken), apiUtil$2.tokenExpireTime(req)).then(function (data) {
           req.userInfo = apiUtil$2.setUserIdNo(data, data._idNo);
         }, function (e) {
+
           //no token
         });
       }
@@ -1572,7 +1582,7 @@ class apiUtil$2 {
     await apiUtil$2.parametersOK(params, "value");
     let c = apiUtil$2.parseCfgPath(cfgItem);
     if (typeof c.value === "object") {
-      throw [err$1.ACCESS_REFUSED, `暂不支持修改复杂配置`];
+      throw [err$1.ACCESS_REFUSED, t_f$2("暂不支持修改复杂配置")];
     }
     // c.oldValue = c.value;
     c.newValue = params.value;
@@ -1634,18 +1644,24 @@ function configNeeded() {
 }
 var ppUtilApi = apiUtil$2;
 
-// 普通消息系统
-// 若 redis 可用，则使用基于 redis 的消息订阅发布系统
-// 若 redis 不可用，则将消息转发到其它主机
-
 const {
-  ppUtil: ppUtil$2
+  t_f: t_f$1
 } = require$$2__default["default"];
-const RedisMessenger = require$$1__default$2["default"];
+const {
+  ppUtil: ppUtil$2
+} = require$$3__default["default"];
+const RedisMessenger = require$$2__default$2["default"];
 const {
   netUtil
-} = require$$5__default["default"];
+} = require$$6__default["default"];
 let conf$1;
+
+/**
+ * 普通消息系统
+ * =
+ * 若 redis 可用，则使用基于 redis 的消息订阅发布系统
+ * 若 redis 不可用，则将消息转发到其它主机
+ */
 class commonMessenger$2 {
   static myMsgAddr = "";
   static redisMessenger = null;
@@ -1712,26 +1728,30 @@ async function forwardMessage(message) {
     data: message
   };
   let res = await netUtil.apiRequest(reqOptions).catch(e => {
-    console.log(`转发消息失败, url: ${reqOptions.url}`, e);
+    console.log(t_f$1("转发消息失败, url: %s", reqOptions.url), e);
     throw e;
   });
   return res.data;
 }
 var ppMessengerEx = commonMessenger$2;
 
-/**
- * CSCA 自动任务
- * ==============
- */
 const CRON = require$$0__default$1["default"];
 const {
-  ppUtil: ppUtil$1
+  t_f
 } = require$$2__default["default"];
+const {
+  ppUtil: ppUtil$1
+} = require$$3__default["default"];
 const apiUtil$1 = ppUtilApi;
 const commonMessenger$1 = ppMessengerEx;
 const MT_SCHEDULE_STATE = 'schedule-state',
   MT_SCHEDULE_STATE_REPLY = 'schedule-state-reply';
 let conf, err;
+
+/**
+ * CSCA 自动任务
+ * ==============
+ */
 class schedule$1 {
   static tasks = {};
 
@@ -1763,9 +1783,9 @@ class schedule$1 {
         doScheduleTask: async function () {
           let self = this;
           if (this._pp_task) self = this._pp_task;
-          console.log(new Date().format('[yyyy/MM/dd hh:mm:ss:S]'), `开始执行${self.caption}任务 ...`);
+          console.log(new Date().format('[yyyy/MM/dd hh:mm:ss:S]'), t_f("开始执行%s任务 ...", self.caption));
           await self.taskFunc();
-          console.log(new Date().format('[yyyy/MM/dd hh:mm:ss:S]'), `${self.caption}任务执行结束`);
+          console.log(new Date().format('[yyyy/MM/dd hh:mm:ss:S]'), t_f("%s任务执行结束", self.caption));
         }
       };
       this.tasks[taskName] = task;
@@ -1799,7 +1819,7 @@ class schedule$1 {
     if (typeof task === "string") {
       task = this.findTask(taskOrName);
     }
-    if (!task) throw [err.INVALID_PARAM, `任务${taskOrName}不存在`];
+    if (!task) throw [err.INVALID_PARAM, t_f("任务%s不存在", taskOrName)];
     cronExp = cronExp || task.cronExp;
     if (task.cronExp !== cronExp) {
       this.stop(task);
@@ -1824,7 +1844,7 @@ class schedule$1 {
     if (typeof task === "string") {
       task = this.findTask(taskOrName);
     }
-    if (!task) throw [err.INVALID_PARAM, `任务${taskOrName}不存在`];
+    if (!task) throw [err.INVALID_PARAM, t_f("任务%s不存在", taskOrName)];
     if (task.schedule) {
       task.schedule.stop();
       task.schedule = null;
@@ -1901,7 +1921,7 @@ class schedule$1 {
     let task;
     if (params.taskName) {
       task = this.findTask(params.taskName);
-      if (!task) throw [err.INVALID_PARAM, `任务${params.taskName}不存在`];
+      if (!task) throw [err.INVALID_PARAM, t_f("任务%s不存在", params.taskName)];
     }
     if (params.state) {
       if ("started" === params.state) {
@@ -1909,7 +1929,7 @@ class schedule$1 {
       } else if ("stopped" === params.state) {
         apiResult = await this.stop(task);
       } else {
-        throw [err.INVALID_PARAM, `(${params.state}), 只能是 started/stopped`];
+        throw [err.INVALID_PARAM, t_f("(%s), 只能是 started/stopped", params.state)];
       }
       if (params.runOnce) {
         task = this.findTask(params.taskName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "0.1.73",
+  "version": "0.1.74",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "-module": "./dist/es/pp-util.js",
@@ -17,8 +17,11 @@
     "q": "^1.5.1",
     "abler-util": ">=0.1.1",
     "abler-db": ">=0.1.1",
+    "abler-lang": "^0.1.20",
     "abler-messenger": ">=0.1.1",
-    "abler-net": ">=0.1.1"
+    "abler-net": ">=0.1.1",
+    "basic-auth": "^2.0.1",
+    "node-cron": "^3.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.18.5",