abler-api 0.1.25 → 0.1.26

package/dist/cjs/pp-util.js

@@ -1685,58 +1685,19 @@ var ppUtil_1 = ppUtil$2;
 // 若 redis 可用，则使用基于 redis 的消息订阅发布系统
 // 若 redis 不可用，则将消息转发到其它主机
 
+const {
+  ppUtil: ppUtil$1
+} = require$$1__default["default"];
 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 onMessage = [];
 
   static initMessenger(appConfig, appErrCfg, msgChannel) {
     conf = appConfig;
@@ -1747,7 +1708,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 +1726,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 +1786,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;

package/dist/es/pp-util.js

@@ -1674,58 +1674,19 @@ var ppUtil_1 = ppUtil$2;
 // 若 redis 可用，则使用基于 redis 的消息订阅发布系统
 // 若 redis 不可用，则将消息转发到其它主机
 
+const {
+  ppUtil: ppUtil$1
+} = require$$1;
 const RedisMessenger = ppUtil_1;
 const {
   netUtil
 } = require$$3;
 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;
@@ -1736,7 +1697,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}`;
@@ -1754,19 +1715,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);
+      }
+    }
   }
 
 }
@@ -1789,10 +1775,10 @@ var ppMessengerEx = commonMessenger$1;
 const apiUtil = ppUtilApi;
 const preconditions = ppPrecond;
 const commonMessenger = ppMessengerEx;
-var ppUtil$1 = {
+var ppUtil = {
   apiUtil,
   preconditions,
   commonMessenger
 };
 
-export { ppUtil$1 as default };
+export { ppUtil as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "module": "./dist/es/pp-util.js",