fix: app.messenger.broadcast send to self

lib/app.js

@@ -236,25 +236,31 @@ function getProperty(target, prop) {
 
 function bindMessenger(Application, agent) {
   const agentMessenger = agent.messenger;
-  return class MeesengerApplication extends Application {
+  return class MessengerApplication extends Application {
     constructor(options) {
       super(options);
 
-      const appMessenger = this.messenger;
       agentMessenger.send = new Proxy(agentMessenger.send, {
-        apply(target, thisArg, [ action, data ]) {
-          setImmediate(() => appMessenger._onMessage({ action, data }));
-        },
+        apply: this._sendMessage.bind(this),
+      });
+    }
+    _sendMessage(target, thisArg, [ action, data, to ]) {
+      const appMessenger = this.messenger;
+      setImmediate(() => {
+
+        if (to === 'app') {
+          appMessenger._onMessage({ action, data });
+        } else {
+          agentMessenger._onMessage({ action, data });
+        }
       });
     }
     get messenger() {
       return this[MESSENGER];
     }
     set messenger(m) {
       m.send = new Proxy(m.send, {
-        apply(target, thisArg, [ action, data ]) {
-          setImmediate(() => agentMessenger._onMessage({ action, data }));
-        },
+        apply: this._sendMessage.bind(this),
       });
       this[MESSENGER] = m;
     }

test/app_proxy.test.js

@@ -282,5 +282,16 @@ describe('test/app_proxy.test.js', () => {
       assert(app._agent.eggReadyData.baseDir === baseDir);
       assert(app._app.eggReadyData.baseDir === baseDir);
     });
+
+    it('should broadcast message successfully', () => {
+      assert(app._app.recievedBroadcastAction === true);
+      assert(app._agent.recievedBroadcastAction === true);
+      assert(app._app.recievedAgentRecievedAction === true);
+    });
+
+    it('should send message from app to app', () => {
+      assert(app._app.recievedAppAction === true);
+    });
+
   });
 });

test/fixtures/messenger-binding/agent.js

@@ -4,6 +4,11 @@ module.exports = agent => {
   agent.received = [];
   agent.messenger.on('action', data => agent.received.push(data));
 
+  agent.messenger.on('broadcast-action', () => {
+    agent.recievedBroadcastAction = true;
+    agent.messenger.sendToApp('agent-recieved-broadcast-action');
+  });
+
   agent.messenger.sendToApp('action', 'send data when agent starting');
   agent.ready(() => {
     agent.messenger.sendToApp('action', 'send data when agent started');

test/fixtures/messenger-binding/app.js

@@ -4,9 +4,24 @@ module.exports = app => {
   app.received = [];
   app.messenger.on('action', data => app.received.push(data));
 
+  app.messenger.on('app-action', () => {
+    app.recievedAppAction = true;
+  });
+
+  app.messenger.on('broadcast-action', () => {
+    app.recievedBroadcastAction = true;
+  });
+
+  app.messenger.on('agent-recieved-broadcast-action', () => {
+    app.recievedAgentRecievedAction = true;
+  });
+
   app.messenger.sendToAgent('action', 'send data when app starting');
+
   app.ready(() => {
     app.messenger.sendToAgent('action', 'send data when app started');
+    app.messenger.broadcast('broadcast-action', 'broadcast action');
+    app.messenger.sendToApp('app-action', 'send action to app');
   });
   app.messenger.on('egg-ready', data => {
     app.eggReady = true;