Issue 4783 - Use Port API for the messageResponder

background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 319 matching lines @@
     applicationVersion: "34.0",
     addonName: "adblockplus",
     addonVersion: "2.6.7"
   };
   updateFromURL(modules.info);
 
   modules.subscriptionInit = {
     reinitialized: params.filterlistsReinitialized
   };
 
-  let messageListeners = {};
   modules.messaging = {

[Sebastian Noack, 2017/01/13 12:12:10]

Can you please just use the EventEmitter class here, rather than duplicating the
very same logic?

[kzar, 2017/01/16 04:27:02]

Well I'm not sure I can since the EventEmitter class is defined in
adblockpluschrome not this repository. Unless you mean for me to copy and paste
the whole thing in here?

[Sebastian Noack, 2017/01/16 13:46:38]

See line 20 in this file. There is a class called EventEmitter which you could
use here.

[kzar, 2017/01/16 14:25:56]

Oh yea, sorry I missed that. Done.

-    port: {
-      on: (name, callback) =>
-      {
-        if (!(name in messageListeners))
-          messageListeners[name] = [];
-        messageListeners[name].push(callback);
-      },
-      off: (name, callback) =>
-      {
-        if (!(name in messageListeners))
-          return;
-
-        let index = messageListeners[name].indexOf(callback);
-        if (index == -1)
-          return;
-
-        if (messageListeners[name].length == 1)
-          delete messageListeners[name];
-        else
-          messageListeners[name].splice(index, 1);
-      }
-    }
-  };
+    port: new EventEmitter()
+  };
+
   window.addEventListener("message", event =>
   {
     if (event.data.type != "message")
       return;
     let message = event.data.payload;
     let messageId = event.data.messageId;
     let sender = {
       page: new ext.Page(event.source)
     };
 
-    let listeners = messageListeners[message.type];
+    let listeners = modules.messaging.port._listeners[message.type];
     if (!listeners)
       return;
 
     function reply(message)
     {
       event.source.postMessage({
         type: "response",
         messageId: messageId,
         payload: message
       }, "*");
@@ skipping 160 matching lines @@
 
   if (params.safariContentBlocker)
   {
     global.safari = {
       extension: {
         setContentBlocker: function() {}
       }
     };
   }
 })(this);