abler-api 0.1.21 → 0.1.24

package/dist/cjs/pp-util.js

@@ -1,29 +1,29 @@
 'use strict';
 
-var require$$0 = require('crypto');
+var require$$0$1 = require('crypto');
 var require$$1 = require('abler-util');
 var require$$2 = require('abler-db');
 var require$$3 = require('abler-net');
-var require$$0$1 = require('fs');
+var require$$0$2 = require('fs');
 var require$$1$1 = require('path');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
+var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 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$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
+var require$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$2);
 var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 
-const crypto = require$$0__default["default"];
-const ppUtil$2 = require$$1__default["default"].ppUtil;
+const crypto = require$$0__default$1["default"];
+const ppUtil$4 = require$$1__default["default"].ppUtil;
 const {
   dbUtil,
   kvStorage
 } = require$$2__default["default"];
-const netUtil = require$$3__default["default"];
-let conf$1, appSetting, err$1, dbSql;
+const netUtil$1 = require$$3__default["default"];
+let conf$2, appSetting$1, err$1, dbSql;
 const pnToken = "access_token",
       hnToken = pnToken,
       pnApiKey = "apiKey",
@@ -31,22 +31,22 @@ const pnToken = "access_token",
       // 我们接收到的 headers 中的字段名总是全小写的
 pnApiSecret = "apiSecret",
       hnApiSecret = pnApiSecret.toLowerCase();
