Fix a bug I just created

2020-11-11 01:44:09 -05:00
parent 8d4e38ccdf
commit f1fd2f6fb6
10 changed files with 43 additions and 39 deletions
--- a/6
+++ b/6
@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES

-MOZ_VERSION=0.84
-VERSION=0.83
+MOZ_VERSION=0.86
+VERSION=0.85

 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.81
+LAST_VERSION=0.83

 YELLOW=F7E59A
 ORANGE=FFC56D
--- a/bookmarks.js
+++ b/bookmarks.js
@ -2,6 +2,7 @@ var gettingInfo = browser.runtime.getPlatformInfo();
 gettingInfo.then((got) => {
  if (got.os != 'android') {
    function bookmarks(bookmarkToolbar) {
+      console.log('(bookmarks)', bookmarkToolbar);
      console.log('Setting up bookmark toolbar', bookmarkToolbar);
      function bookHome(bookmarkItems) {
        if (!bookmarkItems.length) {
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,10 @@
+i2psetproxy.js (0.83-1) UNRELEASED; urgency=low
+
+  * Fix a bug which was causing i2psnark to fail to isolate.
+
+ -- idk <hankhill19580@gmail.com>  Sat, 10 NOV 2020 1:33:50 -0400
+
+
 i2psetproxy.js (0.83-1) UNRELEASED; urgency=low

  * Add a tab for I2P-Native Dispatch
--- a/handler.js
+++ b/handler.js
@ -1,7 +1,9 @@
 function routerHost(url) {
+  console.log('(urlcheck) HANDLER URL CHECK');
  let hostname = '';
  let path = '';
  function pathcheck(str) {
+    console.log('(urlcheck) HANDLER PATH CHECK', str);
    if (str != undefined) {
      let final = str.split('/')[0];
      if (final === 'i2ptunnelmgr' || final === 'i2ptunnel') {
@ -11,7 +13,8 @@ function routerHost(url) {
        final === 'i2psnark' ||
        final === 'torrents' ||
        final.startsWith('transmission') ||
-        final.startsWith('tracker')
+        final.startsWith('tracker') ||
+        str.includes(':7662')
      ) {
        console.log('(urlcheck) Torrent application path', final);
        return 'i2psnark';
--- a/host.js
+++ b/host.js
@ -60,6 +60,7 @@ function i2pHost(url) {
 }

 function routerHost(url) {
+  console.log('(urlcheck) HOST URL CHECK');
  let hostname = '';
  let path = '';
  function pathcheck(str) {
@ -72,7 +73,8 @@ function routerHost(url) {
        final === 'i2psnark' ||
        final === 'torrents' ||
        final.startsWith('transmission') ||
-        final.startsWith('tracker')
+        final.startsWith('tracker') ||
+        str.includes(':7662')
      ) {
        console.log('(urlcheck) Torrent application path', final);
        return 'i2psnark';
@ -111,15 +113,6 @@ function routerHost(url) {
  if (hostname === control_host + ':' + control_port) {
    return pathcheck(path);
  }
-  if (hostname === control_host + ':' + '7662') {
-    return pathcheck(path);
-  }
-  if (hostname === 'localhost' + ':' + '7662') {
-    return pathcheck(path);
-  }
-  if (hostname === '127.0.0.1' + ':' + '7662') {
-    return pathcheck(path);
-  }
  if (hostname === 'localhost' + ':' + control_port) {
    return pathcheck(path);
  }
--- a/i2ppb@eyedeekay.github.io.xpi.torrent
+++ b/i2ppb@eyedeekay.github.io.xpi.torrent
--- a/index.html
+++ b/index.html
@ -38,7 +38,7 @@

    <ul>
        <li>
-            <a href="magnet:?xt=urn:btih:988d73b46899c1495eeea5ed137605ab277470be">Magnet Link</a>
+            <a href="magnet:?xt=urn:btih:09841bd5ca003fa37818754f4bee988698e3c0c8">Magnet Link</a>
        </li>

        <li>
--- a/manifest.json
+++ b/manifest.json
@ -26,7 +26,7 @@
  ],
  "manifest_version": 2,
  "name": "__MSG_extensionName__",
-  "version": "0.82",
+  "version": "0.83",
  "description": "__MSG_extensionDescription__",
  "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
  "icons": {
--- a/releases.atom
+++ b/releases.atom
@ -4,13 +4,32 @@
  <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-11-08T02:44:07Z</updated>
+  <updated>2020-11-11T03:03:56Z</updated>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.83</id>
+    <updated>2020-11-11T04:00:27Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.83"/>
+    <title>0.83</title>
+    <enclosure url="magnet:?xt=urn:btih:09841bd5ca003fa37818754f4bee988698e3c0c8" 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.83-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Add a tab for I2P-Native Dispatch&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 10 NOV 2020 22:00:01 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.81-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
  <entry>
    <id>tag:github.com,2008:Repository/169256012/0.81</id>
    <updated>2020-11-08T02:44:34Z</updated>
    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.81"/>
    <title>0.81</title>
-    <enclosure url="magnet:?xt=urn:btih:988d73b46899c1495eeea5ed137605ab277470be" type="application/x-bittorrent" />
    <content type="html">&lt;p&gt;Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
 i2psetproxy.js (0.81-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
@ -177,23 +196,4 @@ i2psetproxy.js (0.65-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.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>
-    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.63-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;other containerizers bugfix&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Mon, 02 MAR 2020 17:54:26 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.61-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <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>
--- a/scrub.js
+++ b/scrub.js
@ -284,8 +284,8 @@ var contextSetup = function(requestDetails) {
            name: titlepref,
          });
          let tmp = new URL(tabId.url);
-          console.log('tabid host', tmp.host);
-          if (!requestDetails.url.includes(tmp.host)) {
+          console.log('(isolate)tabid host', tmp.host);
+          if (!requestDetails.url.includes('snark/' + tmp.host)) {
            //          if (tabId.cookieStoreId != exemptContext[0].cookieStoreId){
            function Create() {
              function onCreated(tab) {