null-checks for extension host testing

host.js

@@ -29,10 +29,14 @@ function localHost(url) {
 }
 
 function extensionHost(url) {
-  var res = url.originUrl.startsWith(browser.runtime.getURL(""));
-  if (res) return res;
-  var res = url.url.startsWith(browser.runtime.getURL(""));
-  if (res) return res;
+  if (url.originUrl !== undefined) {
+    var res = url.originUrl.startsWith(browser.runtime.getURL(""));
+    if (res) return res;
+  }
+  if (url.url !== undefined) {
+    var res = url.url.startsWith(browser.runtime.getURL(""));
+    if (res) return res;
+  }
 }
 
 function i2pHostName(url) {

proxy.js

@@ -143,12 +143,12 @@ var handleContextProxyRequest = async function(requestDetails) {
       } else if (extensionHost(requestDetails.url)) {
         return;
       } else if (i2pHost(requestDetails.url)) {
-        //console.log("(Proxy)I2P URL detected, ");
+        console.log("(Proxy)I2P URL detected, ");
         var tab = tabGet(requestDetails.tabId);
         requestDetails.tabId = tab;
         var context = tab.then(contextGet);
         var proxy = await context.then(handleProxyRequest);
-        //console.log("(proxy)Returning I2P Proxy", proxy);
+        console.log("(proxy)Returning I2P Proxy", proxy);
         return proxy;
       } else {
         var tab = tabGet(requestDetails.tabId);

scrub.js

@@ -366,9 +366,7 @@ var contextSetup = function(requestDetails) {
       setcookie.then(onContextGotLog, onContextError);
       return requestDetails;
     }
-    if (extensionHost(requestDetails)) {
-      return requestDetails;
-    }
+
     if (requestDetails.tabId > 0) {
       var tab = tabGet(requestDetails.tabId);
       if (i2pHost(requestDetails.url)) {
@@ -381,6 +379,9 @@ var contextSetup = function(requestDetails) {
         var i2ptab = tab.then(i2pTabFind, onContextError);
         return requestDetails;
       }
+      if (extensionHost(requestDetails)) {
+        return requestDetails;
+      }
       let localhost = localHost(requestDetails.url);
       let routerhost = routerHost(requestDetails.url);
       if (!routerhost) {