Merge pull request #36 from eyedeekay/rhizome

Rhizome

.gitignore

@@ -1,2 +1,3 @@
 README.md.asc
 node_modules/
+web-ext-artifacts

Makefile

@@ -6,7 +6,6 @@ install: uninstall
 	mkdir -p $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
 		$(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol \
 		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-	cp -r ./chromium/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./icons/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./_locales/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./options/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
@@ -26,6 +25,7 @@ uninstall:
 		$(PREFIX)/share/webext/i2psetproxy.js@eyedeekay.github.io \
 		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 
+
 ls:
 	ls -lah $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io; \
 	ls -lah $(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
@@ -36,8 +36,8 @@ clean:
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES
 
-MOZ_VERSION=0.42
-VERSION=0.43
+MOZ_VERSION=0.48
+VERSION=0.49
 #VERSION=$(MOZ_VERSION)
 #VERSION=1.27
 
@@ -69,10 +69,19 @@ xpi:
 	cp ~/Downloads/i2p_in_private_browsing-$(VERSION)-an+fx.xpi ./i2ppb@eyedeekay.github.io.xpi
 
 version:
+	sed -i 's|7647|7657|g' *.js* */*.js*
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)\",|g' manifest.json
+	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)\",|g' manifest.json
 
 moz-version:
+	sed -i 's|7647|7657|g' *.js* */*.js*
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(MOZ_VERSION)\",|g' manifest.json
+	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(MOZ_VERSION)\",|g' manifest.json
+
+rhz-version:
+	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)\",|g' manifest.json
+	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)-rhizome\",|g' manifest.json
+	sed -i 's|7657|7647|g' *.js* */*.js*
 
 zip: version
 	zip --exclude="./i2ppb@eyedeekay.github.io.xpi" \
@@ -86,7 +95,7 @@ zip: version
 		--exclude="./.git" -r -FS ../i2psetproxy.js.zip *
 
 release:
-	cat desc | gothub release -p -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n $(VERSION) -d -
+	cat desc debian/changelog | gothub release -p -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n $(VERSION) -d -
 
 delete-release:
 	gothub delete -u eyedeekay -r i2psetproxy.js -t $(VERSION); true
@@ -105,36 +114,46 @@ WEB_EXT_API_SECRET=AMO_SECRET
 tk:
 	echo $(WEB_EXT_API_KEY)
 
+submit: moz-sign rhz-submit moz-submit
+
 ##ODD NUMBERED, SELF-DISTRIBUTED VERSIONS HERE!
-sign: version
+moz-sign: version
 	@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
 	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
-	web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
+	web-ext-submit --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	cp web-ext-artifacts/*.xpi ./i2ppb@eyedeekay.github.io.xpi
 
 ##EVEN NUMBERED, MOZILLA-DISTRIBUTED VERSIONS HERE!
-submit: moz-version
+moz-submit: moz-version
 	@echo "Using the 'submit' target to instantly sign an extension for Mozilla distribution"
 	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
-	web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
+	web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+
+rhz-submit: rhz-version
+	@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
+	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
+	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
+	web-ext-submit --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	#cp web-ext-artifacts/*.xpi ./i2ppb@eyedeekay.github.io.xpi
 
 upload-xpi:
-	gothub upload -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi" -f "./i2ppb@eyedeekay.github.io.xpi"
+	gothub upload -R -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi" -f "./i2ppb@eyedeekay.github.io.xpi"
 
 upload-deb:
-	gothub upload -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.deb" -f "../i2psetproxy.js_$(VERSION)-1_amd64.deb"
-
-lib: libpolyfill
-
-libpolyfill:
-	wget -O chromium/browser-polyfill.js https://unpkg.com/webextension-polyfill/dist/browser-polyfill.js
+	gothub upload -R -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.deb" -f "../i2psetproxy.js_$(VERSION)-1_amd64.deb"
+	gothub upload -R -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2psetproxy.js_$(VERSION).orig.tar.gz" -f "../i2psetproxy.js_$(VERSION).orig.tar.gz"
+	gothub upload -R -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1.debian.tar.xz" -f "../i2psetproxy.js_$(VERSION)-1.debian.tar.xz"
+	gothub upload -R -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1.dsc" -f "../i2psetproxy.js_$(VERSION)-1.dsc"
+	gothub upload -R -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.changes" -f "../i2psetproxy.js_$(VERSION)-1_amd64.changes"
+	gothub upload -R -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.buildinfo" -f "../i2psetproxy.js_$(VERSION)-1_amd64.buildinfo"
 
 fmt:
 	cleancss -O1 all -O2 all --format beautify home.css -o .home.css && mv .home.css home.css
 	cleancss -O1 all -O2 all --format beautify info.css -o .info.css && mv .info.css info.css
 	#find . -path ./node_modules -prune -o -name '*.css' -exec cleancss -O1 --format beautify {} \;
-	find . -path ./node_modules -prune -o -name '*.js' -exec prettier --write {} \;
+	find . -path ./node_modules -prune -o -name '*.js*' -exec prettier --write {} \;
 
 lint:
 	eslint --fix *.js
@@ -154,3 +173,6 @@ deb: deborig
 	cd ../i2psetproxy.js-$(VERSION) && debuild -us -uc -rfakeroot
 
 -include mirrors.mk
+
+dat:
+	wget -c -O dat.js https://bundle.run/dat-js

README.md

@@ -6,7 +6,10 @@ WebExtension that does extended configuration of a dedicated I2P browser. While
 needing to touch about:config and disables several
 fingerprinting/de-anonymization vectors on it's own. It is also the easiest way
 to configure an I2P browser on Android without requiring the user to root their
-device.
+device, although this support may be somewhat spotty in recent versions it it
+beginning to improve again. It aims to be as similar to a fully-fledged I2P
+Rhizome as possible and borrows some code from I2P Rhizome(Which it is also
+compatible with).
 
 The Old Version
 ---------------
@@ -56,34 +59,45 @@ command:
    to the I2P container. Isolate the router console from other local
    applications by automatically intercepting requests to the router console to
    another container.
-  * [done/wip] **Indicate** the I2P browser is in use visually. Find an
+  * [done] **Indicate** the I2P browser is in use visually. Find an
    acceptable way to indicate it on Android.
   * [done] **Set** the http proxy to use the local I2P proxy automatically.
    Provide specific configuration for other types of I2P proxies(SOCKS,
    isolating HTTP)
-  * [done/wip] **Disable** risky webRTC features/offer the option to re-enable
+  * [done] **Disable** risky webRTC features/offer the option to re-enable
    them with the proxy enforced.
   * [done] **Change** the color of the browser window to indicate that I2P is in
    use
-  * [done-ish] **Reset** the HTTP Proxy tunnel to generate a new destination
-   on-demand
-   * it does this by working in conjunction with this
-    [standalone HTTP proxy](https://github.com/eyedeekay/httptunnel), currently
-    disabled*.
-  * [ready] **Provide** help in a variety of languages.
+  * [ready/broken/wip] **Provide** help in a variety sof languages.
   * [wip] **Monitor** the health and readiness of the I2P router it is
    instructed to use. Currently the plugin checks whether the HTTP Proxy is
    working by fetching an image from "http://proxy.i2p" and displaying a result.
    A work-in-progress binding to i2pcontrol is available in ./i2pcontrol, it is
    inert at this time.
-  * [1/2] **Handle** router console applications under their own origins and
+  * [Done] **Handle** router console applications under their own origins and
    within their own contextual identity. (1) The router console is automatically
    confined to it's own container tab. (2) Use a custom protocol handler to
    place each i2p application/plugin under it's own origin, shortening router
    console URL's and placing applications under their own origin.
-  * [not started] **Handle Torrents** by talking to i2psnark-rpc plugin and then
+  * [wip] **Handle Torrents** by talking to i2psnark-rpc plugin and then
    adding them directly into the Firefox downloads drop-downs, menus, etc. If I
-   can.
+   can. Right now instead of talking to snark-rpc, it uses a web-based protocl
+   handler that simply auto-fills the torrent into i2psnark.
+  * [barely started] **Isolate** traffic by contextual identity to it's own HTTP
+   Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The
+   contextual identities. For now, the contextual identities used to manage
+   browsing are "I2P Browsing" and "Web Browsing" where I2P Browsing is capable
+   of using an outproxy but in the case of traffic destined for the clearnet
+   does not do header rewriting, and Web Browsing falls back to the Proxy
+   configured in Firefox. The I2P Browsing will be expanded to
+    - I2P Amnesiac Browsing: Use for General Browsing, stores no history and
+    uses an HTTP Proxy with a very short tunnel-close timeout and no key-reuse.
+    - I2P Social Networking: Use this for logging into social network accounts,
+    forums, and other interactive asynchronous public communication platforms
+    where your identity is behaviorally linkable. This has a very long
+    tunnel-close timeout and key-reuse until specifically invoked.
+    - I2P Blogging: Use this for posting content to the web interface of your
+    blog or to other similar websites that you create content on.
 
 ### Screenshot
 

_locales/en/messages.json

@@ -97,10 +97,22 @@
   },
   "controlHostText": {
     "message": "Control Host: ",
-    "description": "Host for the Reset Tunnel button"
+    "description": "Host for the Router Console"
   },
   "controlPortText": {
     "message": "Control Port: ",
-    "description": "Port for the Reset Tunnel button"
+    "description": "Port for the Router Console"
+  },
+  "controlHostValue": {
+    "message": "127.0.0.1",
+    "description": "Host for the Router Console"
+  },
+  "controlPortValue": {
+    "message": "7657",
+    "description": "Port for the Router Console"
+  },
+  "protocolHandlerValue": {
+    "message": "http://__MSG_controlHostValue__:__MSG_controlPortValue__/i2psnark/?nofilter_newURL=%s&action=Add&foo=Add+torrent",
+    "description": "Value for the magnet protocol handler"
   }
 }

background.js

@@ -11,7 +11,7 @@ var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
 var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
 var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
 
-function onGot(contexts) {
+function onContextsGot(contexts) {
   var ids = [];
   for (let context of contexts) {
     console.log(`Name: ${context.name}`);
@@ -78,24 +78,32 @@ function onCreated(context) {
   console.log(`New identity's ID: ${context.cookieStoreId}.`);
 }
 
-function onError(e) {
-  console.error(e);
-}
+browser.contextualIdentities.query({}).then(onContextsGot, onError);
 
-browser.contextualIdentities.query({}).then(onGot, onError);
-
-if (!isDroid()) {
-  chrome.windows.onCreated.addListener(themeWindow);
-  chrome.windows.onFocusChanged.addListener(themeWindow);
-  chrome.windows.onRemoved.addListener(themeWindow);
-  chrome.tabs.onUpdated.addListener(themeWindowByTab);
-  chrome.tabs.onActivated.addListener(themeWindowByTab);
-}
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os == "android") {
+  } else {
+    browser.windows.onCreated.addListener(themeWindow);
+    browser.windows.onFocusChanged.addListener(themeWindow);
+    browser.windows.onRemoved.addListener(themeWindow);
+    browser.tabs.onUpdated.addListener(themeWindowByTab);
+    browser.tabs.onActivated.addListener(themeWindowByTab);
+  }
+});
 
 function themeWindowByTab(tabId) {
   function tabWindow(tab) {
-    getwindow = browser.windows.get(tab.windowId);
-    getwindow.then(themeWindow);
+    var gettingInfo = browser.runtime.getPlatformInfo();
+    gettingInfo.then(got => {
+      if (got.os == "android") {
+        getwindow = browser.tabs.get(tab.tabId);
+        getwindow.then(themeWindow);
+      } else {
+        getwindow = browser.windows.get(tab.windowId);
+        getwindow.then(themeWindow);
+      }
+    });
   }
   if (typeof tabId === "number") {
     tab = browser.tabs.get(tabId);
@@ -108,18 +116,18 @@ function themeWindowByTab(tabId) {
 function themeWindow(window) {
   // Check if the window is in private browsing
   function logTabs(tabInfo) {
-    function onGot(context) {
+    function onContextGotTheme(context) {
       if (context.name == titlepref) {
         console.log("Active in I2P window");
         if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
               frame: "#FFC56D",
               toolbar: "#FFC56D"
             }
           });
         } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
               frame: "#FFC56D",
               toolbar: "#FFC56D"
@@ -129,14 +137,14 @@ function themeWindow(window) {
       } else if (context.name == routerpref) {
         console.log("Active in Router Console window");
         if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
               frame: "#A4C8E1",
               toolbar: "#A4C8E1"
             }
           });
         } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
               frame: "#A4C8E1",
               toolbar: "#A4C8E1"
@@ -146,14 +154,14 @@ function themeWindow(window) {
       } else if (context.name == tunnelpref) {
         console.log("Active in Hidden Services Manager window");
         if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
               frame: "#D9D9D6",
               toolbar: "#D9D9D6"
             }
           });
         } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
               frame: "#D9D9D6",
               toolbar: "#D9D9D6"
@@ -163,14 +171,14 @@ function themeWindow(window) {
       } else if (context.name == mailpref) {
         console.log("Active in Web Mail window");
         if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
               frame: "#F7E59A",
               toolbar: "#F7E59A"
             }
           });
         } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
               frame: "#F7E59A",
               toolbar: "#F7E59A"
@@ -180,14 +188,14 @@ function themeWindow(window) {
       } else if (context.name == torrentpref) {
         console.log("Active in Bittorrent window");
         if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
               frame: "#A48FE1",
               toolbar: "#A48FE1"
             }
           });
         } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
               frame: "#A48FE1",
               toolbar: "#A48FE1"
@@ -196,7 +204,7 @@ function themeWindow(window) {
         }
       } else {
         console.log("Not active in I2P window");
-        chrome.theme.reset(window.id);
+        browser.theme.reset(window.id);
       }
     }
     if (
@@ -205,9 +213,9 @@ function themeWindow(window) {
     ) {
       browser.contextualIdentities
         .get(tabInfo[0].cookieStoreId)
-        .then(onGot, onError);
+        .then(onContextGotTheme, onError);
     } else {
-      chrome.theme.reset(window.id);
+      browser.theme.reset(window.id);
     }
   }
 
@@ -222,76 +230,75 @@ function setTitle(window) {
   function logTabs(tabInfo) {
     console.log(tabInfo);
 
-    function onGot(context) {
+    function onContextGotTitle(context) {
       if (context.name == titlepref) {
         console.log("Active in I2P window");
 
         if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: titleprefpriv
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + ": "
           });
         } else {
-          chrome.windows.update(window.id, {
-            titlePreface: titlepref
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + ": "
           });
         }
       } else if (context.name == webpref) {
         console.log("Active in Web window");
-
         if (window.incognito) {
-          chrome.windows.update(window.id, {
+          browser.windows.update(window.id, {
             titlePreface: ""
           });
         } else {
-          chrome.windows.update(window.id, {
+          browser.windows.update(window.id, {
             titlePreface: ""
           });
         }
       } else if (context.name == routerpref) {
         console.log("Active in Router Console window");
         if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: routerprefpriv
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + " - " + routerprefpriv + ": "
           });
         } else {
-          chrome.windows.update(window.id, {
-            titlePreface: routerpref
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + " - " + routerpref + ": "
           });
         }
       } else if (context.name == tunnelpref) {
         console.log("Active in Hidden Services Manager window");
 
         if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: tunnelprefpriv
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + " - " + tunnelprefpriv + ": "
           });
         } else {
-          chrome.windows.update(window.id, {
-            titlePreface: tunnelpref
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + " - " + tunnelpref + ": "
           });
         }
       } else if (context.name == mailpref) {
         console.log("Active in Web Mail window");
 
         if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: mailprefpriv
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + " - " + mailprefpriv + ": "
           });
         } else {
-          chrome.windows.update(window.id, {
-            titlePreface: mailpref
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + " - " + mailpref + ": "
           });
         }
       } else if (context.name == torrentpref) {
         console.log("Active in I2P window");
 
         if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: torrentprefpriv
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + " - " + torrentprefpriv + ": "
           });
         } else {
-          chrome.windows.update(window.id, {
-            titlePreface: torrentpref
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + " - " + torrentpref + ": "
           });
         }
       }
@@ -303,14 +310,14 @@ function setTitle(window) {
     ) {
       browser.contextualIdentities
         .get(tabInfo[0].cookieStoreId)
-        .then(onGot, onError);
+        .then(onContextGotTitle, onError);
     } else {
       if (window.incognito) {
-        chrome.windows.update(window.id, {
+        browser.windows.update(window.id, {
           titlePreface: ""
         });
       } else {
-        chrome.windows.update(window.id, {
+        browser.windows.update(window.id, {
           titlePreface: ""
         });
       }
@@ -324,26 +331,44 @@ function setTitle(window) {
   querying.then(logTabs, onError);
 }
 
-chrome.windows.onCreated.addListener(() => {
-  /* var gettingStoredSettings = chrome.storage.local.get();
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os == "android") {
+  } else {
+    browser.windows.onCreated.addListener(() => {
+      /* var gettingStoredSettings = chrome.storage.local.get();
      gettingStoredSettings.then(setupProxy, onError); */
