abler-api 0.1.24 → 0.1.27

package/dist/cjs/pp-util.js

@@ -1,23 +1,25 @@
 'use strict';
 
-var require$$0$1 = require('crypto');
+var require$$0 = require('crypto');
 var require$$1 = require('abler-util');
 var require$$2 = require('abler-db');
 var require$$3 = require('abler-net');
-var require$$0$2 = require('fs');
+var require$$0$1 = require('fs');
 var require$$1$1 = require('path');
+var require$$1$2 = require('abler-messenger');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
+var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);
-var require$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$2);
+var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
+var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
 
-const crypto = require$$0__default$1["default"];
-const ppUtil$4 = require$$1__default["default"].ppUtil;
+const crypto = require$$0__default["default"];
+const ppUtil$3 = require$$1__default["default"].ppUtil;
 const {
   dbUtil,
   kvStorage
@@ -31,17 +33,17 @@ const pnToken = "access_token",
       // 我们接收到的 headers 中的字段名总是全小写的
 pnApiSecret = "apiSecret",
       hnApiSecret = pnApiSecret.toLowerCase();
-const MD5 = ppUtil$4.MD5,
-      moveProperty = ppUtil$4.moveProperty;
+const MD5 = ppUtil$3.MD5,
+      moveProperty = ppUtil$3.moveProperty;
 
 class apiUtil$1 {
-  static debugFlag = ppUtil$4.newGuid(); //应用必须设置，否则谁也不知道是啥
+  static debugFlag = ppUtil$3.newGuid(); //应用必须设置，否则谁也不知道是啥
 
-  static testFlag = ppUtil$4.newGuid();
+  static testFlag = ppUtil$3.newGuid();
   static envId_dev = "?"; // static apiCallRecSaver;
 
   static config(appConfig, appErrCfg, appDbSql) {
-    ppUtil$4.config(appConfig, appErrCfg);
+    ppUtil$3.config(appConfig, appErrCfg);
     conf$2 = appConfig;
     appSetting$1 = conf$2?.appSetting;
     err$1 = appErrCfg, dbSql = appDbSql;
@@ -57,7 +59,7 @@ class apiUtil$1 {
 
 
   static _getApiSecret(companyId) {
-    return ppUtil$4.newGuid();
+    return ppUtil$3.newGuid();
   }
   /**
    * 保存 API 调用记录,应用系统必须重写此方法
@@ -160,7 +162,7 @@ class apiUtil$1 {
 
 
   static setParamsFunctions(params) {
-    ppUtil$4.defUnenumProp(params, "asNumber", function (name, minValue, maxValue, defaultValue) {
+    ppUtil$3.defUnenumProp(params, "asNumber", function (name, minValue, maxValue, defaultValue) {
       // if (!this.hasOwnProperty(name)) // {} 定义的对象没有 hasOwnProperty 函数
       if (this[name] === undefined) return defaultValue;
       let result = +this[name];
@@ -171,7 +173,7 @@ class apiUtil$1 {
 
       return result;
     });
-    ppUtil$4.defUnenumProp(params, "asBool", function (name, defaultValue) {
+    ppUtil$3.defUnenumProp(params, "asBool", function (name, defaultValue) {
       if (this[name] === undefined) return defaultValue;
       let result = JSON.parse(this[name]);
       return !!result;
@@ -236,7 +238,7 @@ class apiUtil$1 {
 
   static apiFail(error, req) {
     configNeeded();
-    let response = err$1.ERROR(error, err$1.errorLangParamFlag + ppUtil$4.getMsgLang(req));
+    let response = err$1.ERROR(error, err$1.errorLangParamFlag + ppUtil$3.getMsgLang(req));
     response.datetime = new Date();
 
     if (req && req.headers) {
@@ -484,7 +486,7 @@ class apiUtil$1 {
     const params = apiUtil$1.extractParams(req);
     req.accessToken = req.accessToken || apiUtil$1.extractToken(req);
 
-    if (req.accessToken === MD5(ppUtil$4.idNumDisturbing)) {
+    if (req.accessToken === MD5(ppUtil$3.idNumDisturbing)) {
       //todo: 检查IP
       params.__internal__ = true;
       req.ignoreToken = true; // if (params.idNum || params.personId) {
@@ -541,7 +543,7 @@ class apiUtil$1 {
 
       if (dbgToken) {
         let envId = process.env.ECS_DEPLOY_ID;
-        req.__debug__ = dbgToken && dbgToken === MD5(req.headers.timestamp, ppUtil$4.commonHashDisturbing) && (envId === "florist_longdan" || envId === "shuzi");
+        req.__debug__ = dbgToken && dbgToken === MD5(req.headers.timestamp, ppUtil$3.commonHashDisturbing) && (envId === "florist_longdan" || envId === "shuzi");
       } else {
         req.__debug__ = false;
       } // console.log("__debug__:", req.__debug__, "dbgToken:", dbgToken);
@@ -721,7 +723,7 @@ class apiUtil$1 {
         };
 
         if (rec.secret !== "") {
-          rec.secret = ppUtil$4.getEncAse192(rec.secret);
+          rec.secret = ppUtil$3.getEncAse192(rec.secret);
         }
 
         req.apiCallRec = rec;
@@ -1021,7 +1023,7 @@ class apiUtil$1 {
         paramExists = typeof params[paramName] != 'undefined' || typeof params[paramName + paramSufix] != 'undefined';
       }
 
-      if (!paramExists) return ppUtil$4.errorPormise(err$1.ERROR(err$1.PARAMETER_NEEDED, paramName));
+      if (!paramExists) return ppUtil$3.errorPormise(err$1.ERROR(err$1.PARAMETER_NEEDED, paramName));
     }
 
     return Promise.resolve(paramSufix);
@@ -1070,7 +1072,7 @@ class apiUtil$1 {
 
   static async hostIsMySelf(host, req) {
     let clientIp = apiUtil$1.getClientIp(req);
-    return ppUtil$4.getMyIp({
+    return ppUtil$3.getMyIp({
       hosts: [host, clientIp]
     });
   }
@@ -1085,7 +1087,7 @@ class apiUtil$1 {
     configNeeded();
     const params = options.replacements;
     const myEnvHosts = apiUtil$1.getEnvHosts(params);
-    const myIp = ppUtil$4.getMyIp();
+    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}`];
 
@@ -1387,7 +1389,7 @@ class apiUtil$1 {
     if (await apiUtil$1.checkForwardsHost(options)) return true;
     let c = apiUtil$1.parseCfgPath(item);
     delete c.parent;
-    c.host = ppUtil$4.getMyIp();
+    c.host = ppUtil$3.getMyIp();
     return c;
   }
   /**
@@ -1415,7 +1417,7 @@ class apiUtil$1 {
     c.newValue = params.value;
     c.parent[c.key] = c.newValue;
     delete c.parent;
-    c.host = ppUtil$4.getMyIp();
+    c.host = ppUtil$3.getMyIp();
     return c; // 应用层自行处理多机同步
   } //#endregion
 
@@ -1424,18 +1426,18 @@ class apiUtil$1 {
 
 function configNeeded() {
   if (!conf$2 || !err$1) {
-    ppUtil$4.configNeeded();
-    conf$2 = ppUtil$4.appConfig;
+    ppUtil$3.configNeeded();
+    conf$2 = ppUtil$3.appConfig;
     appSetting$1 = conf$2.appSetting;
-    err$1 = ppUtil$4.appErrCfg;
+    err$1 = ppUtil$3.appErrCfg;
   }
 }
 
 var ppUtilApi = apiUtil$1;
 
-const fs = require$$0__default$2["default"];
+const fs = require$$0__default$1["default"];
 const path = require$$1__default$1["default"];
-const ppUtil$3 = require$$1__default["default"].ppUtil;
+const ppUtil$2 = require$$1__default["default"].ppUtil;
 const redisUtil = require$$2__default["default"].redisUtil;
 let conf$1, err; // const dbCheck = require('../dbupdate/dd-version');
 
@@ -1456,9 +1458,9 @@ class preconditions$1 {
   static checkPromises = [];
 
   static setAppName(aName) {
-    ppUtil$3.configNeeded();
-    conf$1 = ppUtil$3.appConfig;
-    err = ppUtil$3.appErrCfg;
+    ppUtil$2.configNeeded();
+    conf$1 = ppUtil$2.appConfig;
+    err = ppUtil$2.appErrCfg;
     preconditions$1.appName = aName || conf$1.thisApp;
     return preconditions$1;
   }
@@ -1538,7 +1540,7 @@ class preconditions$1 {
 
 async function createEnvSettingFile(fileName) {
   try {
-    const cfgText = await ppUtil$3.doCreateEnvSettingFile(fileName);
+    const cfgText = await ppUtil$2.doCreateEnvSettingFile(fileName);
 
     if (cfgText.indexOf(`cfgVersion: "${conf$1._envSetting.cfgVersion}"`) > 0) {
       console.log(`\n*** 已創建新的本機環境配置文件\n${fileName}\n请檢查各項內容是否正确(此项更新服务可正常运行)\n\n`);
@@ -1583,7 +1585,7 @@ async function checkRedis() {
   if (!conf$1.redis.enabled) return "";
   const redis = redisUtil.newClient("io"); // console.log(`checkRedis begin：`);
 
-  await ppUtil$3.wait(15 * 1000, param => {
+  await ppUtil$2.wait(15 * 1000, param => {
     if (redis.ready && redis.connected || redis.error) {
       return true;
     }
@@ -1601,142 +1603,22 @@ async function checkRedis() {
 
 var ppPrecond = preconditions$1;
 
-var require$$0 = require$$2__default["default"];
-
-function _interopDefaultLegacy$1(e) {
-  return e && typeof e === 'object' && 'default' in e ? e : {
-    'default': e
-  };
-}
-
-var require$$0__default = /*#__PURE__*/_interopDefaultLegacy$1(require$$0); // const logger = require("log4js").getLogger();
-
-
-const redis = require$$0__default["default"].redisUtil;
-
-class Messenger {
-  constructor(appConfig, appErrCfg) {
-    if (appConfig) {
-      redis.config(appConfig, appErrCfg);
-    }
-
-    this.channel = "ecs_messenger"; //default channel
-
-    this.publisher = redis.newClient("publisher");
-    this.subscriber = redis.newClient("subscriber");
-    this.subscriber.on("subscribe", function (channel, count) {
-      console.log("chanel subscribed :", channel, count);
-    });
-    this.subscriber.on("message", this.handleMessage);
-  }
-
-  setMessageHandle(handle, channel) {
-    channel = channel || this.channel;
-    Messenger.onmessage = Messenger.onmessage || {};
-    Messenger.onmessage[channel] = Messenger.onmessage[channel] || [];
-    const appMsgHandles = Messenger.onmessage[channel];
-
-    for (let i = 0; i < appMsgHandles.length; i++) {
-      if (appMsgHandles[i] === handle) return this;
-    }
-
-    appMsgHandles.push(handle);
-    return this;
-  }
-
-  subscribe(channel) {
-    channel = channel || this.channel;
-    this.subscriber.subscribe(channel);
-    return this;
-  }
-
-  async handleMessage(channel, message) {
-    console.log(`通道[${channel}]收到订阅消息：`, message);
-    let appMsgHandles = Messenger.onmessage[channel] || [];
-
-    for (let i = 0; i < appMsgHandles.length; i++) {
-      const appMsgHandle = appMsgHandles[i];
-
-      try {
-        let msgObj = JSON.parse(message); // await appMsgHandle(msgObj);
-
-        appMsgHandle(msgObj);
-      } catch (e) {
-        console.log(e);
-      }
-    }
-  }
-
-  async publish(message, channel) {
-    channel = channel || this.channel;
-    let msgStr = typeof message === "object" ? JSON.stringify(message) : message.toString();
-    console.log(`通道[${channel}]发布消息：`, message);
-    await this.publisher.publish(channel, msgStr);
-    return this;
-  }
-
-}
-
-var ppMessenger$1 = Messenger;
-const ppMessenger = ppMessenger$1;
-var ppUtil$2 = ppMessenger;
-var ppUtil_1 = ppUtil$2;
-
 // 若 redis 可用，则使用基于 redis 的消息订阅发布系统
 // 若 redis 不可用，则将消息转发到其它主机
 
-const RedisMessenger = ppUtil_1;
+const {
+  ppUtil: ppUtil$1
+} = require$$1__default["default"];
+const RedisMessenger = require$$1__default$2["default"];
 const {
   netUtil
 } = require$$3__default["default"];
 let conf;
 
-class noneRedisMessenger {
-  static onMessage = [];
-
-  static async publishMessage(message) {
-    //没有消息处理器，则将消息转发到目标地址（不支持pm2多进程）
-    if (message.destAddr) {
-      await forwardMessage(message);
-    } else {
-      for (let i = 0; i < conf.appSetting.serverHosts.length; i++) {
-        message.destAddr = conf.appSetting.serverHosts[i];
-
-        if (message.destAddr !== conf.myMsgAddr) {
-          await forwardMessage(message);
-        }
-      }
-    }
-  }
-
-  static setMessageHandle(messageHandle) {
-    if (noneRedisMessenger.onMessage.indexOf(messageHandle) < 0) {
-      noneRedisMessenger.onMessage.push(messageHandle);
-    }
-
-    return noneRedisMessenger;
-  }
-
-  static async handleInternalMessage(options) {
-    const message = options.replacements;
-
-    for (let i = 0; i < noneRedisMessenger.onMessage.length; i++) {
-      const appMsgHandle = noneRedisMessenger.onMessage[i];
-
-      try {
-        // await appMsgHandle(message);
-        appMsgHandle(message);
-      } catch (e) {
-        console.log(e);
-      }
-    }
-  }
-
-}
-
 class commonMessenger$1 {
   static myMsgAddr = "";
   static redisMessenger = null;
+  static onMessage = [];
 
   static initMessenger(appConfig, appErrCfg, msgChannel) {
     conf = appConfig;
@@ -1747,7 +1629,7 @@ class commonMessenger$1 {
   static getMyMsgAddr() {
     if (!conf.myMsgAddr) {
       conf.pm_id = process.env.pm_id || "0";
-      let myIp = ppUtil.getMyIp();
+      let myIp = ppUtil$1.getMyIp();
 
       if (this.redisMessenger) {
         myIp = `${conf.pm_id}@${myIp}`;
@@ -1765,19 +1647,44 @@ class commonMessenger$1 {
       return this.redisMessenger.setMessageHandle(messageHandle, msgChannel);
     }
 
-    return noneRedisMessenger.setMessageHandle(messageHandle);
+    if (commonMessenger$1.onMessage.indexOf(messageHandle) < 0) {
+      commonMessenger$1.onMessage.push(messageHandle);
+    }
+
+    return commonMessenger$1;
   }
 
   static async publishMessage(message) {
     if (this.redisMessenger) {
       return this.redisMessenger.publish(message, msgChannel);
     } else {
-      return noneRedisMessenger.publishMessage(message);
+      //没有消息处理器，则将消息转发到目标地址（不支持pm2多进程）
+      if (message.destAddr) {
+        await forwardMessage(message);
+      } else {
+        for (let i = 0; i < conf.appSetting.serverHosts.length; i++) {
+          message.destAddr = conf.appSetting.serverHosts[i];
+
+          if (message.destAddr !== conf.myMsgAddr) {
+            await forwardMessage(message);
+          }
+        }
+      }
     }
   }
 
   static async handleInternalMessage(options) {
-    return await noneRedisMessenger.handleInternalMessage(options);
+    const message = options.replacements;
+
+    for (let i = 0; i < commonMessenger$1.onMessage.length; i++) {
+      const appMsgHandle = commonMessenger$1.onMessage[i];
+
+      try {
+        await appMsgHandle(message);
+      } catch (e) {
+        console.log(e);
+      }
+    }
   }
 
 }
@@ -1800,10 +1707,10 @@ var ppMessengerEx = commonMessenger$1;
 const apiUtil = ppUtilApi;
 const preconditions = ppPrecond;
 const commonMessenger = ppMessengerEx;
-var ppUtil$1 = {
+var ppUtil = {
   apiUtil,
   preconditions,
   commonMessenger
 };
 
-module.exports = ppUtil$1;
+module.exports = ppUtil;