From a15d45940396b24cbd9d4c281da01fca35ac665e Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Thu, 23 Nov 2017 16:38:45 +0100
Subject: [PATCH 01/28] Start implementing webRequest

---
 example/app.html                       |  3 +-
 example/main.js                        |  4 +-
 lib/browser/api/index.js               |  4 +-
 lib/browser/api/web-request.js         | 52 ++++++++++++++++++
 lib/browser/chrome-extension.js        |  1 +
 lib/renderer/extensions/web-request.js | 73 ++++++++++++++++++++------
 6 files changed, 118 insertions(+), 19 deletions(-)
 create mode 100644 lib/browser/api/web-request.js

diff --git a/example/app.html b/example/app.html
index 2c38dd1..e1db283 100644
--- a/example/app.html
+++ b/example/app.html
@@ -13,7 +13,8 @@
   </style>
 
   <div class="container">
-    <webview allowPopups webpreferences="webSecurity=no" preload='../preload.js' src="https://mail.google.com/"></webview>
+    <!--<webview allowPopups webpreferences="webSecurity=no" preload='../preload.js' src="https://mail.google.com/"></webview>-->
+    <webview allowPopups preload='../preload.js' src="https://inbox.google.com/"></webview>
   </div>
   <script>
     setTimeout(() => Array.from(document.getElementsByTagName('webview')).forEach(w => w.openDevTools()), 1000)
diff --git a/example/main.js b/example/main.js
index 3c9a380..550e4ba 100644
--- a/example/main.js
+++ b/example/main.js
@@ -42,8 +42,8 @@ function createWindow () {
 app.on('ready', createWindow)
 
 app.on('ready', () => {
-  //extensions.addExtension(path.join(__dirname, './extensions/mixmax'))
-  extensions.addExtension(path.join(__dirname, './extensions/gmelius'))
+  extensions.addExtension(path.join(__dirname, './extensions/mixmax'))
+  // extensions.addExtension(path.join(__dirname, './extensions/gmelius'))
   //extensions.addExtension(path.join(__dirname, './extensions/dummy-extension'))
 })
 
diff --git a/lib/browser/api/index.js b/lib/browser/api/index.js
index 6803cc3..d6b3304 100644
--- a/lib/browser/api/index.js
+++ b/lib/browser/api/index.js
@@ -1,12 +1,14 @@
 const ChromeStorageAPIHandler = require('./storage');
+const ChromeWebRequestAPIHandler = require('./web-request');
 
 class ChromeAPIHandler {
     constructor(extensionId) {
         this.storage = new ChromeStorageAPIHandler(extensionId);
+        this.webRequest = new ChromeWebRequestAPIHandler(extensionId);
     }
 
     release() {
-        this.storage.release();
+        [this.storage, this.webRequest].forEach((api) => api.release())
     }
 }
 
diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
new file mode 100644
index 0000000..ca4557e
--- /dev/null
+++ b/lib/browser/api/web-request.js
@@ -0,0 +1,52 @@
+const { rpc, RpcIpcManager } = require('electron-simple-rpc');
+const capitalize = require('capitalize');
+const { session } = require('electron');
+
+class ChromeWebRequestAPIHandler {
+  constructor(extensionId) {
+
+    this.electronWebRequestApi = session.defaultSession.webRequest;
+
+    const rpcScopeMain = `chrome-webRequest-${extensionId}-main`;
+    const rpcScopeRenderer = `chrome-webRequest-${extensionId}-renderer`;
+
+    const lib = {};
+    ['onBeforeRequest', 'onBeforeSendHeaders', 'onSendHeaders', 'onHeadersReceived',
+      'onAuthRequired', 'onResponseStarted', 'onBeforeRedirect', 'onCompleted', 'onErrorOccurred']
+      .forEach(methodName => {
+        this[capitalize(`triggerCallBack${methodName}`)] = (details, callback, callbackId) => {
+          rpc(rpcScopeRenderer, capitalize(`callBack${methodName}`))(callbackId, details)
+            .then(cbReturn => {
+              console.log('cbReturn')
+              console.log(cbReturn)
+              console.log(callback)
+              return console.log(callback(cbReturn))
+            })
+        };
+        lib[capitalize(`registerCbFor${methodName}`)] = (args) => {
+          const callbackId = args.callbackId;
+          this.electronWebRequestApi[methodName](args.filter, (details, callback) => {
+            if (details.responseHeaders) {
+              const responseHeaders = [];
+              Object.keys(details.responseHeaders).forEach((k) => {
+                responseHeaders.push({ name: k, value: details.responseHeaders[k][0] });
+              });
+              details.responseHeaders = responseHeaders;
+            }
+
+            if (!(!!details || !!callback))
+              return;
+
+            this[capitalize(`triggerCallBack${methodName}`)](details, callback, callbackId);
+          });
+        }
+    });
+    this.rpcManager = new RpcIpcManager(lib, rpcScopeMain);
+  }
+
+  release() {
+    this.rpcManager.release();
+  }
+}
+
+module.exports = ChromeWebRequestAPIHandler;
\ No newline at end of file
diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index d785d77..5bcb209 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -97,6 +97,7 @@ const startBackgroundPages = function (manifest) {
       `--preload=${path.join(__dirname, '../../preload.js')}`
     ]
   })
