switch it to page css

Slightly better popup

See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!18

.eslintrc.js

@@ -2,15 +2,15 @@ module.exports = {
   env: {
     browser: true,
     es6: true,
-    webextensions: true
+    webextensions: true,
   },
   extends: "eslint:recommended",
   globals: {
     Atomics: "readonly",
-    SharedArrayBuffer: "readonly"
+    SharedArrayBuffer: "readonly",
   },
   parserOptions: {
-    ecmaVersion: 2018
+    ecmaVersion: 2018,
   },
   rules: {
     "accessor-pairs": "error",
@@ -24,8 +24,8 @@ module.exports = {
       "error",
       {
         after: true,
-        before: true
-      }
+        before: true,
+      },
     ],
     "block-scoped-var": "off",
     "block-spacing": "error",
@@ -39,8 +39,8 @@ module.exports = {
       "error",
       {
         after: true,
-        before: false
-      }
+        before: false,
+      },
     ],
     "comma-style": ["error", "last"],
     complexity: "error",
@@ -77,8 +77,8 @@ module.exports = {
       "error",
       {
         after: true,
-        before: true
-      }
+        before: true,
+      },
     ],
     "line-comment-position": "error",
     "linebreak-style": ["error", "unix"],
@@ -247,6 +247,6 @@ module.exports = {
     "wrap-iife": "error",
     "wrap-regex": "error",
     "yield-star-spacing": "error",
-    yoda: ["error", "never"]
-  }
+    yoda: ["error", "never"],
+  },
 };

.web-extension-id

@@ -0,0 +1,3 @@
+# This file was created by https://github.com/mozilla/web-ext
+# Your auto-generated extension ID for addons.mozilla.org is:
+i2ppb@eyedeekay.github.io

Makefile

