Merge pull request #100 from eyedeekay/bookmarks

make the bookmarks part of a subdirectory

.web-extension-id

@@ -1,3 +0,0 @@
-# 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

@@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES
 
-MOZ_VERSION=0.68
-VERSION=0.67
+MOZ_VERSION=0.76
+VERSION=0.75
 
 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.63
+LAST_VERSION=0.73
 
 YELLOW=F7E59A
 ORANGE=FFC56D
@@ -98,11 +98,15 @@ 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 -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 -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
@@ -143,7 +147,7 @@ recreate-release: delete-release release upload
 
 upload: upload-xpi upload-deb
 
-full-release: release submit upload-xpi torrent upload-torrent deb upload-deb upload-rss
+full-release: release submit upload-xpi torrent upload-torrent deb upload-deb upload-rss seed
 
 WEB_EXT_API_KEY=AMO_KEY
 WEB_EXT_API_SECRET=AMO_SECRET
@@ -154,7 +158,7 @@ WEB_EXT_API_SECRET=AMO_SECRET
 tk:
 	echo $(WEB_EXT_API_KEY)
 
-submit: moz-sign rhz-submit moz-submit
+submit: moz-submit moz-sign
 
 clean-artifacts:
 	rm -fr web-ext-artifacts/*
@@ -164,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."
-	web-ext-submit --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
 
@@ -187,7 +191,7 @@ rhz-submit: rhz-version
 	#@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
 	#@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
 	#@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
-	#web-ext-submit --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	#$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); true
 	#cp web-ext-artifacts/*.xpi ./i2ppb@eyedeekay.github.io.xpi
 
 getxpi:
@@ -275,11 +279,14 @@ fmt-html:
 	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes options/options.html > options/.options.html; mv options/.options.html options/options.html
 
 fmt-js:
-	find . -path ./node_modules -prune -o -name '*.js' -exec prettier --write {} \;
-	find . -path ./node_modules -prune -o -name '*.json' -exec prettier --write {} \;
+	fixjsstyle *.js
+	fixjsstyle options/*.js
+	fixjsstyle torrent/*.js
+	fixjsstyle i2pcontrol/*.js
+	#find . -path ./node_modules -prune -o -name '*.json' -exec fixjsstyle --write {} \;
 
 lint:
-	fixjsstyle *.js
+
 	gjslint *.js; true
 	#eslint --color *.js
 
@@ -323,4 +330,12 @@ snark-mirror:
 	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc.su3
 	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psnark-rpc.su3" -f ../i2psnark-rpc.su3
 	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc-update.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc-update.su3
-	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psnark-rpc-update.su3" -f ../i2psnark-rpc-update.su3
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psnark-rpc-update.su3" -f ../i2psnark-rpc-update.su3
+
+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/"

_locales/en/messages.json

@@ -16,7 +16,7 @@
     "description": "Description of the extension."
   },
   "extensionVersion": {
-    "message": "0.63",
+    "message": "0.71",
     "description": "Version of the extension."
   },
   "extensionStatus": {
@@ -203,6 +203,14 @@
     "message": "Hidden Services Manager (Private)",
     "description": "Preface for the browser titlebar"
   },
+  "muwirePreface": {
+    "message": "MuWire",
+    "description": "Preface for the browser titlebar"
+  },
+  "muwirePrefacePrivate": {
+    "message": "MuWire (Private)",
+    "description": "Preface for the browser titlebar"
+  },
   "resetMessage": {
     "message": "Reset Tunnel",
     "description": "Message for the Reset Tunnel button"

background.js

@@ -1,18 +1,19 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
-var webpref = chrome.i18n.getMessage("webPreface");
-var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
-var routerpref = chrome.i18n.getMessage("routerPreface");
-var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
-var mailpref = chrome.i18n.getMessage("mailPreface");
-var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
-var torrentpref = chrome.i18n.getMessage("torrentPreface");
-var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
-var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
-var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
-var localpref = chrome.i18n.getMessage("localPreface");
-var localprefpriv = chrome.i18n.getMessage("localPrefacePrivate");
-var extensionpref = chrome.i18n.getMessage("extensionPreface");
+var titlepref = chrome.i18n.getMessage('titlePreface');
+var titleprefpriv = chrome.i18n.getMessage('titlePrefacePrivate');
+var webpref = chrome.i18n.getMessage('webPreface');
+var webprefpriv = chrome.i18n.getMessage('webPrefacePrivate');
+var routerpref = chrome.i18n.getMessage('routerPreface');
+var routerprefpriv = chrome.i18n.getMessage('routerPrefacePrivate');
+var mailpref = chrome.i18n.getMessage('mailPreface');
+var mailprefpriv = chrome.i18n.getMessage('mailPrefacePrivate');
+var torrentpref = chrome.i18n.getMessage('torrentPreface');
+var torrentprefpriv = chrome.i18n.getMessage('torrentPrefacePrivate');
+var tunnelpref = chrome.i18n.getMessage('i2ptunnelPreface');
+var tunnelprefpriv = chrome.i18n.getMessage('i2ptunnelPrefacePrivate');
+var localpref = chrome.i18n.getMessage('localPreface');
+var localprefpriv = chrome.i18n.getMessage('localPrefacePrivate');
+var extensionpref = chrome.i18n.getMessage('extensionPreface');
+var muwirepref = chrome.i18n.getMessage('muwirePreface');
 
 function onContextsGot(contexts) {
   var ids = [];
@@ -20,13 +21,13 @@ function onContextsGot(contexts) {
     console.log(`Name : ${context.name}`);
     ids.push(context.name);
   }
-  console.log("Checking new contexts");
+  console.log('Checking new contexts');
   if (ids.indexOf(titlepref) == -1) {
     browser.contextualIdentities
       .create({
         name: titlepref,
-        color: "orange",
-        icon: "fingerprint"
+        color: 'orange',
+        icon: 'fingerprint'
       })
       .then(onCreated, onNotCreated);
   }
@@ -34,8 +35,8 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: webpref,
-        color: "red",
-        icon: "circle"
+        color: 'red',
+        icon: 'circle'
       })
       .then(onCreated, onNotCreated);
   }
@@ -43,8 +44,8 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: routerpref,
-        color: "blue",
-        icon: "briefcase"
+        color: 'blue',
+        icon: 'briefcase'
       })
       .then(onCreated, onNotCreated);
   }
@@ -52,8 +53,8 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: tunnelpref,
-        color: "green",
-        icon: "tree"
+        color: 'green',
+        icon: 'tree'
       })
       .then(onCreated, onNotCreated);
   }
@@ -61,8 +62,8 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: mailpref,
-        color: "yellow",
-        icon: "briefcase"
+        color: 'yellow',
+        icon: 'briefcase'
       })
       .then(onCreated, onNotCreated);
   }
@@ -70,8 +71,8 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: torrentpref,
-        color: "purple",
-        icon: "chill"
+        color: 'purple',
+        icon: 'chill'
       })
       .then(onCreated, onNotCreated);
   }
@@ -79,30 +80,39 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: localpref,
-        color: "red",
-        icon: "fence"
+        color: 'red',
+        icon: 'fence'
+      })
+      .then(onCreated, onNotCreated);
+  }
+  if (ids.indexOf(localpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: muwirepref,
+        color: 'turquoise',
+        icon: 'gift'
       })
       .then(onCreated, onNotCreated);
   }
 }
 
 function onContextsError() {
-  console.log("Error finding contextual identities, is the API enabled?");
+  console.log('Error finding contextual identities, is the API enabled?');
 }
 
 function onCreated(context) {
-  console.log(" ID:", context.cookieStoreId, "created.");
+  console.log(' ID:', context.cookieStoreId, 'created.');
 }
 
 function onNotCreated(context) {
-  console.log("ID:", context.cookieStoreId, "not created.");
+  console.log('ID:', context.cookieStoreId, 'not created.');
 }
 
 browser.contextualIdentities.query({}).then(onContextsGot, onContextsError);
 
 var gettingInfo = browser.runtime.getPlatformInfo();
 gettingInfo.then(got => {
-  if (got.os != "android") {
+  if (got.os != 'android') {
     browser.windows.onCreated.addListener(themeWindow);
     browser.windows.onFocusChanged.addListener(themeWindow);
     browser.windows.onRemoved.addListener(themeWindow);
@@ -115,7 +125,7 @@ function themeWindowByTab(tabId) {
   function tabWindow(tab) {
     var gettingPlatformInfo = browser.runtime.getPlatformInfo();
     gettingPlatformInfo.then(got => {
-      if (got.os == "android") {
+      if (got.os == 'android') {
         let getwindow = browser.tabs.get(tab.tabId);
         getwindow.then(themeWindow);
       } else {
@@ -124,7 +134,7 @@ function themeWindowByTab(tabId) {
       }
     });
   }
-  if (typeof tabId === "number") {
+  if (typeof tabId === 'number') {
     let tab = browser.tabs.get(tabId);
     tab.then(tabWindow);
   } else {
@@ -150,114 +160,114 @@ var getOldTheme = async function getOldTheme() {
   let foundtheme = await browser.theme.getCurrent();
   if (!isEmpty(foundtheme)) {
     oldtheme = foundtheme;
-    console.log("Found old theme", oldtheme);
+    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);
+    console.log('got theme', oldtheme);
     browser.theme.update(oldtheme);
   }
   function logTabs(tabInfo) {
     function onContextGotTheme(context) {
       if (context.name == titlepref) {
-        console.log("Active in I2P window");
+        console.log('Active in I2P window');
         if (window.incognito) {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#FFC56D",
-              toolbar: "#FFC56D"
+              frame: '#FFC56D',
+              toolbar: '#FFC56D'
             }
           });
         } else {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#FFC56D",
-              toolbar: "#FFC56D"
+              frame: '#FFC56D',
+              toolbar: '#FFC56D'
             }
           });
         }
         browser.pageAction.setPopup({
           tabId: tabInfo[0].id,
-          popup: "security.html"
+          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");
+        console.log('Active in Router Console window');
         if (window.incognito) {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#A4C8E1",
-              toolbar: "#A4C8E1"
+              frame: '#A4C8E1',
+              toolbar: '#A4C8E1'
             }
           });
         } else {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#A4C8E1",
-              toolbar: "#A4C8E1"
+              frame: '#A4C8E1',
+              toolbar: '#A4C8E1'
             }
           });
         }
       } else if (context.name == tunnelpref) {
-        console.log("Active in Hidden Services Manager window");
+        console.log('Active in Hidden Services Manager window');
         if (window.incognito) {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#D9D9D6",
-              toolbar: "#D9D9D6"
+              frame: '#D9D9D6',
+              toolbar: '#D9D9D6'
             }
           });
         } else {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#D9D9D6",
-              toolbar: "#D9D9D6"
+              frame: '#D9D9D6',
+              toolbar: '#D9D9D6'
             }
           });
         }
       } else if (context.name == mailpref) {
-        console.log("Active in Web Mail window");
+        console.log('Active in Web Mail window');
         if (window.incognito) {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#F7E59A",
-              toolbar: "#F7E59A"
+              frame: '#F7E59A',
+              toolbar: '#F7E59A'
             }
           });
         } else {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#F7E59A",
-              toolbar: "#F7E59A"
+              frame: '#F7E59A',
+              toolbar: '#F7E59A'
             }
           });
         }
       } else if (context.name == torrentpref) {
-        console.log("Active in Bittorrent window");
+        console.log('Active in Bittorrent window');
         if (window.incognito) {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#A48FE1",
-              toolbar: "#A48FE1"
+              frame: '#A48FE1',
+              toolbar: '#A48FE1'
             }
           });
         } else {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#A48FE1",
-              toolbar: "#A48FE1"
+              frame: '#A48FE1',
+              toolbar: '#A48FE1'
             }
           });
         }
       } else {
-        console.log("Not active in I2P window");
+        console.log('Not active in I2P window');
         if (isEmpty(oldtheme)) {
           browser.theme.reset();
         } else {
@@ -266,8 +276,8 @@ function themeWindow(window) {
       }
     }
     if (
-      tabInfo[0].cookieStoreId != "firefox-default" &&
-      tabInfo[0].cookieStoreId != "firefox-private"
+      tabInfo[0].cookieStoreId != 'firefox-default' &&
+      tabInfo[0].cookieStoreId != 'firefox-private'
     ) {
       browser.contextualIdentities
         .get(tabInfo[0].cookieStoreId)
@@ -289,109 +299,109 @@ function themeWindow(window) {
 function setTitle(window) {
   // Check if the window is in private browsing
   function onContextError() {
-    console.log("Context Error");
+    console.log('Context Error');
   }
   function logTabs(tabInfo) {
     function onContextGotTitle(context) {
       if (context.name == titlepref) {
-        console.log("Active in I2P window");
+        console.log('Active in I2P window');
 
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ": "
+            titlePreface: titleprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: titlepref + ": "
+            titlePreface: titlepref + ': '
           });
         }
       } else if (context.name == webpref) {
-        console.log("Active in Web window");
+        console.log('Active in Web window');
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: webprefpriv + " - "
+            titlePreface: webprefpriv + ' - '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: webpref + " - "
+            titlePreface: webpref + ' - '
           });
         }
       } else if (context.name == routerpref) {
-        console.log("Active in Router Console window");
+        console.log('Active in Router Console window');
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + " - " + routerprefpriv + ": "
+            titlePreface: titleprefpriv + ' - ' + routerprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: titlepref + " - " + routerpref + ": "
+            titlePreface: titlepref + ' - ' + routerpref + ': '
           });
         }
       } else if (context.name == tunnelpref) {
-        console.log("Active in Hidden Services Manager window");
+        console.log('Active in Hidden Services Manager window');
 
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + " - " + tunnelprefpriv + ": "
+            titlePreface: titleprefpriv + ' - ' + tunnelprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: titlepref + " - " + tunnelpref + ": "
+            titlePreface: titlepref + ' - ' + tunnelpref + ': '
           });
         }
       } else if (context.name == mailpref) {
-        console.log("Active in I2P Web Mail window");
+        console.log('Active in I2P Web Mail window');
 
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + " - " + mailprefpriv + ": "
+            titlePreface: titleprefpriv + ' - ' + mailprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: titlepref + " - " + mailpref + ": "
+            titlePreface: titlepref + ' - ' + mailpref + ': '
           });
         }
       } else if (context.name == torrentpref) {
-        console.log("Active in I2P Torrent window");
+        console.log('Active in I2P Torrent window');
 
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + " - " + torrentprefpriv + ": "
+            titlePreface: titleprefpriv + ' - ' + torrentprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: titlepref + " - " + torrentpref + ": "
+            titlePreface: titlepref + ' - ' + torrentpref + ': '
           });
         }
       } else if (context.name == localpref) {
-        console.log("Active in Localhost window");
+        console.log('Active in Localhost window');
 
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: localprefpriv + " - " + localprefpriv + ": "
+            titlePreface: localprefpriv + ' - ' + localprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: localpref + " - " + localpref + ": "
+            titlePreface: localpref + ' - ' + localpref + ': '
           });
         }
       }
     }
 
     if (
-      tabInfo[0].cookieStoreId != "firefox-default" &&
-      tabInfo[0].cookieStoreId != "firefox-private"
+      tabInfo[0].cookieStoreId != 'firefox-default' &&
+      tabInfo[0].cookieStoreId != 'firefox-private'
     ) {
       browser.contextualIdentities
         .get(tabInfo[0].cookieStoreId)
         .then(onContextGotTitle, onContextError);
     } else if (window.incognito) {
       browser.windows.update(window.id, {
-        titlePreface: ""
+        titlePreface: ''
       });
     } else {
       browser.windows.update(window.id, {
-        titlePreface: ""
+        titlePreface: ''
       });
     }
   }
@@ -406,9 +416,9 @@ function setTitle(window) {
 var gettingListenerInfo = browser.runtime.getPlatformInfo();
 gettingListenerInfo.then(got => {
   function onPlatformError() {
-    console.log("Error finding platform info");
+    console.log('Error finding platform info');
   }
-  if (got.os != "android") {
+  if (got.os != 'android') {
     browser.tabs.onCreated.addListener(() => {
       var getting = browser.windows.getCurrent({
         populate: true

bookmarks.js

@@ -1,28 +1,28 @@
 var gettingInfo = browser.runtime.getPlatformInfo();
 gettingInfo.then(got => {
-  if (got.os != "android") {
+  if (got.os != 'android') {
     function bookmarks(bookmarkToolbar) {
-      console.log("Setting up bookmark toolbar", 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 port = info.value.http.split(':')[1];
+            if (port == '7644') {
               let createRhizomeBookmark = browser.bookmarks.create({
-                url: "about:I2p",
-                title: "Home Page",
+                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: "Home Page",
+                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"
@@ -34,19 +34,19 @@ gettingInfo.then(got => {
       function bookTorrent(bookmarkItems) {
         if (!bookmarkItems.length) {
           function gotProxyInfo(info) {
-            let port = info.value.http.split(":")[1];
-            if (port == "7644") {
+            let port = info.value.http.split(':')[1];
+            if (port == '7644') {
               let createBookmark = browser.bookmarks.create({
-                url: "http://localhost:7657/i2psnark",
-                title: "Bittorrent",
+                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",
+                  'http://' + control_host + ':' + control_port + '/i2psnark',
+                title: 'Bittorrent',
                 parentId: bookmarkToolbar[0].id
               });
               createRhizomeBookmark.then(onCreated);
@@ -62,19 +62,18 @@ gettingInfo.then(got => {
       function bookConsole(bookmarkItems) {
         if (!bookmarkItems.length) {
           function gotProxyInfo(info) {
-            let port = info.value.http.split(":")[1];
-            if (port == "7644") {
+            let port = info.value.http.split(':')[1];
+            if (port == '7644') {
               let createBookmark = browser.bookmarks.create({
-                url: "http://localhost:7657/home",
-                title: "I2P Console",
+                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",
+                url: 'http://' + control_host + ':' + control_port + '/home',
+                title: 'I2P Console',
                 parentId: bookmarkToolbar[0].id
               });
               createRhizomeBookmark.then(onCreated);
@@ -90,23 +89,23 @@ gettingInfo.then(got => {
       function bookMail(bookmarkItems) {
         if (!bookmarkItems.length) {
           function gotProxyInfo(info) {
-            let port = info.value.http.split(":")[1];
-            if (port == "7644") {
+            let port = info.value.http.split(':')[1];
+            if (port == '7644') {
               let createBookmark = browser.bookmarks.create({
-                url: "http://localhost:7657/webmail",
-                title: "Web Mail",
+                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",
+                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"
@@ -118,24 +117,24 @@ gettingInfo.then(got => {
       function bookI2PTunnel(bookmarkItems) {
         if (!bookmarkItems.length) {
           function gotProxyInfo(info) {
-            let port = info.value.http.split(":")[1];
-            if (port == "7644") {
+            let port = info.value.http.split(':')[1];
+            if (port == '7644') {
               var createBookmark = browser.bookmarks.create({
-                url: "http://localhost:7657/i2ptunnel",
-                title: "Hidden Services Manager",
+                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",
+                  '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"
@@ -149,41 +148,57 @@ gettingInfo.then(got => {
         console.log(`An error : ${error}`);
       }
       function onCreated(node) {
-        console.log("Bookmarked", node);
+        console.log('Bookmarked', node);
       }
 
       var b0 = browser.bookmarks.search({
-        title: "I2P Home Page"
+        title: 'I2P Extension Home Page'
       });
       b0.then(bookHome, onRejected);
 
       var b1 = browser.bookmarks.search({
-        title: "Bittorrent"
+        title: 'Bittorrent'
       });
       b1.then(bookTorrent, onRejected);
 
       var b2 = browser.bookmarks.search({
-        title: "Hidden Services Manager"
+        title: 'Hidden Services Manager'
       });
       b2.then(bookI2PTunnel, onRejected);
 
       var b3 = browser.bookmarks.search({
-        title: "Web Mail"
+        title: 'Web Mail'
       });
       b3.then(bookMail, onRejected);
 
       var b4 = browser.bookmarks.search({
-        title: "I2P Console"
+        title: 'I2P Console'
       });
       b4.then(bookConsole, onRejected);
-
     }
 
     var bt = browser.bookmarks.search({
-      query: "Toolbar"
+      query: 'Toolbar'
     });
 
-    bt.then(bookmarks);
+    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;

cert.js

@@ -1,42 +1,42 @@
 function blankContent(id) {
   let infoTitle = document.getElementById(id);
   if (infoTitle === null) {
-    console.log("content error", id);
+    console.log('content error', id);
     return;
   }
-  infoTitle.textContent = "";
+  infoTitle.textContent = '';
 }
 
 function contentUpdateById(id, message) {
   let infoTitle = document.getElementById(id);
   let messageContent = chrome.i18n.getMessage(message);
   if (infoTitle === null) {
-    console.log("content error", id, messageContent);
+    console.log('content error', id, messageContent);
     return;
   }
   infoTitle.textContent = messageContent;
 }
 
-contentUpdateById("TypeLabel", "siteLabel");
+contentUpdateById('TypeLabel', 'siteLabel');
 
-contentUpdateById("CertLabel", "certLabel");
+contentUpdateById('CertLabel', 'certLabel');
 
 function tabCheck(tabInfo) {
   // Information Section
-  console.log("(cert) checking tab");
-  var host = tabInfo[0].url.split(".i2p")[0] + ".i2p";
+  console.log('(cert) checking tab');
+  var host = tabInfo[0].url.split('.i2p')[0] + '.i2p';
   if (host.length < 51) {
-    contentUpdateById("AddressInfo", "isHostName");
+    contentUpdateById('AddressInfo', 'isHostName');
   } else {
-    if (host.endsWith("b32.i2p")) {
-      contentUpdateById("AddressInfo", "isBase32");
+    if (host.endsWith('b32.i2p')) {
+      contentUpdateById('AddressInfo', 'isBase32');
     }
   }
-  if (host.startsWith("https")) {
-    contentUpdateById("AddressCertInfo", "certPresent");
-    console.log("(cert) initiating request to check server cert");
+  if (host.startsWith('https')) {
+    contentUpdateById('AddressCertInfo', 'certPresent');
+    console.log('(cert) initiating request to check server cert');
     fetch(host).then(response => {
-      console.log("Updating cert information", response);
+      console.log('Updating cert information', response);
     });
   } else {
     contentUpdateById("AddressCertInfo", "certAbsent");

config.js

@@ -1,18 +1,18 @@
-var proxy_scheme = "HTTP";
-var proxy_host = "127.0.0.1";
-var proxy_port = "4444";
+var proxy_scheme = 'HTTP';
+var proxy_host = '127.0.0.1';
+var proxy_port = '4444';
 
-var control_host = "127.0.0.1";
-var control_port = "7657";
+var control_host = '127.0.0.1';
+var control_port = '7657';
 
-var rpc_host = "127.0.0.1";
-var rpc_port = "7657";
-var rpc_path = "jsonrpc";
-var rpc_pass = "itoopie";
+var rpc_host = '127.0.0.1';
+var rpc_port = '7657';
+var rpc_path = 'jsonrpc';
+var rpc_pass = 'itoopie';
 
-var bt_rpc_host = "127.0.0.1";
-var bt_rpc_port = "7657";
-var bt_rpc_path = "transmission/rpc";
-var bt_rpc_pass = "transmission";
+var bt_rpc_host = '127.0.0.1';
+var bt_rpc_port = '7657';
+var bt_rpc_path = 'transmission/rpc';
+var bt_rpc_pass = 'transmission';
 
 var disable_history = false;

content.js

@@ -2,54 +2,54 @@ function contentUpdateById(id, message) {
   let infoTitle = document.getElementById(id);
   let messageContent = chrome.i18n.getMessage(message);
   if (infoTitle === null) {
-    console.log("content error", id, messageContent);
+    console.log('content error', id, messageContent);
     return;
   }
   infoTitle.textContent = messageContent;
 }
 
 // Information Section
-contentUpdateById("text-section-header", "extensionName");
-contentUpdateById("description", "extensionDescription");
-contentUpdateById("i2pbrowser-version", "extensionVersion");
-contentUpdateById("beta", "extensionStatus");
-contentUpdateById("proxy-check", "proxyFailedStatus");
+contentUpdateById('text-section-header', 'extensionName');
+contentUpdateById('description', 'extensionDescription');
+contentUpdateById('i2pbrowser-version', 'extensionVersion');
+contentUpdateById('beta', 'extensionStatus');
+contentUpdateById('proxy-check', 'proxyFailedStatus');
 
 // Control Section
-contentUpdateById("controlHeader", "controlHeader");
-contentUpdateById("controlExplain", "controlExplain");
-contentUpdateById("clear-browser-data", "clearData");
-contentUpdateById("clear-desc", "clearDesc");
-contentUpdateById("enable-web-rtc", "enableWebRTC");
-contentUpdateById("rtcDesc", "rtcDesc");
-contentUpdateById("disable-history", "disableHistory");
-contentUpdateById("histDesc", "histDesc");
+contentUpdateById('controlHeader', 'controlHeader');
+contentUpdateById('controlExplain', 'controlExplain');
+contentUpdateById('clear-browser-data', 'clearData');
+contentUpdateById('clear-desc', 'clearDesc');
+contentUpdateById('enable-web-rtc', 'enableWebRTC');
+contentUpdateById('rtcDesc', 'rtcDesc');
+contentUpdateById('disable-history', 'disableHistory');
+contentUpdateById('histDesc', 'histDesc');
 
 // Application Section
-contentUpdateById("applicationHeader", "applicationHeader");
-contentUpdateById("applicationExplain", "applicationExplain");
-contentUpdateById("window-visit-index", "windowVisitHelppage");
-contentUpdateById("help", "help");
-contentUpdateById("window-visit-router", "windowVisitConsole");
-contentUpdateById("routerConsole", "routerConsole");
-contentUpdateById("window-visit-homepage", "windowVisitHomepage");
-contentUpdateById("abouthome", "abouthome");
-contentUpdateById("window-visit-i2ptunnel", "windowVisitI2ptunnel");
-contentUpdateById("i2ptunnel", "i2ptunnel");
-contentUpdateById("window-visit-susimail", "windowVisitSusiMail");
-contentUpdateById("susimail", "susimail");
-contentUpdateById("window-visit-snark", "windowVisitSnark");
-contentUpdateById("snark", "snark");
+contentUpdateById('applicationHeader', 'applicationHeader');
+contentUpdateById('applicationExplain', 'applicationExplain');
+contentUpdateById('window-visit-index', 'windowVisitHelppage');
+contentUpdateById('help', 'help');
+contentUpdateById('window-visit-router', 'windowVisitConsole');
+contentUpdateById('routerConsole', 'routerConsole');
+contentUpdateById('window-visit-homepage', 'windowVisitHomepage');
+contentUpdateById('abouthome', 'abouthome');
+contentUpdateById('window-visit-i2ptunnel', 'windowVisitI2ptunnel');
+contentUpdateById('i2ptunnel', 'i2ptunnel');
+contentUpdateById('window-visit-susimail', 'windowVisitSusiMail');
+contentUpdateById('susimail', 'susimail');
+contentUpdateById('window-visit-snark', 'windowVisitSnark');
+contentUpdateById('snark', 'snark');
 
 // Homepage Section
-contentUpdateById("window-visit-webpage", "windowVisitWebPage");
-contentUpdateById("webpage", "help");
-contentUpdateById("window-visit-sources", "windowVisitSources");
-contentUpdateById("sources", "sources");
-contentUpdateById("window-visit-releases", "windowVisitReleases");
-contentUpdateById("releases", "releases");
+contentUpdateById('window-visit-webpage', 'windowVisitWebPage');
+contentUpdateById('webpage', 'help');
+contentUpdateById('window-visit-sources', 'windowVisitSources');
+contentUpdateById('sources', 'sources');
+contentUpdateById('window-visit-releases', 'windowVisitReleases');
+contentUpdateById('releases', 'releases');
 
-fetch("http://proxy.i2p").then(myJson => {
-  console.log("FETCH RESULT", myJson);
-  contentUpdateById("proxy-check", "proxySuccessStatus");
+fetch('http://proxy.i2p').then(myJson => {
+  console.log('FETCH RESULT', myJson);
+  contentUpdateById('proxy-check', 'proxySuccessStatus');
 });

context.js

@@ -1,5 +1,5 @@
 //var windowIds = []
-var titlepref = chrome.i18n.getMessage("titlePreface");
+var titlepref = chrome.i18n.getMessage('titlePreface');
 
 function onError(error) {
   console.log(`Error : ${error}`);
@@ -10,17 +10,17 @@ function eventHandler(event) {
     console.log(`Created window : ${windowInfo.id}`);
     browser.tabs.create({
       windowId: windowInfo.id,
-      url: "about:blank",
+      url: 'about:blank',
       cookieStoreId: event.target.dataset.identity
     });
   }
-  if (event.target.dataset.action == "create") {
+  if (event.target.dataset.action == 'create') {
     var creating = browser.tabs.create({
       cookieStoreId: event.target.dataset.identity
     });
     creating.then(onCreated, onError);
   }
-  if (event.target.dataset.action == "close-all") {
+  if (event.target.dataset.action == 'close-all') {
     browser.tabs
       .query({
         cookieStoreId: event.target.dataset.identity

debian/changelog

@@ -1,8 +1,34 @@
+i2psetproxy.js (0.73-1) UNRELEASED; urgency=low
+
+  * Update bookmarks format
+  * Deprecate WebRTC State Management
+
+ -- idk <hankhill19580@gmail.com>  Mon, 22 JUN 2020 19:21:23 -0400
+
+i2psetproxy.js (0.71-1) UNRELEASED; urgency=low
+
+  * Fix incomplete bugfix from 0.69
+
+ -- idk <hankhill19580@gmail.com>  Tue, 24 MAR 2020 0:19:59 -0400
+
+i2psetproxy.js (0.71-1) UNRELEASED; urgency=low
+
+  * Fix incomplete bugfix from 0.69
+
+ -- idk <hankhill19580@gmail.com>  Tue, 24 MAR 2020 0:19:59 -0400
+
+i2psetproxy.js (0.69-1) UNRELEASED; urgency=low
+
+  * Add MuWire contextual ID
+  * Fix bug occurring on certain modded I2P installs
+
+ -- idk <hankhill19580@gmail.com>  Tue, 24 MAR 2020 0:12:02 -0400
+
 i2psetproxy.js (0.67-1) UNRELEASED; urgency=low
 
   * Tweak some default settings that should have gone into 65
 
- -- idk <hankhill19580@gmail.com> Tue, 17 MAR 2020 22:58:55 -0400
+ -- idk <hankhill19580@gmail.com>  Tue, 17 MAR 2020 22:58:55 -0400
 
 i2psetproxy.js (0.65-1) UNRELEASED; urgency=low
 
@@ -10,26 +36,26 @@ i2psetproxy.js (0.65-1) UNRELEASED; urgency=low
   * Use "pinned apptabs" to minimize the number of tabs occupied by an app
   * Get ready for self-hosted updates but with bittorrent because it's cooler
 
- -- idk <hankhill19580@gmail.com> Tue, 17 MAR 2020 22:58:55 -0400
+ -- idk <hankhill19580@gmail.com>  Tue, 17 MAR 2020 22:58:55 -0400
 
 i2psetproxy.js (0.63-1) UNRELEASED; urgency=low
 
   * other containerizers bugfix
 
- -- idk <hankhill19580@gmail.com> Mon, 02 MAR 2020 17:54:26 -0400
+ -- idk <hankhill19580@gmail.com>  Mon, 02 MAR 2020 17:54:26 -0400
 
 i2psetproxy.js (0.61-1) UNRELEASED; urgency=low
 
   * other containerizers bugfix
 
- -- idk <hankhill19580@gmail.com> Mon, 02 MAR 2020 17:46:24 -0400
+ -- idk <hankhill19580@gmail.com>  Mon, 02 MAR 2020 17:46:24 -0400
 
 i2psetproxy.js (0.59-1) UNRELEASED; urgency=low
 
   * transmission-rpc based torrent controls
   * bugfixes
 
- -- idk <hankhill19580@gmail.com> Tue, 25 FEB 2020 20:52:19 -0400
+ -- idk <hankhill19580@gmail.com>  Tue, 25 FEB 2020 20:52:19 -0400
 
 i2psetproxy.js (0.57-1) UNRELEASED; urgency=low
 
@@ -115,4 +141,3 @@ i2psetproxy.js (0.31-1) UNRELEASED; urgency=low
     <nnnn is the bug number of your ITP>
 
  -- idk <hankhill19580@gmail.com>  Thu, 01 Aug 2019 00:32:39 -0400
- T

handler.js

@@ -1,50 +1,55 @@
 function routerHost(url) {
-  let hostname = "";
-  let path = "";
+  let hostname = '';
+  let path = '';
   function pathcheck(str) {
     if (str != undefined) {
-      let final = str.split("/")[0];
-      if (final === "i2ptunnelmgr" || final === "i2ptunnel") {
-        console.log("(urlcheck) application path", final);
-        return "i2ptunnelmgr";
-      } else if (final === "i2psnark" || final === "torrents") {
-        console.log("(urlcheck) application path", final);
-        return "i2psnark";
-      } else if (final === "webmail" || final === "susimail") {
-        console.log("(urlcheck) application path", final);
-        return "webmail";
+      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') {
+        console.log('(urlcheck) Torrent application path', final);
+        return 'i2psnark';
+      } else if (final === 'webmail' || final === 'susimail') {
+        console.log('(urlcheck) Mail application path', final);
+        return 'webmail';
+      } else if (final.startsWith('MuWire')) {
+        if (!url.includes('.png')) {
+          console.log('(urlcheck) MuWire application path', final);
+          return 'muwire';
+        }
       } else if (
-        final === "home" ||
-        final === "console" ||
-        final === "dns" ||
-        final.startsWith("config")
+        final === 'home' ||
+        final === 'console' ||
+        final === 'dns' ||
+        final.startsWith('config')
       ) {
-        console.log("(urlcheck) application path", final);
-        return "routerconsole";
+        console.log('(urlcheck) Console application path', final);
+        return 'routerconsole';
       }
     }
     return true;
   }
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-    let prefix = url.substr(0, url.indexOf("://") + 3);
-    path = url.replace(prefix + hostname + "/", "");
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
+    let prefix = url.substr(0, url.indexOf('://') + 3);
+    path = url.replace(prefix + hostname + '/', '');
   } else if (identifyProtocolHandler(url)) {
     let newurl = identifyProtocolHandler(url);
     return routerHost(newurl);
   } else {
-    hostname = url.split("/")[0];
-    path = url.replace(hostname + "/", "");
+    hostname = url.split('/')[0];
+    path = url.replace(hostname + '/', '');
   }
-  if (hostname === control_host + ":" + control_port) {
+  if (hostname === control_host + ':' + control_port) {
     //console.log("(hostcheck) router console found on configured ports");
     return pathcheck(path);
   }
-  if (hostname === "localhost" + ":" + control_port) {
+  if (hostname === 'localhost' + ':' + control_port) {
     //console.log("(hostcheck) router console found on configured ports");
     return pathcheck(path);
   }
-  if (hostname === "127.0.0.1" + ":" + control_port) {
+  if (hostname === '127.0.0.1' + ':' + control_port) {
     return pathcheck(path);
   }
 
@@ -54,28 +59,28 @@ function routerHost(url) {
 function identifyProtocolHandler(url) {
   //console.log("looking for handler-able requests")
   if (routerHost(url)) {
-    if (url.includes(encodeURIComponent("ext+rc:"))) {
-      return url.replace(encodeURIComponent("ext+rc:"), "");
-    } else if (url.includes("ext+rc:")) {
-      return url.replace("ext+rc:", "");
+    if (url.includes(encodeURIComponent('ext+rc:'))) {
+      return url.replace(encodeURIComponent('ext+rc:'), '');
+    } else if (url.includes('ext+rc:')) {
+      return url.replace('ext+rc:', '');
     }
-  } else if (url.includes("ext+rc:")) {
+  } else if (url.includes('ext+rc:')) {
     return url;
   }
   return false;
 }
 
 function trimHost(url) {
-  let hostname = "";
-  let prefix = "";
-  if (url.indexOf("://") > -1) {
-    prefix = url.substr(0, url.indexOf("://") + 3);
-    hostname = url.split("/")[2];
+  let hostname = '';
+  let prefix = '';
+  if (url.indexOf('://') > -1) {
+    prefix = url.substr(0, url.indexOf('://') + 3);
+    hostname = url.split('/')[2];
   } else {
-    hostname = url.split("/")[0];
+    hostname = url.split('/')[0];
   }
-  let path = url.replace(prefix + hostname, "");
-  console.log("(handler) path", prefix + hostname, path);
+  let path = url.replace(prefix + hostname, '');
+  console.log('(handler) path', prefix + hostname, path);
   return path;
 }
 
@@ -83,7 +88,7 @@ var handlerSetup = function(requestDetails) {
   //console.log("checking protocol handler listener")
   let rwurl = identifyProtocolHandler(requestDetails.url);
   if (rwurl != false) {
-    console.log("(handler) rewrite URL requested", rwurl);
+    console.log('(handler) rewrite URL requested', rwurl);
     requestDetails.redirectUrl = rwurl;
     requestDetails.url = trimHost(rwurl);
     requestDetails.originUrl = trimHost(rwurl);
@@ -93,6 +98,6 @@ var handlerSetup = function(requestDetails) {
 
 browser.webRequest.onBeforeRequest.addListener(
   handlerSetup,
-  { urls: ["<all_urls>"] },
-  ["blocking"]
+  { urls: ['<all_urls>'] },
+  ['blocking']
 );

home.js

@@ -1,25 +1,25 @@
-document.addEventListener("click", clickEvent => {
-  if (clickEvent.target.id === "onboardingButtonZero") {
-    flipVisibility("onboardingContentZero");
-  } else if (clickEvent.target.id === "onboardingButtonOne") {
-    flipVisibility("onboardingContentOne");
-  } else if (clickEvent.target.id === "onboardingButtonTwo") {
-    flipVisibility("onboardingContentTwo");
-  } else if (clickEvent.target.id === "onboardingButtonThree") {
-    flipVisibility("onboardingContentThree");
-  } else if (clickEvent.target.id === "onboardingButtonFour") {
-    flipVisibility("onboardingContentFour");
-  } else if (clickEvent.target.id === "fliplinks") {
-    flipVisibility("info-content");
+document.addEventListener('click', clickEvent => {
+  if (clickEvent.target.id === 'onboardingButtonZero') {
+    flipVisibility('onboardingContentZero');
+  } else if (clickEvent.target.id === 'onboardingButtonOne') {
+    flipVisibility('onboardingContentOne');
+  } else if (clickEvent.target.id === 'onboardingButtonTwo') {
+    flipVisibility('onboardingContentTwo');
+  } else if (clickEvent.target.id === 'onboardingButtonThree') {
+    flipVisibility('onboardingContentThree');
+  } else if (clickEvent.target.id === 'onboardingButtonFour') {
+    flipVisibility('onboardingContentFour');
+  } else if (clickEvent.target.id === 'fliplinks') {
+    flipVisibility('info-content');
   }
 });
 
 function flipVisibility(div) {
-  console.log("(home) seeking flippable", div);
+  console.log('(home) seeking flippable', div);
   let flippable = document.getElementById(div);
-  if (flippable.style.display !== "block") {
-    flippable.style.display = "block";
+  if (flippable.style.display !== 'block') {
+    flippable.style.display = 'block';
   } else {
-    flippable.style.display = "none";
+    flippable.style.display = 'none';
   }
 }

host.js

@@ -1,30 +1,32 @@
 function proxyHost(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
+  let hostname = '';
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
   } else {
-    hostname = url.split("/")[0];
+    hostname = url.split('/')[0];
   }
-  if (hostname == "proxy.i2p") {
+  if (hostname == 'proxy.i2p') {
     return true;
   }
-  if (hostname == "c6lilt4cr5x7jifxridpkesf2zgfwqfchtp6laihr4pdqomq25iq.b32.i2p") {
+  if (
+    hostname == 'c6lilt4cr5x7jifxridpkesf2zgfwqfchtp6laihr4pdqomq25iq.b32.i2p'
+  ) {
     return true;
   }
   return false;
 }
 
 function localHost(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
+  let hostname = '';
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
   } else {
-    hostname = url.split("/")[0];
+    hostname = url.split('/')[0];
   }
-  hostname = hostname.split(":")[0];
-  if (hostname === "127.0.0.1") {
+  hostname = hostname.split(':')[0];
+  if (hostname === '127.0.0.1') {
     return true;
-  } else if (hostname === "localhost") {
+  } else if (hostname === 'localhost') {
     return true;
   }
 
@@ -33,85 +35,91 @@ function localHost(url) {
 
 function extensionHost(url) {
   if (url.originUrl !== undefined) {
-    var res = url.originUrl.startsWith(browser.runtime.getURL(""));
+    var res = url.originUrl.startsWith(browser.runtime.getURL(''));
     if (res) return res;
   }
   if (url.url !== undefined) {
-    var res = url.url.startsWith(browser.runtime.getURL(""));
+    var res = url.url.startsWith(browser.runtime.getURL(''));
     if (res) return res;
   }
 }
 
 function i2pHostName(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
+  let hostname = '';
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
   } else {
-    hostname = url.split("/")[0];
+    hostname = url.split('/')[0];
   }
   return hostname;
 }
 
 function i2pHost(url) {
   let hostname = i2pHostName(url);
-  return hostname.endsWith(".i2p");
+  return hostname.endsWith('.i2p');
 }
 
 function routerHost(url) {
-  let hostname = "";
-  let path = "";
+  let hostname = '';
+  let path = '';
   function pathcheck(str) {
     if (str != undefined) {
-      let final = str.split("/")[0];
-      if (final === "i2ptunnelmgr" || final === "i2ptunnel") {
-        console.log("(urlcheck) application path", final);
-        return "i2ptunnelmgr";
+      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" ||
-        final.startsWith("transmission")
+        final === 'i2psnark' ||
+        final === 'torrents' ||
+        final.startsWith('transmission')
       ) {
-        console.log("(urlcheck) application path", final);
-        return "i2psnark";
-      } else if (final === "webmail" || final === "susimail") {
-        console.log("(urlcheck) application path", final);
-        return "webmail";
+        console.log('(urlcheck) Torrent application path', final);
+        return 'i2psnark';
+      } else if (final === 'webmail' || final === 'susimail') {
+        console.log('(urlcheck) Mail application path', final);
+        return 'webmail';
+      } else if (final.startsWith('MuWire')) {
+        if (!url.includes('.png')) {
+            console.log('(urlcheck) MuWire application path', final);
+            return 'muwire';
+        }
       } else if (
-        final === "home" ||
-        final === "console" ||
-        final === "dns" ||
-        final.startsWith("config")
+        final === 'home' ||
+        final === 'console' ||
+        final === 'dns' ||
+        final === 'sitemap' ||
+        final.startsWith('config')
       ) {
-        console.log("(urlcheck) application path", final);
-        return "routerconsole";
+        console.log('(urlcheck) Console application path', final);
+        return 'routerconsole';
       }
     }
     return true;
   }
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-    let prefix = url.substr(0, url.indexOf("://") + 3);
-    path = url.replace(prefix + hostname + "/", "");
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
+    let prefix = url.substr(0, url.indexOf('://') + 3);
+    path = url.replace(prefix + hostname + '/', '');
   } else if (identifyProtocolHandler(url)) {
     let newurl = identifyProtocolHandler(url);
     return routerHost(newurl);
   } else {
-    hostname = url.split("/")[0];
-    path = url.replace(hostname + "/", "");
+    hostname = url.split('/')[0];
+    path = url.replace(hostname + '/', '');
   }
-  if (hostname === control_host + ":" + control_port) {
+  if (hostname === control_host + ':' + control_port) {
     return pathcheck(path);
   }
-  if (hostname === "localhost" + ":" + control_port) {
+  if (hostname === 'localhost' + ':' + control_port) {
     return pathcheck(path);
   }
-  if (hostname === "127.0.0.1" + ":" + control_port) {
+  if (hostname === '127.0.0.1' + ':' + control_port) {
     return pathcheck(path);
   }
-  if (hostname === "localhost" + ":" + 7070) {
+  if (hostname === 'localhost' + ':' + 7070) {
     return pathcheck(path);
   }
-  if (hostname === "127.0.0.1" + ":" + 7070) {
+  if (hostname === '127.0.0.1' + ':' + 7070) {
     return pathcheck(path);
   }
   return false;

i2pcontrol/i2pcontrol.js

@@ -1,9 +1,9 @@
-var hello = "hello i2pcontrol";
+var hello = 'hello i2pcontrol';
 
 function makeid(length) {
-  var result = "";
+  var result = '';
   var characters =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
   var charactersLength = characters.length;
   for (var i = 0; i < length; i++) {
     result += characters.charAt(Math.floor(Math.random() * charactersLength));
@@ -22,15 +22,15 @@ function send(
     let requestBody = JSON.stringify(data);
     //console.log("(i2pcontrol) sending request", requestBody);
     let opts = {
-      method: "POST", // *GET, POST, PUT, DELETE, etc.
-      mode: "cors", // no-cors, *cors, same-origin
-      cache: "no-cache", // *default, no-cache, reload, force-cache, only-if-cached
-      credentials: "same-origin", // include, *same-origin, omit
+      method: 'POST', // *GET, POST, PUT, DELETE, etc.
+      mode: 'cors', // no-cors, *cors, same-origin
+      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
+      redirect: 'follow', // manual, *follow, error
+      referrerPolicy: 'no-referrer', // no-referrer, *client
       body: requestBody // body data type must match "Content-Type" header
     };
     const response = await fetch(url, opts);
@@ -39,7 +39,7 @@ function send(
 
   //console.log("http://" + control_host + ":" + control_port + "/" + control_path)
   return postData(
-    "http://" + control_host + ":" + control_port + "/" + control_path + "/",
+    'http://' + control_host + ':' + control_port + '/' + control_path + '/',
     message
   );
 }
@@ -51,12 +51,12 @@ async function authenticate(
   control_path = "jsonrpc"
 ) {
   var json = new Object();
-  json["id"] = makeid(6);
-  json["jsonrpc"] = "2.0";
-  json["method"] = "Authenticate";
-  json["params"] = new Object();
-  json["params"]["API"] = 1;
-  json["params"]["Password"] = password;
+  json['id'] = makeid(6);
+  json['jsonrpc'] = '2.0';
+  json['method'] = 'Authenticate';
+  json['params'] = new Object();
+  json['params']['API'] = 1;
+  json['params']['Password'] = password;
   return send(json, control_host, control_port, control_path);
 }
 
@@ -81,14 +81,14 @@ async function Echo(
   password = "itoopie"
 ) {
   function echo(token) {
-    console.log("(i2pcontrol) testing I2PControl connection");
+    console.log('(i2pcontrol) testing I2PControl connection');
     var json = new Object();
-    json["id"] = makeid(6);
-    json["jsonrpc"] = "2.0";
-    json["method"] = "Echo";
-    json["params"] = new Object();
-    json["params"]["Token"] = token;
-    json["params"]["Echo"] = message;
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'Echo';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params']['Echo'] = message;
     return send(json, control_host, control_port, control_path);
   }
   let token = GetToken(password, control_host, control_port, control_path);
@@ -121,13 +121,13 @@ async function GetRate(
 ) {
   function getrate(token) {
     var json = new Object();
-    json["id"] = makeid(6);
-    json["jsonrpc"] = "2.0";
-    json["method"] = "I2PControl";
-    json["params"] = new Object();
-    json["params"]["Token"] = token;
-    json["params"]["Stat"] = Query;
-    json["params"]["Period"] = 2000;
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'I2PControl';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params']['Stat'] = Query;
+    json['params']['Period'] = 2000;
     return send(json, control_host, control_port, control_path);
   }
   let token = GetToken(password, control_host, control_port, control_path);
@@ -160,12 +160,12 @@ async function I2PControl(
 ) {
   function i2pcontrol(token) {
     var json = new Object();
-    json["id"] = makeid(6);
-    json["jsonrpc"] = "2.0";
-    json["method"] = "I2PControl";
-    json["params"] = new Object();
-    json["params"]["Token"] = token;
-    json["params"][Query] = null;
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'I2PControl';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params'][Query] = null;
     return send(json, control_host, control_port, control_path);
   }
   let token = GetToken(password, control_host, control_port, control_path);
@@ -204,12 +204,12 @@ async function RouterInfo(
 ) {
   function routerinfo(token) {
     var json = new Object();
-    json["id"] = makeid(6);
-    json["jsonrpc"] = "2.0";
-    json["method"] = "RouterInfo";
-    json["params"] = new Object();
-    json["params"]["Token"] = token;
-    json["params"][Query] = null;
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'RouterInfo';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params'][Query] = null;
     return send(json, control_host, control_port, control_path);
   }
   let token = GetToken(password, control_host, control_port, control_path);
@@ -255,12 +255,12 @@ async function RouterManager(
 ) {
   function routermanager(token) {
     var json = new Object();
-    json["id"] = makeid(6);
-    json["jsonrpc"] = "2.0";
-    json["method"] = "RouterManager";
-    json["params"] = new Object();
-    json["params"]["Token"] = token;
-    json["params"][Query] = null;
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'RouterManager';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params'][Query] = null;
     return send(json, control_host, control_port, control_path);
   }
   let token = GetToken(password, control_host, control_port, control_path);
@@ -300,12 +300,12 @@ async function NetworkSetting(
 ) {
   function networksetting(token) {
     var json = new Object();
-    json["id"] = makeid(6);
-    json["jsonrpc"] = "2.0";
-    json["method"] = "NetworkSetting";
-    json["params"] = new Object();
-    json["params"]["Token"] = token;
-    json["params"][Query] = null;
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'NetworkSetting';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params'][Query] = null;
     return send(json, control_host, control_port, control_path);
   }
   let token = GetToken(password, control_host, control_port, control_path);
@@ -336,49 +336,49 @@ function UpdateNetworkSettingElementByID(
 }
 
 function UpdateContents() {
-  UpdateRouterInfoElementByID("i2p.router.status", "router-status");
-  UpdateRouterInfoElementByID("i2p.router.uptime", "router-uptime");
-  UpdateRouterInfoElementByID("i2p.router.version", "router-version");
+  UpdateRouterInfoElementByID('i2p.router.status', 'router-status');
+  UpdateRouterInfoElementByID('i2p.router.uptime', 'router-uptime');
+  UpdateRouterInfoElementByID('i2p.router.version', 'router-version');
   UpdateRouterInfoElementByID(
-    "i2p.router.net.bw.inbound.1s",
-    "router-net-bw-inbound-1s"
+    'i2p.router.net.bw.inbound.1s',
+    'router-net-bw-inbound-1s'
   );
   UpdateRouterInfoElementByID(
-    "i2p.router.net.bw.inbound.15s",
-    "router-net-bw-inbound-15s"
+    'i2p.router.net.bw.inbound.15s',
+    'router-net-bw-inbound-15s'
   );
   UpdateRouterInfoElementByID(
-    "i2p.router.net.bw.outbound.1s",
-    "router-net-bw-outbound-1s"
+    'i2p.router.net.bw.outbound.1s',
+    'router-net-bw-outbound-1s'
   );
   UpdateRouterInfoElementByID(
-    "i2p.router.net.bw.outbound.15s",
-    "router-net-bw-outbound-15s"
+    'i2p.router.net.bw.outbound.15s',
+    'router-net-bw-outbound-15s'
   );
-  UpdateRouterInfoElementByID("i2p.router.net.status", "router-net-status");
+  UpdateRouterInfoElementByID('i2p.router.net.status', 'router-net-status');
   UpdateRouterInfoElementByID(
-    "i2p.router.net.tunnels.participating",
-    "router-net-tunnels-participating"
+    'i2p.router.net.tunnels.participating',
+    'router-net-tunnels-participating'
   );
   UpdateRouterInfoElementByID(
-    "i2p.router.netdb.activepeers",
-    "router-netdb-activepeers"
+    'i2p.router.netdb.activepeers',
+    'router-netdb-activepeers'
   );
   UpdateRouterInfoElementByID(
-    "i2p.router.netdb.fastpeers",
-    "router-netdb-fastpeers"
+    'i2p.router.netdb.fastpeers',
+    'router-netdb-fastpeers'
   );
   UpdateRouterInfoElementByID(
-    "i2p.router.netdb.highcapacitypeers",
-    "router-netdb-highcapacitypeers"
+    'i2p.router.netdb.highcapacitypeers',
+    'router-netdb-highcapacitypeers'
   );
   UpdateRouterInfoElementByID(
-    "i2p.router.netdb.isreseeding",
-    "router-netdb-isreseeding"
+    'i2p.router.netdb.isreseeding',
+    'router-netdb-isreseeding'
   );
   UpdateRouterInfoElementByID(
-    "i2p.router.netdb.knownpeers",
-    "router-netdb-knownpeers"
+    'i2p.router.netdb.knownpeers',
+    'router-netdb-knownpeers'
   );
 }
 
@@ -386,6 +386,6 @@ var done = Echo(hello);
 done.then(Done);
 
 function Done(output) {
-  console.log("(i2pcontrol) I2PControl connection tested,", output);
+  console.log('(i2pcontrol) I2PControl connection tested,', output);
   return output;
 }

index.html

@@ -1,226 +1,209 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>I2P in Private Browsing Mode</title>
-  <link rel="stylesheet" type="text/css" href="home.css" />
-  <link rel="stylesheet" type="text/css" href="sidebar.css" />
+    <title>I2P in Private Browsing Mode</title>
+    <link href="home.css" rel="stylesheet" type="text/css">
+    <link href="sidebar.css" rel="stylesheet" type="text/css">
 </head>
 <body>
-<h1>I2P in Private Browsing Mode(Firefox-Only)</h1>
+    <h1>I2P in Private Browsing Mode(Firefox-Only)</h1>
 
-<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>
+    <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>Installation(Cross-Platform):</h2>
+    <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>
+    <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>
 
-<h2>Debian Installation:</h2>
+    <h2>Debian Installation:</h2>
 
-<p>Should you prefer, it is possible to install this extension system-wide by
-side-loading it into Debian. You can generate your own deb file by running the
-command:</p>
+    <p>Should you prefer, it is possible to install this extension system-wide by side-loading it into Debian. You can generate your own deb file by running the command:</p>
 
-<pre><code>    make deb
+    <pre><code>    make deb
 </code></pre>
+    <p>and then you can install it with:</p>
 
-<p>and then you can install it with:</p>
-
-<pre><code>    sudo apt install ../i2psetproxy.js_*.deb
+    <pre><code>    sudo apt install ../i2psetproxy.js_*.deb
 </code></pre>
+    <h2>Bittorrent Download:</h2>
 
-<h2>Bittorrent Download:</h2>
+    <p>The self-hosted plugin is available from bittorrent both within the I2P and Clearnet Bittorrent network(With a web seed to support it in case one goes dead).</p>
 
-<p>The self-hosted plugin is available from bittorrent both within the I2P and
-Clearnet Bittorrent network(With a web seed to support it in case one goes
-dead).</p>
+    <ul>
+        <li>
+            <a href="">Magnet Link</a>
+        </li>
 
-<ul>
-<li><a href="magnet:?xt=urn:btih:e7bbb4695f63d068522713028987626284aa91d0">Magnet Link</a></li>
-<li><a href="./i2ppb@eyedeekay.github.io.xpi.torrent">Get the .torrent file</a></li>
-</ul>
+        <li>
+            <a href="./i2ppb@eyedeekay.github.io.xpi.torrent">Get the .torrent file</a>
+        </li>
+    </ul>
 
-<h2>Usage:</h2>
+    <h2>Usage:</h2>
 
-<ul>
-<li>Basically, it "Just Works." After you install the plugin, browsing to an I2P
-domain will automatically stop the current tab and re-open the I2P site in an
-I2P Browser tab.</li>
-<li>Besides that, four bookmarks are added to the "Bookmarks Toolbar," which
-will take you to visit your Java I2P applications, or the "Simplified I2P
-Landing Page" embedded in the plugin:</li>
-<li><img src="lander.png" alt="Landing page" title="" /></li>
-<li>Also, there's a menu for accessing I2P functionality while you're browsing.
-It lets you control a few settings in a granular way.</li>
-<li><img src="menu.png" alt="Menu" title="" /></li>
-<li>You can re-enable WebRTC but force it to always use the proxy that is
-enforced by the tab.</li>
-<li>You can either force the browser to delete all history for I2P sites
-immediately, or you can close all your I2P Browser tabs at once and delete
-the history for I2P browsing when you're done.</li>
-<li>That's all there is to it! Your browser is configured to safely use and
-administer I2P.</li>
-<li>Optionally, you can add I2PSnark-RPC and use Bittorrent-over-I2P via the
-transmission-rpc interface. To do this, have a look at the torrent guide:
-<a href="torrent/index.html">Torrent guide</a></li>
-</ul>
+    <ul>
+        <li>Basically, it "Just Works." After you install the plugin, browsing to an I2P domain will automatically stop the current tab and re-open the I2P site in an I2P Browser tab.</li>
 
-<h3>Features</h3>
+        <li>Besides that, four bookmarks are added to the "Bookmarks Toolbar," which will take you to visit your Java I2P applications, or the "Simplified I2P Landing Page" embedded in the plugin:</li>
 
-<ul>
-<li>[done] <strong>Provide</strong> a way to launch into an I2P-Specific contextual identity
-(container). Intercept requests to .i2p domains and automatically route them
-to the I2P container. Isolate the router console from other local
-applications by automatically intercepting requests to the router console to
-another container.</li>
-<li><img src="i2psetproxy.js.png" alt="Visiting i2p-projekt.i2p" title="" /></li>
-<li>[done] <strong>Indicate</strong> the I2P browser is in use visually. Find an
-acceptable way to indicate it on Android.</li>
-<li><img src="susimail.png" alt="Visiting webmail" title="" /></li>
-<li>[done] <strong>Set</strong> the http proxy to use the local I2P proxy automatically.
-Provide specific configuration for other types of I2P proxies(SOCKS,
-isolating HTTP)</li>
-<li>[done] <strong>Disable</strong> risky webRTC features/offer the option to re-enable
-them with the proxy enforced.</li>
-<li>[done] <strong>Change</strong> the color of the browser window to indicate that I2P is in
-use</li>
-<li><img src="i2ptunnel.png" alt="Visiting i2ptunnel" title="" /></li>
-<li>[ready] <strong>Provide</strong> help in a variety of languages.</li>
-<li>[done] <strong>Monitor</strong> the health and readiness of the I2P router it is
-instructed to use. Currently the plugin checks whether the HTTP Proxy is
-working by fetching an image from "http://proxy.i2p" and displaying a result.
-A work-in-progress binding to i2pcontrol is available in ./i2pcontrol, it is
-inert at this time.</li>
-<li><img src="toopie.png" alt="Visiting toopie.html" title="" /></li>
-<li>[Done] <strong>Handle</strong> router console applications under their own origins and
-within their own contextual identity. (1) The router console is automatically
-confined to it's own container tab. (2) Use a custom protocol handler to
-place each i2p application/plugin under it's own origin, shortening router
-console URL's and placing applications under their own origin.</li>
-<li><img src="routerconsole.png" alt="Visiting routerconsole" 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><img src="i2psnark.png" alt="Visiting i2psnark" title="" /></li>
-<li><img src="transmissionrpc.png" alt="Monitoring torrents" 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>[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>
-<li>I2P Amnesiac Browsing: Use for General Browsing, stores no history and
-uses an HTTP Proxy with a very short tunnel-close timeout and no key-reuse.</li>
-<li>I2P Social Networking: Use this for logging into social network accounts,
-forums, and other interactive asynchronous public communication platforms
-where your identity is behaviorally linkable. This has a very long
-tunnel-close timeout and key-reuse until specifically invoked.</li>
-<li>I2P Blogging: Use this for posting content to the web interface of your
-blog or to other similar websites that you create content on.</li>
-</ul></li>
-<li><img src="clearweb.png" alt="Visiting clearweb" title="" /></li>
-</ul>
+        <li><img alt="Landing page" src="lander.png" title="">
+        </li>
 
-<h3>Video</h3>
+        <li>Also, there's a menu for accessing I2P functionality while you're browsing. It lets you control a few settings in a granular way.</li>
 
-<ul>
-<li><img src="i2psetproxy.js.gif" alt="Video of the plugin in action" title="" /></li>
-</ul>
+        <li><img alt="Menu" src="menu.png" title="">
+        </li>
 
-<h2>Documents</h2>
+        <li>You can re-enable WebRTC but force it to always use the proxy that is enforced by the tab.</li>
 
-<ul>
-<li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Browser.Design.Documentation.pdf">Browser Outline</a></strong>: This document is an outline of each of
-the browser extension's feature panels in presentation form.</li>
-<li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Landing.Page.Documentation.pdf">Smart Lander Design</a></strong>: This is the original outline of
-the smart landing page which became the I2P home page within the browser and
-the drop-down control panel.</li>
-<li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/wiki/Other-Extensions">Other extensions</a></strong>: and how they work with this one.</li>
-</ul>
+        <li>You can either force the browser to delete all history for I2P sites immediately, or you can close all your I2P Browser tabs at once and delete the history for I2P browsing when you're done.</li>
 
-<h2>Super Extra Important Background Info:</h2>
+        <li>That's all there is to it! Your browser is configured to safely use and administer I2P.</li>
 
-<p>This plugin's viability is directly related to the viability of Mozilla and
-Tor's work on hardening Firefox itself and of particular interest are the
-"Uplift" and "Fusion(Firefox Using Onions)" projects.</p>
+        <li>Optionally, you can add I2PSnark-RPC and use Bittorrent-over-I2P via the transmission-rpc interface. To do this, have a look at the torrent guide: <a href="torrent/index.html">Torrent guide</a>
+        </li>
+    </ul>
 
-<h3>Links about Project Uplift</h3>
+    <h3>Features</h3>
 
-<ul>
-<li><a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> is a project which
-brings important features of the Tor Browser to the mainstream of Firefox
-users by including patches from Tor Browser Bundle into Firefox where it is
-appropriate.</li>
-<li><a href="https://wiki.mozilla.org/Security/FirstPartyIsolation">First Party Isolation</a>
-is a feature in Firefox and other browsers which keeps information from
-leaking across first-party domains.</li>
-<li><a href="https://wiki.mozilla.org/Security/Fingerprinting">Fingerprinting</a> is a
-technique where a tracker attempts to extract unique information about a user
-from a side-channel in order to create an identifier that can be used to
-correlate the user across many sites.</li>
-<li><a href="https://wiki.mozilla.org/Security/Fennec%2BTor_Project">Fennec</a> is Firefox
-for Android and this link has some analysis of the privacy consequences of the
-Android platform.</li>
-<li><a href="https://wiki.mozilla.org/Security/Tor_Uplift/Tracking">Tracking</a> in Firefox
-is surveyed here.</li>
-</ul>
+    <ul>
+        <li>[done] <strong>Provide</strong> a way to launch into an I2P-Specific contextual identity (container). Intercept requests to .i2p domains and automatically route them to the I2P container. Isolate the router console from other local applications by automatically intercepting requests to the router console to another container.</li>
 
-<p>Project uplift seems to have largely been accomplished?</p>
+        <li><img alt="Visiting i2p-projekt.i2p" src="i2psetproxy.js.png" title="">
+        </li>
 
-<h3>Links about Project Fusion</h3>
+        <li>[done] <strong>Indicate</strong> the I2P browser is in use visually. Find an acceptable way to indicate it on Android.</li>
 
-<ul>
-<li><a href="https://wiki.mozilla.org/Security/Fusion">Project Fusion</a> or Firefox using
-Onions is a joint Mozilla/Tor effort to create an enhanced Private Browsing
-mode for Firefox which uses Tor.</li>
-<li><a href="https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject">Notes</a>
-from a meeting about Fusion.</li>
-<li><a href="https://blog.torproject.org/tor-heart-firefox">Tor at the Heart: Firefox</a> is
-a blog about Tor and the relationship they have to Firefox re: TBB, Fusion.</li>
-</ul>
+        <li><img alt="Visiting webmail" src="susimail.png" title="">
+        </li>
 
-<h2>The Old Version</h2>
+        <li>[done] <strong>Set</strong> the http proxy to use the local I2P proxy automatically. Provide specific configuration for other types of I2P proxies(SOCKS, isolating HTTP)</li>
 
-<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>
+        <li>[done] <strong>Disable</strong> risky webRTC features/offer the option to re-enable them with the proxy enforced.</li>
 
-<ul>
-<li><p>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></p></li>
-<li><p>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></p></li>
-</ul>
+        <li>[done] <strong>Change</strong> the color of the browser window to indicate that I2P is in use</li>
 
-<h2>Android usage:</h2>
+        <li><img alt="Visiting i2ptunnel" src="i2ptunnel.png" title="">
+        </li>
 
-<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>
+        <li>[ready] <strong>Provide</strong> help in a variety of languages.</li>
 
-<h3>Android addons.mozilla.org(Temporarily Disabled)</h3>
+        <li>[done] <strong>Monitor</strong> the health and readiness of the I2P router it is instructed to use. Currently the plugin checks whether the HTTP Proxy is working by fetching an image from "http://proxy.i2p" and displaying a result. A work-in-progress binding to i2pcontrol is available in ./i2pcontrol, it is inert at this time.</li>
 
-<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>
+        <li><img alt="Visiting toopie.html" src="toopie.png" title="">
+        </li>
+
+        <li>[Done] <strong>Handle</strong> router console applications under their own origins and within their own contextual identity. (1) The router console is automatically confined to it's own container tab. (2) Use a custom protocol handler to place each i2p application/plugin under it's own origin, shortening router console URL's and placing applications under their own origin.</li>
+
+        <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><img alt="Visiting i2psnark" src="i2psnark.png" title="">
+        </li>
+
+        <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>[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>
+                <li>I2P Amnesiac Browsing: Use for General Browsing, stores no history and uses an HTTP Proxy with a very short tunnel-close timeout and no key-reuse.</li>
+
+                <li>I2P Social Networking: Use this for logging into social network accounts, forums, and other interactive asynchronous public communication platforms where your identity is behaviorally linkable. This has a very long tunnel-close timeout and key-reuse until specifically invoked.</li>
+
+                <li>I2P Blogging: Use this for posting content to the web interface of your blog or to other similar websites that you create content on.</li>
+            </ul>
+        </li>
+
+        <li><img alt="Visiting clearweb" src="clearweb.png" title="">
+        </li>
+    </ul>
+
+    <h3>Video</h3>
+
+    <ul>
+        <li><img alt="Video of the plugin in action" src="i2psetproxy.js.gif" title="">
+        </li>
+    </ul>
+
+    <h2>Documents</h2>
+
+    <ul>
+        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Browser.Design.Documentation.pdf">Browser Outline</a></strong>: This document is an outline of each of the browser extension's feature panels in presentation form.</li>
+
+        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Landing.Page.Documentation.pdf">Smart Lander Design</a></strong>: This is the original outline of the smart landing page which became the I2P home page within the browser and the drop-down control panel.</li>
+
+        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/wiki/Other-Extensions">Other extensions</a></strong>: and how they work with this one.</li>
+    </ul>
+
+    <h2>Super Extra Important Background Info:</h2>
+
+    <p>This plugin's viability is directly related to the viability of Mozilla and Tor's work on hardening Firefox itself and of particular interest are the "Uplift" and "Fusion(Firefox Using Onions)" projects.</p>
+
+    <h3>Links about Project Uplift</h3>
+
+    <ul>
+        <li>
+            <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> is a project which brings important features of the Tor Browser to the mainstream of Firefox users by including patches from Tor Browser Bundle into Firefox where it is appropriate.
+        </li>
+
+        <li>
+            <a href="https://wiki.mozilla.org/Security/FirstPartyIsolation">First Party Isolation</a> is a feature in Firefox and other browsers which keeps information from leaking across first-party domains.
+        </li>
+
+        <li>
+            <a href="https://wiki.mozilla.org/Security/Fingerprinting">Fingerprinting</a> is a technique where a tracker attempts to extract unique information about a user from a side-channel in order to create an identifier that can be used to correlate the user across many sites.
+        </li>
+
+        <li>
+            <a href="https://wiki.mozilla.org/Security/Fennec%2BTor_Project">Fennec</a> is Firefox for Android and this link has some analysis of the privacy consequences of the Android platform.
+        </li>
+
+        <li>
+            <a href="https://wiki.mozilla.org/Security/Tor_Uplift/Tracking">Tracking</a> in Firefox is surveyed here.
+        </li>
+    </ul>
+
+    <p>Project uplift seems to have largely been accomplished?</p>
+
+    <h3>Links about Project Fusion</h3>
+
+    <ul>
+        <li>
+            <a href="https://wiki.mozilla.org/Security/Fusion">Project Fusion</a> or Firefox using Onions is a joint Mozilla/Tor effort to create an enhanced Private Browsing mode for Firefox which uses Tor.
+        </li>
+
+        <li>
+            <a href="https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject">Notes</a> from a meeting about Fusion.
+        </li>
+
+        <li>
+            <a href="https://blog.torproject.org/tor-heart-firefox">Tor at the Heart: Firefox</a> is a blog about Tor and the relationship they have to Firefox re: TBB, Fusion.
+        </li>
+    </ul>
+
+    <h2>The Old 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>
+
+    <ul>
+        <li>
+            <p>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></p>
+        </li>
+
+        <li>
+            <p>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></p>
+        </li>
+    </ul>
+
+    <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>
 </body>
 </html>

info.js

@@ -2,9 +2,9 @@ function checkPeerConnection() {
   let getting = browser.privacy.network.peerConnectionEnabled.get({});
   getting.then(got => {
     let webrtc = got.value;
-    console.log("checking webrtc", webrtc);
-    if (document.getElementById("enable-web-rtc") !== null)
-      document.getElementById("enable-web-rtc").checked = webrtc;
+    console.log('checking webrtc', webrtc);
+    if (document.getElementById('enable-web-rtc') !== null)
+      document.getElementById('enable-web-rtc').checked = webrtc;
   });
 }
 

manifest.json

@@ -2,7 +2,6 @@
   "applications": {
     "gecko": {
       "id": "i2ppb@eyedeekay.github.io",
-      "update_url": "https://c6lilt4cr5x7jifxridpkesf2zgfwqfchtp6laihr4pdqomq25iq.b32.i2p/i2p/updateManifest.json",
       "strict_min_version": "60.0"
     }
   },
@@ -27,8 +26,8 @@
   ],
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "0.66",
-  "version_name": "0.66",
+  "version": "0.73",
+  "version_name": "0.73",
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
   "icons": {

options/options.js

@@ -1,151 +1,151 @@
 function SetHostText() {
-  var hostid = document.getElementById("hostText");
-  hostid.textContent = chrome.i18n.getMessage("hostText");
+  var hostid = document.getElementById('hostText');
+  hostid.textContent = chrome.i18n.getMessage('hostText');
 }
 
 function SetPortText() {
-  var portid = document.getElementById("portText");
-  portid.textContent = chrome.i18n.getMessage("portText");
+  var portid = document.getElementById('portText');
+  portid.textContent = chrome.i18n.getMessage('portText');
 }
 
 function SetPortHelpText() {
-  var portid = document.getElementById("proxyHelpText");
-  portid.textContent = chrome.i18n.getMessage("proxyHelpText");
+  var portid = document.getElementById('proxyHelpText');
+  portid.textContent = chrome.i18n.getMessage('proxyHelpText');
 }
 
 function SetControlHostText() {
-  var controlhostid = document.getElementById("controlHostText");
-  controlhostid.textContent = chrome.i18n.getMessage("controlHostText");
+  var controlhostid = document.getElementById('controlHostText');
+  controlhostid.textContent = chrome.i18n.getMessage('controlHostText');
 }
 
 function SetControlPortText() {
-  var controlportid = document.getElementById("controlPortText");
-  controlportid.textContent = chrome.i18n.getMessage("controlPortText");
+  var controlportid = document.getElementById('controlPortText');
+  controlportid.textContent = chrome.i18n.getMessage('controlPortText');
 }
 
 function SetControlHelpText() {
-  var portid = document.getElementById("controlHelpText");
-  portid.textContent = chrome.i18n.getMessage("controlHelpText");
+  var portid = document.getElementById('controlHelpText');
+  portid.textContent = chrome.i18n.getMessage('controlHelpText');
 }
 
 function getScheme() {
-  const proxy_scheme = document.querySelector("#proxy_scheme");
-  console.log("(options)Got i2p proxy scheme:", proxy_scheme.value);
-  if (proxy_scheme.value == "HTTP") {
-    return "http";
+  const proxy_scheme = document.querySelector('#proxy_scheme');
+  console.log('(options)Got i2p proxy scheme:', proxy_scheme.value);
+  if (proxy_scheme.value == 'HTTP') {
+    return 'http';
   }
-  if (proxy_scheme.value == "SOCKS") {
-    return "socks";
+  if (proxy_scheme.value == 'SOCKS') {
+    return 'socks';
   }
-  if (proxy_scheme.value == "http") return "http";
-  if (proxy_scheme.value == "socks") return "socks";
-  else return "http";
+  if (proxy_scheme.value == 'http') return 'http';
+  if (proxy_scheme.value == 'socks') return 'socks';
+  else return 'http';
 }
 
 function getHost() {
-  proxy_host = document.getElementById("host").value;
-  console.log("(options)Got i2p proxy host:", proxy_host);
+  proxy_host = document.getElementById('host').value;
+  console.log('(options)Got i2p proxy host:', proxy_host);
   if (proxy_host == undefined) {
-    return "127.0.0.1";
+    return '127.0.0.1';
   }
   return proxy_host;
 }
 
 function getPort() {
-  proxy_port = document.getElementById("port").value;
-  console.log("(options)Got i2p proxy port:", proxy_port);
+  proxy_port = document.getElementById('port').value;
+  console.log('(options)Got i2p proxy port:', proxy_port);
   if (proxy_port == undefined) {
-    return "4444";
+    return '4444';
   }
   return proxy_port;
 }
 
 function getControlHost() {
-  control_host = document.getElementById("controlhost").value;
-  console.log("(options)Got i2p control host:", control_host);
+  control_host = document.getElementById('controlhost').value;
+  console.log('(options)Got i2p control host:', control_host);
   if (control_host == undefined) {
-    return "127.0.0.1";
+    return '127.0.0.1';
   }
   return control_host;
 }
 
 function getControlPort() {
-  control_port = document.getElementById("controlport").value;
-  console.log("(options)Got i2p control port:", control_port);
+  control_port = document.getElementById('controlport').value;
+  console.log('(options)Got i2p control port:', control_port);
   if (control_port == undefined) {
-    return "4444";
+    return '4444';
   }
   return control_port;
 }
 
 function getRPCHost() {
-  rpc_host = document.getElementById("rpchost").value;
-  console.log("(options)Got i2pcontrol rpc host:", rpc_host);
+  rpc_host = document.getElementById('rpchost').value;
+  console.log('(options)Got i2pcontrol rpc host:', rpc_host);
   if (rpc_host == undefined) {
-    return "127.0.0.1";
+    return '127.0.0.1';
   }
   return rpc_host;
 }
 
 function getRPCPort() {
-  rpc_port = document.getElementById("rpcport").value;
-  console.log("(options)Got i2pcontrol rpc port:", rpc_port);
+  rpc_port = document.getElementById('rpcport').value;
+  console.log('(options)Got i2pcontrol rpc port:', rpc_port);
   if (rpc_port == undefined) {
-    return "7657";
+    return '7657';
   }
   return rpc_port;
 }
 
 function getRPCPath() {
-  rpc_path = document.getElementById("rpcpath").value;
-  console.log("(options)Got i2pcontrol rpc path:", rpc_path);
+  rpc_path = document.getElementById('rpcpath').value;
+  console.log('(options)Got i2pcontrol rpc path:', rpc_path);
   if (rpc_path == undefined) {
-    return "jsonrpc";
+    return 'jsonrpc';
   }
   return rpc_path;
 }
 
 function getRPCPass() {
-  rpc_pass = document.getElementById("rpcpass").value;
-  console.log("(options)Got i2pcontrol rpc password:");
+  rpc_pass = document.getElementById('rpcpass').value;
+  console.log('(options)Got i2pcontrol rpc password:');
   if (rpc_pass == undefined) {
-    return "itoopie";
+    return 'itoopie';
   }
   return rpc_pass;
 }
 
 function getBTRPCHost() {
-  bt_rpc_host = document.getElementById("btrpchost").value;
-  console.log("(options)Got torrent rpc host:", bt_rpc_host);
+  bt_rpc_host = document.getElementById('btrpchost').value;
+  console.log('(options)Got torrent rpc host:', bt_rpc_host);
   if (bt_rpc_host == undefined) {
-    return "127.0.0.1";
+    return '127.0.0.1';
   }
   return bt_rpc_host;
 }
 
 function getBTRPCPort() {
-  bt_rpc_port = document.getElementById("btrpcport").value;
-  console.log("(options)Got torrent rpc port:", bt_rpc_port);
+  bt_rpc_port = document.getElementById('btrpcport').value;
+  console.log('(options)Got torrent rpc port:', bt_rpc_port);
   if (bt_rpc_port == undefined) {
-    return "7657";
+    return '7657';
   }
   return bt_rpc_port;
 }
 
 function getBTRPCPath() {
-  bt_rpc_path = document.getElementById("btrpcpath").value;
-  console.log("(options)Got torrent rpc path:", bt_rpc_path);
+  bt_rpc_path = document.getElementById('btrpcpath').value;
+  console.log('(options)Got torrent rpc path:', bt_rpc_path);
   if (bt_rpc_path == undefined) {
-    return "transmission/rpc";
+    return 'transmission/rpc';
   }
   return bt_rpc_path;
 }
 
 function getBTRPCPass() {
-  bt_rpc_pass = document.getElementById("btrpcpass").value;
-  console.log("(options)Got torrent rpc password:");
+  bt_rpc_pass = document.getElementById('btrpcpass').value;
+  console.log('(options)Got torrent rpc password:');
   if (bt_rpc_pass == undefined) {
-    return "itoopie";
+    return 'itoopie';
   }
   return bt_rpc_pass;
 }
@@ -153,85 +153,85 @@ function getBTRPCPass() {
 function checkStoredSettings(storedSettings) {
   function gotProxyInfo(info) {
     let defaultSettings = {};
-    let host = info.value.http.split(":")[0];
-    let port = info.value.http.split(":")[1];
+    let host = info.value.http.split(':')[0];
+    let port = info.value.http.split(':')[1];
     if (port != 7644) {
       port = undefined;
     }
-    console.log("(options)proxy", "'" + host + "'", ":", port);
-    if (!storedSettings["proxy_scheme"])
-      defaultSettings["proxy_scheme"] = "http";
-    else defaultSettings["proxy_scheme"] = storedSettings["proxy_scheme"];
-    if (!storedSettings["proxy_host"]) {
-      if (host == "") defaultSettings["proxy_host"] = "127.0.0.1";
-      else defaultSettings["proxy_host"] = host;
-    } else defaultSettings["proxy_host"] = storedSettings["proxy_host"];
+    console.log('(options)proxy', "'" + host + "'", ':', port);
+    if (!storedSettings['proxy_scheme'])
+      defaultSettings['proxy_scheme'] = 'http';
+    else defaultSettings['proxy_scheme'] = storedSettings['proxy_scheme'];
+    if (!storedSettings['proxy_host']) {
+      if (host == '') defaultSettings['proxy_host'] = '127.0.0.1';
+      else defaultSettings['proxy_host'] = host;
+    } else defaultSettings['proxy_host'] = storedSettings['proxy_host'];
 
-    if (!storedSettings["proxy_port"]) {
-      if (port == undefined) defaultSettings["proxy_port"] = 4444;
-      else if (port == 7644) defaultSettings["proxy_port"] = port;
-      else defaultSettings["proxy_port"] = 4444;
-    } else defaultSettings["proxy_port"] = storedSettings.proxy_port;
+    if (!storedSettings['proxy_port']) {
+      if (port == undefined) defaultSettings['proxy_port'] = 4444;
+      else if (port == 7644) defaultSettings['proxy_port'] = port;
+      else defaultSettings['proxy_port'] = 4444;
+    } else defaultSettings['proxy_port'] = storedSettings.proxy_port;
 
-    if (!storedSettings["control_host"]) {
-      if (host == "") defaultSettings["control_host"] = "127.0.0.1";
-      else defaultSettings["control_host"] = host;
-    } else defaultSettings["control_host"] = storedSettings.control_host;
+    if (!storedSettings['control_host']) {
+      if (host == '') defaultSettings['control_host'] = '127.0.0.1';
+      else defaultSettings['control_host'] = host;
+    } else defaultSettings['control_host'] = storedSettings.control_host;
 
-    if (!storedSettings["control_port"]) {
-      defaultSettings["control_port"] = 7657;
-    } else defaultSettings["control_port"] = storedSettings.control_port;
+    if (!storedSettings['control_port']) {
+      defaultSettings['control_port'] = 7657;
+    } else defaultSettings['control_port'] = storedSettings.control_port;
 
-    if (!storedSettings["rpc_host"]) {
-      if (host == "") defaultSettings["rpc_host"] = "127.0.0.1";
-      else defaultSettings["rpc_host"] = host;
-    } else defaultSettings["rpc_host"] = storedSettings.rpc_host;
+    if (!storedSettings['rpc_host']) {
+      if (host == '') defaultSettings['rpc_host'] = '127.0.0.1';
+      else defaultSettings['rpc_host'] = host;
+    } else defaultSettings['rpc_host'] = storedSettings.rpc_host;
 
-    if (!storedSettings["rpc_port"]) {
-      defaultSettings["rpc_port"] = 7657;
-    } else defaultSettings["rpc_port"] = storedSettings.rpc_port;
+    if (!storedSettings['rpc_port']) {
+      defaultSettings['rpc_port'] = 7657;
+    } else defaultSettings['rpc_port'] = storedSettings.rpc_port;
 
-    if (!storedSettings["rpc_path"]) {
-      defaultSettings["rpc_path"] = "jsonrpc";
-    } else defaultSettings["rpc_path"] = storedSettings.rpc_path;
+    if (!storedSettings['rpc_path']) {
+      defaultSettings['rpc_path'] = 'jsonrpc';
+    } else defaultSettings['rpc_path'] = storedSettings.rpc_path;
 
-    if (!storedSettings["rpc_pass"]) {
-      defaultSettings["rpc_pass"] = "itoopie";
-    } else defaultSettings["rpc_pass"] = storedSettings.rpc_pass;
+    if (!storedSettings['rpc_pass']) {
+      defaultSettings['rpc_pass'] = 'itoopie';
+    } else defaultSettings['rpc_pass'] = storedSettings.rpc_pass;
 
-    if (!storedSettings["bt_rpc_host"]) {
-      if (host == "") defaultSettings["bt_rpc_host"] = "127.0.0.1";
-      else defaultSettings["bt_rpc_host"] = host;
-    } else defaultSettings["bt_rpc_host"] = storedSettings.bt_rpc_host;
+    if (!storedSettings['bt_rpc_host']) {
+      if (host == '') defaultSettings['bt_rpc_host'] = '127.0.0.1';
+      else defaultSettings['bt_rpc_host'] = host;
+    } else defaultSettings['bt_rpc_host'] = storedSettings.bt_rpc_host;
 
-    if (!storedSettings["bt_rpc_port"]) {
-      defaultSettings["bt_rpc_port"] = 7657;
-    } else defaultSettings["bt_rpc_port"] = storedSettings.bt_rpc_port;
+    if (!storedSettings['bt_rpc_port']) {
+      defaultSettings['bt_rpc_port'] = 7657;
+    } else defaultSettings['bt_rpc_port'] = storedSettings.bt_rpc_port;
 
-    if (!storedSettings["bt_rpc_path"]) {
-      defaultSettings["bt_rpc_path"] = "transmission/";
-    } else defaultSettings["bt_rpc_path"] = storedSettings.bt_rpc_path;
+    if (!storedSettings['bt_rpc_path']) {
+      defaultSettings['bt_rpc_path'] = 'transmission/';
+    } else defaultSettings['bt_rpc_path'] = storedSettings.bt_rpc_path;
 
-    if (!storedSettings["bt_rpc_pass"]) {
-      defaultSettings["bt_rpc_pass"] = "transmission";
-    } else defaultSettings["bt_rpc_pass"] = storedSettings.bt_rpc_pass;
+    if (!storedSettings['bt_rpc_pass']) {
+      defaultSettings['bt_rpc_pass'] = 'transmission';
+    } else defaultSettings['bt_rpc_pass'] = storedSettings.bt_rpc_pass;
 
-    console.log("(options)(browserinfo) NATIVE PROXYSETTINGS", info.value);
-    defaultSettings["base_url"] =
-      "http://" +
-      defaultSettings["bt_rpc_host"] +
-      ":" +
-      defaultSettings["bt_rpc_port"] +
-      "/" +
-      defaultSettings["bt_rpc_path"];
+    console.log('(options)(browserinfo) NATIVE PROXYSETTINGS', info.value);
+    defaultSettings['base_url'] =
+      'http://' +
+      defaultSettings['bt_rpc_host'] +
+      ':' +
+      defaultSettings['bt_rpc_port'] +
+      '/' +
+      defaultSettings['bt_rpc_path'];
     console.log(
-      "(options)",
-      defaultSettings["proxy_scheme"],
-      defaultSettings["proxy_host"],
-      defaultSettings["proxy_port"],
-      defaultSettings["control_host"],
-      defaultSettings["control_port"],
-      defaultSettings["base_url"]
+      '(options)',
+      defaultSettings['proxy_scheme'],
+      defaultSettings['proxy_host'],
+      defaultSettings['proxy_port'],
+      defaultSettings['control_host'],
+      defaultSettings['control_port'],
+      defaultSettings['base_url']
     );
 
     chrome.storage.local.set(defaultSettings);
@@ -243,72 +243,72 @@ function checkStoredSettings(storedSettings) {
 
 function checkAndroidStoredSettings(storedSettings) {
   let defaultSettings = {};
-  let host = "";
-  let port = "";
-  if (!storedSettings["proxy_scheme"]) defaultSettings["proxy_scheme"] = "http";
-  else defaultSettings["proxy_scheme"] = storedSettings["proxy_scheme"];
-  if (!storedSettings["proxy_host"]) {
-    if (host == "") defaultSettings["proxy_host"] = "127.0.0.1";
-    else defaultSettings["proxy_host"] = host;
-  } else defaultSettings["proxy_host"] = storedSettings["proxy_host"];
+  let host = '';
+  let port = '';
+  if (!storedSettings['proxy_scheme']) defaultSettings['proxy_scheme'] = 'http';
+  else defaultSettings['proxy_scheme'] = storedSettings['proxy_scheme'];
+  if (!storedSettings['proxy_host']) {
+    if (host == '') defaultSettings['proxy_host'] = '127.0.0.1';
+    else defaultSettings['proxy_host'] = host;
+  } else defaultSettings['proxy_host'] = storedSettings['proxy_host'];
 
-  if (!storedSettings["proxy_port"]) {
-    if (port == undefined) defaultSettings["proxy_port"] = 4444;
-    else if (port == 7644) defaultSettings["proxy_port"] = port;
-    else defaultSettings["proxy_port"] = 4444;
-  } else defaultSettings["proxy_port"] = storedSettings.proxy_port;
+  if (!storedSettings['proxy_port']) {
+    if (port == undefined) defaultSettings['proxy_port'] = 4444;
+    else if (port == 7644) defaultSettings['proxy_port'] = port;
+    else defaultSettings['proxy_port'] = 4444;
+  } else defaultSettings['proxy_port'] = storedSettings.proxy_port;
 
-  if (!storedSettings["control_host"]) {
-    if (host == "") defaultSettings["control_host"] = "127.0.0.1";
-    else defaultSettings["control_host"] = host;
-  } else defaultSettings["control_host"] = storedSettings.control_host;
+  if (!storedSettings['control_host']) {
+    if (host == '') defaultSettings['control_host'] = '127.0.0.1';
+    else defaultSettings['control_host'] = host;
+  } else defaultSettings['control_host'] = storedSettings.control_host;
 
-  if (!storedSettings["control_port"]) {
-    defaultSettings["control_port"] = 7657;
-  } else defaultSettings["control_port"] = storedSettings.control_port;
+  if (!storedSettings['control_port']) {
+    defaultSettings['control_port'] = 7657;
+  } else defaultSettings['control_port'] = storedSettings.control_port;
 
-  if (!storedSettings["rpc_host"]) {
-    if (host == "") defaultSettings["rpc_host"] = "127.0.0.1";
-    else defaultSettings["rpc_host"] = host;
-  } else defaultSettings["rpc_host"] = storedSettings.rpc_host;
+  if (!storedSettings['rpc_host']) {
+    if (host == '') defaultSettings['rpc_host'] = '127.0.0.1';
+    else defaultSettings['rpc_host'] = host;
+  } else defaultSettings['rpc_host'] = storedSettings.rpc_host;
 
-  if (!storedSettings["rpc_port"]) {
-    defaultSettings["rpc_port"] = 7657;
-  } else defaultSettings["rpc_port"] = storedSettings.rpc_port;
+  if (!storedSettings['rpc_port']) {
+    defaultSettings['rpc_port'] = 7657;
+  } else defaultSettings['rpc_port'] = storedSettings.rpc_port;
 
-  if (!storedSettings["rpc_path"]) {
-    defaultSettings["rpc_path"] = "jsonrpc";
-  } else defaultSettings["rpc_path"] = storedSettings.rpc_path;
+  if (!storedSettings['rpc_path']) {
+    defaultSettings['rpc_path'] = 'jsonrpc';
+  } else defaultSettings['rpc_path'] = storedSettings.rpc_path;
 
-  if (!storedSettings["rpc_pass"]) {
-    defaultSettings["rpc_pass"] = "itoopie";
-  } else defaultSettings["rpc_pass"] = storedSettings.rpc_pass;
+  if (!storedSettings['rpc_pass']) {
+    defaultSettings['rpc_pass'] = 'itoopie';
+  } else defaultSettings['rpc_pass'] = storedSettings.rpc_pass;
 
-  if (!storedSettings["bt_rpc_host"]) {
-    if (host == "") defaultSettings["bt_rpc_host"] = "127.0.0.1";
-    else defaultSettings["bt_rpc_host"] = host;
-  } else defaultSettings["bt_rpc_host"] = storedSettings.bt_rpc_host;
+  if (!storedSettings['bt_rpc_host']) {
+    if (host == '') defaultSettings['bt_rpc_host'] = '127.0.0.1';
+    else defaultSettings['bt_rpc_host'] = host;
+  } else defaultSettings['bt_rpc_host'] = storedSettings.bt_rpc_host;
 
-  if (!storedSettings["bt_rpc_port"]) {
-    defaultSettings["bt_rpc_port"] = 7657;
-  } else defaultSettings["bt_rpc_port"] = storedSettings.bt_rpc_port;
+  if (!storedSettings['bt_rpc_port']) {
+    defaultSettings['bt_rpc_port'] = 7657;
+  } else defaultSettings['bt_rpc_port'] = storedSettings.bt_rpc_port;
 
-  if (!storedSettings["bt_rpc_path"]) {
-    defaultSettings["bt_rpc_path"] = "transmission/rpc";
-  } else defaultSettings["bt_rpc_path"] = storedSettings.bt_rpc_path;
+  if (!storedSettings['bt_rpc_path']) {
+    defaultSettings['bt_rpc_path'] = 'transmission/rpc';
+  } else defaultSettings['bt_rpc_path'] = storedSettings.bt_rpc_path;
 
-  if (!storedSettings["bt_rpc_pass"]) {
-    defaultSettings["bt_rpc_pass"] = "transmission";
-  } else defaultSettings["bt_rpc_pass"] = storedSettings.bt_rpc_pass;
+  if (!storedSettings['bt_rpc_pass']) {
+    defaultSettings['bt_rpc_pass'] = 'transmission';
+  } else defaultSettings['bt_rpc_pass'] = storedSettings.bt_rpc_pass;
 
-  console.log("(options)(browserinfo) NATIVE PROXYSETTINGS", info.value);
+  console.log('(options)(browserinfo) NATIVE PROXYSETTINGS', info.value);
   console.log(
-    "(options)",
-    defaultSettings["proxy_scheme"],
-    defaultSettings["proxy_host"],
-    defaultSettings["proxy_port"],
-    defaultSettings["control_host"],
-    defaultSettings["control_port"]
+    '(options)',
+    defaultSettings['proxy_scheme'],
+    defaultSettings['proxy_host'],
+    defaultSettings['proxy_port'],
+    defaultSettings['control_host'],
+    defaultSettings['control_port']
   );
   chrome.storage.local.set(defaultSettings);
   return defaultSettings;
@@ -319,81 +319,81 @@ function onError(e) {
 }
 
 function storeSettings() {
-  let storableSettings = {}
-  storableSettings["proxy_scheme"] = getScheme();
-  storableSettings["proxy_host"] = getHost();
-  storableSettings["proxy_port"] = getPort();
-  storableSettings["control_host"] = getControlHost();
-  storableSettings["control_port"] = getControlPort();
-  storableSettings["rpc_host"] = getRPCHost();
-  storableSettings["rpc_port"] = getRPCPort();
-  storableSettings["rpc_path"] = getRPCPath();
-  storableSettings["rpc_pass"] = getRPCPass();
-  storableSettings["bt_rpc_host"] = getBTRPCHost();
-  storableSettings["bt_rpc_port"] = getBTRPCPort();
-  storableSettings["bt_rpc_path"] = getBTRPCPath();
-  storableSettings["bt_rpc_pass"] = getBTRPCPass();
-  storableSettings["base_url"] =
-    "http://" + bt_rpc_host + ":" + bt_rpc_port + "/" + bt_rpc_path;
-  console.log("storing", storableSettings);
+  let storableSettings = {};
+  storableSettings['proxy_scheme'] = getScheme();
+  storableSettings['proxy_host'] = getHost();
+  storableSettings['proxy_port'] = getPort();
+  storableSettings['control_host'] = getControlHost();
+  storableSettings['control_port'] = getControlPort();
+  storableSettings['rpc_host'] = getRPCHost();
+  storableSettings['rpc_port'] = getRPCPort();
+  storableSettings['rpc_path'] = getRPCPath();
+  storableSettings['rpc_pass'] = getRPCPass();
+  storableSettings['bt_rpc_host'] = getBTRPCHost();
+  storableSettings['bt_rpc_port'] = getBTRPCPort();
+  storableSettings['bt_rpc_path'] = getBTRPCPath();
+  storableSettings['bt_rpc_pass'] = getBTRPCPass();
+  storableSettings['base_url'] =
+    'http://' + bt_rpc_host + ':' + bt_rpc_port + '/' + bt_rpc_path;
+  console.log('storing', storableSettings);
   chrome.storage.local.set(storableSettings);
 }
 
 function updateUI(restoredSettings) {
-  const selectList = document.querySelector("#proxy_scheme");
+  const selectList = document.querySelector('#proxy_scheme');
   if (selectList == undefined) selectList.value = restoredSettings.proxy_scheme;
   //console.log("(options)showing proxy scheme:", selectList.value);
 
-  const hostitem = document.getElementById("host");
+  const hostitem = document.getElementById('host');
   if (hostitem == undefined) hostitem.value = restoredSettings.proxy_host;
   //console.log("(options)showing proxy host:", hostitem.value);
 
-  const portitem = document.getElementById("port");
+  const portitem = document.getElementById('port');
   if (portitem == undefined) portitem.value = restoredSettings.proxy_port;
   //console.log("(options)showing proxy port:", portitem.value);
 
-  const controlhostitem = document.getElementById("controlhost");
+  const controlhostitem = document.getElementById('controlhost');
   if (controlhostitem == undefined)
     controlhostitem.value = restoredSettings.control_host;
   //console.log("(options)showing control host:", controlhostitem.value);
 
-  const controlportitem = document.getElementById("controlport");
+  const controlportitem = document.getElementById('controlport');
   if (controlportitem == undefined)
     controlportitem.value = restoredSettings.control_port;
   //console.log("(options)showing control port:", controlportitem.value);
 
-  const rpchostitem = document.getElementById("rpchost");
+  const rpchostitem = document.getElementById('rpchost');
   if (rpchostitem == undefined) rpchostitem.value = restoredSettings.rpc_host;
   //console.log("(options)showing rpc host:", rpchostitem.value);
 
-  const rpcportitem = document.getElementById("rpcport");
+  const rpcportitem = document.getElementById('rpcport');
   if (rpcportitem == undefined) rpcportitem.value = restoredSettings.rpc_port;
   //console.log("(options)showing rpc port:", rpcportitem.value);
 
-  const rpcpathitem = document.getElementById("rpcpath");
+  const rpcpathitem = document.getElementById('rpcpath');
   if (rpcpathitem == undefined) rpcpathitem.value = restoredSettings.rpc_path;
   //console.log("(options)showing rpc path:", rpcpathitem.value);
 
-  const rpcpassitem = document.getElementById("rpcpass");
+  const rpcpassitem = document.getElementById('rpcpass');
   if (rpcpassitem == undefined) rpcpassitem.value = restoredSettings.rpc_pass;
   //console.log("(options)showing rpc pass:");
 
-  const btrpchostitem = document.getElementById("btrpchost");
+  const btrpchostitem = document.getElementById('btrpchost');
   if (btrpchostitem == undefined)
     btrpchostitem.value = restoredSettings.rpc_host;
   //console.log("(options)showing bt rpc host:", btrpchostitem.value);
 
-  const btrpcportitem = document.getElementById("btrpcport");
+  const btrpcportitem = document.getElementById('btrpcport');
   if (btrpcportitem == undefined)
     btrpcportitem.value = restoredSettings.rpc_port;
   //console.log("(options)showing rbt pc port:", rpcportitem.value);
 
-  const btrpcpathitem = document.getElementById("btrpcpath");
+  const btrpcpathitem = document.getElementById('btrpcpath');
   if (btrpcpathitem == undefined)
     btrpcpathitem.value = restoredSettings.rpc_path;
   //console.log("(options)showing bt rpc path:", btrpcpathitem.value);
 
-  const btrpcpassitem = document.getElementById("btrpcpass");
+  const btrpcpassitem = document.getElementById('btrpcpass');
   if (btrpcpassitem == undefined)
     btrpcpassitem.value = restoredSettings.rpc_pass;
   //console.log("(options)showing bt rpc pass:");
@@ -412,7 +412,7 @@ function onError(e) {
 
 var gettingInfo = browser.runtime.getPlatformInfo();
 gettingInfo.then(got => {
-  if (got.os != "android") {
+  if (got.os != 'android') {
     chrome.storage.local.get(function(got) {
       let settings = checkStoredSettings(got);
       settings.then(updateUI);
@@ -425,5 +425,5 @@ gettingInfo.then(got => {
   }
 });
 
-const saveButton = document.querySelector("#save-button");
-saveButton.addEventListener("click", storeSettings);
+const saveButton = document.querySelector('#save-button');
+saveButton.addEventListener('click', storeSettings);

platform.js

@@ -2,19 +2,19 @@ var android = false;
 
 var gettingInfo = browser.runtime.getPlatformInfo();
 gettingInfo.then(got => {
-  if (got.os == "android") {
-    console.log("Running in Android detected");
+  if (got.os == 'android') {
+    console.log('Running in Android detected');
     android = true;
     return true;
   } else {
-    console.log("Running in Desktop detected");
+    console.log('Running in Desktop detected');
     android = false;
     return false;
   }
 });
 
 function isDroid() {
-  console.log("android?", android);
+  console.log('android?', android);
   if (android == undefined) {
     return false;
   }

privacy.js

@@ -1,10 +1,10 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
+var titlepref = chrome.i18n.getMessage('titlePreface');
 
 function onSet(result) {
   if (result) {
-    console.log("->: Value was updated");
+    console.log('->: Value was updated');
   } else {
-    console.log("-X: Value was not updated");
+    console.log('-X: Value was not updated');
   }
 }
 
@@ -14,7 +14,7 @@ function disableHyperlinkAuditing() {
   var setting = browser.privacy.websites.hyperlinkAuditingEnabled.set({
     value: false
   });
-  console.log("Disabling hyperlink auditing/val=", {
+  console.log('Disabling hyperlink auditing/val=', {
     value: false
   });
   setting.then(onSet);
@@ -25,7 +25,7 @@ function enableFirstPartyIsolation() {
   var setting = browser.privacy.websites.firstPartyIsolate.set({
     value: true
   });
-  console.log("Enabling first party isolation/val=", {
+  console.log('Enabling first party isolation/val=', {
     value: true
   });
   setting.then(onSet);
@@ -39,13 +39,13 @@ function disableEvilCookies() {
   getting.then(got => {
     var setting = browser.privacy.websites.cookieConfig.set({
       value: {
-        behavior: "reject_third_party",
+        behavior: 'reject_third_party',
         nonPersistentCookies: got.value.nonPersistentCookies
       }
     });
-    console.log("Setting cookie behavior/val=", {
+    console.log('Setting cookie behavior/val=', {
       value: {
-        behavior: "reject_third_party",
+        behavior: 'reject_third_party',
         nonPersistentCookies: got.value.nonPersistentCookies
       }
     });
@@ -131,7 +131,7 @@ setAllPrivacy();
 
 function ResetPeerConnection() {
   function reset(snowflake) {
-    var webrtc = false;
+    var webrtc = true;
     console.log("No snowflake plugin found, pre-disabled WebRTC");
     var rtc = browser.privacy.network.peerConnectionEnabled.set({
       value: webrtc
@@ -160,7 +160,7 @@ function EnablePeerConnection() {
 function AssurePeerConnection() {
   function assure(webrtc) {
     browser.privacy.network.peerConnectionEnabled.set({
-      value: webrtc.value
+      value: true
     });
     browser.privacy.network.networkPredictionEnabled.set({
       value: false

proxy.js

@@ -1,18 +1,18 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var webpref = chrome.i18n.getMessage("webPreface");
-var routerpref = chrome.i18n.getMessage("routerPreface");
-var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
+var titlepref = chrome.i18n.getMessage('titlePreface');
+var webpref = chrome.i18n.getMessage('webPreface');
+var routerpref = chrome.i18n.getMessage('routerPreface');
+var routerprefpriv = chrome.i18n.getMessage('routerPrefacePrivate');
 
 browser.privacy.network.peerConnectionEnabled.set({
   value: false
 });
-console.log("Preliminarily disabled WebRTC.");
+console.log('Preliminarily disabled WebRTC.');
 
 chrome.privacy.network.networkPredictionEnabled.set({
   value: false
 });
 chrome.privacy.network.webRTCIPHandlingPolicy.set({
-  value: "proxy_only"
+  value: 'proxy_only'
 });
 
 function shouldProxyRequest(requestInfo) {
@@ -26,7 +26,7 @@ var handleContextProxyRequest = async function(requestDetails) {
         failoverTimeout: 0,
         proxyDns: false
       };
-      if (context == "firefox-default" || context == "firefox-private") {
+      if (context == 'firefox-default' || context == 'firefox-private') {
         proxy = null;
         return proxy;
       }
@@ -46,9 +46,9 @@ var handleContextProxyRequest = async function(requestDetails) {
             return proxy;
           } else if (!routerHost(requestDetails.url)) {
             proxy = {
-              type: "http",
-              host: "localhost",
-              port: "65535"
+              type: 'http',
+              host: 'localhost',
+              port: '65535'
             };
           }
           proxy = {
@@ -64,22 +64,22 @@ var handleContextProxyRequest = async function(requestDetails) {
           if (localHost(requestDetails.url)) {
             if (!routerHost(requestDetails.url)) {
               proxy = {
-                type: "http",
-                host: "localhost",
-                port: "65535"
+                type: 'http',
+                host: 'localhost',
+                port: '65535'
               };
             }
           }
-          console.log("(proxy)", context.name);
-          console.log("Using", proxy.type);
-          console.log("proxy ", proxy.host + ":" + proxy.port);
+          console.log('(proxy)', context.name);
+          console.log('Using', proxy.type);
+          console.log('proxy ', proxy.host + ':' + proxy.port);
           return proxy;
         }
       }
       if (!routerHost(requestDetails.url)) {
         if (localHost(requestDetails.url)) {
           console.log(
-            "(proxy) non-routerconsole localhost url, will not interfere",
+            '(proxy) non-routerconsole localhost url, will not interfere',
             requestDetails.url
           );
           /*proxy = {
@@ -99,12 +99,12 @@ var handleContextProxyRequest = async function(requestDetails) {
     };
     var contextGet = async function(tabInfo) {
       try {
-        console.log("(proxy)Tab info from Function", tabInfo);
+        console.log('(proxy)Tab info from Function', tabInfo);
         context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
         return context;
       } catch (error) {
         console.error(error);
-        return "firefox-default";
+        return 'firefox-default';
       }
     };
     var tabGet = async function(tabId) {
@@ -113,7 +113,7 @@ var handleContextProxyRequest = async function(requestDetails) {
         let tabInfo = await browser.tabs.get(tabId);
         return tabInfo;
       } catch (error) {
-        console.log("(proxy)Tab error", error);
+        console.log('(proxy)Tab error', error);
       }
     };
     if (proxyHost(requestDetails.url)) {
@@ -124,10 +124,10 @@ var handleContextProxyRequest = async function(requestDetails) {
       };
       return proxy;
     }
-    if (requestDetails.originUrl == browser.runtime.getURL("security.html")) {
+    if (requestDetails.originUrl == browser.runtime.getURL('security.html')) {
       console.log(
-        "(proxy) extension security URL",
-        browser.runtime.getURL("security.html")
+        '(proxy) extension security URL',
+        browser.runtime.getURL('security.html')
       );
       proxy = {
         type: getScheme(),
@@ -137,8 +137,8 @@ var handleContextProxyRequest = async function(requestDetails) {
       return proxy;
     }
     if (
-      requestDetails.cookieStoreId == "firefox-default" ||
-      requestDetails.cookieStoreId == "firefox-private"
+      requestDetails.cookieStoreId == 'firefox-default' ||
+      requestDetails.cookieStoreId == 'firefox-private'
     ) {
       return browser.proxy.settings.get({});
     }
@@ -157,7 +157,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);
@@ -171,62 +171,62 @@ var handleContextProxyRequest = async function(requestDetails) {
       return proxy;*/
     }
   } catch (error) {
-    console.log("(proxy)Not using I2P Proxy.", error);
+    console.log('(proxy)Not using I2P Proxy.', error);
   }