-const MD5 = ppUtil$2.MD5,
-      moveProperty = ppUtil$2.moveProperty;
+const MD5 = ppUtil$4.MD5,
+      moveProperty = ppUtil$4.moveProperty;
 
 class apiUtil$1 {
-  static debugFlag = ppUtil$2.newGuid(); //应用必须设置，否则谁也不知道是啥
+  static debugFlag = ppUtil$4.newGuid(); //应用必须设置，否则谁也不知道是啥
 
-  static testFlag = ppUtil$2.newGuid();
+  static testFlag = ppUtil$4.newGuid();
   static envId_dev = "?"; // static apiCallRecSaver;
 
   static config(appConfig, appErrCfg, appDbSql) {
-    ppUtil$2.config(appConfig, appErrCfg);
-    conf$1 = appConfig;
-    appSetting = conf$1?.appSetting;
+    ppUtil$4.config(appConfig, appErrCfg);
+    conf$2 = appConfig;
+    appSetting$1 = conf$2?.appSetting;
     err$1 = appErrCfg, dbSql = appDbSql;
-    apiUtil$1.debugFlag = appSetting?.debugFlag || apiUtil$1.debugFlag;
-    apiUtil$1.testFlag = appSetting?.testFlag || apiUtil$1.testFlag; // apiUtil.apiCallRecSaver = apiCallRecSaver;
+    apiUtil$1.debugFlag = appSetting$1?.debugFlag || apiUtil$1.debugFlag;
+    apiUtil$1.testFlag = appSetting$1?.testFlag || apiUtil$1.testFlag; // apiUtil.apiCallRecSaver = apiCallRecSaver;
   } //#region ===== 需要应用系统重写的方法
 
   /**
@@ -57,7 +57,7 @@ class apiUtil$1 {
 
 
   static _getApiSecret(companyId) {
-    return ppUtil$2.newGuid();
+    return ppUtil$4.newGuid();
   }
   /**
    * 保存 API 调用记录,应用系统必须重写此方法
@@ -160,7 +160,7 @@ class apiUtil$1 {
 
 
   static setParamsFunctions(params) {
-    ppUtil$2.defUnenumProp(params, "asNumber", function (name, minValue, maxValue, defaultValue) {
+    ppUtil$4.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 +171,7 @@ class apiUtil$1 {
 
       return result;
     });
-    ppUtil$2.defUnenumProp(params, "asBool", function (name, defaultValue) {
+    ppUtil$4.defUnenumProp(params, "asBool", function (name, defaultValue) {
       if (this[name] === undefined) return defaultValue;
       let result = JSON.parse(this[name]);
       return !!result;
@@ -236,7 +236,7 @@ class apiUtil$1 {
 
   static apiFail(error, req) {
     configNeeded();
-    let response = err$1.ERROR(error, err$1.errorLangParamFlag + ppUtil$2.getMsgLang(req));
+    let response = err$1.ERROR(error, err$1.errorLangParamFlag + ppUtil$4.getMsgLang(req));
     response.datetime = new Date();
 
     if (req && req.headers) {
@@ -484,7 +484,7 @@ class apiUtil$1 {
     const params = apiUtil$1.extractParams(req);
     req.accessToken = req.accessToken || apiUtil$1.extractToken(req);
 
-    if (req.accessToken === MD5(ppUtil$2.idNumDisturbing)) {
+    if (req.accessToken === MD5(ppUtil$4.idNumDisturbing)) {
       //todo: 检查IP
       params.__internal__ = true;
       req.ignoreToken = true; // if (params.idNum || params.personId) {
@@ -541,7 +541,7 @@ class apiUtil$1 {
 
       if (dbgToken) {
         let envId = process.env.ECS_DEPLOY_ID;
-        req.__debug__ = dbgToken && dbgToken === MD5(req.headers.timestamp, ppUtil$2.commonHashDisturbing) && (envId === "florist_longdan" || envId === "shuzi");
+        req.__debug__ = dbgToken && dbgToken === MD5(req.headers.timestamp, ppUtil$4.commonHashDisturbing) && (envId === "florist_longdan" || envId === "shuzi");
       } else {
         req.__debug__ = false;
       } // console.log("__debug__:", req.__debug__, "dbgToken:", dbgToken);
@@ -580,7 +580,7 @@ class apiUtil$1 {
 
 
   static tokenExpireTime(req) {
-    return apiUtil$1.isDebugMode(req) ? 30 * 24 * 60 * 60 : apiUtil$1.isTestMode(req) ? 4 * 60 * 60 : appSetting.tokenExpireTime;
+    return apiUtil$1.isDebugMode(req) ? 30 * 24 * 60 * 60 : apiUtil$1.isTestMode(req) ? 4 * 60 * 60 : appSetting$1.tokenExpireTime;
   }
   /**
    * 获取用户令牌保存键
@@ -721,7 +721,7 @@ class apiUtil$1 {
         };
 
         if (rec.secret !== "") {
-          rec.secret = ppUtil$2.getEncAse192(rec.secret);
+          rec.secret = ppUtil$4.getEncAse192(rec.secret);
         }
 
         req.apiCallRec = rec;
@@ -1021,7 +1021,7 @@ class apiUtil$1 {
         paramExists = typeof params[paramName] != 'undefined' || typeof params[paramName + paramSufix] != 'undefined';
       }
 
-      if (!paramExists) return ppUtil$2.errorPormise(err$1.ERROR(err$1.PARAMETER_NEEDED, paramName));
+      if (!paramExists) return ppUtil$4.errorPormise(err$1.ERROR(err$1.PARAMETER_NEEDED, paramName));
     }
 
     return Promise.resolve(paramSufix);
@@ -1056,8 +1056,8 @@ class apiUtil$1 {
   static getEnvHosts(params) {
     configNeeded();
     return {
-      hosts: appSetting.serverHosts || ["localhost"],
-      port: appSetting.listenPort || +params.port || 8443
+      hosts: appSetting$1.serverHosts || ["localhost"],
+      port: appSetting$1.listenPort || +params.port || 8443
     };
   }
   /**
@@ -1070,7 +1070,7 @@ class apiUtil$1 {
 
   static async hostIsMySelf(host, req) {
     let clientIp = apiUtil$1.getClientIp(req);
-    return ppUtil$2.getMyIp({
+    return ppUtil$4.getMyIp({
       hosts: [host, clientIp]
     });
   }
@@ -1085,9 +1085,9 @@ class apiUtil$1 {
     configNeeded();
     const params = options.replacements;
     const myEnvHosts = apiUtil$1.getEnvHosts(params);
-    const myIp = ppUtil$2.getMyIp();
+    const myIp = ppUtil$4.getMyIp();
     const host = params.host || myIp;
-    if (!myEnvHosts.hosts.contains(host)) throw [err$1.ACCESS_REFUSED, `环境${conf$1.envId}貌似无此主机：${params.host}`];
+    if (!myEnvHosts.hosts.contains(host)) throw [err$1.ACCESS_REFUSED, `环境${conf$2.envId}貌似无此主机：${params.host}`];
 
     if (!apiUtil$1.hostIsMySelf(host, options._res.req)) {
       let result = await apiUtil$1.forwardsTo(host, myEnvHosts.port, params, options._res.req, myIp);
@@ -1122,7 +1122,7 @@ class apiUtil$1 {
       url: url,
       data: params
     };
-    let result = await netUtil.apiRequest(reqOptions);
+    let result = await netUtil$1.apiRequest(reqOptions);
 
     if (result.status !== 200) {
       console.log(`访问 ${reqOptions.url} 出错`, result.status, result.res.statusMessage);
@@ -1142,7 +1142,7 @@ class apiUtil$1 {
     let keys = Array.isArray(keyPath) ? keyPath : keyPath.split(".");
     let parentKey = "";
     let key = "config";
-    let value = conf$1;
+    let value = conf$2;
     let parent = null;
 
     for (let i = 0; i < keys.length; i++) {
@@ -1387,7 +1387,7 @@ class apiUtil$1 {
     if (await apiUtil$1.checkForwardsHost(options)) return true;
     let c = apiUtil$1.parseCfgPath(item);
     delete c.parent;
-    c.host = ppUtil$2.getMyIp();
+    c.host = ppUtil$4.getMyIp();
     return c;
   }
   /**
@@ -1415,7 +1415,7 @@ class apiUtil$1 {
     c.newValue = params.value;
     c.parent[c.key] = c.newValue;
     delete c.parent;
-    c.host = ppUtil$2.getMyIp();
+    c.host = ppUtil$4.getMyIp();
     return c; // 应用层自行处理多机同步
   } //#endregion
 
@@ -1423,25 +1423,21 @@ class apiUtil$1 {
 }
 
 function configNeeded() {
-  if (!conf$1 || !err$1) {
-    ppUtil$2.configNeeded();
-    conf$1 = ppUtil$2.appConfig;
-    appSetting = conf$1.appSetting;
-    err$1 = ppUtil$2.appErrCfg;
+  if (!conf$2 || !err$1) {
+    ppUtil$4.configNeeded();
+    conf$2 = ppUtil$4.appConfig;
+    appSetting$1 = conf$2.appSetting;
+    err$1 = ppUtil$4.appErrCfg;
   }
 }
 
 var ppUtilApi = apiUtil$1;
 
-function commonjsRequire(path) {
-	throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
-}
-
-const fs = require$$0__default$1["default"];
+const fs = require$$0__default$2["default"];
 const path = require$$1__default$1["default"];
-const ppUtil$1 = require$$1__default["default"].ppUtil;
+const ppUtil$3 = require$$1__default["default"].ppUtil;
 const redisUtil = require$$2__default["default"].redisUtil;
-let conf, err; // const dbCheck = require('../dbupdate/dd-version');
+let conf$1, err; // const dbCheck = require('../dbupdate/dd-version');
 
 /**
  * API服务启动时前置条件检查
@@ -1460,10 +1456,10 @@ class preconditions$1 {
   static checkPromises = [];
 
   static setAppName(aName) {
-    ppUtil$1.configNeeded();
-    conf = ppUtil$1.appConfig;
-    err = ppUtil$1.appErrCfg;
-    preconditions$1.appName = aName || conf.thisApp;
+    ppUtil$3.configNeeded();
+    conf$1 = ppUtil$3.appConfig;
+    err = ppUtil$3.appErrCfg;
+    preconditions$1.appName = aName || conf$1.thisApp;
     return preconditions$1;
   }
 
@@ -1520,8 +1516,8 @@ class preconditions$1 {
    */
 
 
-  static async checkExEnvSetting() {
-    return await checkExEnvSetting();
+  static async checkExEnvSetting(loadjs) {
+    return await checkExEnvSetting(loadjs);
   }
   /**
    * redis 可用性检查
@@ -1542,30 +1538,30 @@ class preconditions$1 {
 
 async function createEnvSettingFile(fileName) {
   try {
-    const cfgText = await ppUtil$1.doCreateEnvSettingFile(fileName);
+    const cfgText = await ppUtil$3.doCreateEnvSettingFile(fileName);
 
-    if (cfgText.indexOf(`cfgVersion: "${conf._envSetting.cfgVersion}"`) > 0) {
+    if (cfgText.indexOf(`cfgVersion: "${conf$1._envSetting.cfgVersion}"`) > 0) {
       console.log(`\n*** 已創建新的本機環境配置文件\n${fileName}\n请檢查各項內容是否正确(此项更新服务可正常运行)\n\n`);
       return "";
     }
 
-    return `已創建新的本機環境配置文件\n${fileName}\n请檢查並正確設置各項內容，然後將配置版本號修改為${conf._envSettings.default.cfgVersion}`;
+    return `已創建新的本機環境配置文件\n${fileName}\n请檢查並正確設置各項內容，然後將配置版本號修改為${conf$1._envSettings.default.cfgVersion}`;
   } catch (e) {
     return `創建本機環境配置文件失敗\n《${fileName}》\n${err.ERROR(e).message}`;
   }
 }
 
-async function checkExEnvSetting() {
-  if (!conf._envSetting.localSettingImported) {
-    let fileName = conf.getEnvSettingFileName();
+async function checkExEnvSetting(loadjs) {
+  if (!conf$1._envSetting.localSettingImported) {
+    let fileName = conf$1.getEnvSettingFileName();
 
     if (!fs.existsSync(fileName)) {
       return await createEnvSettingFile(fileName);
     }
 
-    let envSettingEx = commonjsRequire(fileName);
+    let envSettingEx = loadjs(fileName);
 
-    if (envSettingEx.cfgVersion !== conf._envSettings.default.cfgVersion) {
+    if (envSettingEx.cfgVersion !== conf$1._envSettings.default.cfgVersion) {
       if (envSettingEx.cfgVersion !== "0.0") {
         let fp = path.parse(fileName);
         let newFileName = path.join(fp.dir, fp.name + envSettingEx.cfgVersion + fp.ext);
@@ -1584,10 +1580,10 @@ async function checkExEnvSetting() {
 
 
 async function checkRedis() {
-  if (!conf.redis.enabled) return "";
+  if (!conf$1.redis.enabled) return "";
   const redis = redisUtil.newClient("io"); // console.log(`checkRedis begin：`);
 
-  await ppUtil$1.wait(15 * 1000, param => {
+  await ppUtil$3.wait(15 * 1000, param => {
     if (redis.ready && redis.connected || redis.error) {
       return true;
     }
@@ -1605,11 +1601,209 @@ 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 {
+  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 initMessenger(appConfig, appErrCfg, msgChannel) {
+    conf = appConfig;
+    this.redisMessenger = conf.redis.enabled ? new RedisMessenger(appConfig, appErrCfg, msgChannel).subscribe(msgChannel) : null;
+    this.myMsgAddr = commonMessenger$1.getMyMsgAddr();
+  }
+
+  static getMyMsgAddr() {
+    if (!conf.myMsgAddr) {
+      conf.pm_id = process.env.pm_id || "0";
+      let myIp = ppUtil.getMyIp();
+
+      if (this.redisMessenger) {
+        myIp = `${conf.pm_id}@${myIp}`;
+      }
+
+      conf.myMsgAddr = myIp;
+      console.log(`myMsgAddr: `, conf.myMsgAddr);
+    }
+
+    return conf.myMsgAddr;
+  }
+
+  static setMessageHandle(messageHandle) {
+    if (this.redisMessenger) {
+      return this.redisMessenger.setMessageHandle(messageHandle, msgChannel);
+    }
+
+    return noneRedisMessenger.setMessageHandle(messageHandle);
+  }
+
+  static async publishMessage(message) {
+    if (this.redisMessenger) {
+      return this.redisMessenger.publish(message, msgChannel);
+    } else {
+      return noneRedisMessenger.publishMessage(message);
+    }
+  }
+
+  static async handleInternalMessage(options) {
+    return await noneRedisMessenger.handleInternalMessage(options);
+  }
+
+}
+
+async function forwardMessage(message) {
+  let reqOptions = {
+    url: `https://${message.destAddr}:${appSetting.listenPort}/api/message`,
+    method: "POST",
+    data: message
+  };
+  let res = await netUtil.apiRequest(reqOptions).catch(e => {
+    console.log(`转发消息失败, url: ${reqOptions.url}`, e);
+    throw e;
+  });
+  return res.data;
+}
+
+var ppMessengerEx = commonMessenger$1;
+
 const apiUtil = ppUtilApi;
 const preconditions = ppPrecond;
-var ppUtil = {
+const commonMessenger = ppMessengerEx;
+var ppUtil$1 = {
   apiUtil,
-  preconditions
+  preconditions,
+  commonMessenger
 };
 
-module.exports = ppUtil;
+module.exports = ppUtil$1;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "abler-api",
-  "version": "0.1.21",
+  "version": "0.1.24",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
-  "-module": "./dist/es/pp-util.js",
+  "module": "./dist/es/pp-util.js",
   "scripts": {
     "build": "npx rollup -c rollup.config.js",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -17,6 +17,7 @@
     "q": "^1.5.1",
     "abler-util": ">=0.1.1",
     "abler-db": ">=0.1.1",
+    "abler-messenger": ">=0.1.1",
     "abler-net": ">=0.1.1"
   },
   "devDependencies": {