@@ -32,16 +32,16 @@ ls:
 	ls -lah $(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 
 clean: rc clean-artifacts
-	rm -fr ../i2psetproxy.js.zip ../i2p_proxy*.xpi ../i2p*.xpi *.torrent #../i2psetproxy.js_*.*
+	rm -fr ../i2psetproxy.js.zip ../i2p_proxy*.xpi *.torrent #../i2psetproxy.js_*.*
 
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES
 
-MOZ_VERSION=0.76
-VERSION=0.75
+MOZ_VERSION=0.94
+VERSION=0.93
 
 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.73
+LAST_VERSION=0.91
 
 YELLOW=F7E59A
 ORANGE=FFC56D
@@ -97,20 +97,20 @@ xpi: getxpi
 version:
 	sed -i 's|7647|7657|g' *.js* torrent/*.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
+#	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)\",|g' manifest.json
 	sed -si 's|$(shell grep $(LAST_VERSION) _locales/en/messages.json)|    "message": "$(VERSION)",|g' _locales/en/messages.json; true
 	sed -si 's|$(shell grep $(MOZ_VERSION) _locales/en/messages.json)|    "message": "$(VERSION)",|g' _locales/en/messages.json; true
 
 moz-version:
 	sed -i 's|7647|7657|g' *.js* torrent/*.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
+#	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(MOZ_VERSION)\",|g' manifest.json
 	sed -si 's|$(shell grep $(LAST_VERSION) _locales/en/messages.json)|    "message": "$(MOZ_VERSION)",|g' _locales/en/messages.json; true
 	sed -si 's|$(shell grep $(VERSION) _locales/en/messages.json)|    "message": "$(MOZ_VERSION)",|g' _locales/en/messages.json; true
 
 rhz-version:
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)1\",|g' manifest.json
-	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)1-rhizome\",|g' manifest.json
+#	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)1-rhizome\",|g' manifest.json
 	sed -i 's|7657|7647|g' *.js* torrent/*.js*
 
 zip: version
@@ -168,7 +168,7 @@ moz-sign: version clean-artifacts
 	@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."
-	$HOME/node_modules/web-ext-submit/extender.sh --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
+	$(HOME)/node_modules/web-ext-submit/extender.sh --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
 	make copyss
 	sleep 5
 
@@ -201,10 +201,10 @@ getxpi:
 
 torrent: getxpi
 	rm -f "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent"
-	mktorrent -a http://zviyq72xcmjupynn5y2f5qa3u7bxyu34jnqmwt6czte2l7idxm7q.b32.i2p/announce \
+	mktorrent -a http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
+		-a http://zviyq72xcmjupynn5y2f5qa3u7bxyu34jnqmwt6czte2l7idxm7q.b32.i2p/announce \
 		-a http://s5ikrdyjwbcgxmqetxb3nyheizftms7euacuub2hic7defkh3xhq.b32.i2p/a \
 		-a http://uajd4nctepxpac4c4bdyrdw7qvja2a5u3x25otfhkptcjgd53ioq.b32.i2p/announce \
-		-a http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
 		-a http://explodie.org:6969/announce \
 		-a http://tracker.opentrackr.org:1337/announce \
 		-a http://tracker.kamigami.org:2710/announce \
@@ -283,8 +283,12 @@ fmt-js:
 	fixjsstyle options/*.js
 	fixjsstyle torrent/*.js
 	fixjsstyle i2pcontrol/*.js
+	fixjsstyle manifest.json
 	#find . -path ./node_modules -prune -o -name '*.json' -exec fixjsstyle --write {} \;
 
+fmt-prettier:
+	find . -name '*.js*' -exec $(HOME)/node_modules/.bin/prettier -w {} \;
+
 lint:
 
 	gjslint *.js; true
@@ -335,7 +339,29 @@ snark-mirror:
 seed:
 	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "$(HOME)/.i2p/i2psnark"
 	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/.i2p/i2psnark"
-	
+
 wire:
 	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "$(HOME)/i2p/MuWireDownloads/"
 	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/i2p/MuWireDownloads/"
+
+ndtest:
+	web-ext run -u about:debugging \
+		-u http://127.0.0.1:7657/home \
+		-u http://127.0.0.1:7657/i2ptunnel \
+		-u http://127.0.0.1:7657/i2psnark \
+		-u http://127.0.0.1:7657/webmail \
+		-u http://127.0.0.1:7657/MuWire \
+		-u http://idk.i2p/video.html \
+		-u http://idk.i2p \
+		-u http://stats.i2p \
+		-u https://ramble.pw \
+		-u https://ramble.pw/f/i2p \
+
+lht-test:
+	web-ext run -u about:debugging \
+		-u http://localhost:7657/home \
+		-u http://localhost:7657/i2ptunnel \
+		-u http://localhost:7657/i2psnark \
+		-u http://localhost:7657/webmail \
+		-u http://localhost:7657/MuWire/ \
+		-u http://idk.i2p

README.md

@@ -10,6 +10,20 @@ user requests them. It also adds convenience and management features, like an
 embedded I2P console and Bittorrent integration with clients using the
 transmission-rpc API.
 
+Privacy Policy
+--------------
+
+This browser extension does not collect any personal information. It requires
+access to local storage and browsing data permissions in order to delete them
+when directed to by the user. This browser extension does not transmit any
+information to any third party, nor will it, ever.
+
+This browser extension cannot influence telemetry carried out by browser vendors
+to determine performance in their distribution channels, nor can it mitigate any
+other browser vendor telemetry. 
+
+This browser extension is entirely Free, Open-Source software.
+
 Installation(Cross-Platform):
 -----------------------------
 
@@ -97,13 +111,19 @@ Usage:
    console URL's and placing applications under their own origin.
   * ![Visiting routerconsole](routerconsole.png)
   * [Done] **Handle Torrents** by talking to i2psnark-rpc plugin and then
-   adding them directly into the Firefox downloads drop-downs, menus, etc. If I
-   can.
+   adding them directly into the Firefox downloads drop-downs, menus, etc. Enable
+   the use of I2PSnark as a peer-to-peer delivery mechanism for media files.
   * ![Visiting i2psnark](i2psnark.png)
   * ![Monitoring torrents](transmissionrpc.png)
-  * [Started] Indicate the level of authenticity provided by TLS. TLS is
+  * ![Distribute your site as a torrent.](x-i2p-torrentlocation.png)
+  * [Started] **Indicate** the level of authenticity provided by TLS. TLS is
    optional on I2P for now, but some sites offer it anyway. TLS support is
    experimental and in the works.
+  * [Started] **Provide** alternate, in-I2P destinations for web sites that want to
+   mirror their content within I2P.
+  * [Started] **Enhance** the I2P browsing experience by allowing site developers
+   distribute some or all of their resources as torrents, allowing the torrents to
+   be treated effectively as a CDN.
   * [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
@@ -173,11 +193,14 @@ Project uplift seems to have largely been accomplished?
  * [Tor at the Heart: Firefox](https://blog.torproject.org/tor-heart-firefox) is
   a blog about Tor and the relationship they have to Firefox re: TBB, Fusion.
 
-The Old Version
----------------
+The **Other** Version
+---------------------
 
-New versions of this extension create an I2P in Private Browsing mode instead.
-Since this is a drastic change to the behavior of the old plugin, a new entry
+New versions of this extension create an I2P in Private Browsing mode instead,
+using container tabs.
+
+Since this is a drastic change to the behavior of the old plugin, and since there
+is no UI a new entry
 for the new plugin has been made at a new location on addons.mozilla.org.
 
  * This is the new version: [[link]](https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/)
@@ -187,20 +210,6 @@ for the new plugin has been made at a new location on addons.mozilla.org.
 Android usage:
 --------------
 
-Open the following link
-[Github Releases Version](https://github.com/eyedeekay/i2psetproxy.js/releases/)
-in the browser you want to use for I2P. Firefox will warn you that it is about
-to install an extension and indicate the permissions required. Read them over
-and when you're ready, accept them. That's all it should take, your browser is
-now configured to use I2P.
+Use the old version, on either an old version of Firefox(pre-68) or by enabling
+this custom collection: [Recommended Plugins] https://addons.mozilla.org/en-US/firefox/collections/14614396/I2P-Browser-Fork/
 
-### Android addons.mozilla.org(Temporarily Disabled)
-
-If you would prefer to recieve automatic updates from AMO, the correct product
-page for this plugin is
-[I2P In Private Browsing](https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/).
-This absolutely requires a working outproxy. If you want to avoid the use of AMO
-for updates, you can download the identical plugin from this repository's
-releases page. The latest AMO Plugin will always be identical to the latest
-github release, except for the version number, which must be incremented for
-submission to AMO.

_locales/en/messages.json

@@ -16,13 +16,9 @@
     "description": "Description of the extension."
   },
   "extensionVersion": {
-    "message": "0.71",
+    "message": "0.77",
     "description": "Version of the extension."
   },
-  "extensionStatus": {
-    "message": "It is a labs project for enhancing your I2P browsing experience.",
-    "description": "Release status of the extension."
-  },
   "proxyFailedStatus": {
     "message": "Proxy is not ready",
     "description": "Proxy failed status."
@@ -163,12 +159,20 @@
     "message": "Web Browser (Private)",
     "description": "Preface for the browser titlebar"
   },
-  "localPreface": {
-    "message": "Localhost Browser",
+  "ircPreface": {
+    "message": "Dispatch IRC",
     "description": "Preface for the browser titlebar"
   },
-  "localPrefacePrivate": {
-    "message": "Localhost Browser (Private)",
+  "ircPrefacePrivate": {
+    "message": "Dispatch IRC (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "botePreface": {
+    "message": "I2P-Bote Mail",
+    "description": "Preface for the browser titlebar"
+  },
+  "botePrefacePrivate": {
+    "message": "I2P-Bote Mail (Private)",
     "description": "Preface for the browser titlebar"
   },
   "routerPreface": {

background.js

@@ -10,10 +10,22 @@ 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 localpref = chrome.i18n.getMessage('localPreface');
-var localprefpriv = chrome.i18n.getMessage('localPrefacePrivate');
+var ircpref = chrome.i18n.getMessage('ircPreface');
+var ircprefpriv = chrome.i18n.getMessage('ircPrefacePrivate');
 var extensionpref = chrome.i18n.getMessage('extensionPreface');
 var muwirepref = chrome.i18n.getMessage('muwirePreface');
+var muwireprefpriv = chrome.i18n.getMessage('muwirePrefacePrivate');
+var botepref = chrome.i18n.getMessage('botePreface');
+
+function onError(err) {
+  console.log('(background)', err);
+}
+
+function onContextGotLog(contexts) {
+  if (contexts != null) {
+    console.log(contexts);
+  }
+}
 
 function onContextsGot(contexts) {
   var ids = [];
@@ -27,7 +39,7 @@ function onContextsGot(contexts) {
       .create({
         name: titlepref,
         color: 'orange',
-        icon: 'fingerprint'
+        icon: 'fingerprint',
       })
       .then(onCreated, onNotCreated);
   }
@@ -36,7 +48,7 @@ function onContextsGot(contexts) {
       .create({
         name: webpref,
         color: 'red',
-        icon: 'circle'
+        icon: 'circle',
       })
       .then(onCreated, onNotCreated);
   }
@@ -45,7 +57,7 @@ function onContextsGot(contexts) {
       .create({
         name: routerpref,
         color: 'blue',
-        icon: 'briefcase'
+        icon: 'briefcase',
       })
       .then(onCreated, onNotCreated);
   }
@@ -54,7 +66,7 @@ function onContextsGot(contexts) {
       .create({
         name: tunnelpref,
         color: 'green',
-        icon: 'tree'
+        icon: 'tree',
       })
       .then(onCreated, onNotCreated);
   }
@@ -63,7 +75,7 @@ function onContextsGot(contexts) {
       .create({
         name: mailpref,
         color: 'yellow',
-        icon: 'briefcase'
+        icon: 'briefcase',
       })
       .then(onCreated, onNotCreated);
   }
@@ -72,25 +84,34 @@ function onContextsGot(contexts) {
       .create({
         name: torrentpref,
         color: 'purple',
-        icon: 'chill'
+        icon: 'chill',
       })
       .then(onCreated, onNotCreated);
   }
-  if (ids.indexOf(localpref) == -1) {
+  if (ids.indexOf(ircpref) == -1) {
     browser.contextualIdentities
       .create({
-        name: localpref,
+        name: ircpref,
         color: 'red',
-        icon: 'fence'
+        icon: 'vacation',
       })
       .then(onCreated, onNotCreated);
   }
-  if (ids.indexOf(localpref) == -1) {
+  if (ids.indexOf(muwirepref) == -1) {
     browser.contextualIdentities
       .create({
         name: muwirepref,
         color: 'turquoise',
-        icon: 'gift'
+        icon: 'gift',
+      })
+      .then(onCreated, onNotCreated);
+  }
+  if (ids.indexOf(botepref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: botepref,
+        color: 'blue',
+        icon: 'fence',
       })
       .then(onCreated, onNotCreated);
   }
@@ -111,7 +132,7 @@ function onNotCreated(context) {
 browser.contextualIdentities.query({}).then(onContextsGot, onContextsError);
 
 var gettingInfo = browser.runtime.getPlatformInfo();
-gettingInfo.then(got => {
+gettingInfo.then((got) => {
   if (got.os != 'android') {
     browser.windows.onCreated.addListener(themeWindow);
     browser.windows.onFocusChanged.addListener(themeWindow);
@@ -124,7 +145,7 @@ gettingInfo.then(got => {
 function themeWindowByTab(tabId) {
   function tabWindow(tab) {
     var gettingPlatformInfo = browser.runtime.getPlatformInfo();
-    gettingPlatformInfo.then(got => {
+    gettingPlatformInfo.then((got) => {
       if (got.os == 'android') {
         let getwindow = browser.tabs.get(tab.tabId);
         getwindow.then(themeWindow);
@@ -154,125 +175,81 @@ function isEmpty(obj) {
   return true;
 }
 
-var oldtheme = null;
-
-var getOldTheme = async function getOldTheme() {
-  let foundtheme = await browser.theme.getCurrent();
-  if (!isEmpty(foundtheme)) {
-    oldtheme = foundtheme;
-    console.log('Found old theme', oldtheme);
-  }
-  return oldtheme;
-}
-
-getOldTheme();
-
 function themeWindow(window) {
   // Check if the window is in private browsing
   function onThemeError() {
-    console.log('got theme', oldtheme);
-    browser.theme.update(oldtheme);
+    console.log('theme color set error');
+  }
+  function dynamicTheme() {
+    if (window.incognito) {
+      browser.theme.update(window.id, {
+        colors: {
+          frame: '#4456B7',
+          toolbar: '#4456B7',
+        },
+      });
+    } else {
+      browser.theme.update(window.id, {
+        colors: {
+          frame: '#4456B7',
+          toolbar: '#4456B7',
+        },
+      });
+    }
+  }
+  function browserTheme() {
+    console.log('Active in I2P window');
+    if (window.incognito) {
+      browser.theme.update(window.id, {
+        colors: {
+          frame: '#363A68',
+          toolbar: '#363A68',
+        },
+      });
+    } else {
+      browser.theme.update(window.id, {
+        colors: {
+          frame: '#363A68',
+          toolbar: '#363A68',
+        },
+      });
+    }
   }
   function logTabs(tabInfo) {
     function onContextGotTheme(context) {
       if (context.name == titlepref) {
-        console.log('Active in I2P window');
-        if (window.incognito) {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#FFC56D',
-              toolbar: '#FFC56D'
-            }
+        browserTheme();
+        if (tabInfo[0].url.startsWith('https://')) {
+          browser.pageAction.setPopup({
+            tabId: tabInfo[0].id,
+            popup: 'security.html',
           });
+          //console.log("(background) tabinfo", tabInfo[0].id)
+          browser.pageAction.show(tabInfo[0].id);
         } else {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#FFC56D',
-              toolbar: '#FFC56D'
-            }
-          });
+          //browser.pageAction.hide(tabInfo[0].id);
         }
-        browser.pageAction.setPopup({
-          tabId: tabInfo[0].id,
-          popup: 'security.html'
-        });
-        //console.log("(background) tabinfo", tabInfo[0].id)
-        browser.pageAction.show(tabInfo[0].id);
       } else if (context.name == routerpref) {
         console.log('Active in Router Console window');
-        if (window.incognito) {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#A4C8E1',
-              toolbar: '#A4C8E1'
-            }
-          });
-        } else {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#A4C8E1',
-              toolbar: '#A4C8E1'
-            }
-          });
-        }
+        dynamicTheme();
       } else if (context.name == tunnelpref) {
         console.log('Active in Hidden Services Manager window');
-        if (window.incognito) {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#D9D9D6',
-              toolbar: '#D9D9D6'
-            }
-          });
-        } else {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#D9D9D6',
-              toolbar: '#D9D9D6'
-            }
-          });
-        }
+        dynamicTheme();
       } else if (context.name == mailpref) {
         console.log('Active in Web Mail window');
-        if (window.incognito) {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#F7E59A',
-              toolbar: '#F7E59A'
-            }
-          });
-        } else {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#F7E59A',
-              toolbar: '#F7E59A'
-            }
-          });
-        }
+        dynamicTheme();
       } else if (context.name == torrentpref) {
         console.log('Active in Bittorrent window');
-        if (window.incognito) {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#A48FE1',
-              toolbar: '#A48FE1'
-            }
-          });
-        } else {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#A48FE1',
-              toolbar: '#A48FE1'
-            }
-          });
-        }
-      } else {
-        console.log('Not active in I2P window');
-        if (isEmpty(oldtheme)) {
-          browser.theme.reset();
-        } else {
-          browser.theme.update(window.id, oldtheme);
-        }
+        dynamicTheme();
+      } else if (context.name == botepref) {
+        console.log('Active in Bote window');
+        dynamicTheme();
+      } else if (context.name == ircpref) {
+        console.log('Active in IRC window');
+        dynamicTheme();
+      } else if (context.name == muwirepref) {
+        console.log('Active in MuWire window');
+        dynamicTheme();
       }
     }
     if (
@@ -282,16 +259,23 @@ function themeWindow(window) {
       browser.contextualIdentities
         .get(tabInfo[0].cookieStoreId)
         .then(onContextGotTheme, onThemeError);
-    } else if (isEmpty(oldtheme)) {
-      browser.theme.reset();
     } else {
-      browser.theme.update(window.id, oldtheme);
+      console.log('Not active in I2P window');
+      function unSetTheme(them) {
+        console.log('unsetting theme', them);
+        if (Object.keys(them).length > 0) {
+          browser.theme.update(window.id, them.originalTheme);
+        } else {
+          browser.theme.update(window.id, { colors: null });
+        }
+      }
+      browser.storage.local.get('originalTheme').then(unSetTheme, onError);
     }
   }
 
   var querying = browser.tabs.query({
     currentWindow: true,
-    active: true
+    active: true,
   });
   querying.then(logTabs, onThemeError);
 }
@@ -301,90 +285,43 @@ function setTitle(window) {
   function onContextError() {
     console.log('Context Error');
   }
+  function setTitle(title, privtitle) {
+    if (window.incognito) {
+      browser.windows.update(window.id, {
+        titlePreface: privtitle + ': ',
+      });
+    } else {
+      browser.windows.update(window.id, {
+        titlePreface: title + ': ',
+      });
+    }
+  }
   function logTabs(tabInfo) {
     function onContextGotTitle(context) {
       if (context.name == titlepref) {
         console.log('Active in I2P window');
-
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ': '
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: titlepref + ': '
-          });
-        }
-      } else if (context.name == webpref) {
-        console.log('Active in Web window');
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: webprefpriv + ' - '
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: webpref + ' - '
-          });
-        }
+        setTitle(titlepref, titleprefpriv);
+      } else if (context.name == muwirepref) {
+        console.log('Active in MuWire window');
+        setTitle(muwirepref, muwireprefpriv);
       } else if (context.name == routerpref) {
         console.log('Active in Router Console window');
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ' - ' + routerprefpriv + ': '
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: titlepref + ' - ' + routerpref + ': '
-          });
-        }
+        setTitle(routerpref, routerprefpriv);
+      } else if (context.name == botepref) {
+        console.log('Active in Bote window');
+        setTitle(botepref, boteprefpriv);
       } else if (context.name == tunnelpref) {
         console.log('Active in Hidden Services Manager window');
-
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ' - ' + tunnelprefpriv + ': '
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: titlepref + ' - ' + tunnelpref + ': '
-          });
-        }
+        setTitle(tunnelpref, tunnelprefpriv);
       } else if (context.name == mailpref) {
         console.log('Active in I2P Web Mail window');
-
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ' - ' + mailprefpriv + ': '
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: titlepref + ' - ' + mailpref + ': '
-          });
-        }
+        setTitle(mailpref, mailprefpriv);
       } else if (context.name == torrentpref) {
         console.log('Active in I2P Torrent window');
-
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ' - ' + torrentprefpriv + ': '
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: titlepref + ' - ' + torrentpref + ': '
-          });
-        }
-      } else if (context.name == localpref) {
-        console.log('Active in Localhost window');
-
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: localprefpriv + ' - ' + localprefpriv + ': '
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: localpref + ' - ' + localpref + ': '
-          });
-        }
+        setTitle(torrentpref, torrentprefpriv);
+      } else if (context.name == ircpref) {
+        console.log('Active in IRC window');
+        setTitle(ircpref, ircprefpriv);
       }
     }
 
@@ -397,37 +334,37 @@ function setTitle(window) {
         .then(onContextGotTitle, onContextError);
     } else if (window.incognito) {
       browser.windows.update(window.id, {
-        titlePreface: ''
+        titlePreface: '',
       });
     } else {
       browser.windows.update(window.id, {
-        titlePreface: ''
+        titlePreface: '',
       });
     }
   }
 
   var querying = browser.tabs.query({
     currentWindow: true,
-    active: true
+    active: true,
   });
   querying.then(logTabs, onContextError);
 }
 
 var gettingListenerInfo = browser.runtime.getPlatformInfo();
-gettingListenerInfo.then(got => {
+gettingListenerInfo.then((got) => {
   function onPlatformError() {
     console.log('Error finding platform info');
   }
   if (got.os != 'android') {
     browser.tabs.onCreated.addListener(() => {
       var getting = browser.windows.getCurrent({
-        populate: true
+        populate: true,
       });
       getting.then(setTitle, onPlatformError);
     });
     browser.tabs.onActivated.addListener(() => {
       var getting = browser.windows.getCurrent({
-        populate: true
+        populate: true,
       });
       getting.then(setTitle, onPlatformError);
     });
@@ -435,11 +372,43 @@ gettingListenerInfo.then(got => {
 });
 
 function handleUpdated(updateInfo) {
-  if (updateInfo.theme) {
-    console.log(`Theme was applied: ${updateInfo.theme}`);
-  } else {
-    console.log("Theme was removed");
+  function maybeSet(them) {
+    console.log("original theme found:", them, Object.keys(them).length);
+    try {
+      if (
+        Object.keys(them).length == 0 ||
+        (them.originalTheme.colors == null &&
+          them.originalTheme.images == null &&
+          them.originalTheme.properties == null)
+      ) {
+        if (updateInfo.theme.colors != null) {
+          if (
+            updateInfo.theme.colors.frame != "#4456B7" &&
+            updateInfo.theme.colors.frame != "#363A68"
+          ) {
+            function onSet() {
+              console.log("stored theme:", updateInfo.theme);
+            }
+            if (
+              updateInfo.theme.colors != null &&
+              updateInfo.theme.images != null &&
+              updateInfo.theme.properties != null
+            ) {
+              console.log("storing theme:", updateInfo.theme);
+              browser.storage.local
+                .set({ originalTheme: updateInfo.theme })
+                .then(onSet, onError);
+            }
+          }
+        }
+      } else {
+        console.log("keeping stored theme:", them);
+      }
+    } catch (e) {
+      console.log("theme storage error", e);
+    }
   }
+  browser.storage.local.get("originalTheme").then(maybeSet, onError);
 }
 
 browser.theme.onUpdated.addListener(handleUpdated);
@@ -493,3 +462,24 @@ browser.webRequest.onHeadersReceived.addListener(
   { urls: ["<all_urls>"] },
   ["blocking", "responseHeaders"]
 );
+
+function onClosedWindowCheck() {
+  var getContext = browser.contextualIdentities.query({ name: titlepref });
+  function checkTabs(ctx) {
+    function conditionallyDelete(tabs) {
+      if (tabs.length == 0) {
+        browser.contextualIdentities.remove(ctx[0].cookieStoreId);
+        browser.contextualIdentities
+          .query({})
+          .then(onContextsGot, onContextsError);
+      }
+    }
+    var tabs = browser.tabs.query({ cookieStoreId: ctx[0].cookieStoreId });
+    tabs.then(conditionallyDelete, onError);
+  }
+  getContext.then(checkTabs, onError);
+}
+
+browser.tabs.onRemoved.addListener(onClosedWindowCheck);
+browser.windows.onRemoved.addListener(onClosedWindowCheck);
+browser.windows.onCreated.addListener(onClosedWindowCheck);

bookmarks.js

@@ -1,213 +1,245 @@
-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 port = info.value.http.split(':')[1];
-            if (port == '7644') {
-              let createRhizomeBookmark = browser.bookmarks.create({
-                url: 'about:I2p',
-                title: 'I2P Extension Home Page',
-                parentId: bookmarkToolbar[0].id
-              });
-              createRhizomeBookmark.then(onCreated);
-            } else {
-              let createBookmark = browser.bookmarks.create({
-                url: browser.runtime.getURL('home.html'),
-                title: 'I2P Extension Home Page',
-                parentId: bookmarkToolbar[0].id
-              });
-              createBookmark.then(onCreated);
+function bookmarksSetup() {
+  var gettingInfo = browser.runtime.getPlatformInfo();
+  gettingInfo.then((got) => {
+    if (got.os != 'android') {
+      function bookmarks(bookmarkToolbar) {
+        console.log('(bookmarks)', bookmarkToolbar);
+        console.log('Setting up bookmark toolbar', bookmarkToolbar);
+        function bookHome(bookmarkItems) {
+          if (!bookmarkItems.length) {
+            function gotProxyInfo(info) {
+              let port = info.value.http.split(':')[1];
+              if (port == '7644') {
+                let createRhizomeBookmark = browser.bookmarks.create({
+                  url: 'about:I2p',
+                  title: 'I2P Extension Home Page',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createRhizomeBookmark.then(onCreated);
+              } else {
+                let createBookmark = browser.bookmarks.create({
+                  url: browser.runtime.getURL('home.html'),
+                  title: 'I2P Extension Home Page',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createBookmark.then(onCreated);
+              }
+              console.log('(bookmarks) adding home page bookmark');
             }
-            console.log('(bookmarks) adding home page bookmark');
+            console.log(
+              "(bookmarks) checking if we're running in an I2P Browser"
+            );
+            let gettingProxyInfo = browser.proxy.settings.get({});
+            gettingProxyInfo.then(gotProxyInfo);
           }
-          console.log(
-            "(bookmarks) checking if we're running in an I2P Browser"
-          );
-          let gettingProxyInfo = browser.proxy.settings.get({});
-          gettingProxyInfo.then(gotProxyInfo);
         }
-      }
-      function bookTorrent(bookmarkItems) {
-        if (!bookmarkItems.length) {
-          function gotProxyInfo(info) {
-            let port = info.value.http.split(':')[1];
-            if (port == '7644') {
-              let createBookmark = browser.bookmarks.create({
-                url: 'http://localhost:7657/i2psnark',
-                title: 'Bittorrent',
-                parentId: bookmarkToolbar[0].id
-              });
-              createBookmark.then(onCreated);
-            } else {
-              let createRhizomeBookmark = browser.bookmarks.create({
-                url:
-                  'http://' + control_host + ':' + control_port + '/i2psnark',
-                title: 'Bittorrent',
-                parentId: bookmarkToolbar[0].id
-              });
-              createRhizomeBookmark.then(onCreated);
+        function bookTorrent(bookmarkItems) {
+          if (!bookmarkItems.length) {
+            function gotProxyInfo(info) {
+              let port = info.value.http.split(':')[1];
+              if (port == '7644') {
+                let createBookmark = browser.bookmarks.create({
+                  url: 'http://localhost:7657/i2psnark',
+                  title: 'Bittorrent',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createBookmark.then(onCreated);
+              } else {
+                let createRhizomeBookmark = browser.bookmarks.create({
+                  url:
+                    'http://' + control_host + ':' + control_port + '/i2psnark',
+                  title: 'Bittorrent',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createRhizomeBookmark.then(onCreated);
+              }
             }
+            console.log(
+              "(bookmarks) checking if we're running in an I2P Browser"
+            );
+            let gettingProxyInfo = browser.proxy.settings.get({});
+            gettingProxyInfo.then(gotProxyInfo);
           }
-          console.log(
-            "(bookmarks) checking if we're running in an I2P Browser"
-          );
-          let gettingProxyInfo = browser.proxy.settings.get({});
-          gettingProxyInfo.then(gotProxyInfo);
         }
-      }
-      function bookConsole(bookmarkItems) {
-        if (!bookmarkItems.length) {
-          function gotProxyInfo(info) {
-            let port = info.value.http.split(':')[1];
-            if (port == '7644') {
-              let createBookmark = browser.bookmarks.create({
-                url: 'http://localhost:7657/home',
-                title: 'I2P Console',
-                parentId: bookmarkToolbar[0].id
-              });
-              createBookmark.then(onCreated);
-            } else {
-              let createRhizomeBookmark = browser.bookmarks.create({
-                url: 'http://' + control_host + ':' + control_port + '/home',
-                title: 'I2P Console',
-                parentId: bookmarkToolbar[0].id
-              });
-              createRhizomeBookmark.then(onCreated);
+        function bookConsole(bookmarkItems) {
+          if (!bookmarkItems.length) {
+            function gotProxyInfo(info) {
+              let port = info.value.http.split(':')[1];
+              if (port == '7644') {
+                let createBookmark = browser.bookmarks.create({
+                  url: 'http://localhost:7657/home',
+                  title: 'I2P Console',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createBookmark.then(onCreated);
+              } else {
+                let createRhizomeBookmark = browser.bookmarks.create({
+                  url: 'http://' + control_host + ':' + control_port + '/home',
+                  title: 'I2P Console',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createRhizomeBookmark.then(onCreated);
+              }
             }
+            console.log(
+              "(bookmarks) checking if we're running in an I2P Browser"
+            );
+            let gettingProxyInfo = browser.proxy.settings.get({});
+            gettingProxyInfo.then(gotProxyInfo);
           }
-          console.log(
-            "(bookmarks) checking if we're running in an I2P Browser"
-          );
-          let gettingProxyInfo = browser.proxy.settings.get({});
-          gettingProxyInfo.then(gotProxyInfo);
         }
-      }
-      function bookMail(bookmarkItems) {
-        if (!bookmarkItems.length) {
-          function gotProxyInfo(info) {
-            let port = info.value.http.split(':')[1];
-            if (port == '7644') {
-              let createBookmark = browser.bookmarks.create({
-                url: 'http://localhost:7657/webmail',
-                title: 'Web Mail',
-                parentId: bookmarkToolbar[0].id
-              });
-              createBookmark.then(onCreated);
-            } else {
-              let createRhizomeBookmark = browser.bookmarks.create({
-                url: 'http://' + control_host + ':' + control_port + '/webmail',
-                title: 'Web Mail',
-                parentId: bookmarkToolbar[0].id
-              });
-              createRhizomeBookmark.then(onCreated);
+        function bookMail(bookmarkItems) {
+          if (!bookmarkItems.length) {
+            function gotProxyInfo(info) {
+              let port = info.value.http.split(':')[1];
+              if (port == '7644') {
+                let createBookmark = browser.bookmarks.create({
+                  url: 'http://localhost:7657/webmail',
+                  title: 'Web Mail',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createBookmark.then(onCreated);
+              } else {
+                let createRhizomeBookmark = browser.bookmarks.create({
+                  url:
+                    'http://' + control_host + ':' + control_port + '/webmail',
+                  title: 'Web Mail',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createRhizomeBookmark.then(onCreated);
+              }
+              console.log('(bookmarks) adding webmail bookmark');
             }
-            console.log('(bookmarks) adding webmail bookmark');
+            console.log(
+              "(bookmarks) checking if we're running in an I2P Browser"
+            );
+            let gettingProxyInfo = browser.proxy.settings.get({});
+            gettingProxyInfo.then(gotProxyInfo);
           }
-          console.log(
-            "(bookmarks) checking if we're running in an I2P Browser"
-          );
-          let gettingProxyInfo = browser.proxy.settings.get({});
-          gettingProxyInfo.then(gotProxyInfo);
         }
-      }
-      function bookI2PTunnel(bookmarkItems) {
-        if (!bookmarkItems.length) {
-          function gotProxyInfo(info) {
-            let port = info.value.http.split(':')[1];
-            if (port == '7644') {
-              var createBookmark = browser.bookmarks.create({
-                url: 'http://localhost:7657/i2ptunnel',
-                title: 'Hidden Services Manager',
-                parentId: bookmarkToolbar[0].id
-              });
-              createBookmark.then(onCreated);
-            } else {
-              var createRhizomeBookmark = browser.bookmarks.create({
-                url:
-                  'http://' + control_host + ':' + control_port + '/i2ptunnel',
-                title: 'Hidden Services Manager',
-                parentId: bookmarkToolbar[0].id
-              });
-              createRhizomeBookmark.then(onCreated);
+        function bookI2PTunnel(bookmarkItems) {
+          if (!bookmarkItems.length) {
+            function gotProxyInfo(info) {
+              let port = info.value.http.split(':')[1];
+              if (port == '7644') {
+                var createBookmark = browser.bookmarks.create({
+                  url: 'http://localhost:7657/i2ptunnel',
+                  title: 'Hidden Services Manager',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createBookmark.then(onCreated);
+              } else {
+                var createRhizomeBookmark = browser.bookmarks.create({
+                  url:
+                    'http://' +
+                    control_host +
+                    ':' +
+                    control_port +
+                    '/i2ptunnel',
+                  title: 'Hidden Services Manager',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createRhizomeBookmark.then(onCreated);
+              }
+              console.log('(bookmarks) adding i2ptunnel bookmark');
             }
-            console.log('(bookmarks) adding i2ptunnel bookmark');
+            console.log(
+              "(bookmarks) checking if we're running in an I2P Browser"
+            );
+            var gettingProxyInfo = browser.proxy.settings.get({});
+            gettingProxyInfo.then(gotProxyInfo);
           }
-          console.log(
-            "(bookmarks) checking if we're running in an I2P Browser"
-          );
-          var gettingProxyInfo = browser.proxy.settings.get({});
-          gettingProxyInfo.then(gotProxyInfo);
+        }
+
+        function onRejected(error) {
+          console.log(`An error : ${error}`);
+        }
+        function onCreated(node) {
+          console.log('Bookmarked', node);
+        }
+
+        var b0 = browser.bookmarks.search({
+          title: 'I2P Extension 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 b4 = browser.bookmarks.search({
+          title: 'I2P Console',
+        });
+        b4.then(bookConsole, onRejected);
+        defaultSettings['bookmarks_state'] = true;
+      }
+
+      var bt = browser.bookmarks.search({
+        query: 'Toolbar',
+      });
+
+      function toolDir(bookmarkToolbar) {
+        let defaultSettings = {};
+        chrome.storage.local.set(defaultSettings);
+        console.log('(bookmarks) created');
+        var ibbt = browser.bookmarks.search('I2P Toolbar');
+        function setupDir(ibbt) {
+          function onToolbarCreated(node) {
+            var ibt = browser.bookmarks.search('I2P Toolbar');
+            ibt.then(bookmarks);
+          }
+          if (ibbt[0] == null) {
+            let createBookmark = browser.bookmarks.create({
+              title: 'I2P Toolbar',
+              parentId: bookmarkToolbar[0].id,
+            });
+            createBookmark.then(onToolbarCreated);
+          }
+        }
+        ibbt.then(setupDir);
+      }
+      bt.then(toolDir);
+
+      function handleCreated(id, bookmarkInfo) {
+        //var propValue;
+        for (var propName in bookmarkInfo) {
+          let propValue = bookmarkInfo[propName];
+          console.log(propName, propValue);
         }
       }
 
-      function onRejected(error) {
-        console.log(`An error : ${error}`);
-      }
-      function onCreated(node) {
-        console.log('Bookmarked', node);
-      }
-
-      var b0 = browser.bookmarks.search({
-        title: 'I2P Extension 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 b4 = browser.bookmarks.search({
-        title: 'I2P Console'
-      });
-      b4.then(bookConsole, onRejected);
+      browser.bookmarks.onCreated.addListener(handleCreated);
     }
+  });
+}
 
-    var bt = browser.bookmarks.search({
-      query: 'Toolbar'
-    });
-
-    function toolDir(bookmarkToolbar) {
-	  var ibbt = browser.bookmarks.search('I2P Toolbar');
-	  function setupDir(ibbt) {
-	        function onToolbarCreated(node) {
-        var ibt = browser.bookmarks.search('I2P Toolbar');
-        ibt.then(bookmarks);
-       }
-	    if (ibbt[0] == null) {
-          let createBookmark = browser.bookmarks.create({
-            title: 'I2P Toolbar',
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onToolbarCreated);
-        }
-	  }
-	  ibbt.then(setupDir);
-    }
-	bt.then(toolDir);
-
-    function handleCreated(id, bookmarkInfo) {
-      //var propValue;
-      for (var propName in bookmarkInfo) {
-        let propValue = bookmarkInfo[propName];
-        console.log(propName, propValue);
-      }
-    }
-
-    browser.bookmarks.onCreated.addListener(handleCreated);
+function conditionalBookmarksSetup(obj) {
+  console.log('(bookmarks) state', obj.bookmarks_state);
+  if (obj.bookmarks_state == false) {
+    bookmarksSetup();
   }
-});
+  if (obj.bookmarks_state == undefined) {
+    bookmarksSetup();
+  }
+}
+
+if (browser != null) {
+  let gettingStorage = browser.storage.local.get('bookmarks_state');
+  gettingStorage.then(conditionalBookmarksSetup, bookmarksSetup);
+}
+
+const bookmarksButton = document.getElementById('bookmarksButton');
+if (bookmarksButton != null) {
+  bookmarksButton.addEventListener('click', bookmarksSetup);
+}

cert.js

@@ -35,7 +35,7 @@ function tabCheck(tabInfo) {
   if (host.startsWith('https')) {
     contentUpdateById('AddressCertInfo', 'certPresent');
     console.log('(cert) initiating request to check server cert');
-    fetch(host).then(response => {
+    fetch(host).then((response) => {
       console.log('Updating cert information', response);
     });
   } else {

content.js

@@ -12,7 +12,6 @@ function contentUpdateById(id, message) {
 contentUpdateById('text-section-header', 'extensionName');
 contentUpdateById('description', 'extensionDescription');
 contentUpdateById('i2pbrowser-version', 'extensionVersion');
-contentUpdateById('beta', 'extensionStatus');
 contentUpdateById('proxy-check', 'proxyFailedStatus');
 
 // Control Section
@@ -49,7 +48,6 @@ contentUpdateById('sources', 'sources');
 contentUpdateById('window-visit-releases', 'windowVisitReleases');
 contentUpdateById('releases', 'releases');
 
-fetch('http://proxy.i2p').then(myJson => {
-  console.log('FETCH RESULT', myJson);
+fetch('http://proxy.i2p').then((myJson) => {
   contentUpdateById('proxy-check', 'proxySuccessStatus');
 });

context.js

@@ -11,22 +11,22 @@ function eventHandler(event) {
     browser.tabs.create({
       windowId: windowInfo.id,
       url: 'about:blank',
-      cookieStoreId: event.target.dataset.identity
+      cookieStoreId: event.target.dataset.identity,
     });
   }
   if (event.target.dataset.action == 'create') {
     var creating = browser.tabs.create({
-      cookieStoreId: event.target.dataset.identity
+      cookieStoreId: event.target.dataset.identity,
     });
     creating.then(onCreated, onError);
   }
   if (event.target.dataset.action == 'close-all') {
     browser.tabs
       .query({
-        cookieStoreId: event.target.dataset.identity
+        cookieStoreId: event.target.dataset.identity,
       })
-      .then(tabs => {
-        browser.tabs.remove(tabs.map(rem => rem.id));
+      .then((tabs) => {
+        browser.tabs.remove(tabs.map((rem) => rem.id));
       });
   }
   event.preventDefault();
@@ -52,9 +52,9 @@ if (browser.contextualIdentities === undefined) {
 } else {
   browser.contextualIdentities
     .query({
-      name: titlepref
+      name: titlepref,
     })
-    .then(identities => {
+    .then((identities) => {
       if (!identities.length) {
         div.innerText = "No identities returned from the API.";
         return;
@@ -62,7 +62,7 @@ if (browser.contextualIdentities === undefined) {
 
       for (let identity of identities) {
         let row = document.createElement("div");
-        let span = document.createElement("span");
+        let span = document.createElement("div");
         span.className = "identity";
         span.innerText = identity.name;
         span.style = `color: ${identity.color}`;

debian/changelog

@@ -1,8 +1,76 @@
+i2psetproxy.js (0.93-1) UNRELEASED; urgency=low
+
+  * Emergency fix of the first one
+
+ -- idk <hankhill19580@gmail.com>  Sat, 14 DEC 2020 5:18:53 -0400
+
+i2psetproxy.js (0.91-1) UNRELEASED; urgency=low
+
+  * Exclude clearnet code hosting sites from scrub checks
+
+ -- idk <hankhill19580@gmail.com>  Sat, 14 DEC 2020 2:46:23 -0400
+
+i2psetproxy.js (0.89-1) UNRELEASED; urgency=low
+
+  * Pages with lots of AJAX requests could trigger a performance degradation
+  * Improve performance of x-i2p-* headers and meta tags
+
+ -- idk <hankhill19580@gmail.com>  Sat, 13 DEC 2020 2:22:00 -0400
+
+i2psetproxy.js (0.87-1) UNRELEASED; urgency=low
+
+  * Disable searching for i2p sites in non-i2p search engines
+  * Add contexts for i2pbote and Dispatch
+  * Remain in tighter control of x-i2p-torrentlocation priority
+
+ -- idk <hankhill19580@gmail.com>  Sat, 10 NOV 2020 1:33:50 -0400
+
+i2psetproxy.js (0.85-1) UNRELEASED; urgency=low
+
+  * Fix a bug which was causing i2psnark to fail to isolate.
+
+ -- idk <hankhill19580@gmail.com>  Sat, 10 NOV 2020 1:33:50 -0400
+
+
+i2psetproxy.js (0.83-1) UNRELEASED; urgency=low
+
+  * Add a tab for I2P-Native Dispatch
+
+ -- idk <hankhill19580@gmail.com>  Sat, 10 NOV 2020 22:00:01 -0400
+
+i2psetproxy.js (0.81-1) UNRELEASED; urgency=low
+
+  * X-I2P-TorrentLocation header
+  * Visual tweaks
+  * Deprecate localhost browser container permanently
+  * Isolation rules improvements
+
+ -- idk <hankhill19580@gmail.com>  Sat, 07 NOV 2020 21:34:25 -0400
+
+i2psetproxy.js (0.79-1) UNRELEASED; urgency=low
+
+  * Pin application tabs to the front of the tab order
+  * Refine pageaction behavior
+
+ -- idk <hankhill19580@gmail.com>  Mon, 24 SEP 2020 20:18:03 -0400
+
+i2psetproxy.js (0.77-1) UNRELEASED; urgency=low
+
+  * Implement x-i2p-location header
+
+ -- idk <hankhill19580@gmail.com>  Mon, 24 SEP 2020 20:18:03 -0400
+
 i2psetproxy.js (0.73-1) UNRELEASED; urgency=low
 
   * Update bookmarks format
   * Deprecate WebRTC State Management
 
+ -- idk <hankhill19580@gmail.com>  Mon, 22 JUN 2020 11:22:37 -0400
+
+i2psetproxy.js (0.73-1) UNRELEASED; urgency=low
+
+  * Update bookmarks format
+
  -- idk <hankhill19580@gmail.com>  Mon, 22 JUN 2020 19:21:23 -0400
 
 i2psetproxy.js (0.71-1) UNRELEASED; urgency=low

handler.js

@@ -1,13 +1,21 @@
 function routerHost(url) {
+  //  console.log("(urlcheck) HANDLER URL CHECK");
   let hostname = '';
   let path = '';
   function pathcheck(str) {
+    //    console.log("(urlcheck) HANDLER PATH CHECK", str);
     if (str != undefined) {
       let final = str.split('/')[0];
       if (final === 'i2ptunnelmgr' || final === 'i2ptunnel') {
         console.log('(urlcheck) Tunnel application path', final);
         return 'i2ptunnelmgr';
-      } else if (final === 'i2psnark' || final === 'torrents') {
+      } else if (
+        final === 'i2psnark' ||
+        final === 'torrents' ||
+        final.startsWith('transmission') ||
+        final.startsWith('tracker') ||
+        url.includes(':7662')
+      ) {
         console.log('(urlcheck) Torrent application path', final);
         return 'i2psnark';
       } else if (final === 'webmail' || final === 'susimail') {
@@ -18,10 +26,16 @@ function routerHost(url) {
           console.log('(urlcheck) MuWire application path', final);
           return 'muwire';
         }
+      } else if (final.startsWith('i2pbote')) {
+        if (!url.includes('.png')) {
+          console.log('(urlcheck) I2PBote application path', final);
+          return 'i2pbote';
+        }
       } else if (
         final === 'home' ||
         final === 'console' ||
         final === 'dns' ||
+        final === 'sitemap' ||
         final.startsWith('config')
       ) {
         console.log('(urlcheck) Console application path', final);
@@ -95,9 +109,8 @@ var handlerSetup = function(requestDetails) {
   }
   return requestDetails;
 };
-
-browser.webRequest.onBeforeRequest.addListener(
-  handlerSetup,
-  { urls: ['<all_urls>'] },
-  ['blocking']
-);
+/*
+browser.webRequest.onBeforeRequest.addListener(handlerSetup, {
+  urls: ['<all_urls>'],
+});
+*/

home.css

@@ -1,34 +1,140 @@
+
+
 * {
   padding: 0;
-  margin: 0
+  margin: 0;
 }
+
 html {
-  height: 100%
+  margin: 0 4%;
+  padding: 0 20px;
+  min-height: 100%;
+  background: #9ab;
+  background: repeating-linear-gradient(to bottom, #9ab, #89a 2px);
+  scrollbar-color: #bcd #789;
 }
-a,
-button {
+
+body {
+  margin: 0;
+  padding: 20px 40px;
+  font-family: Open Sans, Noto Sans, Segoe UI, sans-serif;
+  font-size: 12pt;
+  color: #495057;
+  text-decoration: none;
+  word-wrap: break-word;
+  border-left: 1px solid #495057;
+  border-right: 1px solid #495057;
+  box-shadow: 0 0 2px 2px rgba(0, 0, 0, .1);
+  background: #f2f2f2;
+}
+
+h1, h2, h3, h4 {
+  display: block;
+  font-weight: 700;
+}
+
+h1 {
+  text-transform: uppercase;
+  font-weight: 900;
+  font-size: 200%;
+}
+
+h2 {
+  font-size: 140%;
+}
+
+h3 {
+  font-size: 120%;
+}
+
+h4 {
+  margin-bottom: 5px;
+  text-align: right;
+  text-transform: none;
+  font-size: 90%;
+  font-weight: 600;
+  font-style: italic;
+}
+
+p {
+  margin-bottom: 15px;
+  width: 100%;
+  line-height: 1.4;
+  word-wrap: break-word;
+  text-align: justify;
+  text-decoration: none;
+}
+
+ul {
+  margin: 10px 20px;
+  list-style: none;
+}
+
+li {
+  margin-left: 0;
+  padding: 12px 15px 15px 20px;
+  width: calc(100% - 40px);
+  text-align: justify;
+  border: 1px solid #9ab;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff;
+  background: #dee2e6;
+}
+
+li li {
+  padding-bottom: 0;
+  width: calc(100% - 40px);
+  text-align: left;
+  border: none;
+  border-top: 1px solid #9ab;
+  box-shadow: none;
+}
+
+li li:first-of-type {
+  margin-top: 15px;
+  border-top: none;
+}
+
+li a:first-of-type {
+  display: block;
+  width: 100%;
+}
+
+#applicationExplain {
+  float: unset;
+}
+
+li+li {
+  margin-top: 15px;
+}
+
+h3+ul, ul+h3, ul+h2 {
+  margin-top: 20px;
+}
+
+a, button {
   color: #3b6bbf;
   text-decoration: none;
   font-weight: 700;
   word-wrap: break-word;
-  outline: 0
+  outline: 0;
 }
+
 .applicationDesc {
   color: #81888f;
   text-decoration: none;
   font-weight: 700;
   word-wrap: break-word;
-  outline: 0
+  outline: 0;
 }
-.applicationDesc:hover,
-a:hover,
-button:hover {
-  color: #495057;
+
+.applicationDesc:hover, a:hover, button:hover {
   text-decoration: none;
   font-weight: 700;
   word-wrap: break-word;
-  outline: 0
+  outline: 0;
 }
+
 button {
   border: none;
   cursor: pointer;
@@ -36,137 +142,63 @@ button {
   text-decoration: none;
   font-weight: 700;
   word-wrap: break-word;
-  outline: 0
-}
-body {
-  display: flex;
-  flex-direction: column;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  width: 100%;
-  height: 100%;
-  margin: 0 auto;
-  padding: 0;
-  color: #495057;
-  background-attachment: fixed;
-  background-size: 100% 100%;
-  text-decoration: none;
-  font-weight: 700;
-  word-wrap: break-word;
-  outline: 0
+  outline: 0;
 }
+
 .background {
   background-color: #f8f8ff;
-  height: 100%
-}
-p {
-  line-height: 32px;
-  font-size: 17px;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  text-decoration: none;
-  color: #495057;
-  font-weight: 700;
-  word-wrap: break-word;
-  outline: 0
+  height: 100%;
 }
+
 .content {
-  min-height: 3rem;
-  padding: 1rem;
   margin: 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%
-}
-#header,
-.application-info,
-.browser-info,
-.extended-info,
-.search-info {
-  min-height: 3rem;
   padding: 1rem;
-  margin-top: 1.5rem;
+  min-height: 3rem;
+  min-width: 95%;
   display: inline-block;
   border: 1px solid #d9d9d6;
   border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
   background: #f8f8ff;
-  min-width: 95%
 }
-h1 {
-  margin-right: auto;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  font-weight: 600;
-  font-size: 32px;
-  text-transform: uppercase;
-  color: #41465f;
-  border: 1px solid #dee2e6;
-  border-radius: 2px 2px 0 0;
-  padding-left: 5%
-}
-h2,
-h3 {
-  margin-right: auto;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  font-weight: 600;
-  font-size: 25px;
-  text-transform: uppercase;
-  color: #41465f;
-  border-radius: 2px 2px 0 0;
-  width: 90%;
-  padding-left: 5%
-}
-h4 {
-  margin-right: auto;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  font-weight: 600;
-  font-size: 20px!important;
-  text-transform: uppercase;
-  color: #41465f;
-  border: 1px solid #dee2e6;
-  border-radius: 2px 2px 0 0;
-  width: 90%;
-  padding-left: 5%
+
+#header, .application-info, .browser-info, .extended-info, .search-info {
+  margin-top: 1.5rem;
+  padding: 1rem;
+  min-height: 3rem;
+  min-width: 95%;
+  display: inline-block;
+  border: 1px solid #d9d9d6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
+  background: #f8f8ff;
 }
+
 .showhider {
   margin-right: auto;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  text-transform: uppercase;
-  background: 0 0!important;
-  border: none;
   padding: 0!important;
+  text-transform: uppercase;
+  background: none !important;
+  border: none;
   width: 90%;
   color: #3b6bbf;
   text-decoration: none;
   font-weight: 700;
   word-wrap: break-word;
   outline: 0;
-  text-align: left
+  text-align: left;
 }
+
 #links .showhider {
-  font-size: 25px
+  font-size: 25px;
 }
+
 .section-header {
   display: flex;
   flex-direction: row;
-  margin-bottom: 80px
-}
-ul {
-  margin-left: 2rem;
-  list-style: none
-}
-li {
-  min-height: 3rem;
-  padding: .5rem;
-  background: #dee2e6;
-  border: 1px solid #dee2e6;
-  width: 64%;
-  min-width: 64%;
-  border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
-  margin: .5rem .5rem .5rem 32%
+  margin-bottom: 80px;
 }
+
 #readyness {
   padding-top: 1rem;
   padding-bottom: 1rem;
@@ -177,9 +209,10 @@ li {
   text-align: center!important;
   border: 1px solid #dee2e6;
   border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
-  display: inline-block
+  box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
+  display: inline-block;
 }
+
 #onboarding {
   min-height: 5rem;
   padding: .5rem;
@@ -192,8 +225,9 @@ li {
   text-align: center!important;
   border: 1px solid #a48fe1;
   border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+  box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
 }
+
 #i2pbrowser-description {
   padding-top: 1rem;
   padding-bottom: 1rem;
@@ -203,8 +237,9 @@ li {
   background: #dee2e6;
   border: 1px solid #dee2e6;
   border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+  box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
 }
+
 #linksExplain {
   min-height: 5rem;
   padding: .5rem;
@@ -215,10 +250,10 @@ li {
   text-align: center!important;
   border: 1px solid #dee2e6;
   border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+  box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
 }
-#applicationExplain,
-#controlExplain {
+
+#applicationExplain, #controlExplain {
   min-height: 5rem;
   padding: .5rem;
   margin: .5rem;
@@ -228,9 +263,10 @@ li {
   text-align: center!important;
   border: 1px solid #dee2e6;
   border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
-  float: left
+  box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
+  float: left;
 }
+
 #proxyReady {
   min-height: 3rem;
   padding: .5rem;
@@ -243,8 +279,9 @@ li {
   text-align: center!important;
   border: 1px solid #d9d9d6;
   border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+  box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
 }
+
 #proxyUnready {
   min-height: 3rem;
   padding: .5rem;
@@ -257,8 +294,9 @@ li {
   border: 1px solid #ffc56d;
   border-radius: 2px;
   background: #ffc56d;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+  box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
 }
+
 #consoleOn {
   min-height: 3rem;
   padding: .5rem;
@@ -271,30 +309,45 @@ li {
   border: 1px solid #f7e59a;
   border-radius: 2px;
   background: #f7e59a;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+  box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
 }
+
 .onboardingContent {
   font-size: .8rem!important;
   text-align: left;
-  display: none
+  display: none;
 }
+
 #info-content {
-  display: none
+  display: none;
 }
-.consoleOn:hover #proxy-check,
-.proxyReady:hover #proxy-check {
+
+.consoleOn:hover #proxy-check, .proxyReady:hover #proxy-check {
   visibility: visible;
-  opacity: 1
+  opacity: 1;
 }
+
 img {
-  max-width: 100%
+  max-width: 100%;
 }
+
 img.readyness {
   height: 100%;
-  width: auto
+  width: auto;
 }
+
 @media only screen and (max-width: 399px) {
   .application-info {
-    display: none
+    display: none;
   }
-}
+}
+
+@media screen and (max-width: 1200px) {
+  body {
+    font-size: 10.5pt;
+  }
+}
+
+video {
+  width: 100%
+}