-};
+}
 
 function SetupSettings() {
-  console.log("Initialising Settings");
+  console.log('Initialising Settings');
   function onSetupError() {
-    console.log("Settings initialization error");
+    console.log('Settings initialization error');
   }
   //
   function checkSchemeStoredSettings(storedSettings) {
     if (storedSettings.proxy_scheme == undefined)
-      storedSettings.proxy_scheme = "http";
+      storedSettings.proxy_scheme = 'http';
     else proxy_scheme = storedSettings.proxy_scheme;
 
-    console.log("Initialising Proxy Scheme", storedSettings.proxy_scheme);
+    console.log('Initialising Proxy Scheme', storedSettings.proxy_scheme);
     setupProxy();
   }
-  var gettingSchemeStoredSettings = browser.storage.local.get("proxy_scheme");
+  var gettingSchemeStoredSettings = browser.storage.local.get('proxy_scheme');
   gettingSchemeStoredSettings.then(checkSchemeStoredSettings, onSetupError);
 
   //
   function checkHostStoredSettings(storedSettings) {
     if (storedSettings.proxy_host == undefined)
-      storedSettings.proxy_host = "127.0.0.1";
+      storedSettings.proxy_host = '127.0.0.1';
     else proxy_host = storedSettings.proxy_host;
 
-    console.log("Initialising Host", storedSettings.proxy_host);
+    console.log('Initialising Host', storedSettings.proxy_host);
     setupProxy();
   }
-  var gettingHostStoredSettings = browser.storage.local.get("proxy_host");
+  var gettingHostStoredSettings = browser.storage.local.get('proxy_host');
   gettingHostStoredSettings.then(checkHostStoredSettings, onSetupError);
 
   //
   function checkPortStoredSettings(storedSettings) {
     if (storedSettings.proxy_port == undefined)
-      storedSettings.proxy_port = "4444";
+      storedSettings.proxy_port = '4444';
     else proxy_port = storedSettings.proxy_port;
 
-    console.log("Initialising Port", storedSettings.proxy_port);
+    console.log('Initialising Port', storedSettings.proxy_port);
     setupProxy();
   }
-  var gettingPortStoredSettings = browser.storage.local.get("proxy_port");
+  var gettingPortStoredSettings = browser.storage.local.get('proxy_port');
   gettingPortStoredSettings.then(checkPortStoredSettings, onSetupError);
 
   //
   function checkControlHostStoredSettings(storedSettings) {
     if (storedSettings.control_host == undefined)
-      storedSettings.control_host = "127.0.0.1";
+      storedSettings.control_host = '127.0.0.1';
     else control_host = storedSettings.control_host;
 
-    console.log("Initialising Control Host", storedSettings.control_host);
+    console.log('Initialising Control Host', storedSettings.control_host);
     setupProxy();
   }
   var gettingControlHostStoredSettings = browser.storage.local.get(
-    "control_host"
+    'control_host'
   );
   gettingControlHostStoredSettings.then(
     checkControlHostStoredSettings,
@@ -236,14 +236,14 @@ function SetupSettings() {
   //
   function checkControlPortStoredSettings(storedSettings) {
     if (storedSettings.control_port == undefined)
-      storedSettings.control_port = "7657";
+      storedSettings.control_port = '7657';
     else control_port = storedSettings.control_port;
 
-    console.log("Initialising Control Port", storedSettings.control_port);
+    console.log('Initialising Control Port', storedSettings.control_port);
     setupProxy();
   }
   var gettingControlPortStoredSettings = browser.storage.local.get(
-    "control_port"
+    'control_port'
   );
   gettingControlPortStoredSettings.then(
     checkControlPortStoredSettings,
@@ -257,28 +257,28 @@ function SetupSettings() {
     else disable_history = storedSettings.disable_history;
 
     console.log(
-      "Initialising Disabled History",
+      'Initialising Disabled History',
       storedSettings.disable_history
     );
     setupProxy();
   }
   var gettingHistoryStoredSettings = browser.storage.local.get(
-    "disable_history"
+    'disable_history'
   );
   gettingHistoryStoredSettings.then(checkHistoryStoredSettings, onSetupError);
 }
 
 function getScheme() {
-  if (proxy_scheme == "HTTP") return "http";
-  if (proxy_scheme == "SOCKS") return "socks";
-  if (proxy_scheme == "http") return "http";
-  if (proxy_scheme == "socks") return "socks";
-  else return "http";
+  if (proxy_scheme == 'HTTP') return 'http';
+  if (proxy_scheme == 'SOCKS') return 'socks';
+  if (proxy_scheme == 'http') return 'http';
+  if (proxy_scheme == 'socks') return 'socks';
+  else return 'http';
 }
 
 function getHost() {
   if (proxy_host == undefined) {
-    proxy_host = "127.0.0.1";
+    proxy_host = '127.0.0.1';
   }
   return proxy_host;
 }
@@ -286,30 +286,30 @@ function getHost() {
 function getPort() {
   if (proxy_port == undefined) {
     var scheme = getScheme();
-    if (scheme == "socks") proxy_port = "4446";
-    else proxy_port = "4444";
+    if (scheme == 'socks') proxy_port = '4446';
+    else proxy_port = '4444';
   }
   return proxy_port;
 }
 
 function setupProxy() {
-  console.log("Setting up Firefox WebExtension proxy");
+  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");
+  console.log('i2p settings created for WebExtension Proxy');
 }
 
 function update() {
-  console.log("restoring proxy scheme:", proxy_scheme);
-  console.log("restoring proxy host:", proxy_host);
-  console.log("restoring proxy port:", proxy_port);
-  console.log("restoring control host:", control_host);
-  console.log("restoring control port:", control_port);
+  console.log('restoring proxy scheme:', proxy_scheme);
+  console.log('restoring proxy host:', proxy_host);
+  console.log('restoring proxy port:', proxy_port);
+  console.log('restoring control host:', control_host);
+  console.log('restoring control port:', control_port);
 }
 
 function updateFromStorage() {
-  console.log("updating settings from storage");
+  console.log('updating settings from storage');
   chrome.storage.local.get(function() {
     SetupSettings();
     update();
@@ -317,7 +317,7 @@ function updateFromStorage() {
   });
   var gettingInfo = browser.runtime.getPlatformInfo();
   gettingInfo.then(got => {
-    if (got.os != "android") {
+    if (got.os != 'android') {
       browser.windows.getAll().then(wins => wins.forEach(themeWindow));
     }
   });

releases.atom

@@ -4,13 +4,72 @@
   <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-18T02:57:36Z</updated>
+  <updated>2020-03-24T04:22:27Z</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;
+&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;
+&lt;ul&gt;
+&lt;li&gt;Fix incomplete bugfix from 0.69&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>
+    <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>
-    <enclosure url="magnet:?xt=urn:btih:e7bbb4695f63d068522713028987626284aa91d0" type="application/x-bittorrent" />
     <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;
@@ -140,63 +199,4 @@ i2psetproxy.js (0.55-1) UNRELEASED; urgency=low&lt;/p&gt;
     </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.53</id>
-    <updated>2020-01-06T17:17:35Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.53"/>
-    <title>0.53</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;
-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.51-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Numerous code cleanups, compatibility fixes&lt;/li&gt;
-&lt;li&gt;enable-disable history&lt;/li&gt;
-&lt;li&gt;better homepage, better control panel, saner options&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, 23 NOV 2019 22:51:11 -0400&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.51</id>
-    <updated>2020-01-06T17:18:09Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.51"/>
-    <title>0.51</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;
-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.49-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;fix tabs&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, 23 NOV 2019 22:51:11 -0400&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.49</id>
-    <updated>2020-01-06T17:18:38Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.49"/>
-    <title>0.49</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;
-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.49-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;fix tabs&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, 23 NOV 2019 22:51:11 -0400&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>
 </feed>

scrub.js

@@ -1,27 +1,28 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var webpref = chrome.i18n.getMessage("webPreface");
-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 extensionpref = chrome.i18n.getMessage("extensionPreface");
+var titlepref = chrome.i18n.getMessage('titlePreface');
+var webpref = chrome.i18n.getMessage('webPreface');
+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 extensionpref = chrome.i18n.getMessage('extensionPreface');
+var muwirepref = chrome.i18n.getMessage('muwirePreface');
 
 var contextScrub = async function(requestDetails) {
   function onHeaderError() {
-    console.log("Header scrub error");
+    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)";
+      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") {
+            if (header.name.toLowerCase() === 'user-agent') {
               header.value = ua;
-              console.log("(scrub)User-Agent header modified", header.value);
+              console.log('(scrub)User-Agent header modified', header.value);
             }
           }
         }
@@ -31,9 +32,9 @@ var contextScrub = async function(requestDetails) {
       } else if (context.name == routerpref) {
         if (i2pHost(requestDetails.url)) {
           for (var header of requestDetails.requestHeaders) {
-            if (header.name.toLowerCase() === "user-agent") {
+            if (header.name.toLowerCase() === 'user-agent') {
               header.value = ua;
-              console.log("(scrub)User-Agent header modified", header.value);
+              console.log('(scrub)User-Agent header modified', header.value);
             }
           }
         }
@@ -83,9 +84,9 @@ var contextScrub = async function(requestDetails) {
       return req;
     }
   } catch (error) {
-    console.log("(scrub)Not scrubbing non-I2P request.", error);
+    console.log('(scrub)Not scrubbing non-I2P request.', error);
   }
-};
+}
 
 var notMyContextNotMyProblem = async function() {
   var contexts = await browser.contextualIdentities.query({});
@@ -107,8 +108,11 @@ var notMyContextNotMyProblem = async function() {
   var context6 = await browser.contextualIdentities.query({
     name: localpref
   });
+  var context7 = await browser.contextualIdentities.query({
+    name: muwirepref
+  });
   var othercontexts = [];
-  console.log("Contexts:", contexts);
+  console.log('Contexts:', contexts);
   for (context in contexts) {
     if (
       contexts[context].cookieStoreId == context1[0].cookieStoreId ||
@@ -116,12 +120,13 @@ var notMyContextNotMyProblem = async function() {
       contexts[context].cookieStoreId == context3[0].cookieStoreId ||
       contexts[context].cookieStoreId == context4[0].cookieStoreId ||
       contexts[context].cookieStoreId == context5[0].cookieStoreId ||
-      contexts[context].cookieStoreId == context6[0].cookieStoreId
+      contexts[context].cookieStoreId == context6[0].cookieStoreId ||
+      contexts[context].cookieStoreId == context7[0].cookieStoreId
     ) {
       console.log(
-        "Context found",
+        'Context found',
         contexts[context].cookieStoreId,
-        "is my responsibility"
+        'is my responsibility'
       );
     } else {
       //console.log("Context found", contexts[context].cookieStoreId, "is not my responsibility")
@@ -129,11 +134,11 @@ var notMyContextNotMyProblem = async function() {
     }
   }
   return othercontexts;
-};
+}
 
 var contextSetup = function(requestDetails) {
   function onContextError() {
-    console.log("Context launcher error");
+    console.log('Context launcher error');
   }
   //console.log("(isolate)Forcing I2P requests into context");
   try {
@@ -147,14 +152,14 @@ var contextSetup = function(requestDetails) {
             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);
+                  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.pageAction.setPopup({
                   tabId: tabId.id,
-                  popup: "security.html"
+                  popup: 'security.html'
                 });
                 browser.pageAction.show(tabId.id);
               }
@@ -172,7 +177,7 @@ var contextSetup = function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var routerTabFind = async function(tabId) {
@@ -185,9 +190,9 @@ var contextSetup = function(requestDetails) {
             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);
+                  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);
                 }
                 for (index = 0; index < tabs.length; index++) {
@@ -213,7 +218,7 @@ var contextSetup = function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var i2ptunnelTabFind = async function(tabId) {
@@ -226,9 +231,9 @@ var contextSetup = function(requestDetails) {
             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);
+                  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);
                 }
                 for (index = 0; index < tabs.length; index++) {
@@ -254,7 +259,7 @@ var contextSetup = function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var snarkTabFind = async function(tabId) {
@@ -267,9 +272,9 @@ var contextSetup = function(requestDetails) {
             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);
+                  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);
                 }
                 for (index = 0; index < tabs.length; index++) {
@@ -295,7 +300,48 @@ var contextSetup = function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", 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() {
+            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);
+                }
+                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);
+            }
+            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 mailTabFind = async function(tabId) {
@@ -308,9 +354,9 @@ var contextSetup = function(requestDetails) {
             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);
+                  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);
                 }
                 for (index = 0; index < tabs.length; index++) {
@@ -336,7 +382,7 @@ var contextSetup = function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var localTabFind = async function(tabId) {
@@ -349,9 +395,9 @@ var contextSetup = function(requestDetails) {
             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);
+                  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);
                 }
               }
@@ -369,7 +415,7 @@ var contextSetup = function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var normalTabFind = async function(tabId) {
@@ -387,21 +433,21 @@ var contextSetup = function(requestDetails) {
         var nmp = false;
         for (context in othercontexts) {
           if (tabId.cookieStoreId == othercontexts[context].cookieStoreId) {
-            console.log("Not my problem");
+            console.log('Not my problem');
             nmp = true;
           }
         }
         if (
-          tabId.cookieStoreId == "firefox-default" ||
-          tabId.cookieStoreId == "firefox-private" ||
+          tabId.cookieStoreId == 'firefox-default' ||
+          tabId.cookieStoreId == 'firefox-private' ||
           tabId.cookieStoreId == anoncontext[0].cookieStoreId ||
           tabId.cookieStoreId == localcontext[0].cookieStoreId ||
           nmp
         ) {
           console.log(
-            "(ISOLATE)",
+            '(ISOLATE)',
             tabId.cookieStoreId,
-            "not",
+            'not',
             anoncontext[0].cookieStoreId,
             localcontext[0].cookieStoreId
           );
@@ -415,15 +461,15 @@ var contextSetup = function(requestDetails) {
                   tabId.cookieStoreId != tab.cookieStoreId
                 ) {
                   console.log(
-                    "(isolate) Closing isolated tab",
+                    '(isolate) Closing isolated tab',
                     tabId.id,
-                    "with context",
+                    'with context',
                     tabId.cookieStoreId
                   );
                   console.log(
-                    "(isolate) in favor of",
+                    '(isolate) in favor of',
                     tab.id,
-                    "with context",
+                    'with context',
                     tab.cookieStoreId
                   );
                   browser.tabs.remove(tabId.id);
@@ -433,7 +479,7 @@ var contextSetup = function(requestDetails) {
             }
             var created = browser.tabs.create({
               active: true,
-              cookieStoreId: "firefox-default",
+              cookieStoreId: 'firefox-default',
               url: requestDetails.url
             });
             created.then(onCreated, onContextError);
@@ -443,7 +489,7 @@ var contextSetup = function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var tabGet = async function(tabId) {
@@ -452,7 +498,7 @@ var contextSetup = function(requestDetails) {
         let tabInfo = await browser.tabs.get(tabId);
         return tabInfo;
       } catch (error) {
-        console.log("(isolate)Tab error", error);
+        console.log('(isolate)Tab error', error);
       }
     };
     if (requestDetails == undefined) {
@@ -486,16 +532,19 @@ var contextSetup = function(requestDetails) {
       let localhost = localHost(requestDetails.url);
       let routerhost = routerHost(requestDetails.url);
       if (routerhost) {
-        if (routerhost === "i2ptunnelmgr") {
+        if (routerhost === 'i2ptunnelmgr') {
           var tunneltab = tab.then(i2ptunnelTabFind, onContextError);
           return requestDetails;
-        } else if (routerhost === "i2psnark") {
+        } else if (routerhost === 'i2psnark') {
           var snarktab = tab.then(snarkTabFind, onContextError);
           return requestDetails;
-        } else if (routerhost === "webmail") {
+        } else if (routerhost === 'webmail') {
           var mailtab = tab.then(mailTabFind, onContextError);
           return requestDetails;
-        } else if (routerhost === "routerconsole") {
+        } else if (routerhost === 'muwire') {
+          var routertab = tab.then(muwireTabFind, onContextError);
+          return requestDetails;
+        } else if (routerhost === 'routerconsole') {
           var routertab = tab.then(routerTabFind, onContextError);
           return requestDetails;
         }
@@ -510,18 +559,18 @@ var contextSetup = function(requestDetails) {
       }
     }
   } catch (error) {
-    console.log("(isolate)Not an I2P request, blackholing", error);
+    console.log('(isolate)Not an I2P request, blackholing', error);
   }
 };
 
 browser.webRequest.onBeforeRequest.addListener(
   contextSetup,
-  { urls: ["<all_urls>"] },
-  ["blocking"]
+  { urls: ['<all_urls>'] },
+  ['blocking']
 );
 
 browser.webRequest.onBeforeSendHeaders.addListener(
   contextScrub,
-  { urls: ["<all_urls>"] },
-  ["blocking", "requestHeaders"]
+  { urls: ['<all_urls>'] },
+  ['blocking', 'requestHeaders']
 );

torrent/background.js

@@ -1,18 +1,18 @@
-"use strict";
+'use strict';
 
 ////// Session extraction
 
 function setupExtractor() {
   browser.webRequest.onHeadersReceived.removeListener(extractSession);
-  browser.storage.local.get("server").then(({ server }) => {
+  browser.storage.local.get('server').then(({ server }) => {
     if (!server) {
       return;
     }
-    console.log("Session extractor setup for", server.base_url);
+    console.log('Session extractor setup for', server.base_url);
     browser.webRequest.onBeforeSendHeaders.addListener(
       extractSession,
-      { urls: [server.base_url + "*"] },
-      ["requestHeaders"]
+      { urls: [server.base_url + '*'] },
+      ['requestHeaders']
     );
   });
 }

torrent/common.js

@@ -1,28 +1,28 @@
-"use strict";
+'use strict';
 
 ////// RPC
 
 function rpcCall(meth, args) {
   return browser.storage.local.get(function(server) {
     const myHeaders = {
-      "Content-Type": "application/json",
-      "x-transmission-session-id": server.session
+      'Content-Type': 'application/json',
+      'x-transmission-session-id': server.session
     };
     //console.log("(torrent)", server.session)
-    if (server.username !== "" || server.btrpcpass !== "") {
-      myHeaders["Authorization"] =
-        "Basic " +
-        btoa((server.username || "") + ":" + (server.btrpcpass || ""));
+    if (server.username !== '' || server.btrpcpass !== '') {
+      myHeaders['Authorization'] =
+        'Basic ' +
+        btoa((server.username || '') + ':' + (server.btrpcpass || ''));
     }
     //console.log("(torrent) rpc", server.base_url);
-    return fetch(server.base_url + "rpc", {
-      method: "POST",
+    return fetch(server.base_url + 'rpc', {
+      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");
+        const session = response.headers.get('x-transmission-session-id');
         if (session) {
           browser.storage.local.get({}).then(function(storage) {
             storage.session = session;
@@ -50,11 +50,11 @@ function rpcCall(meth, args) {
 function formatSpeed(s) {
   // Firefox shows 4 characters max
   if (s < 1000 * 1000) {
-    return (s / 1000).toFixed() + "K";
+    return (s / 1000).toFixed() + 'K';
   }
   if (s < 1000 * 1000 * 1000) {
-    return (s / 1000 / 1000).toFixed() + "M";
+    return (s / 1000 / 1000).toFixed() + 'M';
   }
   // You probably don't have that download speed…
-  return (s / 1000 / 1000 / 1000).toFixed() + "T";
+  return (s / 1000 / 1000 / 1000).toFixed() + 'T';
 }

torrent/popup.js

@@ -1,22 +1,22 @@
-"use strict";
+'use strict';
 
 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
+    'Content-Type': 'application/json',
+    'x-transmission-session-id': server.session
   };
-  console.log("(torrent) session", server.session);
-  if (server.username !== "" || server.btrpcpass !== "") {
-    myHeaders["Authorization"] =
-      "Basic " + btoa((server.username || "") + ":" + (server.btrpcpass || ""));
+  console.log('(torrent) session', server.session);
+  if (server.username !== '' || server.btrpcpass !== '') {
+    myHeaders['Authorization'] =
+      'Basic ' + btoa((server.username || '') + ':' + (server.btrpcpass || ''));
   }
-  console.log("(torrent) rpcurl", server.base_url + "rpc");
-  return fetch(server.base_url + "rpc", {
-    method: "POST",
+  console.log('(torrent) rpcurl', server.base_url + 'rpc');
+  return fetch(server.base_url + 'rpc', {
+    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) {
@@ -32,13 +32,13 @@ var TrpcCall = async function(meth, args) {
     error.response = response;
     throw error;
   });*/
-};
+}
 
-const torrentsPane = document.getElementById("torrents-pane");
-const configPane = document.getElementById("config-pane");
+const torrentsPane = document.getElementById('torrents-pane');
+const configPane = document.getElementById('config-pane');
 
-for (const opener of document.querySelectorAll(".config-opener")) {
-  opener.addEventListener("click", e => {
+for (const opener of document.querySelectorAll('.config-opener')) {
+  opener.addEventListener('click', e => {
     browser.runtime.openOptionsPage();
   });
 }

window.html

@@ -54,11 +54,11 @@
                 <p id="controlExplain">These controls are used to tailor your I2P Browsing Experience</p>
 
                 <ul>
-                    <li class="application">
+                    <!--<li class="application">
                         <a href="#" id="clear-browser-data">Clear Browsing Data:</a> <span class="applicationDesc" id="clear-desc">Use this to erase your browsing data.</span>
                     </li>
 
-                    <li class="application"><input id="enable-web-rtc" name="enablewebrtc" type="checkbox" value="webrtc"> <label for="enable-web-rtc">Enable WebRTC <strong>with Proxy?</strong></label> <span class="applicationDesc" id="rtcDesc">WebRTC is disabled by default, but can be enabled by checking this box.</span></li>
+                    <li class="application"><input id="enable-web-rtc" name="enablewebrtc" type="checkbox" value="webrtc"> <label for="enable-web-rtc">Enable WebRTC <strong>with Proxy?</strong></label> <span class="applicationDesc" id="rtcDesc">WebRTC is disabled by default, but can be enabled by checking this box.</span></li>-->
 
                     <li class="application">
                         <div class="panel-section-separator">