Merge pull request #93 from eyedeekay/sed

Sed

Makefile

@@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES
 
-MOZ_VERSION=0.64
-VERSION=0.63
+MOZ_VERSION=0.72
+VERSION=0.71
 
 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.61
+LAST_VERSION=0.69
 
 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/*
@@ -176,8 +180,11 @@ moz-submit: moz-version
 	@echo "Using the 'submit' target to instantly sign an extension for Mozilla distribution"
 	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
+	mv manifest.json .manifest.json
+	grep -v update_url .manifest.json > manifest.json
 	web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
 	sleep 5
+	mv .manifest.json manifest.json
 
 rhz-submit: rhz-version
 	@echo "Rhizome releases are disabled while browser is completed."
@@ -320,4 +327,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/"

README.md

@@ -101,6 +101,9 @@ Usage:
    can.
   * ![Visiting i2psnark](i2psnark.png)
   * ![Monitoring torrents](transmissionrpc.png)
+  * [Started] Indicate the level of authenticity provided by TLS. TLS is
+   optional on I2P for now, but some sites offer it anyway. TLS support is
+   experimental and in the works.
   * [barely started] **Isolate** traffic by contextual identity to it's own HTTP
    Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The
    contextual identities. For now, the contextual identities used to manage

_locales/en/messages.json

@@ -16,7 +16,7 @@
     "description": "Description of the extension."
   },
   "extensionVersion": {
-    "message": "0.63",
+    "message": "0.72",
     "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

@@ -13,6 +13,7 @@ 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 = [];
@@ -84,6 +85,15 @@ function onContextsGot(contexts) {
       })
       .then(onCreated, onNotCreated);
   }
+  if (ids.indexOf(localpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: muwirepref,
+        color: "turquoise",
+        icon: "gift"
+      })
+      .then(onCreated, onNotCreated);
+  }
 }
 
 function onContextsError() {

bookmarks.js

@@ -10,14 +10,14 @@ gettingInfo.then(got => {
             if (port == "7644") {
               let createRhizomeBookmark = browser.bookmarks.create({
                 url: "about:I2p",
-                title: "I2P Home Page",
+                title: "Home Page",
                 parentId: bookmarkToolbar[0].id
               });
               createRhizomeBookmark.then(onCreated);
             } else {
               let createBookmark = browser.bookmarks.create({
                 url: browser.runtime.getURL("home.html"),
-                title: "I2P Home Page",
+                title: "Home Page",
                 parentId: bookmarkToolbar[0].id
               });
               createBookmark.then(onCreated);
@@ -59,6 +59,33 @@ gettingInfo.then(got => {
           gettingProxyInfo.then(gotProxyInfo);
         }
       }
+      function bookConsole(bookmarkItems) {
+        if (!bookmarkItems.length) {
+          function gotProxyInfo(info) {
+            let port = info.value.http.split(":")[1];
+            if (port == "7644") {
+              let createBookmark = browser.bookmarks.create({
+                url: "http://localhost:7657/home",
+                title: "I2P Console",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            } else {
+              let createRhizomeBookmark = browser.bookmarks.create({
+                url: "http://" + control_host + ":" + control_port + "/home",
+                title: "I2P Console",
+                parentId: bookmarkToolbar[0].id
+              });
+              createRhizomeBookmark.then(onCreated);
+            }
+          }
+          console.log(
+            "(bookmarks) checking if we're running in an I2P Browser"
+          );
+          let gettingProxyInfo = browser.proxy.settings.get({});
+          gettingProxyInfo.then(gotProxyInfo);
+        }
+      }
       function bookMail(bookmarkItems) {
         if (!bookmarkItems.length) {
           function gotProxyInfo(info) {
@@ -143,6 +170,11 @@ gettingInfo.then(got => {
         title: "Web Mail"
       });
       b3.then(bookMail, onRejected);
+
+      var b4 = browser.bookmarks.search({
+        title: "I2P Console"
+      });
+      b4.then(bookConsole, onRejected);
     }
 
     var bt = browser.bookmarks.search({

debian/changelog

@@ -1,21 +1,48 @@
+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
+
+i2psetproxy.js (0.65-1) UNRELEASED; urgency=low
+
+  * Initial prototype of certs implementation
+  * 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
+
 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
 
@@ -101,4 +128,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,6 +1,7 @@
 function routerHost(url) {
   let hostname = "";
   let path = "";
+  console.log("(urlcheck)", url);
   function pathcheck(str) {
     if (str != undefined) {
       let final = str.split("/")[0];
@@ -13,6 +14,9 @@ function routerHost(url) {
       } else if (final === "webmail" || final === "susimail") {
         console.log("(urlcheck) application path", final);
         return "webmail";
+      } else if (final.startsWith("MuWire") && !final.includes("png")) {
+        console.log("(urlcheck) application path", final);
+        return "muwire";
       } else if (
         final === "home" ||
         final === "console" ||

host.js

@@ -8,7 +8,9 @@ function proxyHost(url) {
   if (hostname == "proxy.i2p") {
     return true;
   }
-  if (hostname == "7egf7fmpbewl35qvxxyff7k62ijgfm47nfmbyy3fa7epsaflyxiq.b32.i2p") {
+  if (
+    hostname == "c6lilt4cr5x7jifxridpkesf2zgfwqfchtp6laihr4pdqomq25iq.b32.i2p"
+  ) {
     return true;
   }
   return false;
@@ -60,6 +62,7 @@ function i2pHost(url) {
 function routerHost(url) {
   let hostname = "";
   let path = "";
+  console.log("(urlcheck)", url);
   function pathcheck(str) {
     if (str != undefined) {
       let final = str.split("/")[0];
@@ -76,10 +79,14 @@ function routerHost(url) {
       } else if (final === "webmail" || final === "susimail") {
         console.log("(urlcheck) application path", final);
         return "webmail";
+      } else if (final.startsWith("MuWire") && !final.includes("png")) {
+        console.log("(urlcheck) application path", final);
+        return "muwire";
       } else if (
         final === "home" ||
         final === "console" ||
         final === "dns" ||
+        final === "sitemap" ||
         final.startsWith("config")
       ) {
         console.log("(urlcheck) application path", final);
@@ -100,16 +107,19 @@ function routerHost(url) {
     path = url.replace(hostname + "/", "");
   }
   if (hostname === control_host + ":" + control_port) {
-    //console.log("(hostcheck) router console found on configured ports");
     return pathcheck(path);
   }
   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) {
     return pathcheck(path);
   }
-
+  if (hostname === "localhost" + ":" + 7070) {
+    return pathcheck(path);
+  }
+  if (hostname === "127.0.0.1" + ":" + 7070) {
+    return pathcheck(path);
+  }
   return false;
 }

index.html

@@ -44,7 +44,7 @@ Clearnet Bittorrent network(With a web seed to support it in case one goes
 dead).</p>
 
 <ul>
-<li><a href="magnet:?xt=urn:btih:6a5d3f3f7fb0aee95a8f864c39eccaaa4b2b7d4b">Magnet Link</a></li>
+<li><a href="magnet:?xt=urn:btih:53abb58770d53c4bc5aeed19c72574fb2acf27a3">Magnet Link</a></li>
 <li><a href="./i2ppb@eyedeekay.github.io.xpi.torrent">Get the .torrent file</a></li>
 </ul>
 
@@ -111,6 +111,9 @@ 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

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.63",
-  "version_name": "0.63",
+  "version": "0.72",
+  "version_name": "0.72",
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
   "icons": {

options/options.js

@@ -319,36 +319,24 @@ function onError(e) {
 }
 
 function storeSettings() {
-  let proxy_scheme = getScheme();
-  let proxy_host = getHost();
-  let proxy_port = getPort();
-  let control_host = getControlHost();
-  let control_port = getControlPort();
-  let rpc_host = getRPCHost();
-  let rpc_port = getRPCPort();
-  let rpc_path = getRPCPath();
-  let rpc_pass = getRPCPass();
-  let bt_rpc_host = getBTRPCHost();
-  let bt_rpc_port = getBTRPCPort();
-  let bt_rpc_path = getBTRPCPath();
-  let bt_rpc_pass = getBTRPCPass();
-  let base_url =
+  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;
-  chrome.storage.local.set({
-    proxy_scheme,
-    proxy_host,
-    proxy_port,
-    control_host,
-    control_port,
-    rpc_host,
-    rpc_port,
-    rpc_path,
-    rpc_pass,
-    bt_rpc_host,
-    bt_rpc_port,
-    bt_rpc_path,
-    bt_rpc_pass
-  });
+  console.log("storing", storableSettings);
+  chrome.storage.local.set(storableSettings);
 }
 
 function updateUI(restoredSettings) {

proxy.js

@@ -12,7 +12,7 @@ chrome.privacy.network.networkPredictionEnabled.set({
   value: false
 });
 chrome.privacy.network.webRTCIPHandlingPolicy.set({
-  value: "disable_non_proxied_udp"
+  value: "proxy_only"
 });
 
 function shouldProxyRequest(requestInfo) {

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-02T22:59:16Z</updated>
+  <updated>2020-03-18T04:30:01Z</updated>
+  <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>
+    <enclosure url="magnet:?xt=urn:btih:53abb58770d53c4bc5aeed19c72574fb2acf27a3" type="application/x-bittorrent" />
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.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>
+    <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;
+&lt;ul&gt;
+&lt;li&gt;Initial prototype of certs implementation&lt;/li&gt;
+&lt;li&gt;Use &quot;pinned apptabs&quot; to minimize the number of tabs occupied by an app&lt;/li&gt;
+&lt;li&gt;Get ready for self-hosted updates but with bittorrent because it&#39;s cooler&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Tue, 17 MAR 2020 22:58:55 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.63-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
   <entry>
     <id>tag:github.com,2008:Repository/169256012/0.63</id>
     <updated>2020-03-02T23:01:58Z</updated>
     <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.63"/>
     <title>0.63</title>
-    <enclosure url="magnet:?xt=urn:btih:6a5d3f3f7fb0aee95a8f864c39eccaaa4b2b7d4b" type="application/x-bittorrent" />
     <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
@@ -141,63 +200,4 @@ i2psetproxy.js (0.51-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.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>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.47</id>
-    <updated>2020-01-06T17:19:14Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.47"/>
-    <title>0.47</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.47-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Improve android compatibility&lt;/li&gt;
-&lt;li&gt;Improve code organization&lt;/li&gt;
-&lt;li&gt;Partial protocol handlers implementation&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 18:53: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

@@ -6,6 +6,7 @@ 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() {
@@ -107,6 +108,9 @@ 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);
   for (context in contexts) {
@@ -116,7 +120,8 @@ 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",
@@ -298,6 +303,47 @@ var contextSetup = function(requestDetails) {
         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) {
       try {
         var context = await browser.contextualIdentities.query({
@@ -495,6 +541,9 @@ var contextSetup = function(requestDetails) {
         } else if (routerhost === "webmail") {
           var mailtab = tab.then(mailTabFind, onContextError);
           return requestDetails;
+        } else if (routerhost === "muwire") {
+          var routertab = tab.then(muwireTabFind, onContextError);
+          return requestDetails;
         } else if (routerhost === "routerconsole") {
           var routertab = tab.then(routerTabFind, onContextError);
           return requestDetails;