home.html

@@ -122,20 +122,20 @@
                     </p>
 
                     <ul>
-                        <li>
+                        <li class="application">
                             <a href="http://i2p-projekt.i2p/" id="window-visit-i2p">I2P Project Homepage:</a> <span class="applicationDesc" id="i2ppage">More information is available here.</span>
                         </li>
 
-                        <li>
+                        <li class="application">
                             <a href="/index.html" id="window-visit-homepage">Webextension Homepage:</a> <span class="applicationDesc" id="webpage">More information is available here.</span>
                         </li>
 
-                        <li>
-                            <a href="http://gittest.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox" id="window-visit-sources">Source Code:</a> <span class="applicationDesc" id="sources">Browse the source of this webextension or contribute here.</span>
+                        <li class="application">
+                            <a href="http://git.idk.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox" id="window-visit-sources">Source Code:</a> <span class="applicationDesc" id="sources">Browse the source of this webextension or contribute here.</span>
                         </li>
 
-                        <li>
-                            <a href="http://gittest.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox/-/releases" id="window-visit-releases">Releases:</a> <span class="applicationDesc" id="releases">Check for new releases here.</span>
+                        <li class="application">
+                            <a href="http://git.idk.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox/-/releases" id="window-visit-releases">Releases:</a> <span class="applicationDesc" id="releases">Check for new releases here.</span>
                         </li>
                     </ul>
 

home.js