-  chrome.storage.local.get(function(got) {
-    setupProxy();
-  });
+      chrome.storage.local.get(function(got) {
+        setupProxy();
+      });
+    });
+  }
 });
 
-chrome.tabs.onCreated.addListener(() => {
-  var getting = browser.windows.getCurrent({
-    populate: true
-  });
-  getting.then(setTitle, onError);
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os == "android") {
+  } else {
+    browser.tabs.onCreated.addListener(() => {
+      var getting = browser.windows.getCurrent({
+        populate: true
+      });
+      getting.then(setTitle, onError);
+    });
+  }
 });
 
-chrome.tabs.onActivated.addListener(() => {
-  var getting = browser.windows.getCurrent({
-    populate: true
-  });
-  getting.then(setTitle, onError);
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os == "android") {
+  } else {
+    browser.tabs.onActivated.addListener(() => {
+      var getting = browser.windows.getCurrent({
+        populate: true
+      });
+      getting.then(setTitle, onError);
+    });
+  }
 });
 
 function handleUpdated(updateInfo) {

bookmarks.js

@@ -1,153 +1,172 @@
-function bookmarks(bookmarkToolbar) {
-  console.log("Setting up bookmark toolbar", bookmarkToolbar);
-  function bookHome(bookmarkItems) {
-    if (!bookmarkItems.length) {
-      function gotProxyInfo(info) {
-        let host = info.value.http.split(":")[0];
-        let port = info.value.http.split(":")[1];
-        if (port == "7644") {
-          var createBookmark = browser.bookmarks.create({
-            url: "about:I2p",
-            title: "I2P Home Page",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
-        } else {
-          var createBookmark = browser.bookmarks.create({
-            url: browser.runtime.getURL("home.html"),
-            title: "I2P Home Page",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
-        }
-        console.log("(bookmarks) adding home page bookmark");
-      }
-      console.log("(bookmarks) checking if we're running in an I2P Browser");
-      var gettingInfo = browser.proxy.settings.get({});
-      gettingInfo.then(gotProxyInfo);
-    }
-  }
-  function bookTorrent(bookmarkItems) {
-    if (!bookmarkItems.length) {
-      function gotProxyInfo(info) {
-        let host = info.value.http.split(":")[0];
-        let port = info.value.http.split(":")[1];
-        if (port == "7644") {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7647/i2psnark",
-            title: "Bittorrent",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
-        } else {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7657/i2psnark",
-            title: "Bittorrent",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os != "android") {
+    function bookmarks(bookmarkToolbar) {
+      console.log("Setting up bookmark toolbar", bookmarkToolbar);
+      function bookHome(bookmarkItems) {
+        if (!bookmarkItems.length) {
+          function gotProxyInfo(info) {
+            let host = info.value.http.split(":")[0];
+            let port = info.value.http.split(":")[1];
+            if (port == "7644") {
+              var createBookmark = browser.bookmarks.create({
+                url: "about:I2p",
+                title: "I2P Home Page",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            } else {
+              var createBookmark = browser.bookmarks.create({
+                url: browser.runtime.getURL("home.html"),
+                title: "I2P Home Page",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            }
+            console.log("(bookmarks) adding home page bookmark");
+          }
+          console.log(
+            "(bookmarks) checking if we're running in an I2P Browser"
+          );
+          var gettingInfo = browser.proxy.settings.get({});
+          gettingInfo.then(gotProxyInfo);
         }
       }
-      console.log("(bookmarks) checking if we're running in an I2P Browser");
-      var gettingInfo = browser.proxy.settings.get({});
-      gettingInfo.then(gotProxyInfo);
-    }
-  }
-  function bookMail(bookmarkItems) {
-    if (!bookmarkItems.length) {
-      function gotProxyInfo(info) {
-        let host = info.value.http.split(":")[0];
-        let port = info.value.http.split(":")[1];
-        if (port == "7644") {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7647/webmail",
-            title: "Web Mail",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
-        } else {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7657/webmail",
-            title: "Web Mail",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
+      function bookTorrent(bookmarkItems) {
+        if (!bookmarkItems.length) {
+          function gotProxyInfo(info) {
+            let host = info.value.http.split(":")[0];
+            let port = info.value.http.split(":")[1];
+            if (port == "7644") {
+              var createBookmark = browser.bookmarks.create({
+                url: "http://localhost:7657/i2psnark",
+                title: "Bittorrent",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            } else {
+              var createBookmark = browser.bookmarks.create({
+                url:
+                  "http://" + control_host + ":" + control_port + "/i2psnark",
+                title: "Bittorrent",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            }
+          }
+          console.log(
+            "(bookmarks) checking if we're running in an I2P Browser"
+          );
+          var gettingInfo = browser.proxy.settings.get({});
+          gettingInfo.then(gotProxyInfo);
         }
-        console.log("(bookmarks) adding webmail bookmark");
       }
-      console.log("(bookmarks) checking if we're running in an I2P Browser");
-      var gettingInfo = browser.proxy.settings.get({});
-      gettingInfo.then(gotProxyInfo);
-    }
-  }
-  function bookI2PTunnel(bookmarkItems) {
-    if (!bookmarkItems.length) {
-      function gotProxyInfo(info) {
-        let host = info.value.http.split(":")[0];
-        let port = info.value.http.split(":")[1];
-        if (port == "7644") {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7647/i2ptunnelmgr",
-            title: "Hidden Services Manager",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
-        } else {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7657/i2ptunnelmgr",
-            title: "Hidden Services Manager",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
+      function bookMail(bookmarkItems) {
+        if (!bookmarkItems.length) {
+          function gotProxyInfo(info) {
+            let host = info.value.http.split(":")[0];
+            let port = info.value.http.split(":")[1];
+            if (port == "7644") {
+              var createBookmark = browser.bookmarks.create({
+                url: "http://localhost:7657/webmail",
+                title: "Web Mail",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            } else {
+              var createBookmark = browser.bookmarks.create({
+                url: "http://" + control_host + ":" + control_port + "/webmail",
+                title: "Web Mail",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            }
+            console.log("(bookmarks) adding webmail bookmark");
+          }
+          console.log(
+            "(bookmarks) checking if we're running in an I2P Browser"
+          );
+          var gettingInfo = browser.proxy.settings.get({});
+          gettingInfo.then(gotProxyInfo);
         }
-        console.log("(bookmarks) adding i2ptunnel bookmark");
       }
-      console.log("(bookmarks) checking if we're running in an I2P Browser");
-      var gettingInfo = browser.proxy.settings.get({});
-      gettingInfo.then(gotProxyInfo);
+      function bookI2PTunnel(bookmarkItems) {
+        if (!bookmarkItems.length) {
+          function gotProxyInfo(info) {
+            let host = info.value.http.split(":")[0];
+            let port = info.value.http.split(":")[1];
+            if (port == "7644") {
+              var createBookmark = browser.bookmarks.create({
+                url: "http://localhost:7657/i2ptunnelmgr",
+                title: "Hidden Services Manager",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            } else {
+              var createBookmark = browser.bookmarks.create({
+                url:
+                  "http://" +
+                  control_host +
+                  ":" +
+                  control_port +
+                  "/i2ptunnelmgr",
+                title: "Hidden Services Manager",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            }
+            console.log("(bookmarks) adding i2ptunnel bookmark");
+          }
+          console.log(
+            "(bookmarks) checking if we're running in an I2P Browser"
+          );
+          var gettingInfo = browser.proxy.settings.get({});
+          gettingInfo.then(gotProxyInfo);
+        }
+      }
+
+      function onRejected(error) {
+        console.log(`An error: ${error}`);
+      }
+      function onCreated(node) {
+        console.log("Bookmarked", node);
+      }
+
+      var b0 = browser.bookmarks.search({
+        title: "I2P Home Page"
+      });
+      b0.then(bookHome, onRejected);
+
+      var b1 = browser.bookmarks.search({
+        title: "Bittorrent"
+      });
+      b1.then(bookTorrent, onRejected);
+
+      var b2 = browser.bookmarks.search({
+        title: "Hidden Services Manager"
+      });
+      b2.then(bookI2PTunnel, onRejected);
+
+      var b3 = browser.bookmarks.search({
+        title: "Web Mail"
+      });
+      b3.then(bookMail, onRejected);
     }
+
+    var bt = browser.bookmarks.search({
+      query: "Toolbar"
+    });
+
+    bt.then(bookmarks);
+
+    function handleCreated(id, bookmarkInfo) {
+      var propValue;
+      for (var propName in bookmarkInfo) {
+        propValue = bookmarkInfo[propName];
+        console.log(propName, propValue);
+      }
+    }
+
+    browser.bookmarks.onCreated.addListener(handleCreated);
   }
-
-  function onRejected(error) {
-    console.log(`An error: ${error}`);
-  }
-  function onCreated(node) {
-    console.log("Bookmarked", node);
-  }
-
-  var b0 = browser.bookmarks.search({
-    title: "I2P Home Page"
-  });
-  b0.then(bookHome, onRejected);
-
-  var b1 = browser.bookmarks.search({
-    title: "Bittorrent"
-  });
-  b1.then(bookTorrent, onRejected);
-
-  var b2 = browser.bookmarks.search({
-    title: "Hidden Services Manager"
-  });
-  b2.then(bookI2PTunnel, onRejected);
-
-  var b3 = browser.bookmarks.search({
-    title: "Web Mail"
-  });
-  b3.then(bookMail, onRejected);
-}
-
-var bt = browser.bookmarks.search({
-  query: "Toolbar"
 });
-
-bt.then(bookmarks);
-
-function handleCreated(id, bookmarkInfo) {
-  var propValue;
-  for (var propName in bookmarkInfo) {
-    propValue = bookmarkInfo[propName];
-    console.log(propName, propValue);
-  }
-}
-
-browser.bookmarks.onCreated.addListener(handleCreated);

chromium/LICENSE

@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.

context.js

@@ -1,21 +1,21 @@
 //var windowIds = []
-
-function onCreated(windowInfo) {
-  console.log(`Created window: ${windowInfo.id}`);
-  browser.tabs.create({
-    windowId: windowInfo.id,
-    url: "about:blank",
-    cookieStoreId: event.target.dataset.identity
-  });
-}
+var titlepref = chrome.i18n.getMessage("titlePreface");
 
 function onError(error) {
   console.log(`Error: ${error}`);
 }
 
 function eventHandler(event) {
+  function onCreated(windowInfo) {
+    console.log(`Created window: ${windowInfo.id}`);
+    browser.tabs.create({
+      windowId: windowInfo.id,
+      url: "about:blank",
+      cookieStoreId: event.target.dataset.identity
+    });
+  }
   if (event.target.dataset.action == "create") {
-    var creating = browser.windows.create({
+    var creating = browser.tabs.create({
       cookieStoreId: event.target.dataset.identity
     });
     creating.then(onCreated, onError);
@@ -52,7 +52,7 @@ if (browser.contextualIdentities === undefined) {
 } else {
   browser.contextualIdentities
     .query({
-      name: "I2P Browser"
+      name: titlepref
     })
     .then(identities => {
       if (!identities.length) {

debian/changelog

@@ -1,8 +1,28 @@
+i2psetproxy.js (0.49-1) UNRELEASED; urgency=low
+
+  * fix tabs
+
+ -- idk <hankhill19580@gmail.com>  Sat, 23 NOV 2019 22:51:11 -0400
+
+i2psetproxy.js (0.47-1) UNRELEASED; urgency=low
+
+  * Improve android compatibility
+  * Improve code organization
+  * Partial protocol handlers implementation
+
+ -- idk <hankhill19580@gmail.com>  Sat, 23 NOV 2019 18:53:11 -0400
+
+i2psetproxy.js (0.45-1) UNRELEASED; urgency=low
+
+  * Improve the user interface a whole bunch
+
+ -- idk <hankhill19580@gmail.com>  Fri, 22 NOV 2019 18:17:33 -0400
+
 i2psetproxy.js (0.43-1) UNRELEASED; urgency=low
 
   * Contextualize All the Things
 
- -- idk <hankhill19580@gmail.com>  Thu, 31 OCT 2019 12:41:33 -0400
+ -- idk <hankhill19580@gmail.com>  Mon, 11 OCT 2019 12:41:33 -0400
 
 i2psetproxy.js (0.41-1) UNRELEASED; urgency=low
 

debian/copyright

@@ -28,6 +28,7 @@ Files:     .gitignore
            scrub.js
            window.html
            debian/*
+           *
 Copyright: MIT
 License:   MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy

debian/rules

@@ -7,7 +7,6 @@ override_dh_auto_install:
 	mkdir -p $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io \
 		$$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol \
 		$$(pwd)/debian/i2psetproxy.js/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-	cp -r ./chromium/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./icons/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./options/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./_locales/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/

geti2p.url

@@ -0,0 +1 @@
+0.9.43

handler.js

@@ -0,0 +1,45 @@
+function identifyProtocolHandler(url) {
+  //console.log("looking for handler-able requests")
+  if (routerHost(url)) {
+    if (url.includes(encodeURIComponent("ext+rc:"))) {
+      return url.replace(encodeURIComponent("ext+rc:"), "");
+    } else if (url.includes("ext+rc:")) {
+      return url.replace("ext+rc:", "");
+    }
+  } else if (url.includes("ext+rc:")) {
+    return url;
+  }
+  return false;
+}
+
+function trimHost(url) {
+  let hostname = "";
+  let prefix = "";
+  if (url.indexOf("://") > -1) {
+    prefix = url.substr(0, url.indexOf("://") + 3);
+    hostname = url.split("/")[2];
+  } else {
+    hostname = url.split("/")[0];
+  }
+  let path = url.replace(prefix + hostname, "");
+  console.log("(handler) path", prefix + hostname, path);
+  return path;
+}
+
+var handlerSetup = async function(requestDetails) {
+  //console.log("checking protocol handler listener")
+  var rwurl = identifyProtocolHandler(requestDetails.url);
+  if (rwurl != false) {
+    console.log("(handler) rewrite URL requested", rwurl);
+    requestDetails.redirectUrl = rwurl;
+    requestDetails.url = trimHost(rwurl);
+    requestDetails.originUrl = trimHost(rwurl);
+  }
+  return requestDetails;
+};
+
+browser.webRequest.onBeforeRequest.addListener(
+  handlerSetup,
+  { urls: ["<all_urls>"] },
+  ["blocking"]
+);

home.css

@@ -76,8 +76,10 @@ p {
   border: 1px solid #d9d9d6;
   border-radius: 2px;
   box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
-  background: #f8f8ff
+  background: #f8f8ff;
+  min-width: 95%
 }
+.application-info,
 .extended-info {
   min-height: 3rem;
   padding: 1rem;
@@ -87,17 +89,7 @@ p {
   border-radius: 2px;
   box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
   background: #f8f8ff;
-  min-width: 50%
-}
-.application-info {
-  min-height: 3rem;
-  padding: 1rem;
-  margin-top: 1.5rem;
-  display: inline-block;
-  border: 1px solid #d9d9d6;
-  border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
-  background: #f8f8ff
+  min-width: 95%
 }
 h1 {
   margin-right: auto;
@@ -269,11 +261,15 @@ li {
 }
 .onboardingContent {
   font-size: .8rem!important;
-  text-align: left
+  text-align: left;
+  display: none
 }
 #proxy-check {
   visibility: hidden
 }
+#info-content {
+  display: none
+}
 .consoleOn:hover #proxy-check,
 .proxyReady:hover #proxy-check {
   visibility: visible;
@@ -282,4 +278,9 @@ li {
 img.readyness {
   height: 100%;
   width: auto
+}
+@media only screen and (max-width: 399px) {
+  .application-info {
+    display: none
+  }
 }

home.html

@@ -12,12 +12,12 @@
     <div class='background'>
       <div class='content'>
         <div class='section-header'>
-          <h1>The Invisible Internet Browser</h1>
+          <h1>I2P In Private Browsing</h1>
         </div>
         <div id="i2pbrowser-version"></div>
           <div id="i2pbrowser-description">
-            <p id="description">The Invisible Internet Browser ( I2P Browser ) is preconfigured to get your content using the anonymous and private I2P network and to provide accessible, first-class access to I2P Peer-to-Peer applications.</p>
-            <p class="beta">This is a experimental sub-project of I2P. It is currently Beta software.</p>
+            <p id="description">I2P in Private Browsing is a webextension to secure and enhance your I2P use in the browser.</p>
+            <p class="beta">This is an experimental product.</p>
           </div>
           <div id="readyness">
             <div id="consoleOn" class="hideIfI2PConsoleOff">
@@ -32,15 +32,15 @@
           </div>
           <div id="onboarding" class="hideIfI2PConsoleOff">
             <h3 id="onboardingTitle">New to I2P? Learn more here.</h3>
-            <h4 id="onboardingZero"><button class="showhider" onclick="flipVisibility('onboardingContentZero')">Protect your Privacy</button></h4>
+            <h4 id="onboardingZero"><button id="onboardingButtonZero" class="showhider" onclick="flipVisibility('onboardingContentZero')">Protect your Privacy</button></h4>
             <p id="onboardingContentZero" class="onboardingContent">I2P Browser allows you to surf the internet using the private and secure I2P network. When using it, you are protected against tracking, surveillance, and censorship as a first-class participant in the I2P network. I2P Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser.</p>
-            <h4 id="onboardingOne"><button class="showhider" onclick="flipVisibility('onboardingContentOne')">Configure your Experience</button></h4>
+            <h4 id="onboardingOne"><button id="onboardingButtonOne" class="showhider" onclick="flipVisibility('onboardingContentOne')">Configure your Experience</button></h4>
             <p id="onboardingContentOne" class="onboardingContent">We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. With all the security and privacy features provided by I2P, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.</p>
-            <h4 id="onboardingTwo"><button class="showhider" onclick="flipVisibility('onboardingContentTwo')">Share Files</button></h4>
+            <h4 id="onboardingTwo"><button id="onboardingButtonTwo" class="showhider" onclick="flipVisibility('onboardingContentTwo')">Share Files</button></h4>
             <p id="onboardingContentTwo" class="onboardingContent">I2P is capable of using peer-to-peer applications like BitTorrent, protecting your identity when you share files. Our anonymous bittorrent client is available in the browser.</p>
-            <h4 id="onboardingThree"><button class="showhider" onclick="flipVisibility('onboardingContentThree')">Hidden e-mail</button></h4>
+            <h4 id="onboardingThree"><button id="onboardingButtonThree" class="showhider" onclick="flipVisibility('onboardingContentThree')">Hidden e-mail</button></h4>
             <p id="onboardingContentThree" class="onboardingContent">There is also an anonymous e-mail service available inside of I2P, which is accessible from our browser via the menu directly below.</p>
-            <h4 id="onboardingFour"><button class="showhider" onclick="flipVisibility('onboardingContentFour')">Experience Tips</button></h4>
+            <h4 id="onboardingFour"><button id="onboardingButtonFour" class="showhider" onclick="flipVisibility('onboardingContentFour')">Experience Tips</button></h4>
             <p id="onboardingContentFour" class="onboardingContent">With all the security and privacy features provided by I2P, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.</p>
           </div>
           <!--<p class="hideIfI2POn">&aboutI2p.warn_not_running; <a href="about:i2p">&aboutI2p.refresh_text;</a> &aboutI2p.reccommend_not_running;</p>-->
@@ -49,17 +49,17 @@
             <h3>Applications</h3>
             <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
               <ul>
-                <a class="applicationName" href="http://127.0.0.1:7657/i2ptunnel">
+                <a class="applicationName" target="_blank" href="http://127.0.0.1:7657/i2ptunnel">
                   <li class="application">
                     Hidden Services Manager <span class="applicationDesc">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span>
                   </li>
                 </a>
-                <a class="applicationName" href="http://127.0.0.1:7657/susimail">
+                <a class="applicationName" target="_blank" href="http://127.0.0.1:7657/susimail">
                   <li class="application">
                   E-Mail <span class="applicationDesc">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span>
                   </li>
                 </a>
-                <a class="applicationName" href="http://127.0.0.1:7657/i2psnark">
+                <a class="applicationName" target="_blank" href="http://127.0.0.1:7657/i2psnark">
                   <li class="application">
                     BitTorrent <span class="applicationDesc">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span>
                   </li>
@@ -68,7 +68,7 @@
             </p>
           </div>
         <div class="extended-info">
-          <h3 id="links"><button class="showhider" onclick="flipVisibility('info-content')">Links</button></h3>
+          <h3 id="links"><button id="fliplinks" class="showhider">Links</button></h3>
             <div id="info-content">
             <p id="linksExplain">If you want to get more information about I2P, you can visit these links.</p>
             <p>

home.js

@@ -1,3 +1,19 @@
+document.addEventListener("click", e => {
+  if (e.target.id === "onboardingButtonZero") {
+    flipVisibility("onboardingContentZero");
+  } else if (e.target.id === "onboardingButtonOne") {
+    flipVisibility("onboardingContentOne");
+  } else if (e.target.id === "onboardingButtonTwo") {
+    flipVisibility("onboardingContentTwo");
+  } else if (e.target.id === "onboardingButtonThree") {
+    flipVisibility("onboardingContentThree");
+  } else if (e.target.id === "onboardingButtonFour") {
+    flipVisibility("onboardingContentFour");
+  } else if (e.target.id === "fliplinks") {
+    flipVisibility("info-content");
+  }
+});
+
 function flipVisibility(div) {
   var x = document.getElementById(div);
   if (x.style.display === "none") {

host.js

@@ -0,0 +1,111 @@
+function proxyHost(url) {
+  let hostname = "";
+  if (url.indexOf("://") > -1) {
+    hostname = url.split("/")[2];
+  } else {
+    hostname = url.split("/")[0];
+  }
+  if (hostname == "proxy.i2p") {
+    return true;
+  }
+  return false;
+}
+
+function localHost(url) {
+  let hostname = "";
+  if (url.indexOf("://") > -1) {
+    hostname = url.split("/")[2];
+  } else {
+    hostname = url.split("/")[0];
+  }
+  hostname = hostname.split(":")[0];
+  if (hostname === "127.0.0.1") {
+    return true;
+  } else if (hostname === "localhost") {
+    return true;
+  }
+
+  return false;
+}
+
+function extensionHost(url) {
+  var res = url.startsWith(browser.runtime.getURL(""));
+  console.log("Extension URL?", res, url, browser.runtime.getURL(""));
+  return res;
+}
+
+function i2pHostName(url) {
+  let hostname = "";
+  if (url.indexOf("://") > -1) {
+    hostname = url.split("/")[2];
+  } else {
+    hostname = url.split("/")[0];
+  }
+  return hostname;
+}
+
+function i2pHost(url) {
+  let hostname = i2pHostName(url);
+  return hostname.endsWith(".i2p");
+}
+
+function routerHost(url) {
+  let hostname = "";
+  let path = "";
+  function pathcheck(str) {
+    if (str != undefined) {
+      let final = str.split("/")[0];
+      if (final === "i2ptunnelmgr" || final === "i2ptunnel") {
+        console.log("(urlcheck) application path", final);
+        return "i2ptunnelmgr";
+      } else if (final === "i2psnark" || final === "torrents") {
+        console.log("(urlcheck) application path", final);
+        return "i2psnark";
+      } else if (final === "webmail" || final === "susimail") {
+        console.log("(urlcheck) application path", final);
+        return "webmail";
+      } else if (
+        final === "home" ||
+        final === "console" ||
+        final.startsWith("config")
+      ) {
+        console.log("(urlcheck) application path", final);
+        return "routerconsole";
+      }
+    }
+    return true;
+  }
+  if (url.indexOf("://") > -1) {
+    hostname = url.split("/")[2];
+    prefix = url.substr(0, url.indexOf("://") + 3);
+    path = url.replace(prefix + hostname + "/", "");
+  } else if (identifyProtocolHandler(url)) {
+    url = identifyProtocolHandler(url);
+    return routerHost(url);
+  } else {
+    hostname = url.split("/")[0];
+    path = url.replace(hostname + "/", "");
+  }
+  if (hostname === control_host + ":" + control_port) {
+    console.log("(hostcheck) router console found on configured ports");
+    return pathcheck(path);
+  } else if (hostname === "127.0.0.1:7657") {
+    return pathcheck(path);
+  } else if (hostname === "localhost:7657") {
+    return pathcheck(path);
+  }
+
+  if (hostname === "127.0.0.1:7657") {
+    return pathcheck(path);
+  } else if (hostname === "localhost:7657") {
+    return pathcheck(path);
+  }
+
+  if (hostname === "127.0.0.1:7070") {
+    return pathcheck(path);
+  } else if (hostname === "localhost:7070") {
+    return pathcheck(path);
+  }
+
+  return false;
+}

info.css

@@ -51,4 +51,4 @@ img.readyness {
 }
 #consoleOn {
   min-height: 2rem
-}
+}

info.js

@@ -1,14 +1,33 @@
-document.addEventListener("click", e => {
-  function getCurrentWindow() {
-    return chrome.windows.getCurrent();
-  }
+function checkPeerConnection() {
+  var getting = browser.privacy.network.peerConnectionEnabled.get({});
+  getting.then(got => {
+    webrtc = got.value;
+    console.log("checking webrtc", webrtc);
+    document.getElementById("enable-web-rtc").checked = webrtc;
+  });
+}
 
+checkPeerConnection();
+
+function checkHistory() {
+  var getting = browser.storage.local.get("disable_history");
+  getting.then(got => {
+    disable_history = got.disable_history;
+    if (disable_history == undefined) disable_history = false;
+    console.log("checking history", disable_history);
+    document.getElementById("disable-history").checked = disable_history;
+  });
+}
+
+checkHistory();
+
+document.addEventListener("click", e => {
   if (e.target.id === "window-create-help-panel") {
     let createData = {
       type: "panel",
       incognito: true
     };
-    let creating = browser.windows.create(createData);
+    let creating = browser.tabs.create(createData);
     creating.then(() => {
       console.log("The help panel has been created");
     });
@@ -17,7 +36,7 @@ document.addEventListener("click", e => {
       type: "panel",
       incognito: true
     };
-    let creating = browser.windows.create(createData);
+    let creating = browser.tabs.create(createData);
     creating.then(() => {
       console.log("The news panel has been created");
     });
@@ -34,12 +53,6 @@ document.addEventListener("click", e => {
     }
     RefreshIdentity();
   } else if (e.target.id === "window-preface-title") {
-    getCurrentWindow().then(currentWindow => {
-      let updateInfo = {
-        titlePreface: "I2P Help | "
-      };
-      chrome.windows.update(currentWindow.id, updateInfo);
-    });
   } else if (e.target.id === "window-visit-homepage") {
     console.log("attempting to create homepage tab");
     goHome();
@@ -62,6 +75,15 @@ document.addEventListener("click", e => {
     } else {
       browser.runtime.sendMessage({ rtc: "disableWebRTC" });
     }
+    //checkPeerConnection()
+    return;
+  } else if (e.target.id === "disable-history") {
+    if (e.target.checked) {
+      browser.runtime.sendMessage({ history: "disableHistory" });
+    } else {
+      browser.runtime.sendMessage({ history: "enableHistory" });
+    }
+    //checkHistory()
     return;
   }
 
@@ -72,17 +94,40 @@ function proxyReadiness() {
   console.log(this.responseText);
 }
 
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os != "android") {
+    browser.history.onVisited.addListener(onVisited);
+  }
+});
+
 function goHome() {
-  let createData = {
-    url: "home.html"
-  };
-  console.log("visiting homepage");
-  let creating = browser.tabs.create(createData);
+  function gotProxyInfo(info) {
+    let host = info.value.http.split(":")[0];
+    let port = info.value.http.split(":")[1];
+    if (port == "7644") {
+      let createData = {
+        url: "about:I2p"
+      };
+      console.log("visiting homepage");
+      let creating = browser.tabs.create(createData);
+    } else {
+      let createData = {
+        url: "home.html"
+      };
+      console.log("visiting homepage");
+      let creating = browser.tabs.create(createData);
+    }
+    console.log("(bookmarks) adding home page bookmark");
+  }
+  console.log("(bookmarks) checking if we're running in an I2P Browser");
+  var gettingInfo = browser.proxy.settings.get({});
+  gettingInfo.then(gotProxyInfo);
 }
 
 function goTunnel() {
   let createData = {
-    url: "http://127.0.0.1:7657/i2ptunnel"
+    url: "http://" + control_host + ":" + control_port + "/i2ptunnel"
   };
   console.log("visiting homepage");
   let creating = browser.tabs.create(createData);
@@ -90,7 +135,7 @@ function goTunnel() {
 
 function goMail() {
   let createData = {
-    url: "http://127.0.0.1:7657/susimail"
+    url: "http://" + control_host + ":" + control_port + "/susimail"
   };
   console.log("visiting homepage");
   let creating = browser.tabs.create(createData);
@@ -98,49 +143,31 @@ function goMail() {
 
 function goSnark() {
   let createData = {
-    url: "http://127.0.0.1:7657/i2psnark"
+    url: "http://" + control_host + ":" + control_port + "/i2psnark"
   };
   console.log("visiting homepage");
   let creating = browser.tabs.create(createData);
 }
-/*
-//document.addEventListener("onpageshow", e => {
-console.log("(Check) Checking Proxy Readiness");
-const Http = new XMLHttpRequest();
-Http.addEventListener("load", proxyReadiness);
-const url = "http://proxy.i2p"; ///themes/console/images/favicon.ico";
-Http.open("GET", url);
-Http.send();
-//});
 
-function transferComplete(evt) {
-  console.log(
-    "The transfer is complete.",
-    this.status,
-    this.statusText,
-    this.responseText
-  );
+function onVisited(historyItem) {
+  function onCleaned(results) {
+    if (!results.length) {
+      console.log(" was removed");
+    } else {
+      console.log(" was not removed");
+    }
+  }
+
+  function onRemoved() {
+    var searching = browser.history.search({
+      text: historyItem.url,
+      startTime: 0
+    });
+    searching.then(onCleaned);
+  }
+  if (!history) {
+    if (i2pHost(historyItem.url))
+      var deletingUrl = browser.history.deleteUrl(historyItem.url);
+    deletingUrl.then(onRemoved);
+  }
 }
-
-function transferFailed(evt) {
-  console.log(
-    "An error occurred while transferring the file.",
-    this.status,
-    this.statusText,
-    this.responseText
-  );
-}
-
-function transferCanceled(evt) {
-  console.log(
-    "The transfer has been canceled by the user.",
-    this.status,
-    this.statusText,
-    this.responseText
-  );
-}
-
-Http.addEventListener("load", transferComplete);
-Http.addEventListener("error", transferFailed);
-Http.addEventListener("abort", transferCanceled);
-*/

manifest.json

@@ -5,7 +5,6 @@
       "strict_min_version": "60.0"
     }
   },
-  "content_security_policy": "script-src 'self' 'sha256-AT9pbzcnD9T9Agf3fMgPh55nsx/xONoULxPFvOb93Uo='; object-src 'self'",
   "permissions": [
     "theme",
     "browsingData",
@@ -24,7 +23,8 @@
   ],
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "0.43",
+  "version": "0.49",
+  "version_name": "0.49",
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://github.com/eyedeekay/i2psetproxy.js",
   "icons": {
@@ -44,6 +44,8 @@
       "privacy.js",
       "platform.js",
       "background.js",
+      "host.js",
+      "handler.js",
       "proxy.js",
       "info.js",
       "home.js",
@@ -52,11 +54,22 @@
       "bookmarks.js"
     ]
   },
-  "protocol_handlers": [{
-    "protocol": "web+rc",
-    "name": "RouterConsole",
-    "uriTemplate": "http://router.console/?%s"
-  }],
+  "protocol_handlers": [
+    {
+      "protocol": "ext+rc",
+      "name": "RouterConsole",
+      "uriTemplate": "http://127.0.0.1:7657/%s"
+    },
+    {
+      "protocol": "ext+dati2p",
+      "name": "Dat over I2P",
+      "uriTemplate": "/dat.html#!/%s"
+    },
+    {
+      "protocol": "magnet",
+      "name": "I2PTorrent",
+      "uriTemplate": "__MSG_protocolHandlerValue__"
+    }
+  ],
   "default_locale": "en"
 }
-

options/options.js

@@ -1,14 +1,3 @@
-function isDroid() {
-  var gettingInfo = browser.runtime.getPlatformInfo();
-  gettingInfo.then(got => {
-    if (got.os == "android") {
-      return true;
-    } else {
-      return false;
-    }
-  });
-}
-
 function SetHostText() {
   var hostid = document.getElementById("hostText");
   hostid.textContent = chrome.i18n.getMessage("hostText");
@@ -24,174 +13,6 @@ function SetControlHostText() {
   controlhostid.textContent = chrome.i18n.getMessage("controlHostText");
 }
 
-var handleContextProxyRequest = async function(requestDetails) {
-  console.log("(proxy)Searching for proxy by context");
-  try {
-    var handleProxyRequest = function(context) {
-      proxy = {
-        failoverTimeout: 0,
-        proxyDns: false
-      };
-      if (context != undefined) {
-        if (context.name == "i2pbrowser") {
-          proxy = {
-            type: getScheme(),
-            host: getHost(),
-            port: getPort()
-          };
-          console.log(
-            "(proxy)",
-            context.name,
-            "Using",
-            proxy.type,
-            "proxy ",
-            proxy.host + ":" + proxy.port
-          );
-          return proxy;
-        } else if (context.name == "routerconsole") {
-          if (routerHost(requestDetails.url)) {
-            return proxy;
-          } else if (!routerHost(requestDetails.url)) {
-            proxy = {
-              type: "http",
-              host: "localhost",
-              port: "65535"
-            };
-          }
-          proxy = {
-            type: getScheme(),
-            host: getHost(),
-            port: getPort()
-          };
-          console.log(
-            "(proxy)",
-            context.name,
-            "Using",
-            proxy.type,
-            "proxy ",
-            proxy.host + ":" + proxy.port
-          );
-          return proxy;
-        } else if (context.name == "fenced-default") {
-          if (localHost(requestDetails.url)) {
-            if (!routerHost(requestDetails.url)) {
-              proxy = {
-                type: "http",
-                host: "localhost",
-                port: "65535"
-              };
-            }
-          }
-          console.log(
-            "(proxy)",
-            context.name,
-            "Using",
-            proxy.type,
-            "proxy ",
-            proxy.host + ":" + proxy.port
-          );
-          return proxy;
-        }
-      }
-      if (!routerHost(requestDetails.url)) {
-        proxy = {
-          type: "http",
-          host: "localhost",
-          port: "65535"
-        };
-      } else if (i2pHost(requestDetails.url)) {
-        proxy = {
-          type: getScheme(),
-          host: getHost(),
-          port: getPort()
-        };
-      }
-      return proxy;
-    };
-    var contextGet = async function(tabInfo) {
-      try {
-        console.log("(proxy)Tab info from Function", tabInfo);
-        context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
-        return context;
-      } catch (error) {
-        console.log("(proxy)Context Error", error);
-      }
-    };
-    var tabFind = async function(tabId) {
-      try {
-        context = await browser.contextualIdentities.query({
-          name: "i2pbrowser"
-        });
-        tabId.cookieStoreId = context[0].cookieStoreId;
-        console.log("(proxy) forcing context", tabId.cookieStoreId);
-        return tabId;
-      } catch (error) {
-        console.log("(proxy)Context Error", error);
-      }
-    };
-    var tabGet = async function(tabId) {
-      try {
-        console.log("(proxy)Tab ID from Request", tabId);
-        let tabInfo = await browser.tabs.get(tabId);
-        return tabInfo;
-      } catch (error) {
-        console.log("(proxy)Tab error", error);
-      }
-    };
-
-    if (requestDetails.tabId > 0) {
-      if (proxyHost(requestDetails.url)) {
-        console.log("(Proxy)I2P Proxy test URL detected, ", requestDetails.url);
-        return {
-          type: getScheme(),
-          host: getHost(),
-          port: getPort()
-        };
-      } else if (i2pHost(requestDetails.url)) {
-        console.log("(Proxy)I2P URL detected, ");
-        var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
-        requestDetails.tabId = mtab;
-        var context = mtab.then(contextGet);
-        var proxy = await context.then(handleProxyRequest);
-        console.log("(proxy)Returning I2P Proxy", proxy);
-        return proxy;
-      } else {
-        var tab = tabGet(requestDetails.tabId);
-        var context = tab.then(contextGet);
-        var proxy = await context.then(handleProxyRequest);
-        console.log("(proxy)Returning I2P Proxy", proxy);
-        return proxy;
-      }
-      proxy = {
-        type: getScheme(),
-        host: getHost(),
-        port: getPort()
-      };
-      console.log("(proxy)Returning I2P Proxy", proxy);
-      return proxy;
-    }
-  } catch (error) {
-    console.log("(proxy)Not using I2P Proxy.", error);
-  }
-};
-
-function setupProxy() {
-  var controlHost = getControlHost();
-  var controlPort = getControlPort();
-  var Host = getHost();
-  var Port = getPort();
-  var Scheme = getScheme();
-
-  /**/
-  console.log("Setting up Firefox WebExtension proxy");
-  browser.proxy.onRequest.addListener(handleContextProxyRequest, {
-    urls: ["<all_urls>"]
-  });
-  console.log("i2p settings created for WebExtension Proxy");
-  /**/
-}
-
 function SetControlPortText() {
   var controlportid = document.getElementById("controlPortText");
   controlportid.textContent = chrome.i18n.getMessage("controlPortText");
@@ -324,6 +145,75 @@ function checkStoredSettings(storedSettings) {
   gettingInfo.then(gotProxyInfo);
 }
 
+function checkAndroidStoredSettings(storedSettings) {
+  let defaultSettings = {};
+  let host = "";
+  let port = "";
+  console.log("proxy", "'" + host + "'", ":", port);
+  if (!storedSettings.proxy_scheme) {
+    defaultSettings["proxy_scheme"] = "http";
+  }
+  if (!storedSettings.proxy_host) {
+    if (host == "") {
+      defaultSettings["proxy_host"] = "127.0.0.1";
+    } else {
+      defaultSettings["proxy_host"] = host;
+    }
+  } else {
+    if (host != "") {
+      defaultSettings["proxy_host"] = host;
+    } else {
+      defaultSettings["proxy_host"] = storedSettings.proxy_host;
+    }
+  }
+  if (!storedSettings.proxy_port) {
+    if (port == undefined) {
+      defaultSettings["proxy_port"] = 4444;
+    } else {
+      defaultSettings["proxy_port"] = port;
+    }
+  } else {
+    if (port != undefined) {
+      defaultSettings["proxy_port"] = port;
+    } else {
+      defaultSettings["proxy_port"] = storedSettings.proxy_port;
+    }
+  }
+  if (!storedSettings.control_host) {
+    if (host == "") {
+      defaultSettings["control_host"] = "127.0.0.1";
+    } else {
+      defaultSettings["control_host"] = host;
+    }
+  } else {
+    if (host != "") {
+      defaultSettings["control_host"] = host;
+    } else {
+      defaultSettings["control_host"] = storedSettings.control_host;
+    }
+  }
+  if (!storedSettings.control_port) {
+    if (port == undefined) {
+      defaultSettings["control_port"] = 4444;
+    } else {
+      defaultSettings["control_port"] = port;
+    }
+  } else {
+    if (port != undefined) {
+      defaultSettings["control_port"] = port;
+    } else {
+      defaultSettings["control_port"] = storedSettings.control_port;
+    }
+  }
+  console.log(
+    defaultSettings["proxy_host"],
+    defaultSettings["proxy_port"],
+    defaultSettings["control_host"],
+    defaultSettings["control_port"]
+  );
+  chrome.storage.local.set(defaultSettings);
+}
+
 function onError(e) {
   console.error(e);
 }
@@ -346,7 +236,6 @@ function storeSettings() {
   console.log("storing proxy port:", proxy_port);
   console.log("storing control host:", control_host);
   console.log("storing control port:", control_port);
-  setupProxy();
 }
 
 function updateUI(restoredSettings) {
@@ -375,15 +264,25 @@ function updateUI(restoredSettings) {
   SetControlHostText();
   SetControlPortText();
   SetControlHelpText();
-  setupProxy();
 }
 
 function onError(e) {
   console.error(e);
 }
-chrome.storage.local.get(function(got) {
-  checkStoredSettings(got);
-  updateUI(got);
+
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os != "android") {
+    chrome.storage.local.get(function(got) {
+      checkStoredSettings(got);
+      updateUI(got);
+    });
+  } else {
+    chrome.storage.local.get(function(got) {
+      checkAndroidStoredSettings(got);
+      updateUI(got);
+    });
+  }
 });
 
 const saveButton = document.querySelector("#save-button");

platform.js

@@ -1,13 +1,30 @@
+var titlepref = chrome.i18n.getMessage("titlePreface");
+var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
+var webpref = chrome.i18n.getMessage("webPreface");
+var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
+var routerpref = chrome.i18n.getMessage("routerPreface");
+var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
+var mailpref = chrome.i18n.getMessage("mailPreface");
+var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
+var torrentpref = chrome.i18n.getMessage("torrentPreface");
+var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
+var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
+var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
+
+var android = false;
+
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os == "android") {
+    console.log("Running in Android detected");
+    android = true;
+    return true;
+  } else {
+    console.log("Running in Desktop detected");
+    return false;
+  }
+});
+
 function isDroid() {
-  var gettingInfo = browser.runtime.getPlatformInfo();
-  gettingInfo.then(got => {
-    if (got.os == "android") {
-      console.log("Running in Android detected");
-      return true;
-    } else {
-      console.log("Running in Desktop detected");
-      return false;
-    }
-  });
-  return false;
+  return android;
 }

privacy.js

@@ -86,7 +86,7 @@ function disableReferrers() {
 
 // enable fingerprinting resistent features(letterboxing and stuff)
 function enableResistFingerprinting() {
-  var setting = browser.privacy.websites.referrersEnabled.set({
+  var setting = browser.privacy.websites.resistFingerprinting.set({
     value: true
   });
   console.log("Enabling resist fingerprinting/val=", {
@@ -139,32 +139,56 @@ function setAllPrivacy() {
 setAllPrivacy();
 
 function ResetPeerConnection() {
-  browser.privacy.network.peerConnectionEnabled.set({
-    value: false
+  var webrtc = false;
+  var rtc = browser.privacy.network.peerConnectionEnabled.set({
+    value: webrtc
   });
-  browser.privacy.network.networkPredictionEnabled.set({
-    value: false
-  });
-  chrome.privacy.network.webRTCIPHandlingPolicy.set({
-    value: "disable_non_proxied_udp"
-  });
-  console.log("Re-disabled WebRTC");
+  rtc.then(AssurePeerConnection);
 }
 
 function EnablePeerConnection() {
-  browser.privacy.network.peerConnectionEnabled.set({
-    value: true
-  });
-  browser.privacy.network.networkPredictionEnabled.set({
-    value: false
-  });
-  chrome.privacy.network.webRTCIPHandlingPolicy.set({
-    value: "disable_non_proxied_udp"
+  var webrtc = false;
+  var rtc = browser.privacy.network.peerConnectionEnabled.set({
+    value: webrtc
   });
+  rtc.then(SetupPeerConnection);
   console.log("Enabled WebRTC");
 }
 
-ResetPeerConnection();
+function SetupPeerConnection() {
+  var webrtc = true;
+  console.log("Pre-disabled WebRTC");
+  rtc = browser.privacy.network.peerConnectionEnabled.set({
+    value: webrtc
+  });
+  rtc.then(AssurePeerConnection);
+}
+
+function AssurePeerConnection() {
+  function assure(webrtc) {
+    browser.privacy.network.peerConnectionEnabled.set({
+      value: webrtc.value
+    });
+    browser.privacy.network.networkPredictionEnabled.set({
+      value: false
+    });
+    chrome.privacy.network.webRTCIPHandlingPolicy.set({
+      value: "proxy_only"
+    });
+  }
+  rtc = browser.privacy.network.peerConnectionEnabled.get({});
+  rtc.then(assure);
+}
+
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os == "android") {
+    browser.tabs.onCreated.addListener(ResetPeerConnection);
+  } else {
+    browser.windows.onCreated.addListener(ResetPeerConnection);
+  }
+});
+//AssurePeerConnection();
 
 function ResetDisableSavePasswords() {
   browser.privacy.services.passwordSavingEnabled.set({
@@ -196,13 +220,6 @@ function onError(e) {
   console.error(e);
 }
 
-function checkStoredSettings(storedSettings) {
-  chrome.storage.local.set(appSettings);
-}
-
-const gettingStoredSettings = browser.storage.local.get();
-gettingStoredSettings.then(checkStoredSettings, onError);
-
 function clearCookiesContext(cookieStoreId) {}
 
 function forgetBrowsingData(storedSettings) {
@@ -256,28 +273,28 @@ function forgetBrowsingData(storedSettings) {
             hostnames: [i2pHostName(item.url)],
             since
           })
-          .then(onGot);
+          .then(onContextGotLog);
         console.log("cleared Passwords");
         browser.browsingData
           .removeDownloads({
             hostnames: [i2pHostName(item.url)],
             since
           })
-          .then(onGot);
+          .then(onContextGotLog);
         console.log("cleared Downloads");
         browser.browsingData
           .removeFormData({
             hostnames: [i2pHostName(item.url)],
             since
           })
-          .then(onGot);
+          .then(onContextGotLog);
         console.log("cleared Form Data");
         browser.browsingData
           .removeLocalStorage({
             hostnames: [i2pHostName(item.url)],
             since
           })
-          .then(onGot);
+          .then(onContextGotLog);
         console.log("cleared Local Storage");
 
         contexts = browser.contextualIdentities.query({
@@ -291,7 +308,7 @@ function forgetBrowsingData(storedSettings) {
               name: cookie.name,
               url: item.url
             });
-            removing.then(onGot, onError);
+            removing.then(onContextGotLog, onError);
           }
           console.log("Cleared cookies");
         }
@@ -338,7 +355,7 @@ function i2pHost(url) {
   return hostname.endsWith(".i2p");
 }
 
-function onGot(contexts) {
+function onContextGotLog(contexts) {
   if (contexts != null) {
     for (let context of contexts) {
       console.log(context);
@@ -348,13 +365,48 @@ function onGot(contexts) {
 
 browser.runtime.onMessage.addListener(message);
 
+function enableHistory() {
+  function checkStoredSettings(storedSettings) {
+    storedSettings["disable_history"] = false;
+    console.log(storedSettings);
+    function enablehistory(settings) {
+      console.log("Store History:", storedSettings);
+    }
+    var setting = browser.storage.local.set(storedSettings);
+    setting.then(enablehistory);
+  }
+  const gettingStoredSettings = browser.storage.local.get();
+  gettingStoredSettings.then(checkStoredSettings, onError);
+}
+
+function disableHistory() {
+  function checkStoredSettings(storedSettings) {
+    storedSettings["disable_history"] = true;
+    console.log(storedSettings);
+    function enablehistory(settings) {
+      console.log("Store History:", storedSettings);
+    }
+    var setting = browser.storage.local.set(storedSettings);
+    setting.then(enablehistory);
+  }
+  const gettingStoredSettings = browser.storage.local.get();
+  gettingStoredSettings.then(checkStoredSettings, onError);
+}
+
 function message(message) {
   console.log(message);
   if (message.rtc === "enableWebRTC") {
     console.log("enableWebRTC");
     EnablePeerConnection();
-  } else {
+  } else if (message.rtc === "disableWebRTC") {
     console.log("disableWebRTC");
     ResetPeerConnection();
   }
+  if (message.history === "enableHistory") {
+    console.log("enableHistory");
+    enableHistory();
+  } else if (message.history === "disableHistory") {
+    console.log("disableHistory");
+    disableHistory();
+  }
 }

proxy.js

@@ -1,3 +1,5 @@
+var titlepref = chrome.i18n.getMessage("titlePreface");
+var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
 var webpref = chrome.i18n.getMessage("webPreface");
 var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
 var routerpref = chrome.i18n.getMessage("routerPreface");
@@ -33,6 +35,10 @@ var handleContextProxyRequest = async function(requestDetails) {
         failoverTimeout: 0,
         proxyDns: false
       };
+      if (context == "firefox-default" || context == "firefox-private") {
+        proxy = null;
+        return proxy;
+      }
       if (context != undefined) {
         if (context.name == titlepref) {
           proxy = {
@@ -121,15 +127,7 @@ var handleContextProxyRequest = async function(requestDetails) {
         context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
         return context;
       } catch (error) {
-        console.log("(proxy)Context Error", error);
-      }
-    };
-    var tabFind = async function(tabId) {
-      try {
-        console.log("(proxy) forcing context", tabId.cookieStoreId);
-        return tabId;
-      } catch (error) {
-        console.log("(proxy)Context Error", error);
+        return "firefox-default";
       }
     };
     var tabGet = async function(tabId) {
@@ -154,9 +152,8 @@ var handleContextProxyRequest = async function(requestDetails) {
       } else if (i2pHost(requestDetails.url)) {
         console.log("(Proxy)I2P URL detected, ");
         var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
-        requestDetails.tabId = mtab;
-        var context = mtab.then(contextGet);
+        requestDetails.tabId = tab;
+        var context = tab.then(contextGet);
         var proxy = await context.then(handleProxyRequest);
         console.log("(proxy)Returning I2P Proxy", proxy);
         return proxy;
@@ -177,6 +174,113 @@ var handleContextProxyRequest = async function(requestDetails) {
 };
 
 var proxy_scheme = "HTTP";
+var proxy_host = "127.0.0.1";
+var proxy_port = "4444";
+var control_host = "127.0.0.1";
+var control_port = "4444";
+var disable_history = false;
+
+function SetupSettings() {
+  console.log("Initialising Settings");
+  //
+  function checkSchemeStoredSettings(storedSettings) {
+    if (storedSettings.proxy_scheme != undefined) {
+      proxy_scheme = storedSettings.proxy_scheme;
+    } else {
+      proxy_scheme = "http";
+      storedSettings.proxy_scheme = proxy_scheme;
+    }
+    console.log("Initialising Proxy Scheme", storedSettings.proxy_scheme);
+    setupProxy();
+  }
+  var gettingSchemeStoredSettings = browser.storage.local.get("proxy_scheme");
+  gettingSchemeStoredSettings.then(checkSchemeStoredSettings, onError);
+
+  //
+  function checkHostStoredSettings(storedSettings) {
+    if (storedSettings.proxy_host != undefined) {
+      proxy_host = storedSettings.proxy_host;
+    } else {
+      proxy_host = "127.0.0.1";
+      storedSettings.proxy_host = proxy_host;
+    }
+    console.log("Initialising Host", storedSettings.proxy_host);
+    setupProxy();
+  }
+  var gettingHostStoredSettings = browser.storage.local.get("proxy_host");
+  gettingHostStoredSettings.then(checkHostStoredSettings, onError);
+
+  //
+  function checkPortStoredSettings(storedSettings) {
+    if (storedSettings.proxy_port != undefined) {
+      proxy_port = storedSettings.proxy_port;
+    } else {
+      proxy_port = "4444";
+      storedSettings.proxy_port = proxy_port;
+    }
+    console.log("Initialising Port", storedSettings.proxy_port);
+    setupProxy();
+  }
+  var gettingPortStoredSettings = browser.storage.local.get("proxy_port");
+  gettingPortStoredSettings.then(checkPortStoredSettings, onError);
+
+  //
+  function checkControlHostStoredSettings(storedSettings) {
+    if (storedSettings.control_host != undefined) {
+      control_host = storedSettings.control_host;
+    } else {
+      control_host = "127.0.0.1";
+      storedSettings.control_host = control_host;
+    }
+    console.log("Initialising Control Host", storedSettings.control_host);
+    setupProxy();
+  }
+  var gettingControlHostStoredSettings = browser.storage.local.get(
+    "control_host"
+  );
+  gettingControlHostStoredSettings.then(
+    checkControlHostStoredSettings,
+    onError
+  );
+
+  //
+  function checkControlPortStoredSettings(storedSettings) {
+    if (storedSettings.control_port != undefined) {
+      contro_port = storedSettings.control_port;
+    } else {
+      control_port = "7657";
+      storedSettings.control_port = control_port;
+    }
+    console.log("Initialising Control Port", storedSettings.control_port);
+    setupProxy();
+  }
+  var gettingControlPortStoredSettings = browser.storage.local.get(
+    "control_port"
+  );
+  gettingControlPortStoredSettings.then(
+    checkControlPortStoredSettings,
+    onError
+  );
+
+  //
+  function checkHistoryStoredSettings(storedSettings) {
+    if (storedSettings.disable_history != undefined) {
+      disable_history = storedSettings.disable_history;
+    } else {
+      disable_history = false;
+      storedSettings.disable_history = disable_history;
+    }
+    console.log(
+      "Initialising Disabled History",
+      storedSettings.disable_history
+    );
+    setupProxy();
+  }
+  var gettingHistoryStoredSettings = browser.storage.local.get(
+    "disable_history"
+  );
+  gettingHistoryStoredSettings.then(checkHistoryStoredSettings, onError);
+}
 
 function getScheme() {
   if (proxy_scheme == undefined) {
@@ -195,13 +299,6 @@ function getScheme() {
   return proxy_scheme;
 }
 
-/*
-var proxy_host = "127.0.0.1";
-var proxy_port = "4444";
-var control_host = "127.0.0.1";
-var control_port = "4444";
-*/
-
 function getHost() {
   if (proxy_host == undefined) {
     proxy_host = "127.0.0.1";
@@ -230,17 +327,17 @@ function getControlHost() {
 
 function getControlPort() {
   if (control_port == undefined) {
-    return "4444";
+    return "7657";
   }
   return control_port;
 }
 
 function setupProxy() {
-  var controlHost = getControlHost();
-  var controlPort = getControlPort();
-  var Host = getHost();
-  var Port = getPort();
-  var Scheme = getScheme();
+  //var controlHost = getControlHost();
+  //var controlPort = getControlPort();
+  //var Host = getHost();
+  //var Port = getPort();
+  //var Scheme = getScheme();
 
   /**/
   console.log("Setting up Firefox WebExtension proxy");
@@ -251,107 +348,35 @@ function setupProxy() {
   /**/
 }
 
-function checkStoredSettings(storedSettings) {
-  function gotProxyInfo(info) {
-    let defaultSettings = {};
-    let host = info.value.http.split(":")[0];
-    let port = info.value.http.split(":")[1];
-    console.log("proxy", "'" + host + "'", ":", port);
-    if (!storedSettings.proxy_scheme) {
-      defaultSettings["proxy_scheme"] = "http";
-    }
-    if (!storedSettings.proxy_host) {
-      if (host == "") {
-        defaultSettings["proxy_host"] = "127.0.0.1";
-      } else {
-        defaultSettings["proxy_host"] = host;
-      }
-    } else {
-      if (host != "") {
-        defaultSettings["proxy_host"] = host;
-      } else {
-        defaultSettings["proxy_host"] = storedSettings.proxy_host;
-      }
-    }
-    if (!storedSettings.proxy_port) {
-      if (port == undefined) {
-        defaultSettings["proxy_port"] = 4444;
-      } else {
-        defaultSettings["proxy_port"] = port;
-      }
-    } else {
-      if (port != undefined) {
-        defaultSettings["proxy_port"] = port;
-      } else {
-        defaultSettings["proxy_port"] = storedSettings.proxy_port;
-      }
-    }
-    if (!storedSettings.control_host) {
-      if (host == "") {
-        defaultSettings["control_host"] = "127.0.0.1";
-      } else {
-        defaultSettings["control_host"] = host;
-      }
-    } else {
-      if (host != "") {
-        defaultSettings["control_host"] = host;
-      } else {
-        defaultSettings["control_host"] = storedSettings.control_host;
-      }
-    }
-    if (!storedSettings.control_port) {
-      if (port == undefined) {
-        defaultSettings["control_port"] = 4444;
-      } else {
-        defaultSettings["control_port"] = port;
-      }
-    } else {
-      if (port != undefined) {
-        defaultSettings["control_port"] = port;
-      } else {
-        defaultSettings["control_port"] = storedSettings.control_port;
-      }
-    }
-    console.log("(browserinfo) NATIVE PROXYSETTINGS", info.value);
-    console.log(
-      defaultSettings["proxy_host"],
-      defaultSettings["proxy_port"],
-      defaultSettings["control_host"],
-      defaultSettings["control_port"]
-    );
-    chrome.storage.local.set(defaultSettings);
-  }
-  var gettingInfo = browser.proxy.settings.get({});
-  gettingInfo.then(gotProxyInfo);
-}
-
-//function gotProxyInfo(info) {
-//console.log("(browserinfo)", info.value);
-//}
-
-//var gettingInfo = browser.proxy.settings.get({});
-//gettingInfo.then(gotProxyInfo);
-
-function update(restoredSettings) {
-  proxy_scheme = restoredSettings.proxy_scheme;
+function update() {
   console.log("restoring proxy scheme:", proxy_scheme);
-  proxy_host = restoredSettings.proxy_host;
   console.log("restoring proxy host:", proxy_host);
-  proxy_port = restoredSettings.proxy_port;
   console.log("restoring proxy port:", proxy_port);
-  control_host = restoredSettings.control_host;
   console.log("restoring control host:", control_host);
-  control_port = restoredSettings.control_port;
   console.log("restoring control port:", control_port);
 }
 
-chrome.storage.local.get(function(got) {
-  checkStoredSettings(got);
-  update(got);
-  setupProxy();
-});
-
-// Theme all currently open windows
-if (!isDroid()) {
-  browser.windows.getAll().then(wins => wins.forEach(themeWindow));
+function updateFromStorage() {
+  console.log("updating settings from storage");
+  var gettingInfo = browser.runtime.getPlatformInfo();
+  gettingInfo.then(got => {
+    if (got.os != "android") {
+      browser.windows.getAll().then(wins => wins.forEach(themeWindow));
+      chrome.storage.local.get(function(got) {
+        SetupSettings();
+        update();
+        setupProxy();
+      });
+    } else {
+      chrome.storage.local.get(function(got) {
+        SetupSettings();
+        update();
+        setupProxy();
+      });
+    }
+  });
 }
+
+browser.storage.onChanged.addListener(updateFromStorage);
+SetupSettings();
+setupProxy();

scrub.js

@@ -16,7 +16,7 @@ var contextScrub = async function(requestDetails) {
   try {
     var headerScrub = function(context) {
       if (!context) {
-        console.error("Context not found");
+        console.error("Context not found", context);
       } else if (context.name == titlepref) {
         var ua = "MYOB/6.66 (AN/ON)";
         if (i2pHost(requestDetails.url)) {
@@ -52,28 +52,19 @@ var contextScrub = async function(requestDetails) {
         context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
         return context;
       } catch (error) {
-        console.log("(scrub)Conext Error", error);
-      }
-    };
-    var tabFind = async function(tabId) {
-      try {
-        context = await browser.contextualIdentities.query({
-          name: titlepref
-        });
-        tabId.cookieStoreId = context[0].cookieStoreId;
-        console.log("(scrub) forcing context", tabId.cookieStoreId);
-        return tabId;
-      } catch (error) {
-        console.log("(scrub)Context Error", error);
+        return "firefox-default";
       }
     };
     var tabGet = async function(tabId) {
       try {
         console.log("(scrub)Tab ID from Request", tabId);
+        let ostype = await browser.runtime.getPlatformInfo();
+        if (ostype == android) tabId += 1;
         let tabInfo = await browser.tabs.get(tabId);
         return tabInfo;
       } catch (error) {
-        console.log("(scrub)Tab error", error);
+        let tabInfo = await browser.tabs.getCurrent();
+        return tabInfo;
       }
     };
     if (requestDetails.tabId > 0) {
@@ -81,18 +72,16 @@ var contextScrub = async function(requestDetails) {
       var context = {};
       var req = {};
       if (i2pHost(requestDetails.url)) {
-        console.log("(Proxy)I2P URL detected, ");
+        console.log("(scrub)I2P URL detected, ");
         tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
-        requestDetails.tabId = mtab;
-        context = mtab.then(contextGet);
-        req = await context.then(headerScrub);
+        context = tab.then(contextGet, onError);
+        req = await context.then(headerScrub, onError);
         console.log("(scrub)Scrubbing I2P Request", req);
         return req;
       } else if (routerHost(requestDetails.url)) {
         tab = tabGet(requestDetails.tabId);
-        context = tab.then(contextGet);
-        req = await context.then(headerScrub);
+        context = tab.then(contextGet, onError);
+        req = await context.then(headerScrub, onError);
         console.log("(scrub)Scrubbing non-I2P Request", req);
         return req;
       }
@@ -106,38 +95,28 @@ var contextScrub = async function(requestDetails) {
 var contextSetup = async function(requestDetails) {
   console.log("(isolate)Forcing I2P requests into context");
   try {
-    var tabFind = async function(tabId) {
+    var i2pTabFind = async function(tabId) {
       try {
         var context = await browser.contextualIdentities.query({
           name: titlepref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing I2P Browsing",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
           function Create(window) {
             function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab", window);
-              browser.tabs.remove(tabId.id);
-              browser.tabs.remove(window.tabs[0].id);
-            }
-            function onError(error) {
-              console.log(`Error: ${error}`);
+              if (tabId != undefined) {
+                console.log("(isolate) Closing old, un-isolated tab");
+                browser.tabs.remove(tabId.id);
+              }
             }
             var created = browser.tabs.create({
               active: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
             });
             created.then(onCreated, onError);
           }
-          var getting = browser.windows.getCurrent();
-          getting.then(Create);
+          var getting = browser.tabs.getCurrent();
+          getting.then(Create, onError);
           return tabId;
         }
       } catch (error) {
@@ -150,32 +129,22 @@ var contextSetup = async function(requestDetails) {
           name: routerpref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing Router Console",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
           function Create(window) {
             function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab");
-              browser.tabs.remove(tabId.id);
-              browser.tabs.remove(window.tabs[0].id);
-            }
-            function onError(error) {
-              console.log(`Error: ${error}`);
+              if (tabId != undefined) {
+                console.log("(isolate) Closing old, un-isolated tab");
+                browser.tabs.remove(tabId.id);
+              }
             }
             var created = browser.tabs.create({
               active: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
             });
             created.then(onCreated, onError);
           }
-          var getting = browser.windows.getCurrent();
-          getting.then(Create);
+          var getting = browser.tabs.getCurrent();
+          getting.then(Create, onError);
           return tabId;
         }
       } catch (error) {
@@ -188,34 +157,22 @@ var contextSetup = async function(requestDetails) {
           name: tunnelpref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing HSM context",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
           function Create(window) {
             function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab");
-              browser.tabs.remove(tabId.id);
-              if (window != undefined) {
-                browser.tabs.remove(window.tabs[0].id);
+              if (tabId != undefined) {
+                console.log("(isolate) Closing old, un-isolated tab");
+                browser.tabs.remove(tabId.id);
               }
             }
-            function onError(error) {
-              console.log(`Error: ${error}`);
-            }
             var created = browser.tabs.create({
               active: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
             });
             created.then(onCreated, onError);
           }
-          var getting = browser.windows.getCurrent();
-          getting.then(Create);
+          var getting = browser.tabs.getCurrent();
+          getting.then(Create, onError);
           return tabId;
         }
       } catch (error) {
@@ -228,32 +185,22 @@ var contextSetup = async function(requestDetails) {
           name: torrentpref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing Bittorrent",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
           function Create(window) {
             function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab");
-              browser.tabs.remove(tabId.id);
-              browser.tabs.remove(window.tabs[0].id);
-            }
-            function onError(error) {
-              console.log(`Error: ${error}`);
+              if (tabId != undefined) {
+                console.log("(isolate) Closing old, un-isolated tab");
+                browser.tabs.remove(tabId.id);
+              }
             }
             var created = browser.tabs.create({
               active: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
             });
             created.then(onCreated, onError);
           }
-          var getting = browser.windows.getCurrent();
-          getting.then(Create);
+          var getting = browser.tabs.getCurrent();
+          getting.then(Create, onError);
           return tabId;
         }
       } catch (error) {
@@ -266,32 +213,22 @@ var contextSetup = async function(requestDetails) {
           name: mailpref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing Web Mail",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
           function Create(window) {
             function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab");
-              browser.tabs.remove(tabId.id);
-              browser.tabs.remove(window.tabs[0].id);
-            }
-            function onError(error) {
-              console.log(`Error: ${error}`);
+              if (tabId != undefined) {
+                console.log("(isolate) Closing old, un-isolated tab");
+                browser.tabs.remove(tabId.id);
+              }
             }
             var created = browser.tabs.create({
               active: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
             });
             created.then(onCreated, onError);
           }
-          var getting = browser.windows.getCurrent();
-          getting.then(Create);
+          var getting = browser.tabs.getCurrent();
+          getting.then(Create, onError);
           return tabId;
         }
       } catch (error) {
@@ -309,32 +246,22 @@ var contextSetup = async function(requestDetails) {
           tabId.cookieStoreId == "firefox-private"
         ) {
           if (tabId.cookieStoreId != context[0].cookieStoreId) {
-            console.log(
-              "(isolate) forcing Web Browsing",
-              requestDetails.url,
-              " context",
-              tabId.cookieStoreId,
-              context[0].cookieStoreId
-            );
             function Create(window) {
               function onCreated(tab) {
-                console.log("(isolate) Closing old, un-isolated tab");
-                browser.tabs.remove(tabId.id);
-                browser.tabs.remove(window.tabs[0].id);
-              }
-              function onError(error) {
-                console.log(`Error: ${error}`);
+                if (tabId != undefined) {
+                  console.log("(isolate) Closing old, un-isolated tab");
+                  browser.tabs.remove(tabId.id);
+                }
               }
               var created = browser.tabs.create({
                 active: true,
                 cookieStoreId: context[0].cookieStoreId,
-                url: requestDetails.url,
-                windowId: window.id
+                url: requestDetails.url
               });
               created.then(onCreated, onError);
             }
-            var getting = browser.windows.getCurrent();
-            getting.then(Create);
+            var getting = browser.tabs.getCurrent();
+            getting.then(Create, onError);
             return tabId;
           }
         }
@@ -351,6 +278,9 @@ var contextSetup = async function(requestDetails) {
         console.log("(isolate)Tab error", error);
       }
     };
+    if (requestDetails == undefined) {
+      return requestDetails;
+    }
     if (requestDetails.tabId > 0) {
       if (proxyHost(requestDetails.url)) {
         setcookie = browser.cookies.set({
@@ -358,7 +288,13 @@ var contextSetup = async function(requestDetails) {
           url: requestDetails.url,
           secure: true
         });
-        setcookie.then(onGot, onError);
+        setcookie.then(onContextGotLog, onError);
+        return requestDetails;
+      }
+      console.log("(isolate)Request Details", requestDetails);
+      if (extensionHost(requestDetails.url)) {
+        var tab = tabGet(requestDetails.tabId);
+        var mtab = tab.then(anyTabFind, onError);
         return requestDetails;
       }
       if (i2pHost(requestDetails.url)) {
@@ -367,140 +303,51 @@ var contextSetup = async function(requestDetails) {
           url: requestDetails.url,
           secure: true
         });
-        setcookie.then(onGot, onError);
+        setcookie.then(onContextGotLog, onError);
         var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
+        var mtab = tab.then(i2pTabFind, onError);
         return requestDetails;
       }
       let routerhost = routerHost(requestDetails.url);
       if (routerhost) {
         if (routerhost === "i2ptunnelmgr") {
           var tab = tabGet(requestDetails.tabId);
-          var mtab = tab.then(i2ptunnelTabFind);
+          var mtab = tab.then(i2ptunnelTabFind, onError);
           return requestDetails;
         } else if (routerhost === "i2psnark") {
           var tab = tabGet(requestDetails.tabId);
-          var mtab = tab.then(snarkTabFind);
+          var mtab = tab.then(snarkTabFind, onError);
           return requestDetails;
         } else if (routerhost === "webmail") {
           var tab = tabGet(requestDetails.tabId);
-          var mtab = tab.then(mailTabFind);
+          var mtab = tab.then(mailTabFind, onError);
           return requestDetails;
         } else if (routerhost === "routerconsole") {
           var tab = tabGet(requestDetails.tabId);
-          var mtab = tab.then(routerTabFind);
+          var mtab = tab.then(routerTabFind, onError);
           return requestDetails;
         }
       } else {
         var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(anyTabFind);
+        var mtab = tab.then(anyTabFind, onError);
         return requestDetails;
       }
     }
-    //var tab = tabGet(requestDetails.tabId);
-    //var mtab = tab.then(anyTabFind);
+    if (typeof requestDetails == "number") {
+      tab = tabGet(requestDetails);
+      var mtab = tab.then(anyTabFind);
+    } else if (typeof requestDetails != undefined) {
+      if (typeof requestDetails.tabId > 0) {
+        tab = tabGet(requestDetails.tabId);
+        var mtab = tab.then(anyTabFind);
+      }
+    }
     return requestDetails;
   } catch (error) {
     console.log("(isolate)Not an I2P request, blackholing", error);
   }
 };
 
-function i2pHostName(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-  } else {
-    hostname = url.split("/")[0];
-  }
-  return hostname;
-}
-
-function i2pHost(url) {
-  let hostname = i2pHostName(url);
-  return hostname.endsWith(".i2p");
-}
-
-function proxyHost(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-  } else {
-    hostname = url.split("/")[0];
-  }
-  if (hostname == "proxy.i2p") {
-    return true;
-  }
-  return false;
-}
-
-function localHost(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-  } else {
-    hostname = url.split("/")[0];
-  }
-  hostname = hostname.split(":")[0];
-  if (hostname === "127.0.0.1") {
-    return true;
-  } else if (hostname === "localhost") {
-    return true;
-  }
-
-  return false;
-}
-
-function routerHost(url) {
-  let hostname = "";
-  let path = "";
-  function pathcheck(str) {
-    if (str != undefined) {
-      let final = str.split("/")[0];
-      if (final === "i2ptunnelmgr" || final === "i2ptunnel") {
-        console.log("(urlcheck) application path", final);
-        return "i2ptunnelmgr";
-      } else if (final === "i2psnark" || final === "torrents") {
-        console.log("(urlcheck) application path", final);
-        return "i2psnark";
-      } else if (final === "webmail" || final === "susimail") {
-        console.log("(urlcheck) application path", final);
-        return "webmail";
-      } else if (final == "") {
-        console.log("(urlcheck) application path", final);
-        return "routerconsole";
-      }
-    }
-    return true;
-  }
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-    prefix = url.substr(0, url.indexOf("://") + 3);
-    path = url.replace(prefix + hostname + "/", "");
-  } else {
-    hostname = url.split("/")[0];
-    path = url.replace(hostname + "/", "");
-  }
-  if (hostname === "127.0.0.1:7657") {
-    return pathcheck(path);
-  } else if (hostname === "localhost:7657") {
-    return pathcheck(path);
-  }
-
-  if (hostname === "127.0.0.1:7647") {
-    return pathcheck(path);
-  } else if (hostname === "localhost:7647") {
-    return pathcheck(path);
-  }
-
-  if (hostname === "127.0.0.1:7070") {
-    return pathcheck(path);
-  } else if (hostname === "localhost:7070") {
-    return pathcheck(path);
-  }
-
-  return false;
-}
-
 browser.webRequest.onBeforeRequest.addListener(
   contextSetup,
   { urls: ["<all_urls>"] },
@@ -512,25 +359,3 @@ browser.webRequest.onBeforeSendHeaders.addListener(
   { urls: ["<all_urls>"] },
   ["blocking", "requestHeaders"]
 );
-
-/*
-function notify(message) {
-  var response = await fetch('https://proxy.i2p', {
-      credentials: 'include'
-    });
-    const myJson = await response.json();
-    console.log(JSON.stringify(myJson));
-
-  console.log(message);
-  const Http = new XMLHttpRequest();
-  Http.mozAnon = true;
-  Http.withCredentials = true;
-  const url = "http://proxy.i2p";
-  Http.open("GET", url);
-  Http.send();
-  Http.onreadystatechange = e => {
-    console.log(Http.responseText);
-    browser.runtime.sendMessage(Http.responseText);
-  };
-}
-*/

window.html

@@ -39,13 +39,18 @@
                 <li class="application">
                   <input type="checkbox" id="enable-web-rtc" name="enablewebrtc" value="webrtc">
                   <label for="enable-web-rtc">Enable WebRTC <strong>with Proxy?</strong></label>
-                  <span class="applicationDesc">For more information about this extension, go here:</span>
+                  <span class="applicationDesc">WebRTC is disabled by default, but can be enabled by checking this box.</span>
                 </li>
                 <li class="application">
                   <div class="panel-section-separator"></div>
                   <div class="panel-section-identity">
                   <div id="identity-list"></div>
                 </li>
+                <li class="application">
+                  <input type="checkbox" id="disable-history" name="disablehistory" value="history">
+                  <label for="disable-history">Disable History in I2P Tabs</label>
+                  <span class="applicationDesc">History is automatically cleared when your I2P tabs are closed. If you want to clear history as you go, check this box.</span>
+                </li>
               </ul>
             </p>
           </p>
@@ -56,16 +61,16 @@
             <h3>Applications</h3>
             <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
               <ul>
-                <li class="application"><button id="window-visit-homepage" class="applicationName window-visit-homepage" href="#">
+                <li class="application"><button id="window-visit-homepage" target="_blank" class="applicationName window-visit-homepage" href="#">
                     Home Page <span class="applicationDesc">For more information about this extension, go here:</span>
                 </button></li>
-                <li class="application"><button id="window-visit-i2ptunnel" class="applicationName">
+                <li class="application"><button id="window-visit-i2ptunnel" target="_blank" class="applicationName">
                     Hidden Services Manager <span class="applicationDesc">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span>
                 </button></li>
-                <li class="application"><button id="window-visit-susimail" class="applicationName">
+                <li class="application"><button id="window-visit-susimail" target="_blank" class="applicationName">
                   E-Mail <span class="applicationDesc">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span>
                 </button></li>
-                <li class="application"><button id="window-visit-snark" class="applicationName">
+                <li class="application"><button id="window-visit-snark" target="_blank" class="applicationName">
                   BitTorrent <span class="applicationDesc">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span>
                 </button></li>
               </ul>