+  contents.openDevTools()
   backgroundPages[manifest.extensionId] = { html: html, webContents: contents, name: name }
   contents.loadURL(url.format({
     protocol: constants.EXTENSION_PROTOCOL,
diff --git a/lib/renderer/extensions/web-request.js b/lib/renderer/extensions/web-request.js
index b71b50c..bf8f0ff 100644
--- a/lib/renderer/extensions/web-request.js
+++ b/lib/renderer/extensions/web-request.js
@@ -1,17 +1,60 @@
-const Event = require('./event');
-
-exports.setup = extensionId => {
-    return {
-        onBeforeRequest: new Event(),
-        onBeforeSendHeaders: new Event(),
-        onSendHeaders: new Event(),
-        onHeadersReceived: new Event(),
-        onAuthRequired: new Event(),
-        onResponseStarted: new Event(),
-        onBeforeRedirect: new Event(),
-        onCompleted: new Event(),
-        onErrorOccurred: new Event(),
-        handlerBehaviorChanged () {},
-        MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: 10
+const { rpc, RpcIpcManager } = require('electron-simple-rpc');
+const capitalize = require('capitalize');
+
+class CallbackRegistry {
+  constructor () {
+    this.cbs = new Map();
+    this.cbIdIncrement = 0;
+  }
+
+  addCallback(callback) {
+    this.cbIdIncrement = this.cbIdIncrement + 1;
+    this.cbs.set(this.cbIdIncrement, callback);
+    return this.cbIdIncrement;
   }
 }
+
+const callbackRegistry = new CallbackRegistry();
+
+class Event {
+  constructor (webRequestMethodName, rpcScopeMain) {
+    this.webRequestMethodName = webRequestMethodName;
+    this.rpcScopeMain = rpcScopeMain;
+    this.listeners = [];
+  }
+
+  addListener (callback, filter, extraInfos) {
+    const cbID = callbackRegistry.addCallback(callback)
+
+    const webRequestHandler = {
+      filter: filter,
+      callbackId: cbID
+    };
+
+    rpc(this.rpcScopeMain,  capitalize(`registerCbFor${this.webRequestMethodName}`))(webRequestHandler);
+    this.listeners.push(webRequestHandler)
+  }
+}
+
+class ChromeWebRequestAPIClient {
+  constructor(extensionId) {
+    this.rpcScopeMain = `chrome-webRequest-${extensionId}-main`;
+    this.rpcScopeRenderer = `chrome-webRequest-${extensionId}-renderer`;
+    this.MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES = 10;
+
+    const lib = {};
+    ['onBeforeRequest', 'onBeforeSendHeaders', 'onSendHeaders', 'onHeadersReceived',
+      'onAuthRequired', 'onResponseStarted', 'onBeforeRedirect', 'onCompleted', 'onErrorOccurred']
+      .forEach(methodName => {
+        this[methodName] = new Event(methodName, this.rpcScopeMain);
+        lib[capitalize(`callBack${methodName}`)] = (callbackId, details) => {
+          const callback = callbackRegistry.cbs.get(callbackId);
+          return callback(details)
+        }
+      });
+
+    this.rpcManager = new RpcIpcManager(lib, this.rpcScopeRenderer);
+  }
+}
+
+exports.setup = extensionId => new ChromeWebRequestAPIClient(extensionId);

From d016ab6b61b7203032081fa753af8836fd1c83b4 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Thu, 23 Nov 2017 17:02:48 +0100
Subject: [PATCH 02/28] Pass urls only

---
 lib/browser/api/web-request.js         | 5 +----
 lib/renderer/extensions/web-request.js | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index ca4557e..01b796e 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -17,10 +17,7 @@ class ChromeWebRequestAPIHandler {
         this[capitalize(`triggerCallBack${methodName}`)] = (details, callback, callbackId) => {
           rpc(rpcScopeRenderer, capitalize(`callBack${methodName}`))(callbackId, details)
             .then(cbReturn => {
-              console.log('cbReturn')
-              console.log(cbReturn)
-              console.log(callback)
-              return console.log(callback(cbReturn))
+              return callback(cbReturn)
             })
         };
         lib[capitalize(`registerCbFor${methodName}`)] = (args) => {
diff --git a/lib/renderer/extensions/web-request.js b/lib/renderer/extensions/web-request.js
index bf8f0ff..f65088a 100644
--- a/lib/renderer/extensions/web-request.js
+++ b/lib/renderer/extensions/web-request.js
@@ -27,7 +27,7 @@ class Event {
     const cbID = callbackRegistry.addCallback(callback)
 
     const webRequestHandler = {
-      filter: filter,
+      filter: filter.urls,
       callbackId: cbID
     };
 

From 617dceb50b35f68c803080ecb9b1b53a98709bd1 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Fri, 24 Nov 2017 14:31:54 +0100
Subject: [PATCH 03/28] Dummy webRequest

---
 example/app.html                              |  3 +-
 example/extensions/dummy-extension/a.js       | 39 +++++++++++++++++++
 .../extensions/dummy-extension/manifest.json  |  6 +++
 example/main.js                               | 33 +++++++++++++++-
 lib/browser/api/web-request.js                | 13 ++++++-
 lib/renderer/extensions/web-request.js        | 25 ++++--------
 6 files changed, 98 insertions(+), 21 deletions(-)

diff --git a/example/app.html b/example/app.html
index e1db283..1303877 100644
--- a/example/app.html
+++ b/example/app.html
@@ -14,7 +14,8 @@
 
   <div class="container">
     <!--<webview allowPopups webpreferences="webSecurity=no" preload='../preload.js' src="https://mail.google.com/"></webview>-->
-    <webview allowPopups preload='../preload.js' src="https://inbox.google.com/"></webview>
+    <webview allowPopups preload='../preload.js' src="http://motherfuckingwebsite.com/"></webview>
+    <!--<webview allowPopups preload='../preload.js' src="https://inbox.google.com/"></webview>-->
   </div>
   <script>
     setTimeout(() => Array.from(document.getElementsByTagName('webview')).forEach(w => w.openDevTools()), 1000)
diff --git a/example/extensions/dummy-extension/a.js b/example/extensions/dummy-extension/a.js
index b2f2ffa..4ad0d34 100644
--- a/example/extensions/dummy-extension/a.js
+++ b/example/extensions/dummy-extension/a.js
@@ -1,3 +1,42 @@
+chrome.webRequest.onBeforeSendHeaders.addListener(function(details) {
+  details.requestHeaders['User-Agent'] = 'My Awesome Agent'
+
+  return {
+    cancel: false,
+    requestHeaders: details.requestHeaders,
+    statusLine: 'HTTP/1.1 200 OK'
+  };
+}, {
+  urls: ['<all_urls>'],
+  types: ['main_frame']
+});
+
+chrome.webRequest.onHeadersReceived.addListener(function(details) {
+  details.responseHeaders.push({
+    name: 'X-Test',
+    value: ['ok']
+  })
+
+  return {
+    cancel: false,
+    responseHeaders: details.responseHeaders,
+    statusLine: 'HTTP/1.1 200 OK'
+  };
+}, {
+  urls: ['<all_urls>'],
+  types: ['main_frame']
+}, ['blocking', 'responseHeaders']);
+
+function reqListener () {
+  console.log('--- XMLHttpRequest from extension')
+  console.log(this.getAllResponseHeaders());
+}
+
+var oReq = new XMLHttpRequest();
+oReq.addEventListener("load", reqListener);
+oReq.open("GET", `http://motherfuckingwebsite.com/?foo=${Date.now()}`);
+oReq.send();
+
 console.log('I\' m injected')
 var foo = "FOOOOO"
 // throw new Error('Foo')
diff --git a/example/extensions/dummy-extension/manifest.json b/example/extensions/dummy-extension/manifest.json
index cef202a..fb2b32c 100644
--- a/example/extensions/dummy-extension/manifest.json
+++ b/example/extensions/dummy-extension/manifest.json
@@ -6,6 +6,12 @@
       "matches": [ "<all_urls>"],
       "run_at": "document_end"
    }],
+   "permissions": [
+      "webRequest",
+      "webRequestBlocking",
+      "*://*/*",
+      "background"
+   ],
    "description": "Dummy Extension",
    "manifest_version": 2,
    "name": "Dummy Extension",
diff --git a/example/main.js b/example/main.js
index 550e4ba..362fef0 100644
--- a/example/main.js
+++ b/example/main.js
@@ -1,6 +1,7 @@
 const electron = require('electron')
 // Module to control application life.
 const app = electron.app
+const session = electron.session
 // Module to create native browser window.
 const BrowserWindow = electron.BrowserWindow
 
@@ -42,9 +43,37 @@ function createWindow () {
 app.on('ready', createWindow)
 
 app.on('ready', () => {
-  extensions.addExtension(path.join(__dirname, './extensions/mixmax'))
+  // extensions.addExtension(path.join(__dirname, './extensions/mixmax'))
   // extensions.addExtension(path.join(__dirname, './extensions/gmelius'))
-  //extensions.addExtension(path.join(__dirname, './extensions/dummy-extension'))
+  extensions.addExtension(path.join(__dirname, './extensions/dummy-extension'))
+
+  const filter = {
+    urls: ['<all_urls>']
+  }
+  //
+  // session.defaultSession.webRequest.onHeadersReceived(filter, (details, callback) => {
+  //   details.responseHeaders['Content-Type'] = ['text/plain'];
+  //   details.responseHeaders['User-Agent'] = ['My Awesome Agent'];
+  //   console.log('--- onHeadersReceived')
+  //   console.log({
+  //     cancel: false,
+  //     responseHeaders: details.responseHeaders,
+  //     statusLine: 'HTTP/1.1 200 OK'
+  //   })
+  //
+  //   callback({
+  //     cancel: false,
+  //     responseHeaders: details.responseHeaders,
+  //     statusLine: 'HTTP/1.1 200 OK'
+  //   })
+  // })
+  //
+  // session.defaultSession.webRequest.onResponseStarted(filter, (details) => {
+  //   if (details.url.indexOf('chrome-devtools://') === -1) {
+  //     console.log('--- onResponseStarted')
+  //     console.log(details);
+  //   }
+  // });
 })
 
 // Quit when all windows are closed.
diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index 01b796e..f347ae5 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -17,6 +17,17 @@ class ChromeWebRequestAPIHandler {
         this[capitalize(`triggerCallBack${methodName}`)] = (details, callback, callbackId) => {
           rpc(rpcScopeRenderer, capitalize(`callBack${methodName}`))(callbackId, details)
             .then(cbReturn => {
+              console.log('--- cbReturn before')
+              console.log(cbReturn)
+              if (cbReturn.responseHeaders) {
+                const responseHeaders = {};
+                cbReturn.responseHeaders.forEach((header) => {
+                  return responseHeaders[header.name] = header.value
+                });
+                cbReturn.responseHeaders = responseHeaders;
+              }
+              console.log('--- cbReturn after')
+              console.log(cbReturn)
               return callback(cbReturn)
             })
         };
@@ -26,7 +37,7 @@ class ChromeWebRequestAPIHandler {
             if (details.responseHeaders) {
               const responseHeaders = [];
               Object.keys(details.responseHeaders).forEach((k) => {
-                responseHeaders.push({ name: k, value: details.responseHeaders[k][0] });
+                responseHeaders.push({ name: k, value: [details.responseHeaders[k][0]]});
               });
               details.responseHeaders = responseHeaders;
             }
diff --git a/lib/renderer/extensions/web-request.js b/lib/renderer/extensions/web-request.js
index f65088a..c615004 100644
--- a/lib/renderer/extensions/web-request.js
+++ b/lib/renderer/extensions/web-request.js
@@ -1,20 +1,7 @@
 const { rpc, RpcIpcManager } = require('electron-simple-rpc');
 const capitalize = require('capitalize');
 
-class CallbackRegistry {
-  constructor () {
-    this.cbs = new Map();
-    this.cbIdIncrement = 0;
-  }
-
-  addCallback(callback) {
-    this.cbIdIncrement = this.cbIdIncrement + 1;
-    this.cbs.set(this.cbIdIncrement, callback);
-    return this.cbIdIncrement;
-  }
-}
-
-const callbackRegistry = new CallbackRegistry();
+const callbackRegistry = new Map();
 
 class Event {
   constructor (webRequestMethodName, rpcScopeMain) {
@@ -24,11 +11,11 @@ class Event {
   }
 
   addListener (callback, filter, extraInfos) {
-    const cbID = callbackRegistry.addCallback(callback)
+    callbackRegistry.set((callbackRegistry.size + 1), callback)
 
     const webRequestHandler = {
       filter: filter.urls,
-      callbackId: cbID
+      callbackId: callbackRegistry.size
     };
 
     rpc(this.rpcScopeMain,  capitalize(`registerCbFor${this.webRequestMethodName}`))(webRequestHandler);
@@ -48,7 +35,11 @@ class ChromeWebRequestAPIClient {
       .forEach(methodName => {
         this[methodName] = new Event(methodName, this.rpcScopeMain);
         lib[capitalize(`callBack${methodName}`)] = (callbackId, details) => {
-          const callback = callbackRegistry.cbs.get(callbackId);
+          const callback = callbackRegistry.get(callbackId);
+          console.log('--- Trigger ' + capitalize(`callBack${methodName}`))
+          //console.log(callbackId)
+          console.log('details', details)
+          console.log(callback)
           return callback(details)
         }
       });

From 49b707d3f8ddf40daf735a8f00e79452e9b5c4c6 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Fri, 24 Nov 2017 17:32:02 +0100
Subject: [PATCH 04/28] Right headers format

---
 example/extensions/dummy-extension/a.js | 5 +++--
 lib/browser/api/web-request.js          | 8 ++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/example/extensions/dummy-extension/a.js b/example/extensions/dummy-extension/a.js
index 4ad0d34..f4577f2 100644
--- a/example/extensions/dummy-extension/a.js
+++ b/example/extensions/dummy-extension/a.js
@@ -12,15 +12,16 @@ chrome.webRequest.onBeforeSendHeaders.addListener(function(details) {
 });
 
 chrome.webRequest.onHeadersReceived.addListener(function(details) {
+  console.log('chrome.webRequest.onHeadersReceived')
+  console.log(details)
   details.responseHeaders.push({
     name: 'X-Test',
-    value: ['ok']
+    value: 'ok'
   })
 
   return {
     cancel: false,
     responseHeaders: details.responseHeaders,
-    statusLine: 'HTTP/1.1 200 OK'
   };
 }, {
   urls: ['<all_urls>'],
diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index f347ae5..8d508ba 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -17,17 +17,13 @@ class ChromeWebRequestAPIHandler {
         this[capitalize(`triggerCallBack${methodName}`)] = (details, callback, callbackId) => {
           rpc(rpcScopeRenderer, capitalize(`callBack${methodName}`))(callbackId, details)
             .then(cbReturn => {
-              console.log('--- cbReturn before')
-              console.log(cbReturn)
               if (cbReturn.responseHeaders) {
                 const responseHeaders = {};
                 cbReturn.responseHeaders.forEach((header) => {
-                  return responseHeaders[header.name] = header.value
+                  return responseHeaders[header.name] = [header.value]
                 });
                 cbReturn.responseHeaders = responseHeaders;
               }
-              console.log('--- cbReturn after')
-              console.log(cbReturn)
               return callback(cbReturn)
             })
         };
@@ -37,7 +33,7 @@ class ChromeWebRequestAPIHandler {
             if (details.responseHeaders) {
               const responseHeaders = [];
               Object.keys(details.responseHeaders).forEach((k) => {
-                responseHeaders.push({ name: k, value: [details.responseHeaders[k][0]]});
+                responseHeaders.push({ name: k, value: details.responseHeaders[k][0]});
               });
               details.responseHeaders = responseHeaders;
             }

From a44802fd877c3e1572c2ef502c9ab0b0dd2acfab Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Fri, 24 Nov 2017 17:47:50 +0100
Subject: [PATCH 05/28] Clean up

---
 example/app.html                       |  4 +--
 example/main.js                        | 35 +++++++-------------------
 lib/renderer/extensions/web-request.js |  4 ---
 3 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/example/app.html b/example/app.html
index 1303877..608d0bc 100644
--- a/example/app.html
+++ b/example/app.html
@@ -14,8 +14,8 @@
 
   <div class="container">
     <!--<webview allowPopups webpreferences="webSecurity=no" preload='../preload.js' src="https://mail.google.com/"></webview>-->
-    <webview allowPopups preload='../preload.js' src="http://motherfuckingwebsite.com/"></webview>
-    <!--<webview allowPopups preload='../preload.js' src="https://inbox.google.com/"></webview>-->
+    <!--<webview allowPopups preload='../preload.js' src="http://motherfuckingwebsite.com/"></webview>-->
+    <webview allowPopups preload='../preload.js' src="https://inbox.google.com/"></webview>
   </div>
   <script>
     setTimeout(() => Array.from(document.getElementsByTagName('webview')).forEach(w => w.openDevTools()), 1000)
diff --git a/example/main.js b/example/main.js
index 362fef0..3e53e85 100644
--- a/example/main.js
+++ b/example/main.js
@@ -43,37 +43,20 @@ function createWindow () {
 app.on('ready', createWindow)
 
 app.on('ready', () => {
-  // extensions.addExtension(path.join(__dirname, './extensions/mixmax'))
+  extensions.addExtension(path.join(__dirname, './extensions/mixmax'))
   // extensions.addExtension(path.join(__dirname, './extensions/gmelius'))
-  extensions.addExtension(path.join(__dirname, './extensions/dummy-extension'))
+  // extensions.addExtension(path.join(__dirname, './extensions/dummy-extension'))
 
   const filter = {
     urls: ['<all_urls>']
   }
-  //
-  // session.defaultSession.webRequest.onHeadersReceived(filter, (details, callback) => {
-  //   details.responseHeaders['Content-Type'] = ['text/plain'];
-  //   details.responseHeaders['User-Agent'] = ['My Awesome Agent'];
-  //   console.log('--- onHeadersReceived')
-  //   console.log({
-  //     cancel: false,
-  //     responseHeaders: details.responseHeaders,
-  //     statusLine: 'HTTP/1.1 200 OK'
-  //   })
-  //
-  //   callback({
-  //     cancel: false,
-  //     responseHeaders: details.responseHeaders,
-  //     statusLine: 'HTTP/1.1 200 OK'
-  //   })
-  // })
-  //
-  // session.defaultSession.webRequest.onResponseStarted(filter, (details) => {
-  //   if (details.url.indexOf('chrome-devtools://') === -1) {
-  //     console.log('--- onResponseStarted')
-  //     console.log(details);
-  //   }
-  // });
+
+  session.defaultSession.webRequest.onResponseStarted(filter, (details) => {
+    if (details.url.indexOf('chrome-devtools://') === -1) {
+      console.log('--- onResponseStarted')
+      console.log(details);
+    }
+  });
 })
 
 // Quit when all windows are closed.
diff --git a/lib/renderer/extensions/web-request.js b/lib/renderer/extensions/web-request.js
index c615004..d71373c 100644
--- a/lib/renderer/extensions/web-request.js
+++ b/lib/renderer/extensions/web-request.js
@@ -36,10 +36,6 @@ class ChromeWebRequestAPIClient {
         this[methodName] = new Event(methodName, this.rpcScopeMain);
         lib[capitalize(`callBack${methodName}`)] = (callbackId, details) => {
           const callback = callbackRegistry.get(callbackId);
-          console.log('--- Trigger ' + capitalize(`callBack${methodName}`))
-          //console.log(callbackId)
-          console.log('details', details)
-          console.log(callback)
           return callback(details)
         }
       });

From 0cd332f8f0d9d5b99cdd2d7283f1fbb171f4a2d7 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Fri, 24 Nov 2017 17:55:09 +0100
Subject: [PATCH 06/28] Add handlerBehaviorChanged

---
 lib/renderer/extensions/web-request.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/renderer/extensions/web-request.js b/lib/renderer/extensions/web-request.js
index d71373c..9090fb0 100644
--- a/lib/renderer/extensions/web-request.js
+++ b/lib/renderer/extensions/web-request.js
@@ -42,6 +42,8 @@ class ChromeWebRequestAPIClient {
 
     this.rpcManager = new RpcIpcManager(lib, this.rpcScopeRenderer);
   }
+
+  handlerBehaviorChanged () {}
 }
 
 exports.setup = extensionId => new ChromeWebRequestAPIClient(extensionId);

From 72464cdd985552a4b95f42081f018c7b98dd5604 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Mon, 27 Nov 2017 12:33:54 +0100
Subject: [PATCH 07/28] Implement calls in dummy extension

---
 example/app.html                              |  4 +-
 example/extensions/dummy-extension/a.js       | 40 -------------------
 .../extensions/dummy-extension/manifest.json  |  2 +-
 example/main.js                               |  4 +-
 lib/browser/api/web-request.js                |  6 ++-
 lib/renderer/extensions/web-request.js        |  4 +-
 6 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/example/app.html b/example/app.html
index 608d0bc..1303877 100644
--- a/example/app.html
+++ b/example/app.html
@@ -14,8 +14,8 @@
 
   <div class="container">
     <!--<webview allowPopups webpreferences="webSecurity=no" preload='../preload.js' src="https://mail.google.com/"></webview>-->
-    <!--<webview allowPopups preload='../preload.js' src="http://motherfuckingwebsite.com/"></webview>-->
-    <webview allowPopups preload='../preload.js' src="https://inbox.google.com/"></webview>
+    <webview allowPopups preload='../preload.js' src="http://motherfuckingwebsite.com/"></webview>
+    <!--<webview allowPopups preload='../preload.js' src="https://inbox.google.com/"></webview>-->
   </div>
   <script>
     setTimeout(() => Array.from(document.getElementsByTagName('webview')).forEach(w => w.openDevTools()), 1000)
diff --git a/example/extensions/dummy-extension/a.js b/example/extensions/dummy-extension/a.js
index f4577f2..b2f2ffa 100644
--- a/example/extensions/dummy-extension/a.js
+++ b/example/extensions/dummy-extension/a.js
@@ -1,43 +1,3 @@
-chrome.webRequest.onBeforeSendHeaders.addListener(function(details) {
-  details.requestHeaders['User-Agent'] = 'My Awesome Agent'
-
-  return {
-    cancel: false,
-    requestHeaders: details.requestHeaders,
-    statusLine: 'HTTP/1.1 200 OK'
-  };
-}, {
-  urls: ['<all_urls>'],
-  types: ['main_frame']
-});
-
-chrome.webRequest.onHeadersReceived.addListener(function(details) {
-  console.log('chrome.webRequest.onHeadersReceived')
-  console.log(details)
-  details.responseHeaders.push({
-    name: 'X-Test',
-    value: 'ok'
-  })
-
-  return {
-    cancel: false,
-    responseHeaders: details.responseHeaders,
-  };
-}, {
-  urls: ['<all_urls>'],
-  types: ['main_frame']
-}, ['blocking', 'responseHeaders']);
-
-function reqListener () {
-  console.log('--- XMLHttpRequest from extension')
-  console.log(this.getAllResponseHeaders());
-}
-
-var oReq = new XMLHttpRequest();
-oReq.addEventListener("load", reqListener);
-oReq.open("GET", `http://motherfuckingwebsite.com/?foo=${Date.now()}`);
-oReq.send();
-
 console.log('I\' m injected')
 var foo = "FOOOOO"
 // throw new Error('Foo')
diff --git a/example/extensions/dummy-extension/manifest.json b/example/extensions/dummy-extension/manifest.json
index fb2b32c..858b9dc 100644
--- a/example/extensions/dummy-extension/manifest.json
+++ b/example/extensions/dummy-extension/manifest.json
@@ -1,7 +1,7 @@
 {
    "content_scripts": [ {
       "css": [ "/hello.css" ],
-      "js": [ "/a.js", "/b.js", "/crash.js"],
+      "js": [ "/a.js", "/b.js", "/web-request.js", "/crash.js"],
       "__matches": [ "https://github.com/*", "https://developer.mozilla.org/*", "https://mail.google.com/*"],
       "matches": [ "<all_urls>"],
       "run_at": "document_end"
diff --git a/example/main.js b/example/main.js
index 3e53e85..ad3e7fe 100644
--- a/example/main.js
+++ b/example/main.js
@@ -43,9 +43,9 @@ function createWindow () {
 app.on('ready', createWindow)
 
 app.on('ready', () => {
-  extensions.addExtension(path.join(__dirname, './extensions/mixmax'))
+  // extensions.addExtension(path.join(__dirname, './extensions/mixmax'))
   // extensions.addExtension(path.join(__dirname, './extensions/gmelius'))
-  // extensions.addExtension(path.join(__dirname, './extensions/dummy-extension'))
+  extensions.addExtension(path.join(__dirname, './extensions/dummy-extension'))
 
   const filter = {
     urls: ['<all_urls>']
diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index 8d508ba..09b5152 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -17,14 +17,16 @@ class ChromeWebRequestAPIHandler {
         this[capitalize(`triggerCallBack${methodName}`)] = (details, callback, callbackId) => {
           rpc(rpcScopeRenderer, capitalize(`callBack${methodName}`))(callbackId, details)
             .then(cbReturn => {
-              if (cbReturn.responseHeaders) {
+              if (cbReturn && cbReturn.responseHeaders) {
                 const responseHeaders = {};
                 cbReturn.responseHeaders.forEach((header) => {
                   return responseHeaders[header.name] = [header.value]
                 });
                 cbReturn.responseHeaders = responseHeaders;
               }
-              return callback(cbReturn)
+
+              if (callback)
+                return callback(cbReturn)
             })
         };
         lib[capitalize(`registerCbFor${methodName}`)] = (args) => {
diff --git a/lib/renderer/extensions/web-request.js b/lib/renderer/extensions/web-request.js
index 9090fb0..8513014 100644
--- a/lib/renderer/extensions/web-request.js
+++ b/lib/renderer/extensions/web-request.js
@@ -43,7 +43,9 @@ class ChromeWebRequestAPIClient {
     this.rpcManager = new RpcIpcManager(lib, this.rpcScopeRenderer);
   }
 
-  handlerBehaviorChanged () {}
+  handlerBehaviorChanged () {
+    return Promise.resolve()
+  }
 }
 
 exports.setup = extensionId => new ChromeWebRequestAPIClient(extensionId);

From 6ff83932644f9cc2bc4c5bc5466806040a56b1ae Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Mon, 27 Nov 2017 15:47:34 +0100
Subject: [PATCH 08/28] Implement missing methods on Event

---
 lib/browser/api/web-request.js         |  5 ++-
 lib/renderer/extensions/event.js       | 14 +++++---
 lib/renderer/extensions/web-request.js | 49 ++++++++++++++++++++------
 3 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index 09b5152..a60240b 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -29,9 +29,8 @@ class ChromeWebRequestAPIHandler {
                 return callback(cbReturn)
             })
         };
-        lib[capitalize(`registerCbFor${methodName}`)] = (args) => {
-          const callbackId = args.callbackId;
-          this.electronWebRequestApi[methodName](args.filter, (details, callback) => {
+        lib[capitalize(`registerCbFor${methodName}`)] = (filter, callbackId) => {
+          this.electronWebRequestApi[methodName](filter, (details, callback) => {
             if (details.responseHeaders) {
               const responseHeaders = [];
               Object.keys(details.responseHeaders).forEach((k) => {
diff --git a/lib/renderer/extensions/event.js b/lib/renderer/extensions/event.js
index 4a95140..4c2e7cf 100644
--- a/lib/renderer/extensions/event.js
+++ b/lib/renderer/extensions/event.js
@@ -1,14 +1,18 @@
 class Event {
   constructor () {
-    this.listeners = []
+    this.listeners = [];
   }
 
   addListener (callback) {
-    this.listeners.push(callback)
+    this.listeners.push(callback);
+  }
+
+  hasListener (callback) {
+    return this.listeners.indexOf(callback) !== -1;
   }
 
   removeListener (callback) {
-    const index = this.listeners.indexOf(callback)
+    const index = this.listeners.indexOf(callback);
     if (index !== -1) {
       this.listeners.splice(index, 1)
     }
@@ -16,9 +20,9 @@ class Event {
 
   emit (...args) {
     for (const listener of this.listeners) {
-      listener(...args)
+      listener(...args);
     }
   }
 }
 
-module.exports = Event
+module.exports = Event;
diff --git a/lib/renderer/extensions/web-request.js b/lib/renderer/extensions/web-request.js
index 8513014..63682ee 100644
--- a/lib/renderer/extensions/web-request.js
+++ b/lib/renderer/extensions/web-request.js
@@ -1,25 +1,54 @@
 const { rpc, RpcIpcManager } = require('electron-simple-rpc');
 const capitalize = require('capitalize');
+const Event = require('../../renderer/extensions/event');
+
+const callbackToDigest = (fn) => {
+  let functionFingerprint = fn.toString();
+  let hash = 0;
+  let i;
+  let chr;
+
+  if (functionFingerprint.length === 0) {
+    return hash;
+  }
+
+  for (i = 0; i < functionFingerprint.length; i++) {
+    chr = functionFingerprint.charCodeAt(i);
+    hash = ((hash << 5) - hash) + chr;
+    hash |= 0; // convert to 32bit integer
+  }
+
+  return hash;
+};
 
 const callbackRegistry = new Map();
 
-class Event {
+class WebRequestEvent extends Event {
   constructor (webRequestMethodName, rpcScopeMain) {
+    super();
     this.webRequestMethodName = webRequestMethodName;
     this.rpcScopeMain = rpcScopeMain;
-    this.listeners = [];
   }
 
   addListener (callback, filter, extraInfos) {
-    callbackRegistry.set((callbackRegistry.size + 1), callback)
+    const digest = callbackToDigest(callback);
+    callbackRegistry.set(digest, callback);
+
+    rpc(this.rpcScopeMain,  capitalize(`registerCbFor${this.webRequestMethodName}`))(filter, digest);
+    this.listeners.push(digest)
+  }
 
-    const webRequestHandler = {
-      filter: filter.urls,
-      callbackId: callbackRegistry.size
-    };
+  removeListener (callback) {
+    const digest = callbackToDigest(callback);
+    const index = this.listeners.indexOf(digest);
+    if (index !== -1) {
+      this.listeners.splice(index, 1)
+    }
+  }
 
-    rpc(this.rpcScopeMain,  capitalize(`registerCbFor${this.webRequestMethodName}`))(webRequestHandler);
-    this.listeners.push(webRequestHandler)
+  hasListener (callback) {
+    const digest = callbackToDigest(callback);
+    return this.listeners.indexOf(digest) !== -1
   }
 }
 
@@ -33,7 +62,7 @@ class ChromeWebRequestAPIClient {
     ['onBeforeRequest', 'onBeforeSendHeaders', 'onSendHeaders', 'onHeadersReceived',
       'onAuthRequired', 'onResponseStarted', 'onBeforeRedirect', 'onCompleted', 'onErrorOccurred']
       .forEach(methodName => {
-        this[methodName] = new Event(methodName, this.rpcScopeMain);
+        this[methodName] = new WebRequestEvent(methodName, this.rpcScopeMain);
         lib[capitalize(`callBack${methodName}`)] = (callbackId, details) => {
           const callback = callbackRegistry.get(callbackId);
           return callback(details)

From 9e4bce41190d2664dfb42ae42897882db2334ca0 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Mon, 27 Nov 2017 16:35:38 +0100
Subject: [PATCH 09/28] Refacto

---
 lib/browser/api/web-request.js         | 76 +++++++++++++-------------
 lib/common/constants.js                |  2 +
 lib/renderer/extensions/web-request.js | 27 ++++-----
 3 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index a60240b..5bb0a6d 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -2,54 +2,56 @@ const { rpc, RpcIpcManager } = require('electron-simple-rpc');
 const capitalize = require('capitalize');
 const { session } = require('electron');
 
+const WEBREQUEST_EVENTS = ['onBeforeRequest', 'onBeforeSendHeaders', 'onSendHeaders',
+  'onHeadersReceived', 'onAuthRequired', 'onResponseStarted', 'onBeforeRedirect', 'onCompleted',
+  'onErrorOccurred'];
+
+const fromElectronObjectToChromeObject = (cbReturn) => {
+  if (cbReturn && cbReturn.responseHeaders) {
+    const responseHeaders = {};
+    cbReturn.responseHeaders.forEach((header) => {
+      return responseHeaders[header.name] = [header.value]
+    });
+    cbReturn.responseHeaders = responseHeaders;
+  }
+
+  return cbReturn
+};
+
+const fromChromeObjectToElectronObject = (details) => {
+  if (details.responseHeaders) {
+    const responseHeaders = [];
+    Object.keys(details.responseHeaders).forEach((k) => {
+      responseHeaders.push({ name: k, value: details.responseHeaders[k][0]});
+    });
+    details.responseHeaders = responseHeaders;
+  }
+
+  return details;
+};
+
 class ChromeWebRequestAPIHandler {
   constructor(extensionId) {
-
     this.electronWebRequestApi = session.defaultSession.webRequest;
 
     const rpcScopeMain = `chrome-webRequest-${extensionId}-main`;
     const rpcScopeRenderer = `chrome-webRequest-${extensionId}-renderer`;
 
     const lib = {};
-    ['onBeforeRequest', 'onBeforeSendHeaders', 'onSendHeaders', 'onHeadersReceived',
-      'onAuthRequired', 'onResponseStarted', 'onBeforeRedirect', 'onCompleted', 'onErrorOccurred']
-      .forEach(methodName => {
-        this[capitalize(`triggerCallBack${methodName}`)] = (details, callback, callbackId) => {
-          rpc(rpcScopeRenderer, capitalize(`callBack${methodName}`))(callbackId, details)
-            .then(cbReturn => {
-              if (cbReturn && cbReturn.responseHeaders) {
-                const responseHeaders = {};
-                cbReturn.responseHeaders.forEach((header) => {
-                  return responseHeaders[header.name] = [header.value]
-                });
-                cbReturn.responseHeaders = responseHeaders;
-              }
-
-              if (callback)
-                return callback(cbReturn)
-            })
-        };
-        lib[capitalize(`registerCbFor${methodName}`)] = (filter, callbackId) => {
-          this.electronWebRequestApi[methodName](filter, (details, callback) => {
-            if (details.responseHeaders) {
-              const responseHeaders = [];
-              Object.keys(details.responseHeaders).forEach((k) => {
-                responseHeaders.push({ name: k, value: details.responseHeaders[k][0]});
-              });
-              details.responseHeaders = responseHeaders;
-            }
-
-            if (!(!!details || !!callback))
-              return;
-
-            this[capitalize(`triggerCallBack${methodName}`)](details, callback, callbackId);
-          });
-        }
+    WEBREQUEST_EVENTS.forEach(methodName => {
+      this[`triggerCallBack${capitalize(methodName)}`] = (details, callback, callbackId) =>
+        rpc(rpcScopeRenderer, `triggerCallBack${capitalize(methodName)}`)(callbackId, details)
+          .then(cbReturn => callback ? callback(fromElectronObjectToChromeObject(cbReturn)) : {});
+      lib[`registerCb${capitalize(methodName)}`] = (filter, callbackId) =>
+        this.electronWebRequestApi[methodName](filter, (details, callback) =>
+          this[`triggerCallBack${capitalize(methodName)}`]
+          (fromChromeObjectToElectronObject(details), callback, callbackId))
     });
+
     this.rpcManager = new RpcIpcManager(lib, rpcScopeMain);
-  }
+  };
 
-  release() {
+  release () {
     this.rpcManager.release();
   }
 }
diff --git a/lib/common/constants.js b/lib/common/constants.js
index c358f91..d5c6109 100644
--- a/lib/common/constants.js
+++ b/lib/common/constants.js
@@ -36,6 +36,8 @@ constants.TABS_SEND_MESSAGE_RESULT_ = 'CHROME_TABS_SEND_MESSAGE_RESULT_';
 constants.TABS_EXECUTESCRIPT = 'CHROME_TABS_EXECUTESCRIPT';
 constants.TABS_EXECUTESCRIPT_RESULT_ = 'CHROME_TABS_EXECUTESCRIPT_RESULT_';
 
+constants.TABS_EXECUTESCRIPT_RESULT_ = 'CHROME_TABS_EXECUTESCRIPT_RESULT_';
+
 constants.EXTENSION_PROTOCOL = 'chrome-extension';
 
 // to differentiate fron electron implentation of chrome extensions
diff --git a/lib/renderer/extensions/web-request.js b/lib/renderer/extensions/web-request.js
index 63682ee..3ee3f16 100644
--- a/lib/renderer/extensions/web-request.js
+++ b/lib/renderer/extensions/web-request.js
@@ -2,6 +2,10 @@ const { rpc, RpcIpcManager } = require('electron-simple-rpc');
 const capitalize = require('capitalize');
 const Event = require('../../renderer/extensions/event');
 
+const WEBREQUEST_EVENTS = ['onBeforeRequest', 'onBeforeSendHeaders', 'onSendHeaders',
+  'onHeadersReceived', 'onAuthRequired', 'onResponseStarted', 'onBeforeRedirect', 'onCompleted',
+  'onErrorOccurred'];
+
 const callbackToDigest = (fn) => {
   let functionFingerprint = fn.toString();
   let hash = 0;
@@ -21,20 +25,20 @@ const callbackToDigest = (fn) => {
   return hash;
 };
 
-const callbackRegistry = new Map();
+const callbacks = new Map();
 
 class WebRequestEvent extends Event {
-  constructor (webRequestMethodName, rpcScopeMain) {
+  constructor (event, rpcScopeMain) {
     super();
-    this.webRequestMethodName = webRequestMethodName;
+    this.webRequestEvent = event;
     this.rpcScopeMain = rpcScopeMain;
   }
 
   addListener (callback, filter, extraInfos) {
     const digest = callbackToDigest(callback);
-    callbackRegistry.set(digest, callback);
+    callbacks.set(digest, callback);
 
-    rpc(this.rpcScopeMain,  capitalize(`registerCbFor${this.webRequestMethodName}`))(filter, digest);
+    rpc(this.rpcScopeMain,  `registerCb${capitalize(this.webRequestEvent)}`)(filter, digest);
     this.listeners.push(digest)
   }
 
@@ -42,6 +46,7 @@ class WebRequestEvent extends Event {
     const digest = callbackToDigest(callback);
     const index = this.listeners.indexOf(digest);
     if (index !== -1) {
+      callbacks.delete(digest);
       this.listeners.splice(index, 1)
     }
   }
@@ -59,14 +64,10 @@ class ChromeWebRequestAPIClient {
     this.MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES = 10;
 
     const lib = {};
-    ['onBeforeRequest', 'onBeforeSendHeaders', 'onSendHeaders', 'onHeadersReceived',
-      'onAuthRequired', 'onResponseStarted', 'onBeforeRedirect', 'onCompleted', 'onErrorOccurred']
-      .forEach(methodName => {
-        this[methodName] = new WebRequestEvent(methodName, this.rpcScopeMain);
-        lib[capitalize(`callBack${methodName}`)] = (callbackId, details) => {
-          const callback = callbackRegistry.get(callbackId);
-          return callback(details)
-        }
+    WEBREQUEST_EVENTS.forEach(event => {
+        this[event] = new WebRequestEvent(event, this.rpcScopeMain);
+        lib[`triggerCallBack${capitalize(event)}`] = (callbackId, details) =>
+          callbacks.get(callbackId)(details);
       });
 
     this.rpcManager = new RpcIpcManager(lib, this.rpcScopeRenderer);

From 01a503f563b6352af5282fa7f045708dbef82980 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Mon, 27 Nov 2017 16:39:02 +0100
Subject: [PATCH 10/28] Better wording

---
 lib/browser/api/web-request.js         | 2 +-
 lib/renderer/extensions/web-request.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index 5bb0a6d..a964b97 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -40,7 +40,7 @@ class ChromeWebRequestAPIHandler {
     const lib = {};
     WEBREQUEST_EVENTS.forEach(methodName => {
       this[`triggerCallBack${capitalize(methodName)}`] = (details, callback, callbackId) =>
-        rpc(rpcScopeRenderer, `triggerCallBack${capitalize(methodName)}`)(callbackId, details)
+        rpc(rpcScopeRenderer, `executeCallback${capitalize(methodName)}`)(callbackId, details)
           .then(cbReturn => callback ? callback(fromElectronObjectToChromeObject(cbReturn)) : {});
       lib[`registerCb${capitalize(methodName)}`] = (filter, callbackId) =>
         this.electronWebRequestApi[methodName](filter, (details, callback) =>
diff --git a/lib/renderer/extensions/web-request.js b/lib/renderer/extensions/web-request.js
index 3ee3f16..67b2461 100644
--- a/lib/renderer/extensions/web-request.js
+++ b/lib/renderer/extensions/web-request.js
@@ -65,10 +65,10 @@ class ChromeWebRequestAPIClient {
 
     const lib = {};
     WEBREQUEST_EVENTS.forEach(event => {
-        this[event] = new WebRequestEvent(event, this.rpcScopeMain);
-        lib[`triggerCallBack${capitalize(event)}`] = (callbackId, details) =>
-          callbacks.get(callbackId)(details);
-      });
+      this[event] = new WebRequestEvent(event, this.rpcScopeMain);
+      lib[`executeCallback${capitalize(event)}`] = (callbackId, details) =>
+        callbacks.get(callbackId)(details);
+    });
 
     this.rpcManager = new RpcIpcManager(lib, this.rpcScopeRenderer);
   }

From 569452e81acb02b96460b897eaa7e98ef543f9d6 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Mon, 27 Nov 2017 16:41:38 +0100
Subject: [PATCH 11/28] Bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index df94706..efb8aa5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-chrome-extension",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "- re-implement preference manager",
   "main": "index.js",
   "private": true,

From 5ddf5abae155674c186c4426bd0fe90f2ac4bd6a Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Mon, 27 Nov 2017 17:15:35 +0100
Subject: [PATCH 12/28] Remove unnecessary code

---
 lib/browser/chrome-extension.js | 2 +-
 lib/common/constants.js         | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 5bcb209..ceb3c27 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -97,7 +97,7 @@ const startBackgroundPages = function (manifest) {
       `--preload=${path.join(__dirname, '../../preload.js')}`
     ]
   })
-  contents.openDevTools()
+  // contents.openDevTools()
   backgroundPages[manifest.extensionId] = { html: html, webContents: contents, name: name }
   contents.loadURL(url.format({
     protocol: constants.EXTENSION_PROTOCOL,
diff --git a/lib/common/constants.js b/lib/common/constants.js
index d5c6109..c358f91 100644
--- a/lib/common/constants.js
+++ b/lib/common/constants.js
@@ -36,8 +36,6 @@ constants.TABS_SEND_MESSAGE_RESULT_ = 'CHROME_TABS_SEND_MESSAGE_RESULT_';
 constants.TABS_EXECUTESCRIPT = 'CHROME_TABS_EXECUTESCRIPT';
 constants.TABS_EXECUTESCRIPT_RESULT_ = 'CHROME_TABS_EXECUTESCRIPT_RESULT_';
 
-constants.TABS_EXECUTESCRIPT_RESULT_ = 'CHROME_TABS_EXECUTESCRIPT_RESULT_';
-
 constants.EXTENSION_PROTOCOL = 'chrome-extension';
 
 // to differentiate fron electron implentation of chrome extensions

From 1dcd9e1ec23eaf649f4f9f5b91fc13216cca1012 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Tue, 28 Nov 2017 11:13:27 +0100
Subject: [PATCH 13/28] Remove useless code

---
 example/main.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/example/main.js b/example/main.js
index ad3e7fe..bee227a 100644
--- a/example/main.js
+++ b/example/main.js
@@ -46,17 +46,6 @@ app.on('ready', () => {
   // extensions.addExtension(path.join(__dirname, './extensions/mixmax'))
   // extensions.addExtension(path.join(__dirname, './extensions/gmelius'))
   extensions.addExtension(path.join(__dirname, './extensions/dummy-extension'))
-
-  const filter = {
-    urls: ['<all_urls>']
-  }
-
-  session.defaultSession.webRequest.onResponseStarted(filter, (details) => {
-    if (details.url.indexOf('chrome-devtools://') === -1) {
-      console.log('--- onResponseStarted')
-      console.log(details);
-    }
-  });
 })
 
 // Quit when all windows are closed.

From cbc95cc3670449b3f779574267894b6900e4965c Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Tue, 28 Nov 2017 11:17:20 +0100
Subject: [PATCH 14/28] add missing file and remove useless import

---
 .../extensions/dummy-extension/web-request.js | 116 ++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 example/extensions/dummy-extension/web-request.js

diff --git a/example/extensions/dummy-extension/web-request.js b/example/extensions/dummy-extension/web-request.js
new file mode 100644
index 0000000..d1ea859
--- /dev/null
+++ b/example/extensions/dummy-extension/web-request.js
@@ -0,0 +1,116 @@
+// Try it with motherfuckingwebsite.com
+
+chrome.webRequest.onBeforeRequest.addListener(function(details) {
+  // Fires when a request is about to occur.
+  // This event is sent before any TCP connection is made and can be used to cancel or redirect requests.
+  console.log('--- onBeforeRequest details')
+  console.log(details)
+  return {
+    cancel: details.url.indexOf("://evil.com/") !== -1
+  };
+}, {
+  urls: ['<all_urls>'],
+  types: ['main_frame']
+});
+
+
+chrome.webRequest.onBeforeSendHeaders.addListener(function(details) {
+  // Fires when a request is about to occur and the initial headers have been prepared.
+  // The event is intended to allow extensions to add, modify, and delete request headers (*).
+  // The onBeforeSendHeaders event is passed to all subscribers, so different subscribers may attempt to modify the request;
+  // see the Implementation details section for how this is handled. This event can be used to cancel the request.
+  details.requestHeaders['User-Agent'] = 'My Awesome Agent added onBeforeSendHeaders'
+  console.log('--- onBeforeSendHeaders details')
+  console.log(details)
+  return {
+    cancel: false,
+    requestHeaders: details.requestHeaders,
+  };
+}, {
+  urls: ['<all_urls>'],
+  types: ['main_frame']
+});
+
+chrome.webRequest.onSendHeaders.addListener(function(details) {
+  // Fires after all extensions have had a chance to modify the request headers, and presents the final (*) version.
+  // The event is triggered before the headers are sent to the network. This event is informational and handled asynchronously.
+  // It does not allow modifying or cancelling the request.
+  console.log('--- onSendHeaders details')
+  console.log(details)
+}, {
+  urls: ['<all_urls>'],
+  types: ['main_frame']
+});
+
+chrome.webRequest.onHeadersReceived.addListener(function(details) {
+  // Fired when HTTP response headers of a request have been received.
+  details.responseHeaders.push({
+    name: 'X-onHeadersReceived',
+    value: 'ok'
+  });
+
+  return {
+    cancel: false,
+    responseHeaders: details.responseHeaders,
+  };
+}, {
+  urls: ['<all_urls>'],
+  types: ['main_frame']
+});
+//
+// chrome.webRequest.onAuthRequired.addListener(function(details) {
+//   // not available in electron. We have to implement it.
+// }, {
+//   urls: ['<all_urls>'],
+//   types: ['main_frame']
+// });
+
+chrome.webRequest.onBeforeRedirect.addListener(function(details) {
+  // Fires when a redirect is about to be executed. A redirection can be triggered by an HTTP response code or by an extension.
+  // This event is informational and handled asynchronously.
+  // It does not allow you to modify or cancel the request.
+  console.log('--- onBeforeRedirect details')
+  console.log(details)
+}, {
+  urls: ['<all_urls>'],
+  types: ['main_frame']
+});
+
+
+chrome.webRequest.onResponseStarted.addListener(function(details) {
+  // Fires when the first byte of the response body is received.
+  // For HTTP requests, this means that the status line and response headers are available.
+  // This event is informational and handled asynchronously.
+  // It does not allow modifying or cancelling the request.
+  console.log('--- onResponseStarted details')
+  console.log(details)
+}, {
+  urls: ['<all_urls>'],
+  types: ['main_frame']
+});
+
+chrome.webRequest.onCompleted.addListener(function(details) {
+  // Fires when a request has been processed successfully.
+  console.log('--- onCompleted details')
+  console.log(details)
+}, {
+  urls: ['<all_urls>'],
+  types: ['main_frame']
+});
+
+chrome.webRequest.onErrorOccurred.addListener(function(details) {
+  // Fires when a request could not be processed successfully.
+  console.log('--- onErrorOccurred details')
+  console.log(details)
+}, {
+  urls: ['<all_urls>'],
+  types: ['main_frame']
+});
+
+const sampleRequest = new XMLHttpRequest();
+sampleRequest.addEventListener('load', function () {
+  console.log('--- sampleRequest AllResponseHeaders');
+  console.log(this.getAllResponseHeaders());
+});
+sampleRequest.open('GET', `http://motherfuckingwebsite.com/?foo=${Date.now()}`);
+sampleRequest.send();
\ No newline at end of file

From f4202af9f971a29247a0d0fab09af4fd7dc9d470 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Tue, 28 Nov 2017 11:28:37 +0100
Subject: [PATCH 15/28] Remove useless line

---
 example/main.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/example/main.js b/example/main.js
index bee227a..d980a18 100644
--- a/example/main.js
+++ b/example/main.js
@@ -1,7 +1,6 @@
 const electron = require('electron')
 // Module to control application life.
 const app = electron.app
-const session = electron.session
 // Module to create native browser window.
 const BrowserWindow = electron.BrowserWindow
 

From bcc9ba758e881a7b828fce47b1fa01779201f2c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Lach=C3=A8ze?= <alexandre.lacheze@gmail.com>
Date: Tue, 28 Nov 2017 13:39:08 +0100
Subject: [PATCH 16/28] Pseudo-code for RCEvent+RCEventControler

---
 lib/browser/rc-event-controler.js   | 34 ++++++++++++++++++++++++++
 lib/renderer/extensions/rc-event.js | 37 +++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 lib/browser/rc-event-controler.js
 create mode 100644 lib/renderer/extensions/rc-event.js

diff --git a/lib/browser/rc-event-controler.js b/lib/browser/rc-event-controler.js
new file mode 100644
index 0000000..89c2b0d
--- /dev/null
+++ b/lib/browser/rc-event-controler.js
@@ -0,0 +1,34 @@
+const { rpc, RpcIpcManager } = require('electron-simple-rpc');
+
+class RCEventControler extends EventEmitter {
+  constructor(eventId) {
+    super();
+    this.listeners = new Map();
+
+    this.controlerRPCScope = `${eventId}-controler`;
+    this.eventRPCScope = `${eventId}-event`;
+
+    this.rcpManager = new RpcIpcManager({
+      addListener: this._addListener.bind(this)
+    }, this.controlerRPCScope)
+    
+  }
+
+  _addListener(listernerId, listenerArgs) {
+    const remoteCallListner = (args) => {
+      // todo: add tiemout
+      return rpc(this.eventRPCScope, 'triggerListener')(listernerId, args);
+    }
+    this.emit('new-listener', listenerArgs, remoteCallListner);
+  }
+
+  _removeListener(listernerId) {
+    // todo
+  }
+
+  release() {
+    // todo
+  }
+ }
+
+module.exports = RCEventControler;
diff --git a/lib/renderer/extensions/rc-event.js b/lib/renderer/extensions/rc-event.js
new file mode 100644
index 0000000..6ca5ab2
--- /dev/null
+++ b/lib/renderer/extensions/rc-event.js
@@ -0,0 +1,37 @@
+const { rpc, RpcIpcManager } = require('electron-simple-rpc');
+const uuid = require('uuid/v1');
+
+class RCEvent {
+  constructor(eventId) {
+    this.listeners = new Map();
+
+    this.controlerRPCScope = `${eventId}-controler`;
+    this.eventRPCScope = `${eventId}-event`;
+
+    this.rcpManager = new RpcIpcManager({
+      triggerListener: this._triggerListener.bind(this)
+    }, this.controlerRPCScope)
+  }
+
+  addListener(callback, ...args) {
+    const listernerId = uuid()
+    this.listeners.set(listernerId, callback);
+    rpc(this.controlerRPCScope, 'addListner')(listernerId, args);
+  }
+
+  hasListener(callback) {
+    // todo
+    return this.listeners.indexOf(callback) !== -1;
+  }
+
+  removeListener(callback) {
+    // todo: get listernerId and rpc removeListener
+  }
+
+  _triggerListener(listernerId, args) {
+    const listener = this.listeners.get(listernerId);
+    return listener.call(args);
+  }
+}
+
+module.exports = Event;

From 6f535a664301a85f71c522c7e8ba1f273f2730dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Lach=C3=A8ze?= <alexandre.lacheze@gmail.com>
Date: Tue, 28 Nov 2017 13:47:19 +0100
Subject: [PATCH 17/28] oops

---
 lib/renderer/extensions/rc-event.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/renderer/extensions/rc-event.js b/lib/renderer/extensions/rc-event.js
index 6ca5ab2..0e10f90 100644
--- a/lib/renderer/extensions/rc-event.js
+++ b/lib/renderer/extensions/rc-event.js
@@ -34,4 +34,4 @@ class RCEvent {
   }
 }
 
-module.exports = Event;
+module.exports = RCEvent;

From 62b47f43b75fac331c64f2ac7628850f88be5596 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Tue, 28 Nov 2017 14:07:05 +0100
Subject: [PATCH 18/28] =?UTF-8?q?From=20Alex=E2=80=99s=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/browser/api/web-request.js         | 22 ++++++++--------------
 lib/renderer/extensions/web-request.js |  1 +
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index a964b97..10df2af 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -6,26 +6,20 @@ const WEBREQUEST_EVENTS = ['onBeforeRequest', 'onBeforeSendHeaders', 'onSendHead
   'onHeadersReceived', 'onAuthRequired', 'onResponseStarted', 'onBeforeRedirect', 'onCompleted',
   'onErrorOccurred'];
 
-const fromElectronObjectToChromeObject = (cbReturn) => {
+const fromElectronHeadersToChromeHeaders = (cbReturn) => {
   if (cbReturn && cbReturn.responseHeaders) {
     const responseHeaders = {};
-    cbReturn.responseHeaders.forEach((header) => {
-      return responseHeaders[header.name] = [header.value]
-    });
+    cbReturn.responseHeaders.forEach((header) => responseHeaders[header.name] = [header.value]);
     cbReturn.responseHeaders = responseHeaders;
   }
 
   return cbReturn
 };
 
-const fromChromeObjectToElectronObject = (details) => {
-  if (details.responseHeaders) {
-    const responseHeaders = [];
-    Object.keys(details.responseHeaders).forEach((k) => {
-      responseHeaders.push({ name: k, value: details.responseHeaders[k][0]});
-    });
-    details.responseHeaders = responseHeaders;
-  }
+const fromChromeHeadersToElectronHeaders = (details) => {
+  if (details.responseHeaders)
+    details.responseHeaders = Object.keys(details.responseHeaders).map((k) =>
+      ({ name: k, value: details.responseHeaders[k][0]}));
 
   return details;
 };
@@ -41,11 +35,11 @@ class ChromeWebRequestAPIHandler {
     WEBREQUEST_EVENTS.forEach(methodName => {
       this[`triggerCallBack${capitalize(methodName)}`] = (details, callback, callbackId) =>
         rpc(rpcScopeRenderer, `executeCallback${capitalize(methodName)}`)(callbackId, details)
-          .then(cbReturn => callback ? callback(fromElectronObjectToChromeObject(cbReturn)) : {});
+          .then(cbReturn => callback ? callback(fromElectronHeadersToChromeHeaders(cbReturn)) : {});
       lib[`registerCb${capitalize(methodName)}`] = (filter, callbackId) =>
         this.electronWebRequestApi[methodName](filter, (details, callback) =>
           this[`triggerCallBack${capitalize(methodName)}`]
-          (fromChromeObjectToElectronObject(details), callback, callbackId))
+          (fromChromeHeadersToElectronHeaders(details), callback, callbackId))
     });
 
     this.rpcManager = new RpcIpcManager(lib, rpcScopeMain);
diff --git a/lib/renderer/extensions/web-request.js b/lib/renderer/extensions/web-request.js
index 67b2461..1838d5b 100644
--- a/lib/renderer/extensions/web-request.js
+++ b/lib/renderer/extensions/web-request.js
@@ -74,6 +74,7 @@ class ChromeWebRequestAPIClient {
   }
 
   handlerBehaviorChanged () {
+    console.warn('Call not implemented method **handlerBehaviorChanged**')
     return Promise.resolve()
   }
 }

From ca809df750cd9ad43c6d5769bfc10c25e2b5396d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Lach=C3=A8ze?= <alexandre.lacheze@gmail.com>
Date: Tue, 28 Nov 2017 15:34:21 +0100
Subject: [PATCH 19/28] Oops

---
 lib/renderer/extensions/rc-event.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/renderer/extensions/rc-event.js b/lib/renderer/extensions/rc-event.js
index 0e10f90..203bf2b 100644
--- a/lib/renderer/extensions/rc-event.js
+++ b/lib/renderer/extensions/rc-event.js
@@ -10,13 +10,13 @@ class RCEvent {
 
     this.rcpManager = new RpcIpcManager({
       triggerListener: this._triggerListener.bind(this)
-    }, this.controlerRPCScope)
+    }, this.eventRPCScope)
   }
 
   addListener(callback, ...args) {
-    const listernerId = uuid()
-    this.listeners.set(listernerId, callback);
-    rpc(this.controlerRPCScope, 'addListner')(listernerId, args);
+    const listenerId = uuid()
+    this.listeners.set(listenerId, callback);
+    rpc(this.controlerRPCScope, 'addListener')(listenerId, args);
   }
 
   hasListener(callback) {
@@ -25,11 +25,11 @@ class RCEvent {
   }
 
   removeListener(callback) {
-    // todo: get listernerId and rpc removeListener
+    // todo: get listenerId and rpc removeListener
   }
 
-  _triggerListener(listernerId, args) {
-    const listener = this.listeners.get(listernerId);
+  _triggerListener(listenerId, args) {
+    const listener = this.listeners.get(listenerId);
     return listener.call(args);
   }
 }

From 093cd9c103bdb4efd2c7dd5f4fdaf3a99cff5311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Lach=C3=A8ze?= <alexandre.lacheze@gmail.com>
Date: Tue, 28 Nov 2017 15:34:29 +0100
Subject: [PATCH 20/28] Require event-emeiter

---
 lib/browser/rc-event-controler.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/browser/rc-event-controler.js b/lib/browser/rc-event-controler.js
index 89c2b0d..fa0309f 100644
--- a/lib/browser/rc-event-controler.js
+++ b/lib/browser/rc-event-controler.js
@@ -1,4 +1,5 @@
 const { rpc, RpcIpcManager } = require('electron-simple-rpc');
+const EventEmitter = require('events');
 
 class RCEventControler extends EventEmitter {
   constructor(eventId) {

From 88f0831871de969af7e603b31635de35d32f2c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Lach=C3=A8ze?= <alexandre.lacheze@gmail.com>
Date: Tue, 28 Nov 2017 15:35:55 +0100
Subject: [PATCH 21/28] Lint

---
 lib/browser/rc-event-controler.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/browser/rc-event-controler.js b/lib/browser/rc-event-controler.js
index fa0309f..9ad9e31 100644
--- a/lib/browser/rc-event-controler.js
+++ b/lib/browser/rc-event-controler.js
@@ -11,13 +11,13 @@ class RCEventControler extends EventEmitter {
 
     this.rcpManager = new RpcIpcManager({
       addListener: this._addListener.bind(this)
-    }, this.controlerRPCScope)
+    }, this.controlerRPCScope);
     
   }
 
   _addListener(listernerId, listenerArgs) {
     const remoteCallListner = (args) => {
-      // todo: add tiemout
+      // todo: add timeout
       return rpc(this.eventRPCScope, 'triggerListener')(listernerId, args);
     }
     this.emit('new-listener', listenerArgs, remoteCallListner);

From 395db7863cc5a2ba8faf8c87547af2f16a4b50cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Lach=C3=A8ze?= <alexandre.lacheze@gmail.com>
Date: Tue, 28 Nov 2017 15:36:08 +0100
Subject: [PATCH 22/28] Add uuid

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index efb8aa5..2a86129 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "electron-simple-rpc": "github:alexstrat/electron-simple-rpc",
     "fs-extra": "^4.0.1",
     "npm-internal": "^1.4.0",
-    "p-queue": "^1.1.0"
+    "p-queue": "^1.1.0",
+    "uuid": "^3.1.0"
   }
 }

From 130da8f6c349823c53dc840f4bdd4f3ab01303a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Lach=C3=A8ze?= <alexandre.lacheze@gmail.com>
Date: Tue, 28 Nov 2017 15:56:45 +0100
Subject: [PATCH 23/28] Handle case where no listener

---
 lib/renderer/extensions/rc-event.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/renderer/extensions/rc-event.js b/lib/renderer/extensions/rc-event.js
index 203bf2b..ee342d5 100644
--- a/lib/renderer/extensions/rc-event.js
+++ b/lib/renderer/extensions/rc-event.js
@@ -30,7 +30,11 @@ class RCEvent {
 
   _triggerListener(listenerId, args) {
     const listener = this.listeners.get(listenerId);
-    return listener.call(args);
+    if (!listener) return;
+
+    // todo: do try catch
+    const ret = listener.call(this, args);
+    return ret;
   }
 }
 

From adf94722b8935d9299773d0d3d34aa39a6930eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Lach=C3=A8ze?= <alexandre.lacheze@gmail.com>
Date: Tue, 28 Nov 2017 16:03:44 +0100
Subject: [PATCH 24/28] Real working implementation

---
 lib/browser/api/web-request.js         | 27 +++++++++++++++++---------
 lib/renderer/extensions/web-request.js |  9 ++-------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index a964b97..f2cf78a 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -1,6 +1,7 @@
 const { rpc, RpcIpcManager } = require('electron-simple-rpc');
 const capitalize = require('capitalize');
 const { session } = require('electron');
+const RCEventControler = require('../rc-event-controler');
 
 const WEBREQUEST_EVENTS = ['onBeforeRequest', 'onBeforeSendHeaders', 'onSendHeaders',
   'onHeadersReceived', 'onAuthRequired', 'onResponseStarted', 'onBeforeRedirect', 'onCompleted',
@@ -39,20 +40,28 @@ class ChromeWebRequestAPIHandler {
 
     const lib = {};
     WEBREQUEST_EVENTS.forEach(methodName => {
-      this[`triggerCallBack${capitalize(methodName)}`] = (details, callback, callbackId) =>
-        rpc(rpcScopeRenderer, `executeCallback${capitalize(methodName)}`)(callbackId, details)
-          .then(cbReturn => callback ? callback(fromElectronObjectToChromeObject(cbReturn)) : {});
-      lib[`registerCb${capitalize(methodName)}`] = (filter, callbackId) =>
-        this.electronWebRequestApi[methodName](filter, (details, callback) =>
-          this[`triggerCallBack${capitalize(methodName)}`]
-          (fromChromeObjectToElectronObject(details), callback, callbackId))
+      const controler = new RCEventControler(`${extensionId}-webRequest-${methodName}`);
+      controler.on('new-listener', (listenerArgs, remoteCallListener) => {
+        const filter = listenerArgs[0];
+        this.electronWebRequestApi[methodName](filter, (details, callback) => {
+          console.log(details);
+          const p = remoteCallListener(fromChromeObjectToElectronObject(details));
+          
+          if (callback) {
+            p.then(returnedDetails => {
+              if (!returnedDetails) return callback(details);
+              callback(fromElectronObjectToChromeObject(returnedDetails))
+            });
+          }
+        })
+      })
     });
 
-    this.rpcManager = new RpcIpcManager(lib, rpcScopeMain);
+    // this.rpcManager = new RpcIpcManager(lib, rpcScopeMain);
   };
 
   release () {
-    this.rpcManager.release();
+    //this.rpcManager.release();
   }
 }
 
diff --git a/lib/renderer/extensions/web-request.js b/lib/renderer/extensions/web-request.js
index 67b2461..aa5e3e0 100644
--- a/lib/renderer/extensions/web-request.js
+++ b/lib/renderer/extensions/web-request.js
@@ -1,6 +1,7 @@
 const { rpc, RpcIpcManager } = require('electron-simple-rpc');
 const capitalize = require('capitalize');
 const Event = require('../../renderer/extensions/event');
+const RCEvent = require('./rc-event');
 
 const WEBREQUEST_EVENTS = ['onBeforeRequest', 'onBeforeSendHeaders', 'onSendHeaders',
   'onHeadersReceived', 'onAuthRequired', 'onResponseStarted', 'onBeforeRedirect', 'onCompleted',
@@ -59,18 +60,12 @@ class WebRequestEvent extends Event {
 
 class ChromeWebRequestAPIClient {
   constructor(extensionId) {
-    this.rpcScopeMain = `chrome-webRequest-${extensionId}-main`;
-    this.rpcScopeRenderer = `chrome-webRequest-${extensionId}-renderer`;
     this.MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES = 10;
 
     const lib = {};
     WEBREQUEST_EVENTS.forEach(event => {
-      this[event] = new WebRequestEvent(event, this.rpcScopeMain);
-      lib[`executeCallback${capitalize(event)}`] = (callbackId, details) =>
-        callbacks.get(callbackId)(details);
+        this[event] = new RCEvent(`${extensionId}-webRequest-${event}`);
     });
-
-    this.rpcManager = new RpcIpcManager(lib, this.rpcScopeRenderer);
   }
 
   handlerBehaviorChanged () {

From 332d1f23b81520d8352346fbe75fa5e37ebdc470 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Tue, 28 Nov 2017 17:41:45 +0100
Subject: [PATCH 25/28] Remove useless code

---
 lib/browser/api/web-request.js      |  4 ++--
 lib/browser/rc-event-controller.js  | 16 ++++------------
 lib/renderer/extensions/rc-event.js |  3 +--
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index 073101a..bfa4734 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -26,12 +26,12 @@ const fromChromeHeadersToElectronHeaders = (details) => {
 class ChromeWebRequestAPIHandler {
   constructor(extensionId) {
     this.electronWebRequestApi = session.defaultSession.webRequest;
-    this.rcEventControllers = []
+    this.rcEventControllers = [];
 
     WEBREQUEST_EVENTS.forEach(methodName => {
       const controller = new RCEventController(`${extensionId}-webRequest-${methodName}`);
       this.rcEventControllers.push(controller);
-      controller.on('new-listener', (listenerArgs, remoteCallListener) => {
+      controller.on('add-listener', (listenerArgs, remoteCallListener) => {
         const [filter, extraInfos] = listenerArgs;
         this.electronWebRequestApi[methodName](filter, (details, callback) => {
           if (callback)
diff --git a/lib/browser/rc-event-controller.js b/lib/browser/rc-event-controller.js
index 8164691..a6663f7 100644
--- a/lib/browser/rc-event-controller.js
+++ b/lib/browser/rc-event-controller.js
@@ -4,28 +4,20 @@ const EventEmitter = require('events');
 class RCEventController extends EventEmitter {
   constructor(eventId) {
     super();
-    this.listeners = new Map();
 
     this.controlerRPCScope = `${eventId}-controller`;
     this.eventRPCScope = `${eventId}-event`;
 
     this.rcpManager = new RpcIpcManager({
-      addListener: this._addListener.bind(this),
-      removeListener: this._removeListener.bind(this)
+      addListener: this._addListener.bind(this)
     }, this.controlerRPCScope);
     
   }
 
   _addListener(listenerId, listenerArgs) {
-    const remoteCallListener = (args) => {
-      // todo: add timeout
-      return rpc(this.eventRPCScope, 'triggerListener')(listenerId, args);
-    };
-    this.emit('new-listener', listenerArgs, remoteCallListener);
-  }
-
-  _removeListener(listenerId) {
-    this.listeners.delete(listenerId)
+    const remoteCallListener = (args) =>
+      rpc(this.eventRPCScope, 'triggerListener')(listenerId, args).timeout(100);
+    this.emit('add-listener', listenerArgs, remoteCallListener);
   }
 
   release() {
diff --git a/lib/renderer/extensions/rc-event.js b/lib/renderer/extensions/rc-event.js
index 20f34ce..34b7146 100644
--- a/lib/renderer/extensions/rc-event.js
+++ b/lib/renderer/extensions/rc-event.js
@@ -25,8 +25,7 @@ class RCEvent {
 
   removeListener(callback) {
     const [listenerId, cb] = this._listenerIdFromCallback(callback);
-    rpc(this.controllerRPCScope, 'removeListener')(listenerId)
-      .then(() => this.listeners.delete(listenerId));
+    this.listeners.delete(listenerId)
   }
 
   _triggerListener(listenerId, args) {

From c90bc7e3f6128a53cd9a5ef04a163ba1e24dd105 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Tue, 28 Nov 2017 17:50:39 +0100
Subject: [PATCH 26/28] Handle timeout

---
 lib/browser/api/web-request.js     | 7 +++++--
 lib/browser/rc-event-controller.js | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index bfa4734..cb0e09e 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -36,8 +36,11 @@ class ChromeWebRequestAPIHandler {
         this.electronWebRequestApi[methodName](filter, (details, callback) => {
           if (callback)
             remoteCallListener(fromChromeHeadersToElectronHeaders(details))
-              .then(returnedDetails =>
-                callback(fromElectronHeadersToChromeHeaders(returnedDetails)));
+              .then(returnedDetails => {
+                if (!returnedDetails) return callback(details);
+                return callback(fromElectronHeadersToChromeHeaders(returnedDetails))
+              })
+              .catch(e => {})
         })
       })
     });
diff --git a/lib/browser/rc-event-controller.js b/lib/browser/rc-event-controller.js
index a6663f7..c3ffc11 100644
--- a/lib/browser/rc-event-controller.js
+++ b/lib/browser/rc-event-controller.js
@@ -16,7 +16,7 @@ class RCEventController extends EventEmitter {
 
   _addListener(listenerId, listenerArgs) {
     const remoteCallListener = (args) =>
-      rpc(this.eventRPCScope, 'triggerListener')(listenerId, args).timeout(100);
+      rpc(this.eventRPCScope, 'triggerListener')(listenerId, args).timeout(2500);
     this.emit('add-listener', listenerArgs, remoteCallListener);
   }
 

From d8a63d5de7b528a4fd9e154892dc2ea62798cf2f Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Tue, 28 Nov 2017 18:05:44 +0100
Subject: [PATCH 27/28] Small fixes

---
 lib/browser/api/web-request.js      | 2 +-
 lib/browser/rc-event-controller.js  | 7 +++++--
 lib/renderer/extensions/rc-event.js | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/browser/api/web-request.js b/lib/browser/api/web-request.js
index cb0e09e..7ed73ee 100644
--- a/lib/browser/api/web-request.js
+++ b/lib/browser/api/web-request.js
@@ -51,4 +51,4 @@ class ChromeWebRequestAPIHandler {
   }
 }
 
-module.exports = ChromeWebRequestAPIHandler;
\ No newline at end of file
+module.exports = ChromeWebRequestAPIHandler;
diff --git a/lib/browser/rc-event-controller.js b/lib/browser/rc-event-controller.js
index c3ffc11..8655701 100644
--- a/lib/browser/rc-event-controller.js
+++ b/lib/browser/rc-event-controller.js
@@ -1,6 +1,9 @@
 const { rpc, RpcIpcManager } = require('electron-simple-rpc');
+const { ipcMain } = require('electron');
 const EventEmitter = require('events');
 
+ipcMain.setMaxListeners(100);
+
 class RCEventController extends EventEmitter {
   constructor(eventId) {
     super();
@@ -8,7 +11,7 @@ class RCEventController extends EventEmitter {
     this.controlerRPCScope = `${eventId}-controller`;
     this.eventRPCScope = `${eventId}-event`;
 
-    this.rcpManager = new RpcIpcManager({
+    this.rpcManager = new RpcIpcManager({
       addListener: this._addListener.bind(this)
     }, this.controlerRPCScope);
     
@@ -21,7 +24,7 @@ class RCEventController extends EventEmitter {
   }
 
   release() {
-    this.rcpManager.release();
+    this.rpcManager.release();
   }
  }
 
diff --git a/lib/renderer/extensions/rc-event.js b/lib/renderer/extensions/rc-event.js
index 34b7146..42d53a0 100644
--- a/lib/renderer/extensions/rc-event.js
+++ b/lib/renderer/extensions/rc-event.js
@@ -35,7 +35,7 @@ class RCEvent {
     try {
       return listener.call(this, args);
     } catch (e) {
-      return e
+      console.error(e);
     }
   }
 

From 7680b32f751780bd3c9a305140e5441bd2880381 Mon Sep 17 00:00:00 2001
From: Hugo Mano <hugo@hugomano.com>
Date: Tue, 28 Nov 2017 18:09:01 +0100
Subject: [PATCH 28/28] typo

---
 lib/renderer/extensions/rc-event.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/renderer/extensions/rc-event.js b/lib/renderer/extensions/rc-event.js
index 42d53a0..397d675 100644
--- a/lib/renderer/extensions/rc-event.js
+++ b/lib/renderer/extensions/rc-event.js
@@ -8,7 +8,7 @@ class RCEvent {
     this.controllerRPCScope = `${eventId}-controller`;
     this.eventRPCScope = `${eventId}-event`;
 
-    this.rcpManager = new RpcIpcManager({
+    this.rpcManager = new RpcIpcManager({
       triggerListener: this._triggerListener.bind(this)
     }, this.eventRPCScope)
   }