@@ -1,4 +1,4 @@
-document.addEventListener('click', clickEvent => {
+document.addEventListener('click', (clickEvent) => {
   if (clickEvent.target.id === 'onboardingButtonZero') {
     flipVisibility('onboardingContentZero');
   } else if (clickEvent.target.id === 'onboardingButtonOne') {

host.js

@@ -46,7 +46,24 @@ function extensionHost(url) {
 
 function i2pHostName(url) {
   let hostname = '';
-  if (url.indexOf('://') > -1) {
+  console.log('(hosts)', url);
+  if (url.includes('=')) {
+    if (url.includes('.i2p')) {
+      lsit = url.split('=');
+      for (let item in lsit) {
+        var items = lsit[item].split(`\ % `); //"\%")
+        for (let p in items) {
+          if (items[p].includes('.i2p')) {
+            hostname = items[p].replace('3D', 1);
+          }
+          break;
+        }
+        if (hostname != '') {
+          break;
+        }
+      }
+    }
+  } else if (url.indexOf('://') > -1) {
     hostname = url.split('/')[2];
   } else {
     hostname = url.split('/')[0];
@@ -60,6 +77,7 @@ function i2pHost(url) {
 }
 
 function routerHost(url) {
+  //  console.log("(urlcheck) HOST URL CHECK");
   let hostname = '';
   let path = '';
   function pathcheck(str) {
@@ -71,7 +89,9 @@ function routerHost(url) {
       } else if (
         final === 'i2psnark' ||
         final === 'torrents' ||
-        final.startsWith('transmission')
+        final.startsWith('transmission') ||
+        final.startsWith('tracker') ||
+        url.includes(':7662')
       ) {
         console.log('(urlcheck) Torrent application path', final);
         return 'i2psnark';
@@ -80,8 +100,13 @@ function routerHost(url) {
         return 'webmail';
       } else if (final.startsWith('MuWire')) {
         if (!url.includes('.png')) {
-            console.log('(urlcheck) MuWire application path', final);
-            return 'muwire';
+          console.log('(urlcheck) MuWire application path', final);
+          return 'muwire';
+        }
+      } else if (final.startsWith('i2pbote')) {
+        if (!url.includes('.png')) {
+          console.log('(urlcheck) I2PBote application path', final);
+          return 'i2pbote';
         }
       } else if (
         final === 'home' ||

i2pcontrol/i2pcontrol.js

@@ -27,11 +27,11 @@ function send(
       cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
       credentials: 'same-origin', // include, *same-origin, omit
       headers: {
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/json',
       },
       redirect: 'follow', // manual, *follow, error
       referrerPolicy: 'no-referrer', // no-referrer, *client
-      body: requestBody // body data type must match "Content-Type" header
+      body: requestBody, // body data type must match "Content-Type" header
     };
     const response = await fetch(url, opts);
     return await response.json(); // parses JSON response into native JavaScript objects

icons/i2plogo.svg

@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="109.95727mm"
-   height="27.706699mm"
-   viewBox="0 0 109.95727 27.706699"
-   version="1.1"
-   id="svg4773"
-   inkscape:version="0.92.1 r"
-   sodipodi:docname="horizontal_color.svg">
-  <defs
-     id="defs4767" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="125.25987"
-     inkscape:cy="51.24018"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1366"
-     inkscape:window-height="740"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4770">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-55.768389,-115.63486)">
-    <g
-       id="g5355">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4516"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
-         d="m 55.768389,116.32817 h 5.625388 v 26.53071 h -5.625388 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4528"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
-         d="M 83.567492,142.85915 H 64.806129 v -3.94692 l 6.737086,-6.81049 c 1.994831,-2.04361 3.297929,-3.46052 3.910222,-4.24981 0.611829,-0.78977 1.052235,-1.52051 1.321681,-2.19367 0.268981,-0.67315 0.403705,-1.37046 0.403705,-2.09285 0,-1.07686 -0.296392,-1.8787 -0.890103,-2.40504 -0.593711,-0.52589 -1.38579,-0.78929 -2.377165,-0.78929 -1.040621,0 -2.050116,0.23877 -3.028948,0.71589 -0.979764,0.47756 -2.001336,1.15675 -3.066113,2.03756 l -3.083766,-3.65285 c 1.321681,-1.1261 2.416654,-1.92143 3.285851,-2.38646 0.868731,-0.46502 1.817367,-0.8232 2.845444,-1.07406 1.028078,-0.25087 2.178334,-0.3763 3.451235,-0.3763 1.676607,0 3.157633,0.30615 4.442612,0.91798 1.284979,0.61229 2.282403,1.46848 2.992248,2.56995 0.709385,1.10148 1.064782,2.36231 1.064782,3.78154 0,1.23667 -0.217415,2.39575 -0.651785,3.47912 -0.434369,1.08288 -1.107514,2.19365 -2.01946,3.33183 -0.911472,1.13818 -2.517923,2.75997 -4.818901,4.86443 l -3.451235,3.24962 v 0.2569 h 11.693973 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4532"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
-         d="m 92.213601,128.81343 h 1.850822 c 1.730025,0 3.024298,-0.34145 3.88374,-1.02529 0.858507,-0.68337 1.288228,-1.67846 1.288228,-2.98528 0,-1.31843 -0.360032,-2.29215 -1.079636,-2.92164 -0.720078,-0.62854 -1.848504,-0.94352 -3.384343,-0.94352 h -2.558811 z m 12.703009,-4.21033 c 0,2.85566 -0.89243,5.03911 -2.67682,6.55126 -1.78485,1.51261 -4.322284,2.26845 -7.612787,2.26845 h -2.413402 v 9.43621 h -5.625393 v -26.53071 h 8.474561 c 3.218022,0 5.664411,0.69266 7.340551,2.078 1.6752,1.38532 2.51329,3.45076 2.51329,6.19679" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4536"
-         style="fill:#ffc434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
-         d="m 121.18308,137.09597 c 0,-3.44937 -2.79621,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44939 2.7962,6.24559 6.24557,6.24559 3.44938,0 6.24559,-2.7962 6.24559,-6.24559" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4540"
-         style="fill:#60ab60;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
-         d="m 121.18308,122.24846 c 0,-3.44937 -2.79621,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44938 2.7962,6.24559 6.24557,6.24559 3.44938,0 6.24559,-2.79621 6.24559,-6.24559" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4544"
-         style="fill:#e15647;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
-         d="m 136.03063,137.09597 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44939,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44939 2.7962,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.7962 6.24557,-6.24559" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4548"
-         style="fill:#ffc434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
-         d="m 136.03063,122.24846 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44939,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44938 2.7962,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.79621 6.24557,-6.24559" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4552"
-         style="fill:#ffc434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
-         d="m 150.87814,137.09597 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44938,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44939 2.79621,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.7962 6.24557,-6.24559" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4556"
-         style="fill:#60ab60;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
-         d="m 150.87814,122.24846 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44938,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44938 2.79621,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.79621 6.24557,-6.24559" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4560"
-         style="fill:#60ab60;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
-         d="m 165.72566,137.09597 c 0,-3.44937 -2.7962,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44939 2.7962,6.24559 6.24557,6.24559 3.44939,0 6.24559,-2.7962 6.24559,-6.24559" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4564"
-         style="fill:#e15647;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
-         d="m 165.72566,122.24846 c 0,-3.44937 -2.7962,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44938 2.7962,6.24559 6.24557,6.24559 3.44939,0 6.24559,-2.79621 6.24559,-6.24559" />
-    </g>
-  </g>
-</svg>

images/restart.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="restart.svg"
+   id="svg22"
+   version="1.1"
+   viewBox="0 0 512 512"
+   role="img"
+   class="svg-inline--fa fa-sync-alt fa-w-16"
+   data-icon="sync-alt"
+   data-prefix="fas"
+   focusable="false"
+   aria-hidden="true">
+  <metadata
+     id="metadata28">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs26" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg22"
+     inkscape:window-maximized="1"
+     inkscape:window-y="31"
+     inkscape:window-x="0"
+     inkscape:cy="256"
+     inkscape:cx="256"
+     inkscape:zoom="1.6757812"
+     showgrid="false"
+     id="namedview24"
+     inkscape:window-height="1026"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <path
+     style="fill:#526bce;fill-opacity:1"
+     id="path20"
+     d="M370.72 133.28C339.458 104.008 298.888 87.962 255.848 88c-77.458.068-144.328 53.178-162.791 126.85-1.344 5.363-6.122 9.15-11.651 9.15H24.103c-7.498 0-13.194-6.807-11.807-14.176C33.933 94.924 134.813 8 256 8c66.448 0 126.791 26.136 171.315 68.685L463.03 40.97C478.149 25.851 504 36.559 504 57.941V192c0 13.255-10.745 24-24 24H345.941c-21.382 0-32.09-25.851-16.971-40.971l41.75-41.749zM32 296h134.059c21.382 0 32.09 25.851 16.971 40.971l-41.75 41.75c31.262 29.273 71.835 45.319 114.876 45.28 77.418-.07 144.315-53.144 162.787-126.849 1.344-5.363 6.122-9.15 11.651-9.15h57.304c7.498 0 13.194 6.807 11.807 14.176C478.067 417.076 377.187 504 256 504c-66.448 0-126.791-26.136-171.315-68.685L48.97 471.03C33.851 486.149 8 475.441 8 454.059V320c0-13.255 10.745-24 24-24z"
+     fill="currentColor" />
+</svg>

images/shutdown.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="shutdown.svg"
+   id="svg32"
+   version="1.1"
+   viewBox="0 0 512 512"
+   role="img"
+   class="svg-inline--fa fa-power-off fa-w-16"
+   data-icon="power-off"
+   data-prefix="fas"
+   focusable="false"
+   aria-hidden="true">
+  <metadata
+     id="metadata38">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg32"
+     inkscape:window-maximized="1"
+     inkscape:window-y="31"
+     inkscape:window-x="0"
+     inkscape:cy="256"
+     inkscape:cx="256"
+     inkscape:zoom="1.6757812"
+     showgrid="false"
+     id="namedview34"
+     inkscape:window-height="1026"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <path
+     style="fill:#526bce;fill-opacity:1"
+     id="path30"
+     d="M400 54.1c63 45 104 118.6 104 201.9 0 136.8-110.8 247.7-247.5 248C120 504.3 8.2 393 8 256.4 7.9 173.1 48.9 99.3 111.8 54.2c11.7-8.3 28-4.8 35 7.7L162.6 90c5.9 10.5 3.1 23.8-6.6 31-41.5 30.8-68 79.6-68 134.9-.1 92.3 74.5 168.1 168 168.1 91.6 0 168.6-74.2 168-169.1-.3-51.8-24.7-101.8-68.1-134-9.7-7.2-12.4-20.5-6.5-30.9l15.8-28.1c7-12.4 23.2-16.1 34.8-7.8zM296 264V24c0-13.3-10.7-24-24-24h-32c-13.3 0-24 10.7-24 24v240c0 13.3 10.7 24 24 24h32c13.3 0 24-10.7 24-24z"
+     fill="currentColor" />
+</svg>

index.html

@@ -10,6 +10,14 @@
 
     <p>This is an webextension which introduces a set of new "Private Browsing" modes to Firefox-based browsers(Supporting webextensions) that makes it easier to configure a browser to use I2P securely and adds features for making I2P applications easier to use. It does this by isolating I2P-specific settings to Contextual Identities within Firefox, then loading them automatically when the user requests them. It also adds convenience and management features, like an embedded I2P console and Bittorrent integration with clients using the transmission-rpc API.</p>
 
+    <h2>Privacy Policy</h2>
+
+    <p>This browser extension does not collect any personal information. It requires access to local storage and browsing data permissions in order to delete them when directed to by the user. This browser extension does not transmit any information to any third party, nor will it, ever.</p>
+
+    <p>This browser extension cannot influence telemetry carried out by browser vendors to determine performance in their distribution channels, nor can it mitigate any other browser vendor telemetry.</p>
+
+    <p>This browser extension is entirely Free, Open-Source software.</p>
+
     <h2>Installation(Cross-Platform):</h2>
 
     <p>For desktop users this addon is available from addons.mozilla.org, where you will be able to recive automatic updates: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>.</p>
@@ -30,7 +38,7 @@
 
     <ul>
         <li>
-            <a href="">Magnet Link</a>
+            <a href="magnet:?xt=urn:btih:991cc1181d816c20629caef454ebabf14785fbf7">Magnet Link</a>
         </li>
 
         <li>
@@ -97,7 +105,7 @@
         <li><img alt="Visiting routerconsole" src="routerconsole.png" title="">
         </li>
 
-        <li>[Done] <strong>Handle Torrents</strong> by talking to i2psnark-rpc plugin and then adding them directly into the Firefox downloads drop-downs, menus, etc. If I can.</li>
+        <li>[Done] <strong>Handle Torrents</strong> by talking to i2psnark-rpc plugin and then adding them directly into the Firefox downloads drop-downs, menus, etc. Enable the use of I2PSnark as a peer-to-peer delivery mechanism for media files.</li>
 
         <li><img alt="Visiting i2psnark" src="i2psnark.png" title="">
         </li>
@@ -105,7 +113,14 @@
         <li><img alt="Monitoring torrents" src="transmissionrpc.png" title="">
         </li>
 
-        <li>[Started] Indicate the level of authenticity provided by TLS. TLS is optional on I2P for now, but some sites offer it anyway. TLS support is experimental and in the works.</li>
+        <li><img alt="Distribute your site as a torrent." src="x-i2p-torrentlocation.png" title="">
+        </li>
+
+        <li>[Started] <strong>Indicate</strong> the level of authenticity provided by TLS. TLS is optional on I2P for now, but some sites offer it anyway. TLS support is experimental and in the works.</li>
+
+        <li>[Started] <strong>Provide</strong> alternate, in-I2P destinations for web sites that want to mirror their content within I2P.</li>
+
+        <li>[Started] <strong>Enhance</strong> the I2P browsing experience by allowing site developers distribute some or all of their resources as torrents, allowing the torrents to be treated effectively as a CDN.</li>
 
         <li>[barely started] <strong>Isolate</strong> 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
             <ul>
@@ -184,9 +199,11 @@
         </li>
     </ul>
 
-    <h2>The Old Version</h2>
+    <h2>The <strong>Other</strong> Version</h2>
 
-    <p>New versions of this extension create an I2P in Private Browsing mode instead. Since this is a drastic change to the behavior of the old plugin, a new entry for the new plugin has been made at a new location on addons.mozilla.org.</p>
+    <p>New versions of this extension create an I2P in Private Browsing mode instead, using container tabs.</p>
+
+    <p>Since this is a drastic change to the behavior of the old plugin, and since there is no UI a new entry for the new plugin has been made at a new location on addons.mozilla.org.</p>
 
     <ul>
         <li>
@@ -200,10 +217,6 @@
 
     <h2>Android usage:</h2>
 
-    <p>Open the following link <a href="https://github.com/eyedeekay/i2psetproxy.js/releases/">Github Releases Version</a> in the browser you want to use for I2P. Firefox will warn you that it is about to install an extension and indicate the permissions required. Read them over and when you're ready, accept them. That's all it should take, your browser is now configured to use I2P.</p>
-
-    <h3>Android addons.mozilla.org(Temporarily Disabled)</h3>
-
-    <p>If you would prefer to recieve automatic updates from AMO, the correct product page for this plugin is <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P In Private Browsing</a>. This absolutely requires a working outproxy. If you want to avoid the use of AMO for updates, you can download the identical plugin from this repository's releases page. The latest AMO Plugin will always be identical to the latest github release, except for the version number, which must be incremented for submission to AMO.</p>
+    <p>Use the old version, on either an old version of Firefox(pre-68) or by enabling this custom collection: [Recommended Plugins] https://addons.mozilla.org/en-US/firefox/collections/14614396/I2P-Browser-Fork/</p>
 </body>
 </html>

info.css

@@ -1,24 +1,27 @@
 body,
 html {
-  width: 50rem
-}
-a {
-  margin: 10px
+  width: 450px
 }
 .panel {
-  margin: 5px
+  margin: 5px;
+  width: 450px;
+  height: 450px
+}
+.panel-section-header {
+  width: 450px
+}
+#text-section-torrents-header {
+  width: 450px
 }
 span.identity {
-  width: 100px;
-  display: inline-block;
+  width: 450px;
+  display: block;
   margin-left: 1em
 }
 figcaption {
-  display: inline
+  display: block
 }
 .section-header {
-  display: flex;
-  flex-direction: row;
   margin-bottom: 8px
 }
 p {
@@ -56,5 +59,8 @@ img.readyness {
   display: none
 }
 .torrent-progress {
-  width: 100%
+  width: 90%
+}
+.tabicon {
+  width: 32px
 }

info.js

@@ -1,6 +1,6 @@
 function checkPeerConnection() {
   let getting = browser.privacy.network.peerConnectionEnabled.get({});
-  getting.then(got => {
+  getting.then((got) => {
     let webrtc = got.value;
     console.log('checking webrtc', webrtc);
     if (document.getElementById('enable-web-rtc') !== null)
@@ -14,7 +14,7 @@ function checkSnowflake() {
   try {
     function snowflake(snowflake) {
       console.log("snowflake plugin found, leaving WebRTC alone", snowflake);
-      EnablePeerConnection();
+      AssurePeerConnection();
     }
     var snowflakeInfo = browser.management.get(
       "{b11bea1f-a888-4332-8d8a-cec2be7d24b9}" // string
@@ -29,7 +29,7 @@ checkSnowflake();
 
 function checkHistory() {
   let getting = browser.storage.local.get("disable_history");
-  getting.then(got => {
+  getting.then((got) => {
     let disable_history = got.disable_history;
     if (disable_history == undefined) {
       disable_history = false;
@@ -42,11 +42,11 @@ function checkHistory() {
 
 checkHistory();
 
-document.addEventListener("click", clickEvent => {
+document.addEventListener("click", (clickEvent) => {
   if (clickEvent.target.id === "window-create-help-panel") {
     let createData = {
       type: "panel",
-      incognito: true
+      incognito: true,
     };
     let creating = browser.tabs.create(createData);
     creating.then(() => {
@@ -55,12 +55,15 @@ document.addEventListener("click", clickEvent => {
   } else if (clickEvent.target.id === "window-create-news-panel") {
     let createData = {
       type: "panel",
-      incognito: true
+      incognito: true,
     };
     let creating = browser.tabs.create(createData);
     creating.then(() => {
       console.log("The news panel has been created");
     });
+  } else if (clickEvent.target.id === "visit-irc") {
+    browser.sidebarAction.setPanel({ panel: "http://127.0.0.1:7669" });
+    browser.sidebarAction.open();
   } else if (clickEvent.target.id === "generate-fresh-tunnel") {
     function refreshIdentity() {
       console.log("Generating new identity");
@@ -68,7 +71,7 @@ document.addEventListener("click", clickEvent => {
       const url = "http://" + controlHost + ":" + controlPort;
       Http.open("GET", url);
       Http.send();
-      Http.onreadystatechange = event => {
+      Http.onreadystatechange = (event) => {
         console.log(Http.responseText);
       };
     }
@@ -79,6 +82,32 @@ document.addEventListener("click", clickEvent => {
   } else if (clickEvent.target.id === "label-router-shutdown") {
     console.log("attempting to initiate graceful shutdown");
     RouterManager("ShutdownGraceful");
+  } else if (clickEvent.target.id === "label-router-status") {
+    if (document.getElementById("label-status-list").style.display !== "none") {
+      console.log("hiding label-status-list");
+      document.getElementById("label-status-list").style.display = "none";
+    } else {
+      console.log("showing label-status-list");
+      document.getElementById("label-status-list").style.display = "block";
+    }
+  } else if (clickEvent.target.id === "label-router-peers") {
+    if (document.getElementById("label-peers-list").style.display !== "none") {
+      console.log("hiding label-peers-list");
+      document.getElementById("label-peers-list").style.display = "none";
+    } else {
+      console.log("showing label-peers-list");
+      document.getElementById("label-peers-list").style.display = "block";
+    }
+  } else if (clickEvent.target.id === "label-router-bandwidth") {
+    if (
+      document.getElementById("label-bandwidth-list").style.display !== "none"
+    ) {
+      console.log("hiding label-bandwidth-list");
+      document.getElementById("label-bandwidth-list").style.display = "none";
+    } else {
+      console.log("showing label-bandwidth-list");
+      document.getElementById("label-bandwidth-list").style.display = "block";
+    }
   } else if (clickEvent.target.id === "search-submit") {
     console.log("attempting to create search tab");
     goSearch();
@@ -133,12 +162,21 @@ document.addEventListener("click", clickEvent => {
   clickEvent.preventDefault();
 });
 
+window.onload = function (e) {
+  if (document.getElementById("label-peers-list") != null) {
+    document.getElementById("label-peers-list").style.display = "none";
+  }
+  if (document.getElementById("label-bandwidth-list") != null) {
+    document.getElementById("label-bandwidth-list").style.display = "none";
+  }
+};
+
 function proxyReadiness() {
   console.log(this.responseText);
 }
 
 var gettingInfo = browser.runtime.getPlatformInfo();
-gettingInfo.then(got => {
+gettingInfo.then((got) => {
   if (got.os != "android") {
     browser.history.onVisited.addListener(onVisited);
   }
@@ -163,14 +201,14 @@ function goHome() {
     let port = info.value.http.split(":")[1];
     if (port == "7644") {
       let createRhizomeData = {
-        url: "about:I2p"
+        url: "about:I2p",
       };
       console.log("visiting homepage");
       let creating = browser.tabs.create(createRhizomeData);
       creating.then(onTabCreated, onTabError);
     } else {
       let createData = {
-        url: "home.html"
+        url: "home.html",
       };
       console.log("visiting homepage");
       let creating = browser.tabs.create(createData);
@@ -188,7 +226,7 @@ function goIndex() {
     console.log("Help tab created");
   }
   let createData = {
-    url: "index.html"
+    url: "index.html",
   };
   console.log("visiting help");
   let creating = browser.tabs.create(createData);
@@ -216,7 +254,7 @@ function goSearch() {
     url:
       "http://yacy.idk.i2p/yacysearch.html?" +
       "query=" +
-      document.getElementById("search-query").value
+      document.getElementById("search-query").value,
   };
   console.log("visiting legwork");
   let creating = browser.tabs.create(createData);
@@ -234,7 +272,7 @@ function goTunnel() {
     console.log("I2PTunnel tab created");
   }
   let createData = {
-    url: "http://" + routerAddr() + "/i2ptunnel"
+    url: "http://" + routerAddr() + "/i2ptunnel",
   };
   console.log("visiting i2ptunnel");
   let creating = browser.tabs.create(createData);
@@ -246,7 +284,7 @@ function goMail() {
     console.log("Mail tab created");
   }
   let createData = {
-    url: "http://" + routerAddr() + "/susimail"
+    url: "http://" + routerAddr() + "/susimail",
   };
   console.log("visiting mail");
   let creating = browser.tabs.create(createData);
@@ -258,7 +296,7 @@ function goSnark() {
     console.log("Snark tab created");
   }
   let createData = {
-    url: "http://" + routerAddr() + "/i2psnark"
+    url: "http://" + routerAddr() + "/i2psnark",
   };
   console.log("visiting snark");
   let creating = browser.tabs.create(createData);
@@ -277,7 +315,7 @@ function onVisited(historyItem) {
   function onRemoved() {
     var searching = browser.history.search({
       text: historyItem.url,
-      startTime: 0
+      startTime: 0,
     });
     searching.then(onCleaned);
   }
@@ -294,6 +332,15 @@ if (UpdateContents !== undefined) UpdateContents();
 const minutes = 0.2;
 const interval = minutes * 60 * 1000;
 
-setInterval(function() {
+setInterval(function () {
   if (UpdateContents !== undefined) UpdateContents();
 }, interval);
+
+fetch("http://127.0.0.1:7669").then((myJson) => {
+  if (myJson.status == 200) {
+    let irc = document.getElementById("visit-irc");
+    if (irc != null) {
+      irc.classList.remove("hidden");
+    }
+  }
+});

issues.csv

@@ -0,0 +1,76 @@
+"title","description"
+"Moar Bookmarks","A larger set of default bookmarks in their own directory would probably be good. Stuff like the forums, zzz's forums, gitlab, stats, identiguy, postman, echobot test, fingerprint test, etc."
+"privacy-breach-generic false positive with lintian","We make a request to proxy.i2p, a sort of loopback site, to ensure that the proxy is ready for the browser and provide user feedback. Lintian sees proxy.i2p as a remote site, which it isn't. Given this, the Warning issued by lintian is a false positive. This should be handled somehow."
+"App-tabs for Project sites?","Not sure if this is a good idea. May want to talk to Simply Secure about it."
+"Descriptive Proxy Error Page","When the proxy isn't ready, but the user enters an I2P browsing tab, provide a descriptive error page to guide the user to a solution, even if that solution is to tell them to wait 2 minutes.
+
+States should be described:
+
+ - Router Not Present: There is no indication that I2P is installed on the system. Direct them to an I2P distribution.
+ - HTTP Proxy Not Ready: The router is present, but the HTTP Proxy is not up yet. Wait 2 minutes, if t>2 minutes, direct them to /i2ptunnel to troubleshoot."
+"More intuitive history management, better programming interface","Right now history management is from before it used contextual identities, with some hacks on top. It needs to be changed to a better interface, which simply takes a contextual identity and clears history based on that information. This will improve security, reliability, and be useful in non-I2P contexts in the future."
+"Reseed over WebRTC Data Channel","This can't be done in just this extension, but this extension is probably an important component of a future plan in which this is straightforward. This is the trickiest thing I've tried so far, K, let's define some phases here...
+
+Phase 0: Design
+=============
+
+We're pretty different from Tor in the places where Snowflake would really matter, but it's an inspiring effort and a cool product. This process probably won't bear much resemblance to Snowflake when it's all designed, but Snowflake was the original inspiration for the idea.
+
+What we want to do is make it possible for I2P users to easily reseed eachother in a peer-to-peer way when necessary. It must be done no more often than a normal reseed, and it must only ever be client initiated.
+
+This is **not** a webRTC transport for I2P. That would be an entirely different project. Especially if it were to do something genuinely insane like try to incorporate browser users not otherwise running I2P into the routing process. That would be crazy, right? Right? (It might not actually be that crazy but I have enough to think about right now). This is only for reseeds.
+
+Questions
+--------------
+
+ - Where to get the reseed file? Locally or from a reseed server? Probably a server, and we act as a proxy, but we need to examine advantages and disadvantages of each. Maybe both, server then a local fallback? 
+ - Do we need to geolocate and never fetch a reseed file for a user in a country which is already automatically in hidden mode? Probably yes. Might want to never make them reseed helpers anyway.
+ - How to distribute the reseed file? If it comes from a server it will be signed by a key we already trust, that's fine, but if it comes from somewhere local we may want to use an interstitial
+
+Components
+-----------------
+
+ - Browser Extension - This repo. We use it because we can to some extent assume that people using this extension are also using I2P and can thus provide a reseed from a local source if need be.
+ - Javascript Import - Placed on web pages, a'la Snowflake and or Flashproxy. Shows a download link that says Download reseed file over WebRTC, uses a (random?) extension user.
+ - Native Proxy - Runs locally, obviates the need to download the reseed in a browser by fetching it over WebRTC on behalf of the router. Will start out as a Bridge but eventually be incorporated into I2P if successful.
+   1. Go version, using pion/webrtc
+   2. Java version, using whatever that Guardian Project library is probably
+
+Phase 1: Manual Mode
+=================
+
+Components required
+-----------------------------
+
+ - Browser Extension
+ - Javascript Import
+
+
+Phase 2: Bridged Prototype
+====================
+
+ - Native Proxy, Go Version
+
+Phase 3: Router Incorporation
+======================
+
+ - Native Proxy, Java Version
+"
+"Torbrowser","Are there any plans to support the Torbrowser?
+"
+"Use pageAction to indicate Security Status of I2P Sites(TLS, etc)","https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/pageAction"
+"SSH in the Browser?","TODO"
+"Dat Support?","TODO"
+"Secure configuration of tunnels for RPC remotes","Eventually we'll have to have configuration for different RPC endpoints for I2PControl and Bittorrent, from there it's not a stretch to let remote clients be controlled over i2p tunnels as well, but in this case we need to make sure that we require the password to be changed from the default and possibly look into using encrypted leasesets here too."
+"Tidy up the settings and document where they come from and what they do","Now that this is getting more and cooler features, I need to go over what all the settings are, how they're configured, which ones are obsolete and which ones needs to be created to fully realize all the cool stuff this plugin can do. This should be done before I even introduce settings for the torrent RPC protocols which makes it another blocker for the next version."
+"Internationalize website","The plugin itself supports multiple languages, but the website does not. I should fix that up ASAP."
+"Plugin Tab: I2P-Bote","An I2P-Bote plugin tab is a good idea too, but a low priority since Bote isn't very active right now."
+"Style Guide","Develop a consistent style guide."
+"Cool idea: tab or window.privacy API","Design webextension experiment."
+"Uplifting 3: Letterboxing","I dunno what's up here. This setting is privacy.resistFingerprinting.letterboxing=true or something like that. If seems like the privacy.websites.resistFingerprinting API should enables privacy.resistFingerprinting."
+"Uplifting 2: audio stuff","Work with Mozilla to disable fingerprintable audio API's when privacy.resistFingerprinting=true."
+"Uplifting 1: webgl","Work with Mozilla to finish webgl requirements for resistFingerprinting."
+"FoxyProxy Compatibility?","This extension currently *Breaks the expected behavior of FoxyProxy* by enforcing it's rules over those described by FoxyProxy. This one might be more trouble than it's worth, in fact I think it probably is, but if it isn't, this is a nice-to-have for some of the longtime Foxy users to ease their transition. "
+"Android","Somewhere in the past few releases I broke Android, probably while I was making the window-management less irritating. Find+fix."
+"Whonix","I2P integration in Whonix is running into the problem of making the router console available(Which requires either a proxy exception or an extra proxy like Privoxy) without making the whole localhost available. Since that's a problem this can solve, after I deal with the linting stuff I need to get back in touch with them. Right now I'm also (ab)using include-binaries, I'll need to resolve that too."
+"Update channel for non-AMO Webextension","TODO:"

location.html

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <link href="search.css" rel="stylesheet">
+    <link href="home.css" rel="stylesheet">
+    <!--<link href="info.css" rel="stylesheet">--><!--<link href="torrent/popup.css" rel="stylesheet">-->
+
+    <title>
+    </title>
+</head>
+<body>
+    <div id="browserpanel">
+        <div class="panel">
+            <div class="section-header panel-section panel-section-header" id="headline">
+                <div class="text-section-header" id="text-section-header">
+                    <h1 id="text-section-header">This site offers an anonymous mirror on I2P</h1>
+                </div>
+            </div>
+        </div>
+
+        <div class="panel">
+            <ul>
+                <li>
+                    <div class="address-info">
+                      <span id="TypeLabel">Alternate Addresses:</span> <span id="Type"></span>
+                      <div id="TypeInfo">
+                      </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <script src="location.js"></script>
+</body>
+</html>

location.js

@@ -0,0 +1,19 @@
+function gotCurrent(tab) {
+  function gotTitle(title) {
+    let addr = title;
+    document.getElementById('TypeInfo').innerHTML =
+      '<div class="AddressInfo"><a href="' + addr + '">' + addr + '</a></div>';
+  }
+  console.log(tab);
+  var gettingTitle = browser.pageAction.getTitle({
+    tabId: tab[0].id,
+  });
+  gettingTitle.then(gotTitle);
+}
+
+function tabError(error) {
+  console.log(`Error : ${error}`);
+}
+
+const gettingCurrent = browser.tabs.query({ active: true });
+gettingCurrent.then(gotCurrent, tabError);

manifest.json

@@ -16,6 +16,7 @@
     "proxy",
     "privacy",
     "storage",
+    "webNavigation",
     "webRequest",
     "webRequestBlocking",
     "contextualIdentities",
@@ -26,22 +27,21 @@
   ],
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "0.73",
-  "version_name": "0.73",
+  "version": "0.91",
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
   "icons": {
-    "48": "icons/toopie.png"
+    "48": "icons/i2plogo.png"
   },
   "browser_action": {
     "browser_style": true,
-    "default_icon": "icons/toopie.png",
+    "default_icon": "icons/i2plogo.png",
     "default_title": "__MSG_extensionName__",
     "default_popup": "window.html"
   },
   "sidebar_action": {
     "browser_style": true,
-    "default_icon": "icons/logo.png",
+    "default_icon": "icons/i2plogo.png",
     "default_title": "__MSG_toopieName__",
     "default_panel": "toopie.html",
     "open_at_install": false
@@ -56,12 +56,17 @@
       "http://*.b32.i2p/*",
       "https://*.b32.i2p/*"
     ],
-    "default_panel": "security.html",
     "pinned": true
   },
   "options_ui": {
     "page": "options/options.html"
   },
+  "content_scripts": [
+    {
+      "matches": ["<all_urls>"],
+      "js": ["script.js"]
+    }
+  ],
   "background": {
     "persistent": true,
     "scripts": [

options/options.css

@@ -1,5 +1,4 @@
 body {
-  width: 25em;
   font-family: "Open Sans Light",sans-serif;
   font-size: 0.9em;
   font-weight: 300
@@ -14,7 +13,7 @@ section.scheme-options {
 #clear-button,
 section.scheme-options input,
 section.scheme-options>select {
-  float: right
+  
 }
 label {
   display: block;
@@ -25,27 +24,29 @@ label:hover {
 }
 .title {
   font-size: 1.2em;
-  margin-bottom: 0.5em
+  margin-bottom: 0.5em;
+  width: 100%
 }
 body,
 html {
-  width: 350px
+  width: 100%
 }
 a {
-  margin: 10px;
-  display: inline-block
+  margin: 10px
 }
 .panel {
   margin: 5px
 }
 span.identity {
   width: 100px;
-  display: inline-block;
   margin-left: 1em
 }
 .identity-options {
   display: none
 }
 input {
-  display: inline
+  
+}
+div {
+  width: 100%!important
 }

options/options.html

@@ -19,16 +19,21 @@
         </select>
     </section>
 
-    <section class="scheme-options proxy-options" id="proxy-options">
-        <div class="title">
-            Proxy Options
-        </div>
+    <section class="scheme-options">
+        <span class="title">Bookmarks Status:</span> <input id="bookmarksState" name="bookmarksstate" type="checkbox" value="bookmarksstate"> <label for="bookmarksState">Bookmarks were created at install-time. <button id="bookmarksButton" type="submit">Re-Create Bookmarks</button></label>
+    </section>
 
-        <p id="proxyHelpText">
+    <section class="scheme-options proxy-options" id="proxy-options">
+        <label for="bookmarksState"></label>
+        <div class="title">
+            <label for="bookmarksState">Proxy Options</label>
+        </div>
+        <label for="bookmarksState"></label>
+        <p id="proxyHelpText"><label for="bookmarksState"></label>
         </p>
-        <label id="portText">Host:</label> <input data="host" id="host" type="text" value="127.0.0.1">
+        <label for="bookmarksState"><label id="portText">Host:</label> <input data="host" id="host" type="text" value="127.0.0.1">
         <br>
-        <label id="hostText">Port:</label> <input data="port" id="port" type="text" value="4444">
+        <label id="hostText">Port:</label> <input data="port" id="port" type="text" value="4444"></label>
     </section>
     <!--<section class="scheme-options identity-options">
       <div class="panel">
@@ -83,7 +88,8 @@
         </div>
     </section>
     <input id="save-button" type="button" value="Save preferences"> 
-    <script src="options.js"></script> <!--<script src="/torrent/browser-polyfill.min.js"></script>
+    <script src="options.js"></script> 
+    <script src="/bookmarks.js"></script> <!--<script src="/torrent/browser-polyfill.min.js"></script>
     <script src="/torrent/options.js"></script>-->
 </body>
 </html>

options/options.js

@@ -1,3 +1,8 @@
+function SetBookButton() {
+  //  var bmid = document.getElementById("bookmark");
+  //bmid.textContent = chrome.i18n.getMessage("bookmarkButton");
+}
+
 function SetHostText() {
   var hostid = document.getElementById('hostText');
   hostid.textContent = chrome.i18n.getMessage('hostText');
@@ -28,6 +33,21 @@ function SetControlHelpText() {
   portid.textContent = chrome.i18n.getMessage('controlHelpText');
 }
 
+function getBookmarksCreated() {
+  bookmarks_state = document.getElementById('bookmarks').value;
+  console.log('(options)Got i2p bookmarks state:', bookmarks_state);
+  if (bookmarks_state == undefined) {
+    return false;
+  }
+  if (bookmarks_state == 'false') {
+    return false;
+  }
+  if (bookmarks_state == 'true') {
+    return true;
+  }
+  return false;
+}
+
 function getScheme() {
   const proxy_scheme = document.querySelector('#proxy_scheme');
   console.log('(options)Got i2p proxy scheme:', proxy_scheme.value);
@@ -159,6 +179,9 @@ function checkStoredSettings(storedSettings) {
       port = undefined;
     }
     console.log('(options)proxy', "'" + host + "'", ':', port);
+    if (!storedSettings['bookmarks_state'])
+      defaultSettings['bookmarks_state'] = false;
+    else defaultSettings['bookmarks_state'] = storedSettings['bookmarks_state'];
     if (!storedSettings['proxy_scheme'])
       defaultSettings['proxy_scheme'] = 'http';
     else defaultSettings['proxy_scheme'] = storedSettings['proxy_scheme'];
@@ -245,6 +268,9 @@ function checkAndroidStoredSettings(storedSettings) {
   let defaultSettings = {};
   let host = '';
   let port = '';
+  if (!storedSettings['bookmarks_state'])
+    defaultSettings['bookmarks_state'] = false;
+  else defaultSettings['bookmarks_state'] = storedSettings['bookmarks_state'];
   if (!storedSettings['proxy_scheme']) defaultSettings['proxy_scheme'] = 'http';
   else defaultSettings['proxy_scheme'] = storedSettings['proxy_scheme'];
   if (!storedSettings['proxy_host']) {
@@ -320,6 +346,7 @@ function onError(e) {
 
 function storeSettings() {
   let storableSettings = {};
+  storableSettings['bookmarks_state'] = getBookmarksCreated();
   storableSettings['proxy_scheme'] = getScheme();
   storableSettings['proxy_host'] = getHost();
   storableSettings['proxy_port'] = getPort();
@@ -341,15 +368,19 @@ function storeSettings() {
 
 function updateUI(restoredSettings) {
   const selectList = document.querySelector('#proxy_scheme');
-  if (selectList == undefined) selectList.value = restoredSettings.proxy_scheme;
+  if (selectList != undefined) selectList.value = restoredSettings.proxy_scheme;
   //console.log("(options)showing proxy scheme:", selectList.value);
 
+  console.log(restoredSettings);
+  const bms = document.getElementById('bookmarksState');
+  if (bms != undefined) bms.checked = restoredSettings.bookmarks_state;
+
   const hostitem = document.getElementById('host');
-  if (hostitem == undefined) hostitem.value = restoredSettings.proxy_host;
+  if (hostitem != undefined) hostitem.value = restoredSettings.proxy_host;
   //console.log("(options)showing proxy host:", hostitem.value);
 
   const portitem = document.getElementById('port');
-  if (portitem == undefined) portitem.value = restoredSettings.proxy_port;
+  if (portitem != undefined) portitem.value = restoredSettings.proxy_port;
   //console.log("(options)showing proxy port:", portitem.value);
 
   const controlhostitem = document.getElementById('controlhost');
@@ -363,41 +394,42 @@ function updateUI(restoredSettings) {
   //console.log("(options)showing control port:", controlportitem.value);
 
   const rpchostitem = document.getElementById('rpchost');
-  if (rpchostitem == undefined) rpchostitem.value = restoredSettings.rpc_host;
+  if (rpchostitem != undefined) rpchostitem.value = restoredSettings.rpc_host;
   //console.log("(options)showing rpc host:", rpchostitem.value);
 
   const rpcportitem = document.getElementById('rpcport');
-  if (rpcportitem == undefined) rpcportitem.value = restoredSettings.rpc_port;
+  if (rpcportitem != undefined) rpcportitem.value = restoredSettings.rpc_port;
   //console.log("(options)showing rpc port:", rpcportitem.value);
 
   const rpcpathitem = document.getElementById('rpcpath');
-  if (rpcpathitem == undefined) rpcpathitem.value = restoredSettings.rpc_path;
+  if (rpcpathitem != undefined) rpcpathitem.value = restoredSettings.rpc_path;
   //console.log("(options)showing rpc path:", rpcpathitem.value);
 
   const rpcpassitem = document.getElementById('rpcpass');
-  if (rpcpassitem == undefined) rpcpassitem.value = restoredSettings.rpc_pass;
+  if (rpcpassitem != undefined) rpcpassitem.value = restoredSettings.rpc_pass;
   //console.log("(options)showing rpc pass:");
 
   const btrpchostitem = document.getElementById('btrpchost');
-  if (btrpchostitem == undefined)
+  if (btrpchostitem != undefined)
     btrpchostitem.value = restoredSettings.rpc_host;
   //console.log("(options)showing bt rpc host:", btrpchostitem.value);
 
   const btrpcportitem = document.getElementById('btrpcport');
-  if (btrpcportitem == undefined)
+  if (btrpcportitem != undefined)
     btrpcportitem.value = restoredSettings.rpc_port;
   //console.log("(options)showing rbt pc port:", rpcportitem.value);
 
   const btrpcpathitem = document.getElementById('btrpcpath');
-  if (btrpcpathitem == undefined)
+  if (btrpcpathitem != undefined)
     btrpcpathitem.value = restoredSettings.rpc_path;
   //console.log("(options)showing bt rpc path:", btrpcpathitem.value);
 
   const btrpcpassitem = document.getElementById('btrpcpass');
-  if (btrpcpassitem == undefined)
+  if (btrpcpassitem != undefined)
     btrpcpassitem.value = restoredSettings.rpc_pass;
   //console.log("(options)showing bt rpc pass:");
 
+  SetBookButton();
   SetHostText();
   SetPortText();
   SetPortHelpText();
@@ -411,7 +443,7 @@ function onError(e) {
 }
 
 var gettingInfo = browser.runtime.getPlatformInfo();
-gettingInfo.then(got => {
+gettingInfo.then((got) => {
   if (got.os != 'android') {
     chrome.storage.local.get(function(got) {
       let settings = checkStoredSettings(got);

platform.js

@@ -1,7 +1,7 @@
 var android = false;
 
 var gettingInfo = browser.runtime.getPlatformInfo();
-gettingInfo.then(got => {
+gettingInfo.then((got) => {
   if (got.os == 'android') {
     console.log('Running in Android detected');
     android = true;

privacy.js

@@ -12,10 +12,19 @@ function onSet(result) {
    risky sites in your browser */
 function disableHyperlinkAuditing() {
   var setting = browser.privacy.websites.hyperlinkAuditingEnabled.set({
-    value: false
+    value: false,
   });
   console.log('Disabling hyperlink auditing/val=', {
-    value: false
+    value: false,
+  });
+  setting.then(onSet);
+}
+
+// UNINSTALL ONLY
+function enableHyperlinkAuditing() {
+  var setting = browser.privacy.websites.hyperlinkAuditingEnabled.clear();
+  console.log('Disabling hyperlink auditing/val=', {
+    value: false,
   });
   setting.then(onSet);
 }
@@ -23,10 +32,19 @@ function disableHyperlinkAuditing() {
 // This enables first-party isolation
 function enableFirstPartyIsolation() {
   var setting = browser.privacy.websites.firstPartyIsolate.set({
-    value: true
+    value: true,
   });
   console.log('Enabling first party isolation/val=', {
-    value: true
+    value: true,
+  });
+  setting.then(onSet);
+}
+
+// UNINSTALL ONLY
+function disableFirstPartyIsolation() {
+  var setting = browser.privacy.websites.firstPartyIsolate.clear();
+  console.log('Enabling first party isolation/val=', {
+    value: true,
   });
   setting.then(onSet);
 }
@@ -36,23 +54,27 @@ function enableFirstPartyIsolation() {
    interface for now */
 function disableEvilCookies() {
   var getting = browser.privacy.websites.cookieConfig.get({});
-  getting.then(got => {
+  getting.then((got) => {
     var setting = browser.privacy.websites.cookieConfig.set({
       value: {
         behavior: 'reject_third_party',
-        nonPersistentCookies: got.value.nonPersistentCookies
-      }
+        nonPersistentCookies: got.value.nonPersistentCookies,
+      },
     });
     console.log('Setting cookie behavior/val=', {
       value: {
         behavior: 'reject_third_party',
-        nonPersistentCookies: got.value.nonPersistentCookies
-      }
+        nonPersistentCookies: got.value.nonPersistentCookies,
+      },
     });
     setting.then(onSet);
   });
 }
 
+function enableEvilCookies() {
+  var getting = browser.privacy.websites.cookieConfig.clear();
+}
+
 // Make sure that they're gone
 /*function disableBadCookies(){
     var setting = browser.privacy.websites.thirdPartyCookiesAllowed.set({
@@ -67,10 +89,19 @@ function disableEvilCookies() {
 // this disables the use of referrer headers
 function disableReferrers() {
   var setting = browser.privacy.websites.referrersEnabled.set({
-    value: false
+    value: false,
   });
   console.log("Disabling referrer headers/val=", {
-    value: false
+    value: false,
+  });
+  setting.then(onSet);
+}
+
+// UNINSATALL ONLY
+function enableReferrers() {
+  var setting = browser.privacy.websites.referrersEnabled.clear();
+  console.log("Disabling referrer headers/val=", {
+    value: false,
   });
   setting.then(onSet);
 }
@@ -78,10 +109,19 @@ function disableReferrers() {
 // enable fingerprinting resistent features(letterboxing and stuff)
 function enableResistFingerprinting() {
   var setting = browser.privacy.websites.resistFingerprinting.set({
-    value: true
+    value: true,
   });
   console.log("Enabling resist fingerprinting/val=", {
-    value: true
+    value: true,
+  });
+  setting.then(onSet);
+}
+
+// UNINSTALL ONLY
+function disableResistFingerprinting() {
+  var setting = browser.privacy.websites.resistFingerprinting.clear();
+  console.log("Enabling resist fingerprinting/val=", {
+    value: false,
   });
   setting.then(onSet);
 }
@@ -89,10 +129,19 @@ function enableResistFingerprinting() {
 // This is essentially a blocklist of clearnet web-sites known to do bad tracking
 function enableTrackingProtection() {
   var setting = browser.privacy.websites.trackingProtectionMode.set({
-    value: "always"
+    value: "always",
   });
   console.log("Enabling tracking protection/val=", {
-    value: "always"
+    value: "always",
+  });
+  setting.then(onSet);
+}
+
+// UNINSTALL ONLY
+function disableTrackingProtection() {
+  var setting = browser.privacy.websites.trackingProtectionMode.clear();
+  console.log("Enabling tracking protection/val=", {
+    value: "always",
   });
   setting.then(onSet);
 }
@@ -101,15 +150,15 @@ function enableTrackingProtection() {
    management dependent on identifying information */
 function disableDigitalRestrictionsManagement() {
   var gettingInfo = browser.runtime.getPlatformInfo();
-  gettingInfo.then(got => {
+  gettingInfo.then((got) => {
     if (got.os == "win") {
       var setting = browser.privacy.websites.protectedContentEnabled.set({
-        value: false
+        value: false,
       });
       console.log(
         "Setting Protected Content(Digital Restrictions Management) false/val=",
         {
-          value: false
+          value: false,
         }
       );
       setting.then(onSet);
@@ -117,6 +166,45 @@ function disableDigitalRestrictionsManagement() {
   });
 }
 
+// UNINSTALL ONLY
+function disableDigitalRestrictionsManagement() {
+  var gettingInfo = browser.runtime.getPlatformInfo();
+  gettingInfo.then((got) => {
+    if (got.os == "win") {
+      var setting = browser.privacy.websites.protectedContentEnabled.clear();
+      console.log(
+        "Setting Protected Content(Digital Restrictions Management) false/val=",
+        {
+          value: true,
+        }
+      );
+      setting.then(onSet);
+    }
+  });
+}
+
+function unsetAllPrivacy() {
+  enableHyperlinkAuditing();
+  disableFirstPartyIsolation();
+  enableEvilCookies();
+  enableReferrers();
+  disableTrackingProtection();
+  disableResistFingerprinting();
+  enableDigitalRestrictionsManagement();
+  UnsetPeerConnection();
+  EnableSavePasswords();
+}
+
+browser.management.onUninstalled.addListener((info) => {
+  function gotSelf(selfinfo) {
+    if (info.name == selfinfo.name) {
+      unsetAllPrivacy();
+    }
+  }
+  var gettingSelf = browser.management.getSelf();
+  gettingSelf.then(gotSelf);
+});
+
 function setAllPrivacy() {
   disableHyperlinkAuditing();
   enableFirstPartyIsolation();
@@ -134,13 +222,13 @@ function ResetPeerConnection() {
     var webrtc = true;
     console.log("No snowflake plugin found, pre-disabled WebRTC");
     var rtc = browser.privacy.network.peerConnectionEnabled.set({
-      value: webrtc
+      value: webrtc,
     });
     rtc.then(AssurePeerConnection);
   }
   function snowflake(snowflake) {
     console.log("snowflake plugin found, leaving WebRTC alone", snowflake);
-    EnablePeerConnection();
+    AssurePeerConnection();
   }
   var snowflakeInfo = browser.management.get(
     "{b11bea1f-a888-4332-8d8a-cec2be7d24b9}" // string
@@ -148,25 +236,27 @@ function ResetPeerConnection() {
   snowflakeInfo.then(snowflake, reset);
 }
 
-function EnablePeerConnection() {
-  var webrtc = true;
-  var rtc = browser.privacy.network.peerConnectionEnabled.set({
-    value: webrtc
-  });
-  rtc.then(AssurePeerConnection);
-  console.log("Enabled WebRTC");
-}
-
 function AssurePeerConnection() {
   function assure(webrtc) {
     browser.privacy.network.peerConnectionEnabled.set({
-      value: true
-    });
-    browser.privacy.network.networkPredictionEnabled.set({
-      value: false
+      value: true,
     });
     chrome.privacy.network.webRTCIPHandlingPolicy.set({
-      value: "proxy_only"
+      value: "disable_non_proxied_udp",
+    });
+  }
+  let rtc = browser.privacy.network.peerConnectionEnabled.get({});
+  rtc.then(assure);
+}
+
+// UNINSTALL ONLY
+function UnsetPeerConnection() {
+  function assure(webrtc) {
+    browser.privacy.network.peerConnectionEnabled.set({
+      value: true,
+    });
+    chrome.privacy.network.webRTCIPHandlingPolicy.set({
+      value: "default",
     });
   }
   let rtc = browser.privacy.network.peerConnectionEnabled.get({});
@@ -174,7 +264,7 @@ function AssurePeerConnection() {
 }
 
 var gettingInfo = browser.runtime.getPlatformInfo();
-gettingInfo.then(got => {
+gettingInfo.then((got) => {
   if (got.os == "android") {
     browser.tabs.onCreated.addListener(ResetPeerConnection);
   } else {
@@ -185,15 +275,13 @@ gettingInfo.then(got => {
 
 function ResetDisableSavePasswords() {
   browser.privacy.services.passwordSavingEnabled.set({
-    value: false
+    value: false,
   });
   console.log("Re-disabled saved passwords");
 }
 
 function EnableSavePasswords() {
-  browser.privacy.services.passwordSavingEnabled.set({
-    value: true
-  });
+  browser.privacy.services.passwordSavingEnabled.clear();
   console.log("Enabled saved passwords");
 }
 
@@ -201,7 +289,7 @@ function EnableSavePasswords() {
 
 var defaultSettings = {
   since: "forever",
-  dataTypes: ["downloads", "passwords", "formData", "localStorage", "history"]
+  dataTypes: ["downloads", "passwords", "formData", "localStorage", "history"],
 };
 
 function onError(therror) {
@@ -217,7 +305,7 @@ function forgetBrowsingData(storedSettings) {
     const times = {
       hour: () => 1000 * 60 * 60,
       day: () => 1000 * 60 * 60 * 24,
-      week: () => 1000 * 60 * 60 * 24 * 7
+      week: () => 1000 * 60 * 60 * 24 * 7,
     };
 
     const sinceMilliseconds = times[selectedSince].call();
@@ -241,7 +329,7 @@ function forgetBrowsingData(storedSettings) {
     browser.notifications.create({
       type: "basic",
       title: "Removed browsing data",
-      message: `Removed ${dataTypesString}\n for I2P Browsing`
+      message: `Removed ${dataTypesString}\n for I2P Browsing`,
     });
   }
 
@@ -250,41 +338,41 @@ function forgetBrowsingData(storedSettings) {
     for (let item of historyItems) {
       if (i2pHost(item.url)) {
         browser.history.deleteUrl({
-          url: item.url
+          url: item.url,
         });
         browser.browsingData.removeCache({});
         console.log("cleared Cache");
         browser.browsingData
           .removePasswords({
             hostnames: [i2pHostName(item.url)],
-            since
+            since,
           })
           .then(onContextGotLog);
         console.log("cleared Passwords");
         browser.browsingData
           .removeDownloads({
             hostnames: [i2pHostName(item.url)],
-            since
+            since,
           })
           .then(onContextGotLog);
         console.log("cleared Downloads");
         browser.browsingData
           .removeFormData({
             hostnames: [i2pHostName(item.url)],
-            since
+            since,
           })
           .then(onContextGotLog);
         console.log("cleared Form Data");
         browser.browsingData
           .removeLocalStorage({
             hostnames: [i2pHostName(item.url)],
-            since
+            since,
           })
           .then(onContextGotLog);
         console.log("cleared Local Storage");
 
         let contexts = browser.contextualIdentities.query({
-          name: titlepref
+          name: titlepref,
         });
 
         function deepCleanCookies(cookies) {
@@ -292,7 +380,7 @@ function forgetBrowsingData(storedSettings) {
             var removing = browser.cookies.remove({
               firstPartyDomain: cookie.firstPartyDomain,
               name: cookie.name,
-              url: item.url
+              url: item.url,
             });
             removing.then(onContextGotLog, onError);
           }
@@ -303,7 +391,7 @@ function forgetBrowsingData(storedSettings) {
           for (let cookieStoreId of cookieStoreIds) {
             var removing = browser.cookies.getAll({
               firstPartyDomain: null,
-              storeId: cookieStoreId.cookieStoreId
+              storeId: cookieStoreId.cookieStoreId,
             });
             removing.then(deepCleanCookies, onError);
           }
@@ -317,7 +405,7 @@ function forgetBrowsingData(storedSettings) {
 
   var searching = browser.history.search({
     text: "i2p",
-    startTime: 0
+    startTime: 0,
   });
 
   searching.then(deepCleanHistory);
@@ -328,7 +416,24 @@ function forgetBrowsingData(storedSettings) {
 
 function i2pHostName(url) {
   let hostname = "";
-  if (url.indexOf("://") > -1) {
+  console.log("(hosts)", url);
+  if (url.includes("=")) {
+    if (url.includes(".i2p")) {
+      lsit = url.split("=");
+      for (let item in lsit) {
+        var items = lsit[item].split(`\%`); //"\%")
+        for (let p in items) {
+          if (items[p].includes(".i2p")) {
+            hostname = items[p].replace("3D", 1);
+          }
+          break;
+        }
+        if (hostname != "") {
+          break;
+        }
+      }
+    }
+  } else if (url.indexOf("://") > -1) {
     hostname = url.split("/")[2];
   } else {
     hostname = url.split("/")[0];
@@ -338,14 +443,15 @@ function i2pHostName(url) {
 
 function i2pHost(url) {
   let hostname = i2pHostName(url);
+  if (hostname.endsWith(".i2p")) {
+    console.log("(hostname) i2p", hostname);
+  }
   return hostname.endsWith(".i2p");
 }
 
 function onContextGotLog(contexts) {
   if (contexts != null) {
-    for (let context of contexts) {
-      console.log(context);
-    }
+    console.log(contexts);
   }
 }
 
@@ -383,7 +489,7 @@ function message(recieved) {
   console.log(recieved);
   if (recieved.rtc === "enableWebRTC") {
     console.log("enableWebRTC");
-    EnablePeerConnection();
+    AssurePeerConnection();
   } else if (recieved.rtc === "disableWebRTC") {
     console.log("disableWebRTC");
     ResetPeerConnection();

proxy.js

@@ -1,105 +1,141 @@
 var titlepref = chrome.i18n.getMessage('titlePreface');
 var webpref = chrome.i18n.getMessage('webPreface');
+var ircpref = chrome.i18n.getMessage('ircPreface');
+var torrentpref = chrome.i18n.getMessage('torrentPreface');
 var routerpref = chrome.i18n.getMessage('routerPreface');
 var routerprefpriv = chrome.i18n.getMessage('routerPrefacePrivate');
+var ircpref = chrome.i18n.getMessage('ircPreface');
 
 browser.privacy.network.peerConnectionEnabled.set({
-  value: false
+  value: true,
 });
-console.log('Preliminarily disabled WebRTC.');
 
 chrome.privacy.network.networkPredictionEnabled.set({
-  value: false
+  value: false,
 });
 chrome.privacy.network.webRTCIPHandlingPolicy.set({
-  value: 'proxy_only'
+  value: 'disable_non_proxied_udp',
 });
+console.log('Disabled unproxied UDP.');
 
 function shouldProxyRequest(requestInfo) {
   return requestInfo.parentFrameId != -1;
 }
 
 var handleContextProxyRequest = async function(requestDetails) {
+  function ircProxy() {
+    if (!requestDetails.url.includes('7669')) {
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort(),
+      };
+      return proxy;
+    }
+    if (requestDetails.url.includes(':7669')) {
+      proxy = null;
+      return proxy;
+    }
+  }
+  function btProxy() {
+    proxy = routerProxy();
+    if (requestDetails.url.includes(':7662')) {
+      proxy = null;
+      return proxy;
+    }
+    console.log('(bt proxy)', proxy);
+    return proxy;
+  }
+  function mainProxy() {
+    console.log('(proxy) mainproxy 0');
+    proxy = {
+      type: getScheme(),
+      host: getHost(),
+      port: getPort(),
+    };
+    let url = new URL(requestDetails.url);
+    if (
+      requestDetails.url.startsWith(
+        'http://' + getHost() + ':' + getConsolePort() + '/i2psnark/'
+      )
+    ) {
+      //+url.host)) {
+      console.log('(proxy) mainproxy 2', url);
+      proxy = null;
+    }
+    return proxy;
+  }
+  function routerProxy() {
+    if (routerHost(requestDetails.url)) {
+      proxy = null;
+      return proxy;
+    } else if (!routerHost(requestDetails.url)) {
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort(),
+      };
+      return proxy;
+    }
+  }
   try {
     var handleProxyRequest = function(context) {
       proxy = {
-        failoverTimeout: 0,
-        proxyDns: false
+        type: getScheme(),
+        host: getHost(),
+        port: getPort(),
       };
+
       if (context == 'firefox-default' || context == 'firefox-private') {
         proxy = null;
         return proxy;
       }
+
       if (context != undefined) {
-        if (context.name == titlepref) {
-          proxy = {
-            type: getScheme(),
-            host: getHost(),
-            port: getPort()
-          };
-          /*console.log("(proxy)", context.name);
-          console.log("Using", proxy.type);
-          console.log("proxy ", proxy.host + ":" + proxy.port);*/
+        console.log('(proxy), context', context);
+        proxy = routerProxy();
+        if (context.name == ircpref) {
+          proxy = ircProxy();
+          return proxy;
+        } else if (context.name == titlepref) {
+          proxy = mainProxy();
           return proxy;
         } else if (context.name == routerpref) {
-          if (routerHost(requestDetails.url)) {
-            return proxy;
-          } else if (!routerHost(requestDetails.url)) {
-            proxy = {
-              type: 'http',
-              host: 'localhost',
-              port: '65535'
-            };
+          proxy = routerProxy();
+          return proxy;
+        } else if (context.name == torrentpref) {
+          proxy = btProxy();
+          return proxy;
+        }
+        return proxy;
+      } else {
+        if (!routerHost(requestDetails.url)) {
+          if (localHost(requestDetails.url)) {
+            if (requestDetails.url.includes(':7669')) {
+              proxy = null;
+            } else if (requestDetails.url.includes(':7662')) {
+              proxy = null;
+            } else {
+              console.log(
+                '(proxy) non-routerconsole localhost url, will not interfere',
+                requestDetails.url
+              );
+            }
           }
+        } else if (i2pHost(requestDetails.url)) {
           proxy = {
             type: getScheme(),
             host: getHost(),
-            port: getPort()
+            port: getPort(),
           };
-          /*console.log("(proxy)", context.name);
-          console.log("Using", proxy.type);
-          console.log("proxy ", proxy.host + ":" + proxy.port);*/
-          return proxy;
-        } else if (context.name == webpref) {
-          if (localHost(requestDetails.url)) {
-            if (!routerHost(requestDetails.url)) {
-              proxy = {
-                type: 'http',
-                host: 'localhost',
-                port: '65535'
-              };
-            }
-          }
-          console.log('(proxy)', context.name);
-          console.log('Using', proxy.type);
-          console.log('proxy ', proxy.host + ':' + proxy.port);
-          return proxy;
         }
+        //var tab = tabGet(requestDetails.tabId);
+        //tab.then(handleTabRequest,)
+        return proxy;
       }
-      if (!routerHost(requestDetails.url)) {
-        if (localHost(requestDetails.url)) {
-          console.log(
-            '(proxy) non-routerconsole localhost url, will not interfere',
-            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) {
@@ -109,7 +145,6 @@ var handleContextProxyRequest = async function(requestDetails) {
     };
     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) {
@@ -120,19 +155,15 @@ var handleContextProxyRequest = async function(requestDetails) {
       proxy = {
         type: getScheme(),
         host: getHost(),
-        port: getPort()
+        port: getPort(),
       };
       return proxy;
     }
     if (requestDetails.originUrl == browser.runtime.getURL('security.html')) {
-      console.log(
-        '(proxy) extension security URL',
-        browser.runtime.getURL('security.html')
-      );
       proxy = {
         type: getScheme(),
         host: getHost(),
-        port: getPort()
+        port: getPort(),
       };
       return proxy;
     }
@@ -143,11 +174,14 @@ var handleContextProxyRequest = async function(requestDetails) {
       return browser.proxy.settings.get({});
     }
     if (requestDetails.tabId > 0) {
+      if (requestDetails.url.includes('MuWire')) {
+        return;
+      }
       if (proxyHost(requestDetails.url)) {
         proxy = {
           type: getScheme(),
           host: getHost(),
-          port: getPort()
+          port: getPort(),
         };
         return proxy;
       } else if (extensionHost(requestDetails.url)) {
@@ -157,7 +191,7 @@ var handleContextProxyRequest = async function(requestDetails) {
         requestDetails.tabId = tab;
         var context = tab.then(contextGet);
         var proxy = await context.then(handleProxyRequest);
-        console.log('(proxy)Returning I2P Proxy', proxy);
+        //console.log('(proxy)Returning I2P Proxy', proxy);
         return proxy;
       } else {
         var tab = tabGet(requestDetails.tabId);
@@ -292,10 +326,19 @@ function getPort() {
   return proxy_port;
 }
 
+function getConsolePort() {
+  if (control_port == undefined) {
+    var scheme = getScheme();
+    if (scheme == 'socks') proxy_port = '7657';
+    else control_port = '7657';
+  }
+  return control_port;
+}
+
 function setupProxy() {
   console.log('Setting up Firefox WebExtension proxy');
   browser.proxy.onRequest.addListener(handleContextProxyRequest, {
-    urls: ['<all_urls>']
+    urls: ['<all_urls>'],
   });
   console.log('i2p settings created for WebExtension Proxy');
 }
@@ -316,9 +359,9 @@ function updateFromStorage() {
     setupProxy();
   });
   var gettingInfo = browser.runtime.getPlatformInfo();
-  gettingInfo.then(got => {
+  gettingInfo.then((got) => {
     if (got.os != 'android') {
-      browser.windows.getAll().then(wins => wins.forEach(themeWindow));
+      browser.windows.getAll().then((wins) => wins.forEach(themeWindow));
     }
   });
 }
@@ -329,7 +372,7 @@ SetupSettings();
 setupProxy();
 
 var gettingListenerInfo = browser.runtime.getPlatformInfo();
-gettingListenerInfo.then(got => {
+gettingListenerInfo.then((got) => {
   browser.windows.onCreated.addListener(() => {
     chrome.storage.local.get(function() {
       setupProxy();

releases.atom

@@ -4,196 +4,192 @@
   <link type="text/html" rel="alternate" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases"/>
   <link type="application/atom+xml" rel="self" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases.atom"/>
   <title>Release notes from I2P-in-Private-Browsing-Mode-Firefox</title>
-  <updated>2020-03-24T04:22:27Z</updated>
+  <updated>2020-12-14T19:47:34Z</updated>
   <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.71</id>
-    <updated>2020-03-24T23:01:20Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.71"/>
-    <title>0.71</title>
-    <enclosure url="magnet:?xt=urn:btih:337ece11e8d9318c0e11d9320e3426fe9ff15556" type="application/x-bittorrent" />
-    <content type="html">&lt;h1&gt;I2P in Private Browsing Mode&lt;/h1&gt;
+    <id>tag:github.com,2008:Repository/169256012/0.91</id>
+    <updated>2020-12-14T19:47:59Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.91"/>
+    <title>0.91</title>
+    <enclosure url="magnet:?xt=urn:btih:991cc1181d816c20629caef454ebabf14785fbf7" type="application/x-bittorrent" />
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.91-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Exclude clearnet code hosting sites from scrub checks&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 14 DEC 2020 2:46:23 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.89-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.89</id>
+    <updated>2020-12-13T19:11:13Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.89"/>
+    <title>0.89</title>
+    <content type="html">&lt;p&gt;============================&lt;/p&gt;
 &lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.71-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.89-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;Fix incomplete bugfix from 0.69&lt;/li&gt;
+&lt;li&gt;Pages with lots of AJAX requests could trigger a performance degradation&lt;/li&gt;
+&lt;li&gt;Improve performance of x-i2p-* headers and meta tags&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Tue, 24 MAR 2020 0:19:59 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.69-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+&lt;p&gt;i2psetproxy.js (0.87-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
     <author>
       <name>eyedeekay</name>
     </author>
     <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
   </entry>
   <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.69</id>
-    <updated>2020-03-24T04:19:44Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.69"/>
-    <title>0.69</title>
-    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.69-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Add MuWire contextual ID&lt;/li&gt;
-&lt;li&gt;Fix bug occurring on certain modded I2P installs&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Tue, 24 MAR 2020 0:12:02 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.67-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.67</id>
-    <updated>2020-03-18T04:27:30Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.67"/>
-    <title>0.67</title>
-    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.67-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Tweak some default settings that should have gone into 65&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Tue, 17 MAR 2020 22:58:55 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.65-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.65</id>
-    <updated>2020-03-18T03:01:20Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.65"/>
-    <title>0.65</title>
+    <id>tag:github.com,2008:Repository/169256012/0.87</id>
+    <updated>2020-12-06T18:37:57Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.87"/>
+    <title>0.87</title>
     <content type="html">&lt;p&gt;Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.65-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.87-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;Initial prototype of certs implementation&lt;/li&gt;
-&lt;li&gt;Use &quot;pinned apptabs&quot; to minimize the number of tabs occupied by an app&lt;/li&gt;
-&lt;li&gt;Get ready for self-hosted updates but with bittorrent because it&#39;s cooler&lt;/li&gt;
+&lt;li&gt;Disable searching for i2p sites in non-i2p search engines&lt;/li&gt;
+&lt;li&gt;Add contexts for i2pbote and Dispatch&lt;/li&gt;
+&lt;li&gt;Remain in tighter control of x-i2p-torrentlocation priority&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Tue, 17 MAR 2020 22:58:55 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.63-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 10 NOV 2020 1:33:50 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.85-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
     <author>
       <name>eyedeekay</name>
     </author>
     <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
   </entry>
   <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.63</id>
-    <updated>2020-03-02T23:01:58Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.63"/>
-    <title>0.63</title>
+    <id>tag:github.com,2008:Repository/169256012/0.85</id>
+    <updated>2020-11-11T06:44:44Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.85"/>
+    <title>0.85</title>
     <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.63-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.85-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;other containerizers bugfix&lt;/li&gt;
+&lt;li&gt;Fix a bug which was causing i2psnark to fail to isolate.&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Mon, 02 MAR 2020 17:54:26 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.61-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 10 NOV 2020 1:33:50 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.83-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
     <author>
       <name>eyedeekay</name>
     </author>
     <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
   </entry>
   <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.61</id>
-    <updated>2020-03-02T22:48:06Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.61"/>
-    <title>0.61</title>
+    <id>tag:github.com,2008:Repository/169256012/0.83</id>
+    <updated>2020-11-11T04:00:27Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.83"/>
+    <title>0.83</title>
     <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.61-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.83-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;other containerizers bugfix&lt;/li&gt;
+&lt;li&gt;Add a tab for I2P-Native Dispatch&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Mon, 02 MAR 2020 17:46:24 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.59-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 10 NOV 2020 22:00:01 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.81-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
     <author>
       <name>eyedeekay</name>
     </author>
     <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
   </entry>
   <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.59</id>
-    <updated>2020-02-26T03:10:23Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.59"/>
-    <title>0.59</title>
+    <id>tag:github.com,2008:Repository/169256012/0.81</id>
+    <updated>2020-11-08T02:44:34Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.81"/>
+    <title>0.81</title>
+    <content type="html">&lt;p&gt;Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.81-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;X-I2P-TorrentLocation header&lt;/li&gt;
+&lt;li&gt;Visual tweaks&lt;/li&gt;
+&lt;li&gt;Deprecate localhost browser container permanently&lt;/li&gt;
+&lt;li&gt;Isolation rules improvements&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 07 NOV 2020 21:34:25 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.79-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.79</id>
+    <updated>2020-09-26T03:36:46Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.79"/>
+    <title>0.79</title>
     <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.59-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.79-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;transmission-rpc based torrent controls&lt;/li&gt;
-&lt;li&gt;bugfixes&lt;/li&gt;
+&lt;li&gt;Pin application tabs to the front of the tab order&lt;/li&gt;
+&lt;li&gt;Refine pageaction behavior&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Tue, 25 FEB 2020 20:52:19 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.57-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 SEP 2020 20:18:03 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.77-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
     <author>
       <name>eyedeekay</name>
     </author>
     <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
   </entry>
   <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.57</id>
-    <updated>2020-01-06T17:16:33Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.57"/>
-    <title>0.57</title>
-    <content type="html">&lt;h1&gt;I2P in Private Browsing Mode&lt;/h1&gt;
-&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+    <id>tag:github.com,2008:Repository/169256012/0.77</id>
+    <updated>2020-09-25T00:19:45Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.77"/>
+    <title>0.77</title>
+    <content type="html">&lt;p&gt;Merge pull request &lt;a class=&quot;issue-link js-issue-link&quot; href=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/pull/100&quot;&gt;#100&lt;/a&gt; from eyedeekay/bookmarks&lt;/p&gt;
+
+&lt;p&gt;make the bookmarks part of a subdirectory&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.75</id>
+    <updated>2020-06-23T03:22:59Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.75"/>
+    <title>0.75</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.57-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.75-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;Snowflake compatibility&lt;/li&gt;
-&lt;li&gt;Lots of small compatibility fixes&lt;/li&gt;
-&lt;li&gt;More linter errors&lt;/li&gt;
-&lt;li&gt;Make it multilingual again&lt;/li&gt;
-&lt;li&gt;Distribute a torrent and a magnet link with the plugin of the plugin&lt;/li&gt;
+&lt;li&gt;Update bookmarks format&lt;/li&gt;
+&lt;li&gt;Deprecate WebRTC State Management&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Thu, 4 JAN 2019 16:43:58 -0400&lt;/p&gt;</content>
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 22 JUN 2020 11:22:37 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.73-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
     <author>
       <name>eyedeekay</name>
     </author>
     <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
   </entry>
   <entry>
-    <id>tag:github.com,2008:Repository/169256012/docs</id>
-    <updated>2020-01-03T18:01:49Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/docs"/>
-    <title>Documentation</title>
-    <content type="html">&lt;p&gt;PDF&#39;s and text about the extension&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.55</id>
-    <updated>2020-01-06T17:17:01Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.55"/>
-    <title>0.55</title>
-    <content type="html">&lt;h1&gt;I2P in Private Browsing Mode&lt;/h1&gt;
-&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+    <id>tag:github.com,2008:Repository/169256012/0.73</id>
+    <updated>2020-03-24T23:49:45Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.73"/>
+    <title>0.73</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.55-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.73-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;Get rid of Web Browsing context launcher&lt;/li&gt;
-&lt;li&gt;Fix linter errors&lt;/li&gt;
-&lt;li&gt;Tolerate themes&lt;/li&gt;
-&lt;li&gt;Tolerate other containerizers&lt;/li&gt;
+&lt;li&gt;Fix incomplete bugfix from 0.69 again&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Thu, 2 JAN 2019 16:47:33 -0400&lt;/p&gt;</content>
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Tue, 24 MAR 2020 19:48:14 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.71-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
     <author>
       <name>eyedeekay</name>
     </author>

script.js

@@ -0,0 +1,151 @@
+browser.runtime.onMessage.addListener((request) => {
+  var response = 'no-alt-location';
+  console.log(request);
+  if (request.req === 'i2p-location') {
+    var tag = document.querySelector('meta[http-equiv="i2p-location"]');
+    if (tag != undefined) {
+      console.log(tag);
+      if (tag) response = tag.content;
+    }
+    var tag = document.querySelector('meta[http-equiv="x-i2p-location"]');
+    if (tag != undefined) {
+      console.log(tag);
+      if (tag) response = tag.content;
+    }
+  }
+  if (request.req === 'i2p-torrentlocation') {
+    var tag = document.querySelector('meta[http-equiv="i2p-torrentlocation"]');
+    if (tag != undefined) {
+      console.log(tag);
+      response = i2pTorrent(tag);
+    }
+    var tag = document.querySelector(
+      'meta[http-equiv="x-i2p-torrentlocation"]'
+    );
+    if (tag != undefined) {
+      console.log(tag);
+      response = i2pTorrent(tag);
+    }
+  }
+  return Promise.resolve({ content: response });
+});
+
+window.document.onload = function (e) {
+  console.log("presetting x-i2p-torrentlocation");
+  var tag = document.querySelector('meta[http-equiv="i2p-torrentlocation"]');
+  if (tag != undefined) {
+    console.log(tag);
+    response = i2pTorrent(tag);
+  }
+  var tag = document.querySelector('meta[http-equiv="x-i2p-torrentlocation"]');
+  if (tag != undefined) {
+    console.log(tag);
+    response = i2pTorrent(tag);
+  }
+};
+
+console.log("presetting x-i2p-torrentlocation");
+var tag = document.querySelector('meta[http-equiv="i2p-torrentlocation"]');
+if (tag != undefined) {
+  console.log(tag);
+  response = i2pTorrent(tag);
+}
+var tag = document.querySelector('meta[http-equiv="x-i2p-torrentlocation"]');
+if (tag != undefined) {
+  console.log(tag);
+  response = i2pTorrent(tag);
+}
+
+function i2pTorrent(tag) {
+  let response = "no-alt-location";
+  if (tag) {
+    response = tag.content;
+    var imgs = document.getElementsByTagName("img");
+    console.log("rewriting torrent link");
+    for (let img of imgs) {
+      let tmpsrc = new URL(img.src);
+      if (tmpsrc.host == location.host) {
+        img.src =
+          "http://127.0.0.1:7657/i2psnark/" + tmpsrc.host + tmpsrc.pathname;
+        img.onerror = function () {
+          img.src = tmpsrc;
+        };
+      }
+    }
+    var videos = document.getElementsByTagName("video");
+    for (let video of videos) {
+      video.setAttribute("preload", "none");
+      let tmpsrc = new URL(video.currentSrc);
+      if (tmpsrc.host == location.host) {
+        if (!video.innerHTML.includes("127.0.0.1")) {
+          innerHTML = video.innerHTML;
+          topInnerHTML = video.innerHTML.replace(
+            'src="',
+            'src="http://127.0.0.1:7657/i2psnark/' + location.host + "/"
+          );
+          //          let url = new URL("http://127.0.0.1:7657/i2psnark/"+location.host+"/"location.path)
+          console.log(
+            "http://127.0.0.1:7657/i2psnark/" + tmpsrc.host + tmpsrc.pathname
+          ); //+"/"location.path)
+          video.src =
+            "http://127.0.0.1:7657/i2psnark/" + tmpsrc.host + tmpsrc.pathname;
+          video.innerHTML = topInnerHTML; // + innerHTML;
+          video.onerror = function () {
+            console.log("video error");
+            video.innerHTML = topInnerHTML + innerHTML;
+          };
+        }
+      }
+    }
+    var audios = document.getElementsByTagName("audio");
+    for (let audio of audios) {
+      audio.setAttribute("preload", "none");
+      let tmpsrc = new URL(audio.currentSrc);
+      if (tmpsrc.host == location.host) {
+        if (!audio.innerHTML.includes("127.0.0.1")) {
+          innerHTML = audio.innerHTML;
+          topInnerHTML = audio.innerHTML.replace(
+            'src="',
+            'src="http://127.0.0.1:7657/i2psnark/' + location.host + "/"
+          );
+          //console.log("http://127.0.0.1:7657/i2psnark/" + location); //.host+"/"location.path)
+          console.log(
+            "http://127.0.0.1:7657/i2psnark/" + tmpsrc.host + tmpsrc.pathname
+          ); //+"/"location.path)
+          audio.src =
+            "http://127.0.0.1:7657/i2psnark/" + tmpsrc.host + tmpsrc.pathname;
+          audio.innerHTML = topInnerHTML; // + innerHTML;
+          audio.onerror = function () {
+            console.log("audio error");
+            audio.innerHTML = topInnerHTML + innerHTML;
+          };
+        }
+      }
+    }
+    var links = document.getElementsByTagName("a");
+    for (let link of links) {
+      let tmpsrc = new URL(link.href);
+      if (tmpsrc.host == location.host) {
+        if (
+          !tmpsrc.pathname.endsWith("html") &&
+          !tmpsrc.pathname.endsWith("htm") &&
+          !tmpsrc.pathname.endsWith("php") &&
+          !tmpsrc.pathname.endsWith("jsp") &&
+          !tmpsrc.pathname.endsWith("asp") &&
+          !tmpsrc.pathname.endsWith("aspx") &&
+          !tmpsrc.pathname.endsWith("atom") &&
+          !tmpsrc.pathname.endsWith("rss") &&
+          !tmpsrc.pathname.endsWith("/") &&
+          tmpsrc.pathname.includes(".")
+        ) {
+          link.href =
+            "http://127.0.0.1:7657/i2psnark/" + tmpsrc.host + tmpsrc.pathname;
+          link.onerror = function () {
+            window.location.href = tmpsrc.href;
+          };
+        }
+      }
+    }
+  }
+  return response;
+}

scrub.js

@@ -4,42 +4,27 @@ var routerpref = chrome.i18n.getMessage('routerPreface');
 var mailpref = chrome.i18n.getMessage('mailPreface');
 var torrentpref = chrome.i18n.getMessage('torrentPreface');
 var tunnelpref = chrome.i18n.getMessage('i2ptunnelPreface');
-var localpref = chrome.i18n.getMessage('localPreface');
+var ircpref = chrome.i18n.getMessage('ircPreface');
 var extensionpref = chrome.i18n.getMessage('extensionPreface');
 var muwirepref = chrome.i18n.getMessage('muwirePreface');
+var botepref = chrome.i18n.getMessage('botePreface');
 
 var contextScrub = async function(requestDetails) {
   function onHeaderError() {
     console.log('Header scrub error');
   }
-  //console.log("(scrub)Scrubbing info from contextualized request");
   try {
     var headerScrub = function(context) {
       var ua = 'MYOB/6.66 (AN/ON)';
       if (!context) {
       } else if (context.name == titlepref) {
-        if (i2pHost(requestDetails.url)) {
-          for (var header of requestDetails.requestHeaders) {
-            if (header.name.toLowerCase() === 'user-agent') {
-              header.value = ua;
-              console.log('(scrub)User-Agent header modified', header.value);
-            }
+        for (var header of requestDetails.requestHeaders) {
+          if (header.name.toLowerCase() === 'user-agent') {
+            header.value = ua;
           }
         }
         return {
-          requestHeaders: requestDetails.requestHeaders
-        };
-      } else if (context.name == routerpref) {
-        if (i2pHost(requestDetails.url)) {
-          for (var header of requestDetails.requestHeaders) {
-            if (header.name.toLowerCase() === 'user-agent') {
-              header.value = ua;
-              console.log('(scrub)User-Agent header modified', header.value);
-            }
-          }
-        }
-        return {
-          requestHeaders: requestDetails.requestHeaders
+          requestHeaders: requestDetails.requestHeaders,
         };
       }
     };
@@ -64,23 +49,10 @@ var contextScrub = async function(requestDetails) {
       }
     };
     if (requestDetails.tabId > 0) {
-      var tab = {};
-      var context = {};
-      var req = {};
-      if (i2pHost(requestDetails.url)) {
-        //console.log("(scrub)I2P URL detected, ");
-        tab = tabGet(requestDetails.tabId);
-        context = tab.then(contextGet, onHeaderError);
-        req = await context.then(headerScrub, onHeaderError);
-        //console.log("(scrub)Scrubbing I2P Request", req);
-        return req;
-      } else if (routerHost(requestDetails.url)) {
-        tab = tabGet(requestDetails.tabId);
-        context = tab.then(contextGet, onHeaderError);
-        req = await context.then(headerScrub, onHeaderError);
-        //console.log("(scrub)Scrubbing non-I2P Request", req);
-        return req;
-      }
+      tab = tabGet(requestDetails.tabId);
+      context = tab.then(contextGet, onHeaderError);
+      req = context.then(headerScrub, onHeaderError);
+      //console.log("(scrub)Scrubbing I2P Request", req);
       return req;
     }
   } catch (error) {
@@ -91,25 +63,28 @@ var contextScrub = async function(requestDetails) {
 var notMyContextNotMyProblem = async function() {
   var contexts = await browser.contextualIdentities.query({});
   var context1 = await browser.contextualIdentities.query({
-    name: titlepref
+    name: titlepref,
   });
   var context2 = await browser.contextualIdentities.query({
-    name: routerpref
+    name: routerpref,
   });
   var context3 = await browser.contextualIdentities.query({
-    name: mailpref
+    name: mailpref,
   });
   var context4 = await browser.contextualIdentities.query({
-    name: torrentpref
+    name: torrentpref,
   });
   var context5 = await browser.contextualIdentities.query({
-    name: tunnelpref
+    name: tunnelpref,
   });
   var context6 = await browser.contextualIdentities.query({
-    name: localpref
+    name: ircpref,
   });
   var context7 = await browser.contextualIdentities.query({
-    name: muwirepref
+    name: muwirepref,
+  });
+  var context7 = await browser.contextualIdentities.query({
+    name: botepref,
   });
   var othercontexts = [];
   console.log('Contexts:', contexts);
@@ -145,7 +120,7 @@ var contextSetup = function(requestDetails) {
     var i2pTabFind = async function(tabId) {
       try {
         var context = await browser.contextualIdentities.query({
-          name: titlepref
+          name: titlepref,
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
           function Create() {
@@ -159,7 +134,7 @@ var contextSetup = function(requestDetails) {
                 }
                 browser.pageAction.setPopup({
                   tabId: tabId.id,
-                  popup: 'security.html'
+                  popup: 'security.html',
                 });
                 browser.pageAction.show(tabId.id);
               }
@@ -168,7 +143,7 @@ var contextSetup = function(requestDetails) {
             var created = browser.tabs.create({
               active: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url
+              url: requestDetails.url,
             });
             created.then(onCreated, onContextError);
           }
@@ -183,7 +158,7 @@ var contextSetup = function(requestDetails) {
     var routerTabFind = async function(tabId) {
       try {
         var context = await browser.contextualIdentities.query({
-          name: routerpref
+          name: routerpref,
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
           function Create() {
@@ -194,6 +169,7 @@ var contextSetup = function(requestDetails) {
                   console.log('in favor of', tab.id);
                   console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
+                  browser.tabs.move(tab.id, { index: 0 });
                 }
                 for (index = 0; index < tabs.length; index++) {
                   if (index != tabs.length - 1)
@@ -201,15 +177,20 @@ var contextSetup = function(requestDetails) {
                 }
               }
               var pins = browser.tabs.query({
-                cookieStoreId: context[0].cookieStoreId
+                cookieStoreId: context[0].cookieStoreId,
               });
               pins.then(closeOldTab, onError);
             }
+            if (requestDetails.url.endsWith('xhr1.html')) {
+              hostname = url.split('/')[2];
+              let prefix = url.substr(0, url.indexOf('://') + 3);
+              requestDetails.url = prefix + hostname + '/home';
+            }
             var created = browser.tabs.create({
               active: true,
               pinned: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url
+              url: requestDetails.url,
             });
             created.then(onCreated, onContextError);
           }
@@ -224,7 +205,7 @@ var contextSetup = function(requestDetails) {
     var i2ptunnelTabFind = async function(tabId) {
       try {
         var context = await browser.contextualIdentities.query({
-          name: tunnelpref
+          name: tunnelpref,
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
           function Create() {
@@ -235,6 +216,7 @@ var contextSetup = function(requestDetails) {
                   console.log('in favor of', tab.id);
                   console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
+                  browser.tabs.move(tab.id, { index: 0 });
                 }
                 for (index = 0; index < tabs.length; index++) {
                   if (index != tabs.length - 1)
@@ -242,15 +224,20 @@ var contextSetup = function(requestDetails) {
                 }
               }
               var pins = browser.tabs.query({
-                cookieStoreId: context[0].cookieStoreId
+                cookieStoreId: context[0].cookieStoreId,
               });
               pins.then(closeOldTab, onError);
             }
+            if (requestDetails.url.endsWith('xhr1.html')) {
+              hostname = url.split('/')[2];
+              let prefix = url.substr(0, url.indexOf('://') + 3);
+              requestDetails.url = prefix + hostname + '/i2ptunnelmgr/';
+            }
             var created = browser.tabs.create({
               active: true,
               pinned: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url
+              url: requestDetails.url,
             });
             created.then(onCreated, onContextError);
           }
@@ -265,7 +252,62 @@ var contextSetup = function(requestDetails) {
     var snarkTabFind = async function(tabId) {
       try {
         var context = await browser.contextualIdentities.query({
-          name: torrentpref
+          name: torrentpref,
+        });
+        if (tabId.cookieStoreId != context[0].cookieStoreId) {
+          var exemptContext = await browser.contextualIdentities.query({
+            name: titlepref,
+          });
+          let tmp = new URL(tabId.url);
+          console.log('(isolate)tabid host', tmp.host);
+          if (!requestDetails.url.includes('snark/' + tmp.host)) {
+            //          if (tabId.cookieStoreId != exemptContext[0].cookieStoreId){
+            function Create() {
+              function onCreated(tab) {
+                function closeOldTab(tabs) {
+                  if (tabId.id != tab.id) {
+                    console.log('(isolate) Closing un-isolated tab', tabId.id);
+                    console.log('in favor of', tab.id);
+                    console.log('with context', tab.cookieStoreId);
+                    browser.tabs.remove(tabId.id);
+                    browser.tabs.move(tab.id, { index: 0 });
+                  }
+                  for (index = 0; index < tabs.length; index++) {
+                    if (index != tabs.length - 1)
+                      browser.tabs.remove(tabs[index].id);
+                  }
+                }
+                var pins = browser.tabs.query({
+                  cookieStoreId: context[0].cookieStoreId,
+                });
+                pins.then(closeOldTab, onError);
+              }
+              if (requestDetails.url.endsWith('xhr1.html')) {
+                hostname = url.split('/')[2];
+                let prefix = url.substr(0, url.indexOf('://') + 3);
+                requestDetails.url = prefix + hostname + '/i2psnark/';
+              }
+              var created = browser.tabs.create({
+                active: true,
+                pinned: true,
+                cookieStoreId: context[0].cookieStoreId,
+                url: requestDetails.url,
+              });
+              created.then(onCreated, onContextError);
+            }
+            var gettab = browser.tabs.get(tabId.id);
+            gettab.then(Create, onContextError);
+            return tabId;
+          }
+        }
+      } catch (error) {
+        console.log('(isolate)Context Error', error);
+      }
+    };
+    var muwireTabFind = async function(tabId) {
+      try {
+        var context = await browser.contextualIdentities.query({
+          name: muwirepref,
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
           function Create() {
@@ -276,6 +318,7 @@ var contextSetup = function(requestDetails) {
                   console.log('in favor of', tab.id);
                   console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
+                  browser.tabs.move(tab.id, { index: 0 });
                 }
                 for (index = 0; index < tabs.length; index++) {
                   if (index != tabs.length - 1)
@@ -283,15 +326,20 @@ var contextSetup = function(requestDetails) {
                 }
               }
               var pins = browser.tabs.query({
-                cookieStoreId: context[0].cookieStoreId
+                cookieStoreId: context[0].cookieStoreId,
               });
               pins.then(closeOldTab, onError);
             }
+            if (requestDetails.url.endsWith('xhr1.html')) {
+              hostname = url.split('/')[2];
+              let prefix = url.substr(0, url.indexOf('://') + 3);
+              requestDetails.url = prefix + hostname + '/muwire/';
+            }
             var created = browser.tabs.create({
               active: true,
               pinned: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url
+              url: requestDetails.url,
             });
             created.then(onCreated, onContextError);
           }
@@ -303,10 +351,10 @@ var contextSetup = function(requestDetails) {
         console.log('(isolate)Context Error', error);
       }
     };
-    var muwireTabFind = async function(tabId) {
+    var i2pboteTabFind = async function(tabId) {
       try {
         var context = await browser.contextualIdentities.query({
-          name: muwirepref
+          name: botepref,
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
           function Create() {
@@ -317,6 +365,7 @@ var contextSetup = function(requestDetails) {
                   console.log('in favor of', tab.id);
                   console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
+                  browser.tabs.move(tab.id, { index: 0 });
                 }
                 for (index = 0; index < tabs.length; index++) {
                   if (index != tabs.length - 1)
@@ -324,15 +373,20 @@ var contextSetup = function(requestDetails) {
                 }
               }
               var pins = browser.tabs.query({
-                cookieStoreId: context[0].cookieStoreId
+                cookieStoreId: context[0].cookieStoreId,
               });
               pins.then(closeOldTab, onError);
             }
+            if (requestDetails.url.endsWith('xhr1.html')) {
+              hostname = url.split('/')[2];
+              let prefix = url.substr(0, url.indexOf('://') + 3);
+              requestDetails.url = prefix + hostname + '/i2pbote/';
+            }
             var created = browser.tabs.create({
               active: true,
               pinned: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url
+              url: requestDetails.url,
             });
             created.then(onCreated, onContextError);
           }
@@ -347,7 +401,7 @@ var contextSetup = function(requestDetails) {
     var mailTabFind = async function(tabId) {
       try {
         var context = await browser.contextualIdentities.query({
-          name: mailpref
+          name: mailpref,
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
           function Create() {
@@ -358,6 +412,7 @@ var contextSetup = function(requestDetails) {
                   console.log('in favor of', tab.id);
                   console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
+                  browser.tabs.move(tab.id, { index: 0 });
                 }
                 for (index = 0; index < tabs.length; index++) {
                   if (index != tabs.length - 1)
@@ -365,15 +420,20 @@ var contextSetup = function(requestDetails) {
                 }
               }
               var pins = browser.tabs.query({
-                cookieStoreId: context[0].cookieStoreId
+                cookieStoreId: context[0].cookieStoreId,
               });
               pins.then(closeOldTab, onError);
             }
+            if (requestDetails.url.endsWith('xhr1.html')) {
+              hostname = url.split('/')[2];
+              let prefix = url.substr(0, url.indexOf('://') + 3);
+              requestDetails.url = prefix + hostname + '/webmail/';
+            }
             var created = browser.tabs.create({
               active: true,
               pinned: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url
+              url: requestDetails.url,
             });
             created.then(onCreated, onContextError);
           }
@@ -385,34 +445,45 @@ var contextSetup = function(requestDetails) {
         console.log('(isolate)Context Error', error);
       }
     };
-    var localTabFind = async function(tabId) {
+    var ircTabFind = async function(tabId) {
       try {
         var context = await browser.contextualIdentities.query({
-          name: localpref
+          name: ircpref,
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          function Create() {
-            function onCreated(tab) {
-              function closeOldTab() {
-                if (tabId.id != tab.id) {
-                  console.log('(isolate) Closing un-isolated tab', tabId.id);
-                  console.log('in favor of', tab.id);
-                  console.log('with context', tab.cookieStoreId);
-                  browser.tabs.remove(tabId.id);
+          if (requestDetails.url.includes(':7669')) {
+            function Create() {
+              function onCreated(tab) {
+                function closeOldTab(tabs) {
+                  if (tabId.id != tab.id) {
+                    console.log('(isolate) Closing un-isolated tab', tabId.id);
+                    console.log('in favor of', tab.id);
+                    console.log('with context', tab.cookieStoreId);
+                    browser.tabs.remove(tabId.id);
+                    browser.tabs.move(tab.id, { index: 0 });
+                  }
+                  for (index = 0; index < tabs.length; index++) {
+                    if (index != tabs.length - 1)
+                      browser.tabs.remove(tabs[index].id);
+                  }
                 }
+                var pins = browser.tabs.query({
+                  cookieStoreId: context[0].cookieStoreId,
+                });
+                pins.then(closeOldTab, onError);
               }
-              closeOldTab(tab);
+              var created = browser.tabs.create({
+                active: true,
+                pinned: true,
+                cookieStoreId: context[0].cookieStoreId,
+                url: requestDetails.url,
+              });
+              created.then(onCreated, onContextError);
             }
-            var created = browser.tabs.create({
-              active: true,
-              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url
-            });
-            created.then(onCreated, onContextError);
+            var gettab = browser.tabs.get(tabId.id);
+            gettab.then(Create, onContextError);
+            return tabId;
           }
-          var gettab = browser.tabs.get(tabId.id);
-          gettab.then(Create, onContextError);
-          return tabId;
         }
       } catch (error) {
         console.log('(isolate)Context Error', error);
@@ -424,10 +495,10 @@ var contextSetup = function(requestDetails) {
       }
       try {
         var anoncontext = await browser.contextualIdentities.query({
-          name: titlepref
+          name: titlepref,
         });
-        var localcontext = await browser.contextualIdentities.query({
-          name: localpref
+        var irccontext = await browser.contextualIdentities.query({
+          name: ircpref,
         });
         var othercontexts = await notMyContextNotMyProblem();
         var nmp = false;
@@ -441,7 +512,7 @@ var contextSetup = function(requestDetails) {
           tabId.cookieStoreId == 'firefox-default' ||
           tabId.cookieStoreId == 'firefox-private' ||
           tabId.cookieStoreId == anoncontext[0].cookieStoreId ||
-          tabId.cookieStoreId == localcontext[0].cookieStoreId ||
+          tabId.cookieStoreId == irccontext[0].cookieStoreId ||
           nmp
         ) {
           console.log(
@@ -449,7 +520,7 @@ var contextSetup = function(requestDetails) {
             tabId.cookieStoreId,
             'not',
             anoncontext[0].cookieStoreId,
-            localcontext[0].cookieStoreId
+            irccontext[0].cookieStoreId
           );
           return;
         } else {
@@ -480,7 +551,7 @@ var contextSetup = function(requestDetails) {
             var created = browser.tabs.create({
               active: true,
               cookieStoreId: 'firefox-default',
-              url: requestDetails.url
+              url: requestDetails.url,
             });
             created.then(onCreated, onContextError);
           }
@@ -508,7 +579,7 @@ var contextSetup = function(requestDetails) {
       setcookie = browser.cookies.set({
         firstPartyDomain: i2pHostName(requestDetails.url),
         url: requestDetails.url,
-        secure: true
+        secure: true,
       });
       setcookie.then(onContextGotLog, onContextError);
       return requestDetails;
@@ -516,46 +587,69 @@ var contextSetup = function(requestDetails) {
 
     if (requestDetails.tabId > 0) {
       var tab = tabGet(requestDetails.tabId);
-      if (i2pHost(requestDetails.url)) {
-        var setcookie = browser.cookies.set({
-          firstPartyDomain: i2pHostName(requestDetails.url),
-          url: requestDetails.url,
-          secure: true
-        });
-        setcookie.then(onContextGotLog, onContextError);
-        var i2ptab = tab.then(i2pTabFind, onContextError);
-        return requestDetails;
-      }
-      if (extensionHost(requestDetails)) {
-        return requestDetails;
-      }
-      let localhost = localHost(requestDetails.url);
-      let routerhost = routerHost(requestDetails.url);
-      if (routerhost) {
-        if (routerhost === 'i2ptunnelmgr') {
-          var tunneltab = tab.then(i2ptunnelTabFind, onContextError);
-          return requestDetails;
-        } else if (routerhost === 'i2psnark') {
-          var snarktab = tab.then(snarkTabFind, onContextError);
-          return requestDetails;
-        } else if (routerhost === 'webmail') {
-          var mailtab = tab.then(mailTabFind, onContextError);
-          return requestDetails;
-        } else if (routerhost === 'muwire') {
-          var routertab = tab.then(muwireTabFind, onContextError);
-          return requestDetails;
-        } else if (routerhost === 'routerconsole') {
-          var routertab = tab.then(routerTabFind, onContextError);
+      tab.then(isolate);
+      function isolate(oldtab) {
+        //        if (oldtab.cookieStoreId == 'firefox-default') {
+        if (i2pHost(requestDetails.url)) {
+          var thn = i2pHostName(requestDetails.url);
+          if (requestDetails.url.includes('=' + thn)) {
+            if (
+              !requestDetails.url.includes('github.com') ||
+              !requestDetails.url.includes('notabug.org') ||
+              !requestDetails.url.includes('i2pgit.org') ||
+              !requestDetails.url.includes('gitlab.com')
+            ) {
+              console.log('(scrub)checking search hostnames =' + thn);
+              var tpt = requestDetails.url.split('=' + thn, 2);
+              requestDetails.url =
+                'http://' + thn + '/' + tpt[1].replace('%2F', '');
+            }
+          }
+          console.log('(scrub) new hostname', requestDetails.url);
+          var setcookie = browser.cookies.set({
+            firstPartyDomain: i2pHostName(requestDetails.url),
+            url: requestDetails.url,
+            secure: true,
+          });
+          setcookie.then(onContextGotLog, onContextError);
+          var i2ptab = tab.then(i2pTabFind, onContextError);
           return requestDetails;
         }
-      } else {
-        if (localhost) {
-          var localtab = tab.then(localTabFind, onContextError);
+        if (extensionHost(requestDetails)) {
           return requestDetails;
         }
-        var normalTab = tab.then(normalTabFind, onContextError);
-        return requestDetails;
-        //return requestDetails;
+        let localhost = localHost(requestDetails.url);
+        let routerhost = routerHost(requestDetails.url);
+        if (routerhost) {
+          if (routerhost === 'i2ptunnelmgr') {
+            var tunneltab = tab.then(i2ptunnelTabFind, onContextError);
+            return requestDetails;
+          } else if (routerhost === 'i2psnark') {
+            var snarktab = tab.then(snarkTabFind, onContextError);
+            return requestDetails;
+          } else if (routerhost === 'webmail') {
+            var mailtab = tab.then(mailTabFind, onContextError);
+            return requestDetails;
+          } else if (routerhost === 'muwire') {
+            var routertab = tab.then(muwireTabFind, onContextError);
+            return requestDetails;
+          } else if (routerhost === 'i2pbote') {
+            var routertab = tab.then(i2pboteTabFind, onContextError);
+            return requestDetails;
+          } else if (routerhost === 'routerconsole') {
+            var routertab = tab.then(routerTabFind, onContextError);
+            return requestDetails;
+          }
+        } else {
+          if (localhost) {
+            var irctab = tab.then(ircTabFind, onContextError);
+            return requestDetails;
+          }
+          var normalTab = tab.then(normalTabFind, onContextError);
+          return requestDetails;
+          //return requestDetails;
+        }
+        //}
       }
     }
   } catch (error) {
@@ -563,14 +657,253 @@ var contextSetup = function(requestDetails) {
   }
 };
 
-browser.webRequest.onBeforeRequest.addListener(
-  contextSetup,
-  { urls: ['<all_urls>'] },
-  ['blocking']
+var coolheadersSetup = function(e) {
+  var asyncSetPageAction = new Promise((resolve, reject) => {
+    window.setTimeout(() => {
+      if (e.tabId != undefined) {
+        popup = browser.pageAction.getPopup({ tabId: e.tabId });
+        popup.then(gotPopup);
+      }
+      function gotPopup(p) {
+        console.log('(scrub) checking popup', p);
+        if (p.length != 0) return;
+        let headers = e.responseHeaders.filter((word) =>
+          word.name.toUpperCase().includes('I2P')
+        );
+        for (i = headers.length - 1; i >= 0; i--) {
+          let header = headers[i];
+          console.log('(scrub) checking header', header);
+          if (header.name.toUpperCase().endsWith('I2P-LOCATION')) {
+            var tab = browser.tabs.get(e.tabId);
+            tab.then(altSrc);
+            function altSrc(tab) {
+              console.log('(scrub) X-I2P-LOCATION');
+              let url = new URL(header.value);
+              browser.pageAction.setPopup({
+                tabId: e.tabId,
+                popup: 'location.html',
+              });
+              browser.pageAction.setIcon({
+                path: 'icons/i2plogo.png',
+                tabId: e.tabId,
+              });
+              let eurl = new URL(tab.url);
+              browser.pageAction.setTitle({
+                tabId: e.tabId,
+                title: 'http://' + url.host + eurl.pathname,
+              });
+              browser.pageAction.show(e.tabId);
+            }
+            break;
+          } else {
+            if (header.name.toUpperCase().endsWith('I2P-TORRENTLOCATION')) {
+              var imgs = document.getElementsByTagName('img');
+              for (let img of imgs) {
+                if (tmpsrc.host == location.host) {
+                  img.src =
+                    'http://127.0.0.1:7657/i2psnark/' +
+                    tmpsrc.host +
+                    tmpsrc.pathname;
+                  img.onerror = function() {
+                    img.src = tmpsrc;
+                  };
+                }
+              }
+              var videos = document.getElementsByTagName('video');
+              for (let video of videos) {
+                let tmpsrc = new URL(video.currentSrc);
+                if (tmpsrc.host == location.host) {
+                  if (!video.innerHTML.includes('127.0.0.1')) {
+                    innerHTML = video.innerHTML;
+                    topInnerHTML = video.innerHTML.replace(
+                      'src="',
+                      'src="http://127.0.0.1:7657/i2psnark/' +
+                        location.host +
+                        '/'
+                    );
+                    video.innerHTML = topInnerHTML; // + innerHTML;
+                    video.onerror = function() {
+                      video.innerHTML = topInnerHTML + innerHTML;
+                    };
+                  }
+                }
+              }
+              var audios = document.getElementsByTagName('audio');
+              for (let audio of audios) {
+                let tmpsrc = new URL(audio.currentSrc);
+                if (tmpsrc.host == location.host) {
+                  if (!audio.innerHTML.includes('127.0.0.1')) {
+                    innerHTML = audio.innerHTML;
+                    topInnerHTML = audio.innerHTML.replace(
+                      'src="',
+                      'src="http://127.0.0.1:7657/i2psnark/' +
+                        location.host +
+                        '/'
+                    );
+                    audio.innerHTML = topInnerHTML; // + innerHTML;
+                    audio.onerror = function() {
+                      audio.innerHTML = topInnerHTML + innerHTML;
+                    };
+                  }
+                }
+              }
+              browser.pageAction.setPopup({
+                tabId: tabId.id,
+                popup: 'torrent.html',
+              });
+              browser.pageAction.setIcon({
+                path: 'icons/i2plogo.png',
+                tabId: e.tabId,
+              });
+              browser.pageAction.setTitle({
+                tabId: e.tabId,
+                title: header.value,
+              });
+              browser.pageAction.show(e.tabId);
+              break;
+            }
+          }
+        }
+      }
+      resolve({ responseHeaders: e.responseHeaders });
+    }, 2000);
+  });
+  return asyncSetPageAction;
+};
+
+function getTabURL(tab) {
+  if (tab.url.startsWith("https")) {
+    try {
+      browser.tabs
+        .sendMessage(tab.id, { req: "i2p-location" })
+        .then((response) => {
+          if (response != undefined) {
+            console.log("(scrub) i2p-location response object", response);
+            if (response.content.toUpperCase() != "NO-ALT-LOCATION") {
+              browser.pageAction.setPopup({
+                tabId: tab.id,
+                popup: "location.html",
+              });
+              browser.pageAction.setIcon({
+                path: "icons/i2plogo.png",
+                tabId: tab.id,
+              });
+              browser.pageAction.setTitle({
+                tabId: tab.id,
+                title: response.content,
+              });
+              browser.pageAction.show(tab.id);
+            }
+          }
+        });
+      console.log("(pageaction)", tab.id, tab.url);
+    } catch (e) {
+      console.log("(pageaction)", e);
+    }
+  } else {
+    try {
+      browser.tabs
+        .sendMessage(tab.id, { req: "i2p-torrentlocation" })
+        .then((response) => {
+          if (response != undefined) {
+            console.log("(scrub) i2p-location response object", response);
+            if (response.content.toUpperCase() != "NO-ALT-LOCATION") {
+              browser.pageAction.setPopup({
+                tabId: tab.id,
+                popup: "torrent.html",
+              });
+              browser.pageAction.setIcon({
+                path: "icons/i2plogo.png",
+                tabId: tab.id,
+              });
+              browser.pageAction.setTitle({
+                tabId: tab.id,
+                title: response.content,
+              });
+              browser.pageAction.show(tab.id);
+            }
+          }
+        });
+      console.log("(pageaction)", tab.id, tab.url);
+    } catch (e) {
+      console.log("(pageaction)", e);
+    }
+  }
+}
+
+function getClearTab(tobj) {
+  function setupTabs(tobj) {
+    if (typeof tobj == "number") {
+      browser.tabs.get(tobj).then(getTabURL, onError);
+    }
+    if (typeof tobj.tabId == "number") {
+      console.log("(scrub) tobj", tobj);
+      browser.tabs.get(tobj.tabId).then(getTabURL, onError);
+    } else {
+      for (let tab in tobj.tabIds) {
+        console.log("(scrub) tab", tobj.tabIds[tab]);
+        browser.tabs.get(tobj.tabIds[tab]).then(getTabURL, onError);
+      }
+    }
+  }
+  if (tobj != undefined) {
+    setupTabs(tobj);
+  } else {
+    browser.tabs.query({}).then(setupTabs);
+  }
+}
+
+const filter = {
+  url: [{ hostContains: ".i2p" }],
+};
+
+function logOnDOMContentLoaded(details) {
+  console.log(`onDOMContentLoaded: ${details.url}`);
+}
+
+browser.tabs.onActivated.addListener(getClearTab);
+browser.tabs.onAttached.addListener(getClearTab);
+browser.tabs.onCreated.addListener(getClearTab);
+browser.tabs.onDetached.addListener(getClearTab);
+browser.tabs.onHighlighted.addListener(getClearTab);
+browser.tabs.onMoved.addListener(getClearTab);
+browser.tabs.onReplaced.addListener(getClearTab);
+
+browser.pageAction.onClicked.addListener(getClearTab);
+
+function reloadTabs(tabs) {
+  for (let tab of tabs) {
+    browser.tabs.reload(tab.id);
+  }
+}
+
+function reloadError(error) {
+  console.log(`Error: ${error}`);
+}
+
+let querying = browser.tabs.query({});
+querying.then(reloadTabs, onError);
+
+// Listen for onHeaderReceived for the target page.
+// Set "blocking" and "responseHeaders".
+browser.webRequest.onHeadersReceived.addListener(
+  coolheadersSetup,
+  { urls: ["*://*.i2p/*", "https://*/*"] },
+  ["responseHeaders"]
 );
 
+browser.webNavigation.onDOMContentLoaded.addListener(getClearTab, filter);
+browser.webNavigation.onDOMContentLoaded.addListener(
+  logOnDOMContentLoaded,
+  filter
+);
+
+browser.webRequest.onBeforeRequest.addListener(contextSetup, {
+  urls: ["*://*.i2p/*", "*://localhost/*", "*://127.0.0.1/*", "*://*/*i2p*"],
+});
+
 browser.webRequest.onBeforeSendHeaders.addListener(
   contextScrub,
-  { urls: ['<all_urls>'] },
-  ['blocking', 'requestHeaders']
+  { urls: ["*://*.i2p/*"] },
+  ["requestHeaders"]
 );

search.css

@@ -2,13 +2,9 @@
   overflow: hidden;
   min-height: 3rem;
   padding: .5rem;
-  background: #dee2e6;
-  border: 1px solid #dee2e6;
-  width: 64%;
   min-width: 64%;
   border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
-  margin: .5rem .5rem .5rem 32%
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
 }
 .topnav a {
   float: left;
@@ -24,10 +20,10 @@
   color: #fff
 }
 .topnav input[type=search] {
-  float: right;
   padding: 6px;
   border: none;
   margin-top: 8px;
+  color: #e6e6e7;
   margin-right: 16px
 }
 .topnav input[type=submit] {
@@ -35,19 +31,12 @@
   padding: 6px;
   border: none;
   margin-top: 8px;
+  color: #e6e6e7;
   margin-right: 16px
 }
-@media screen and (max-width: 600px) {
-  .topnav a,
-  .topnav input[type=text] {
-    float: none;
-    display: block;
-    text-align: left;
-    width: 100%;
-    margin: 0;
-    padding: 14px
-  }
-  .topnav input[type=text] {
-    border: 1px solid #ccc
-  }
+#search-query {
+  color: #1f1a24
+}
+#search-submit {
+  color: #1f1a24
 }

security.html

@@ -3,8 +3,7 @@
 <head>
     <meta charset="utf-8">
     <link href="search.css" rel="stylesheet">
-    <link href="home.css" rel="stylesheet">
-    <link href="info.css" rel="stylesheet"><!--<link href="torrent/popup.css" rel="stylesheet">-->
+    <link href="home.css" rel="stylesheet"><!--<link href="info.css" rel="stylesheet">--><!--<link href="torrent/popup.css" rel="stylesheet">-->
 
     <title>
     </title>

sidebar.css

@@ -2,6 +2,22 @@ li {
   width: 90%;
   margin-left: 0
 }
+ul {
+  width: 100%
+}
+button {
+  width: 50%;
+  text-align: center
+}
 #applicationExplain {
   float: unset
+}
+.button-list {
+  display: inline
+}
+#hidden {
+  display: none
+}
+.hidden {
+  display: none
 }

toopie.html

@@ -6,57 +6,81 @@
     <link href="sidebar.css" rel="stylesheet" type="text/css">
 </head>
 <body>
+    <script src="i2pcontrol/i2pcontrol.js"></script> 
+    <script src="info.js"></script> 
+    <script src="content.js"></script>
     <h1>I2P Router Information</h1>
 
     <ul>
-        <li><button id="label-router-restart" target="_blank">Restart: <span id="router-restart">Gracefully restart router</span></button>
+        <li>
+            <a href="http://localhost:7657" target="_blank"><img alt="i2p router console" class="center" src="/icons/i2plogo.png"></a>
+        </li>
+    </ul>
+
+    <ul class="button-list">
+        <li><button id="label-router-restart" target="_blank"><img alt="Restart:" id="label-router-shutdown" src="/images/restart.svg"></button>
+        <br>
+        <span id="router-restart">Gracefully restart router</span>
         </li>
 
-        <li><button id="label-router-shutdown" target="_blank">Shutdown: <span id="router-shutdown">Gracefully shutdown router</span></button>
+        <li><button id="label-router-shutdown" target="_blank"><img alt="Shutdown:" id="label-router-shutdown" src="/images/shutdown.svg"></button>
+        <br>
+        <span id="router-shutdown">Gracefully shutdown router</span>
         </li>
     </ul>
 
     <ul>
+        <li><button id="label-router-status" target="_blank">Status</button>
+        </li>
+    </ul>
+
+    <ul class="label-list" id="label-status-list">
         <li><span id="label-router-status">Router Status:</span> <span id="router-status">Replace with Router Status</span></li>
 
         <li><span id="label-router-uptime">Router Uptime(Ms):</span> <span id="router-uptime">Replace with Router Uptime</span></li>
 
         <li><span id="label-router-version">Router Version:</span> <span id="router-version">Replace with Router Version</span></li>
+    </ul>
 
-        <li>
-            <ul>
-                <li><span id="label-router-bw-outbound-1s">Outbound bw 1s:</span> <span id="router-net-bw-outbound-1s">Replace with Router Bandwidth Outbound 1s</span></li>
-
-                <li><span id="label-router-bw-outbound-15s">Outbound bw 15s:</span> <span id="router-net-bw-outbound-15s">Replace with Router Bandwidth Outbound 15s</span></li>
-
-                <li><span id="label-router-bw-inbound-1s">Inbound bw 1s:</span> <span id="router-net-bw-inbound-1s">Replace with Router Bandwidth Inbound 1s</span></li>
-
-                <li><span id="label-router-bw-inbound-15s">Inbound bw 15s:</span> <span id="router-net-bw-inbound-15s">Replace with Router Bandwidth Outbound 15s</span></li>
-            </ul>
-        </li>
-        <!--<li>
-        <span id="label-router-net-status">Network Status:</span>
-        <span id="router-net-status">Replace with Router Network Status</span>
-      </li>-->
-
-        <li>
-            <ul>
-                <li><span id="label-router-net-tunnels-participating">Participating Tunnels:</span> <span id="router-net-tunnels-participating">Replace with Router Participating Tunnel Count</span></li>
-
-                <li><span id="label-router-activepeers">Active Peers:</span> <span id="router-netdb-activepeers">Replace with Router Active Peers</span></li>
-
-                <li><span id="label-router-netdb-fastpeers">Fast Peers:</span> <span id="router-netdb-fastpeers">Replace with Router Fast Peers</span></li>
-
-                <li><span id="label-router-netdb-highcapacitypeers">High Capacity Peers:</span> <span id="router-netdb-highcapacitypeers">Replace with High Capacity Peers</span></li>
-
-                <li><span id="label-router-netdb-isreseeding">Reseed status:</span> <span id="router-netdb-isreseeding">Replace with Router netDB Reseeding Status</span></li>
-
-                <li><span id="label-router-netdb-knownpeers">Known Peers:</span> <span id="router-netdb-knownpeers">Replace with Router Known Peers</span></li>
-            </ul>
+    <ul>
+        <li><button id="label-router-bandwidth" target="_blank">Bandwidth</button>
         </li>
     </ul>
-    <script src="i2pcontrol/i2pcontrol.js"></script> 
-    <script src="info.js"></script> 
-    <script src="content.js"></script>
+
+    <ul class="label-list" id="label-bandwidth-list">
+        <li><span id="label-router-bw-outbound-1s">Outbound bw 1s:</span> <span id="router-net-bw-outbound-1s">Replace with Router Bandwidth Outbound 1s</span></li>
+
+        <li><span id="label-router-bw-outbound-15s">Outbound bw 15s:</span> <span id="router-net-bw-outbound-15s">Replace with Router Bandwidth Outbound 15s</span></li>
+
+        <li><span id="label-router-bw-inbound-1s">Inbound bw 1s:</span> <span id="router-net-bw-inbound-1s">Replace with Router Bandwidth Inbound 1s</span></li>
+
+        <li><span id="label-router-bw-inbound-15s">Inbound bw 15s:</span> <span id="router-net-bw-inbound-15s">Replace with Router Bandwidth Outbound 15s</span></li>
+    </ul>
+    <!--<li>
+<span id="label-router-net-status">Network Status:</span>
+<span id="router-net-status">Replace with Router Network Status</span>
+</li>-->
+
+    <ul>
+        <li><button id="label-router-peers" target="_blank">Peers</button>
+        </li>
+    </ul>
+
+    <ul class="label-list" id="label-peers-list">
+        <li><span id="label-router-net-tunnels-participating">Transit Tunnels:</span> <span id="router-net-tunnels-participating">Replace with Router Participating Tunnel Count</span></li>
+
+        <li><span id="label-router-activepeers">Active Peers:</span> <span id="router-netdb-activepeers">Replace with Router Active Peers</span></li>
+
+        <li><span id="label-router-netdb-fastpeers">Fast Peers:</span> <span id="router-netdb-fastpeers">Replace with Router Fast Peers</span></li>
+
+        <li><span id="label-router-netdb-highcapacitypeers">High Capacity Peers:</span> <span id="router-netdb-highcapacitypeers">Replace with High Capacity Peers</span></li>
+
+        <li><span id="label-router-netdb-isreseeding">Reseed status:</span> <span id="router-netdb-isreseeding">Replace with Router netDB Reseeding Status</span></li>
+
+        <li><span id="label-router-netdb-knownpeers">Known Peers:</span> <span id="router-netdb-knownpeers">Replace with Router Known Peers</span></li>
+    </ul>
+
+    <br>
+    <br>
 </body>
 </html>

torrent.html

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <link href="search.css" rel="stylesheet">
+    <link href="home.css" rel="stylesheet">
+    <!--<link href="info.css" rel="stylesheet">--><!--<link href="torrent/popup.css" rel="stylesheet">-->
+
+    <title>
+    </title>
+</head>
+<body>
+    <div id="browserpanel">
+        <div class="panel">
+            <div class="section-header panel-section panel-section-header" id="headline">
+                <div class="text-section-header" id="text-section-header">
+                    <h1 id="text-section-header">This I2P Site has peer-to-peer resources.</h1>
+                </div>
+            </div>
+        </div>
+
+        <div class="panel">
+            <p>
+            To help distribute the site content, use the links below to join the swarm.
+            </p>
+            <ul>
+                <li>
+                    <div class="address-info">
+                      <span id="TypeLabel">Torrent Links:</span> <span id="Type"></span>
+                      <div id="TypeInfo">
+                      </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <script src="torrent.js"></script>
+</body>
+</html>

torrent.js

@@ -0,0 +1,19 @@
+function gotCurrent(tab) {
+  function gotTitle(title) {
+    let addr = title;
+    document.getElementById('TypeInfo').innerHTML =
+      '<div class="AddressInfo"><a href="' + addr + '">' + addr + '</a></div>';
+  }
+  console.log(tab);
+  var gettingTitle = browser.pageAction.getTitle({
+    tabId: tab[0].id,
+  });
+  gettingTitle.then(gotTitle);
+}
+
+function tabError(error) {
+  console.log(`Error : ${error}`);
+}
+
+const gettingCurrent = browser.tabs.query({ active: true });
+gettingCurrent.then(gotCurrent, tabError);

torrent/background.js

@@ -21,7 +21,7 @@ setupExtractor();
 
 function extractSession(requestDetails) {
   const hdr = requestDetails.requestHeaders.filter(
-    x => x.name.toLowerCase() === "x-transmission-session-id"
+    (x) => x.name.toLowerCase() === "x-transmission-session-id"
   )[0];
   if (!hdr) {
     return;
@@ -58,21 +58,21 @@ function addUrl(torrentUrl, downloadDir) {
     console.log("Downloading torrent", torrentUrl);
     p = fetch(torrentUrl, {
       method: "GET",
-      credentials: "include"
+      credentials: "include",
     })
-      .then(resp => {
+      .then((resp) => {
         if (resp.ok) {
           return resp.blob();
         }
         throw new Error("Could not download torrent");
       })
       .then(blobToBase64)
-      .then(b64 => {
+      .then((b64) => {
         params.metainfo = b64;
         return rpcCall("torrent-add", params);
       });
   }
-  return p.then(x => {
+  return p.then((x) => {
     updateBadge();
     return x;
   });
@@ -85,7 +85,7 @@ function handleUrl(requestDetails) {
     decodeURIComponent(
       requestDetails.url.replace("http://transmitter.web-extension/", "")
     )
-  ).then(x => {
+  ).then((x) => {
     return browser.storage.local.get("server").then(({ server }) => {
       return { redirectUrl: server.base_url + "web/" };
     });
@@ -107,19 +107,19 @@ function createContextMenu() {
       browser.contextMenus.create({
         id: "transmitter-add",
         title: "Download with Transmission remote",
-        contexts: ["link"]
+        contexts: ["link"],
       });
     } else {
       browser.contextMenus.create({
         id: "transmitter-add",
         title: "Download to Default location",
-        contexts: ["link"]
+        contexts: ["link"],
       });
-      server.locations.forEach(location => {
+      server.locations.forEach((location) => {
         browser.contextMenus.create({
           id: "transmitter-add-loc-" + location.index,
           title: "Download to " + location.name,
-          contexts: ["link"]
+          contexts: ["link"],
         });
       });
     }
@@ -152,42 +152,42 @@ function updateBadge() {
     ) {
       return;
     }
-    return rpcCall("session-stats", {}).then(response => {
+    return rpcCall("session-stats", {}).then((response) => {
       const args = response.arguments; // lol the name 'arguments' means destructuring in strict mode is impossible
       switch (server.badge) {
         case "num":
           browser.browserAction.setBadgeBackgroundColor({ color: "gray" });
           browser.browserAction.setBadgeText({
-            text: "" + args.activeTorrentCount
+            text: "" + args.activeTorrentCount,
           });
           break;
         case "dl":
           browser.browserAction.setBadgeBackgroundColor({ color: "green" });
           browser.browserAction.setBadgeText({
-            text: formatSpeed(args.downloadSpeed)
+            text: formatSpeed(args.downloadSpeed),
           });
           break;
         case "ul":
           browser.browserAction.setBadgeBackgroundColor({ color: "blue" });
           browser.browserAction.setBadgeText({
-            text: formatSpeed(args.uploadSpeed)
+            text: formatSpeed(args.uploadSpeed),
           });
           break;
         case "auto":
           if (args.downloadSpeed > 0) {
             browser.browserAction.setBadgeBackgroundColor({ color: "green" });
             browser.browserAction.setBadgeText({
-              text: formatSpeed(args.downloadSpeed)
+              text: formatSpeed(args.downloadSpeed),
             });
           } else if (args.uploadSpeed > 0) {
             browser.browserAction.setBadgeBackgroundColor({ color: "blue" });
             browser.browserAction.setBadgeText({
-              text: formatSpeed(args.uploadSpeed)
+              text: formatSpeed(args.uploadSpeed),
             });
           } else {
             browser.browserAction.setBadgeBackgroundColor({ color: "gray" });
             browser.browserAction.setBadgeText({
-              text: "" + args.activeTorrentCount
+              text: "" + args.activeTorrentCount,
             });
           }
           break;
@@ -196,20 +196,20 @@ function updateBadge() {
   });
 }
 
-browser.alarms.onAlarm.addListener(alarm => {
+browser.alarms.onAlarm.addListener((alarm) => {
   if (alarm.name === "transmitter-badge-update") {
     return updateBadge();
   }
 });
 
 function setupBadge() {
-  browser.alarms.clear("transmitter-badge-update").then(x => {
+  browser.alarms.clear("transmitter-badge-update").then((x) => {
     browser.storage.local.get("server").then(({ server }) => {
       if (!server) {
         return;
       }
       browser.alarms.create("transmitter-badge-update", {
-        periodInMinutes: parseInt(server.badge_interval || "1")
+        periodInMinutes: parseInt(server.badge_interval || "1"),
       });
       updateBadge();
     });

torrent/common.js

@@ -6,7 +6,7 @@ function rpcCall(meth, args) {
   return browser.storage.local.get(function(server) {
     const myHeaders = {
       'Content-Type': 'application/json',
-      'x-transmission-session-id': server.session
+      'x-transmission-session-id': server.session,
     };
     //console.log("(torrent)", server.session)
     if (server.username !== '' || server.btrpcpass !== '') {
@@ -19,7 +19,7 @@ function rpcCall(meth, args) {
       method: 'POST',
       headers: myHeaders,
       body: JSON.stringify({ method: meth, arguments: args }),
-      credentials: 'include' // allows HTTPS client certs!
+      credentials: 'include', // allows HTTPS client certs!
     })
       .then(function(response) {
         const session = response.headers.get('x-transmission-session-id');

torrent/popup.js

@@ -4,7 +4,7 @@ var TrpcCall = async function(meth, args) {
   const server = await browser.storage.local.get(null);
   const myHeaders = {
     'Content-Type': 'application/json',
-    'x-transmission-session-id': server.session
+    'x-transmission-session-id': server.session,
   };
   console.log('(torrent) session', server.session);
   if (server.username !== '' || server.btrpcpass !== '') {
@@ -16,7 +16,7 @@ var TrpcCall = async function(meth, args) {
     method: 'POST',
     headers: myHeaders,
     body: JSON.stringify({ method: meth, arguments: args }),
-    credentials: 'include' // allows HTTPS client certs!
+    credentials: 'include', // allows HTTPS client certs!
   });
 
   /*.then(function(response) {
@@ -38,7 +38,7 @@ const torrentsPane = document.getElementById('torrents-pane');
 const configPane = document.getElementById('config-pane');
 
 for (const opener of document.querySelectorAll('.config-opener')) {
-  opener.addEventListener('click', e => {
+  opener.addEventListener('click', (e) => {
     browser.runtime.openOptionsPage();
   });
 }
@@ -53,7 +53,13 @@ const torrentsList = document.getElementById("torrents-list");
 const torrentsTpl = document.getElementById("torrents-tpl");
 const torrentsError = document.getElementById("torrents-error");
 const getArgs = {
-  fields: ["name", "percentDone", "rateDownload", "rateUpload", "queuePosition"]
+  fields: [
+    "name",
+    "percentDone",
+    "rateDownload",
+    "rateUpload",
+    "queuePosition",
+  ],
 };
 let cachedTorrents = [];
 
@@ -90,7 +96,7 @@ function searchTorrents() {
   let newTorrents = cachedTorrents;
   const val = torrentsSearch.value.toLowerCase().trim();
   if (val.length > 0) {
-    newTorrents = newTorrents.filter(x => x.name.toLowerCase().includes(val));
+    newTorrents = newTorrents.filter((x) => x.name.toLowerCase().includes(val));
   }
   renderTorrents(newTorrents);
 }
@@ -99,16 +105,16 @@ torrentsSearch.addEventListener("keyup", searchTorrents);
 
 function refreshTorrents(server) {
   console.log("(torrent) initiating", server);
-  return TrpcCall("torrent-get", getArgs).then(function(response) {
+  return TrpcCall("torrent-get", getArgs).then(function (response) {
     const session = response.headers.get("x-transmission-session-id");
     if (session) {
-      browser.storage.local.get({}).then(function(storage) {
+      browser.storage.local.get({}).then(function (storage) {
         storage.session = session;
         browser.storage.local.set(storage);
       });
     }
     let sponse = response.json();
-    sponse.then(function(response) {
+    sponse.then(function (response) {
       console.log("(torrent) refreshing", response);
       let newTorrents = response.arguments.torrents;
       newTorrents.sort((x, y) => y.queuePosition - x.queuePosition);
@@ -125,7 +131,7 @@ function refreshTorrents(server) {
 }
 
 function refreshTorrentsLogErr(server) {
-  return refreshTorrents(server).catch(err => {
+  return refreshTorrents(server).catch((err) => {
     console.error(err);
     torrentsError.textContent = "Error: " + err.toString();
   });
@@ -138,12 +144,12 @@ function showTorrents(server) {
     opener.href = server.base_url + "web/";
   }
   console.log("(torrent) showing torrents");
-  refreshTorrents(server).catch(_ => refreshTorrentsLogErr(server));
+  refreshTorrents(server).catch((_) => refreshTorrentsLogErr(server));
   setInterval(() => refreshTorrentsLogErr(server), 2000);
 }
 
 //let store =
-browser.storage.local.get(function(server) {
+browser.storage.local.get(function (server) {
   console.log("(torrent) querying storage", server);
   if (server && server.base_url && server.base_url !== "") {
     showTorrents(server);

window.html

@@ -12,13 +12,13 @@
 <body>
     <div class="section-header panel-section panel-section-header" id="topbar">
         <!--<div class="text-section-header" id="text-section-header">-->
-        <img height="32px" src="icons/toopie.png" width="32px"> <a href="#" id="browser-action">Browse</a> <img height="32px" src="icons/torrents.png" width="32px"> <a href="#" id="torrent-action">Download</a> <!--</div>-->
+        <a href="#" id="browser-action"><img class="tabicon" height="32px" src="icons/browse.png" width="32px">Browse</a> <a href="#" id="torrent-action"><img class="tabicon" height="32px" src="icons/torrents.png" width="32px">Download</a> <!--</div>-->
     </div>
 
     <div id="browserpanel">
         <div class="panel">
             <div class="section-header panel-section panel-section-header" id="headline">
-                <div class="text-section-header" id="text-section-header">
+                <div class="text-section-header">
                     <h1 id="text-section-header">The Invisible Internet Browser</h1>
                 </div>
             </div>
@@ -40,8 +40,7 @@
 
                 <div id="i2pbrowser-description">
                     <p id="description">You are now able to use I2P in this browser.</p>
-
-                    <p id="beta">It is experimental.</p>
+                    <button class="hidden" id="visit-irc">Visit IRC</button>
                 </div>
             </div>
 
@@ -72,16 +71,9 @@
 
                     <li class="application"><input id="disable-history" name="disablehistory" type="checkbox" value="history"> <label for="disable-history">Disable History in I2P Tabs</label> <span class="applicationDesc" id="histDesc">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>
-
-                <p>
-                </p>
-            </div>
-
-            <div class="panel-section-separator">
             </div>
+            <!--<div class="panel-section-separator">
+            </div>-->
 
             <div class="application-info">
                 <p class="hideIfI2PConsoleOff">
@@ -102,25 +94,21 @@
 
                     <li class="application"><button class="applicationName" id="window-visit-snark" target="_blank">BitTorrent</button> <span class="applicationDesc" id="snark">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span></li>
                 </ul>
-
-                <p>
-                </p>
-
-                <p>
-                </p>
             </div>
         </div>
     </div>
 
+    <br>
+
     <div id="torrentpanel">
         <div class="panel" id="torrentstatus">
             <div class="section-header panel-section panel-section-header">
                 <div class="text-section-header" id="text-section-torrents-header">
-                    <h3>Torrent Downloads</h3>
+                    <h1>Torrent Downloads</h1>
                 </div>
             </div>
 
-            <div hidden="" id="config-pane">
+            <div id="config-pane">
                 <strong>Torrent RPC Configuration</strong>
                 <br>
                 The server address is not set yet.
@@ -128,13 +116,13 @@
                 <a class="config-opener" href="#">Open the settings</a> to continue.
             </div>
 
-            <div hidden="" id="torrents-pane">
+            <div id="torrents-pane">
                 <header>
                     <h1>Torrent Controls</h1>
-                    <a class="webui-opener" href="#" target="_blank"><img alt="Open Web UI" src="icon.svg"></a> <!--<a class="config-opener" href="#">
-                            <img alt="Settings" src="gear.svg"></a>
+                    <a class="webui-opener" href="#" target="_blank"><img alt="Open Web UI" src="images/i2plogo.png"></a> <!--<a class="config-opener" href="#">
+                            <img alt="Settings" src="images/gear.svg"></a>
                             <a class="info-opener" href="https://github.com/myfreeweb/transmitter" target="_blank">
-                            <img alt="Extension Info" src="info.svg"></a>-->
+                            <img alt="Extension Info" src="images/info.svg"></a>-->
                 </header>
                 <input id="torrents-search" placeholder="Search…" type="search">
                 <template id="torrents-tpl">