add hidden manifest to .gitignore

check in point release change
Re-enable closure compiler
2021-08-30 22:35:51 -04:00 · 2021-08-30 22:35:13 -04:00 · 2021-08-08 11:36:35 -04:00 · 2021-07-24 20:43:55 -04:00 · 2021-07-24 19:11:35 -04:00
21 changed files with 201 additions and 235 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ README.md.asc
 node_modules/
 web-ext-artifacts
 releases.diff
-.releases.atom
+.releases.atom
+.manifest.json
--- a/21
+++ b/21
@@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES

-MOZ_VERSION=0.114
-VERSION=0.113
+MOZ_VERSION=0.112.1
+VERSION=0.111.1

 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.111.1
+LAST_VERSION=0.112

 YELLOW=F7E59A
 ORANGE=FFC56D
@@ -367,14 +367,7 @@ lht-test:
 		-u http://localhost:7657/MuWire/ \
 		-u http://idk.i2p

-android:
-	$(HOME)/web-ext/bin/web-ext run --target firefox-android \
-		--android-device NE1GAM7780819544 \
-		--browser-console
-
-run:
-	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging
-
-chromium:
-	$(HOME)/web-ext/bin/web-ext run --target chromium
-	
+compile:
+	closure-compiler --js background.js --js cert.js --js content.js --js handler.js --js host.js --js location.js --js privacy.js --js script.js \
+		--js  torrent.js --js bookmarks.js --js  config.js --js  context.js --js  home.js --js info.js --js platform.js --js proxy.js --js  scrub.js \
+		--js_output_file compile.js
--- a/background.js
+++ b/background.js
@@ -1,23 +1,23 @@
-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 ircpref = chrome.i18n.getMessage('ircPreface');
-var ircprefpriv = chrome.i18n.getMessage('ircPrefacePrivate');
-var extensionpref = chrome.i18n.getMessage('extensionPreface');
-var muwirepref = chrome.i18n.getMessage('muwirePreface');
-var muwireprefpriv = chrome.i18n.getMessage('muwirePrefacePrivate');
-var botepref = chrome.i18n.getMessage('botePreface');
-var blogpref = chrome.i18n.getMessage('blogPreface');
-var blogprefpriv = chrome.i18n.getMessage('blogPrefacePrivate');
+var titlepref = browser.i18n.getMessage('titlePreface');
+var titleprefpriv = browser.i18n.getMessage('titlePrefacePrivate');
+var webpref = browser.i18n.getMessage('webPreface');
+var webprefpriv = browser.i18n.getMessage('webPrefacePrivate');
+var routerpref = browser.i18n.getMessage('routerPreface');
+var routerprefpriv = browser.i18n.getMessage('routerPrefacePrivate');
+var mailpref = browser.i18n.getMessage('mailPreface');
+var mailprefpriv = browser.i18n.getMessage('mailPrefacePrivate');
+var torrentpref = browser.i18n.getMessage('torrentPreface');
+var torrentprefpriv = browser.i18n.getMessage('torrentPrefacePrivate');
+var tunnelpref = browser.i18n.getMessage('i2ptunnelPreface');
+var tunnelprefpriv = browser.i18n.getMessage('i2ptunnelPrefacePrivate');
+var ircpref = browser.i18n.getMessage('ircPreface');
+var ircprefpriv = browser.i18n.getMessage('ircPrefacePrivate');
+var extensionpref = browser.i18n.getMessage('extensionPreface');
+var muwirepref = browser.i18n.getMessage('muwirePreface');
+var muwireprefpriv = browser.i18n.getMessage('muwirePrefacePrivate');
+var botepref = browser.i18n.getMessage('botePreface');
+var blogpref = browser.i18n.getMessage('blogPreface');
+var blogprefpriv = browser.i18n.getMessage('blogPrefacePrivate');

 function onError(err) {
  console.log('(background)', err);
@@ -41,7 +41,7 @@ function onContextsGot(contexts) {
      .create({
        name: titlepref,
        color: 'orange',
-        icon: 'fingerprint'
+        icon: 'fingerprint',
      })
      .then(onCreated, onNotCreated);
  }
@@ -50,7 +50,7 @@ function onContextsGot(contexts) {
      .create({
        name: blogpref,
        color: 'pink',
-        icon: 'pet'
+        icon: 'pet',
      })
      .then(onCreated, onNotCreated);
  }
@@ -59,7 +59,7 @@ function onContextsGot(contexts) {
      .create({
        name: webpref,
        color: 'red',
-        icon: 'circle'
+        icon: 'circle',
      })
      .then(onCreated, onNotCreated);
  }
@@ -68,7 +68,7 @@ function onContextsGot(contexts) {
      .create({
        name: routerpref,
        color: 'blue',
-        icon: 'briefcase'
+        icon: 'briefcase',
      })
      .then(onCreated, onNotCreated);
  }
@@ -77,7 +77,7 @@ function onContextsGot(contexts) {
      .create({
        name: tunnelpref,
        color: 'green',
-        icon: 'tree'
+        icon: 'tree',
      })
      .then(onCreated, onNotCreated);
  }
@@ -86,7 +86,7 @@ function onContextsGot(contexts) {
      .create({
        name: mailpref,
        color: 'yellow',
-        icon: 'briefcase'
+        icon: 'briefcase',
      })
      .then(onCreated, onNotCreated);
  }
@@ -95,7 +95,7 @@ function onContextsGot(contexts) {
      .create({
        name: torrentpref,
        color: 'purple',
-        icon: 'chill'
+        icon: 'chill',
      })
      .then(onCreated, onNotCreated);
  }
@@ -104,7 +104,7 @@ function onContextsGot(contexts) {
      .create({
        name: ircpref,
        color: 'red',
-        icon: 'vacation'
+        icon: 'vacation',
      })
      .then(onCreated, onNotCreated);
  }
@@ -113,7 +113,7 @@ function onContextsGot(contexts) {
      .create({
        name: muwirepref,
        color: 'turquoise',
-        icon: 'gift'
+        icon: 'gift',
      })
      .then(onCreated, onNotCreated);
  }
@@ -122,7 +122,7 @@ function onContextsGot(contexts) {
      .create({
        name: botepref,
        color: 'blue',
-        icon: 'fence'
+        icon: 'fence',
      })
      .then(onCreated, onNotCreated);
  }
@@ -189,15 +189,15 @@ function isEmpty(obj) {
 let btheme = {
  colors: {
    frame: '#363A68',
-    toolbar: '#363A68'
-  }
+    toolbar: '#363A68',
+  },
 };

 let dtheme = {
  colors: {
    frame: '#4456B7',
-    toolbar: '#4456B7'
-  }
+    toolbar: '#4456B7',
+  },
 };

 function themeWindow(window) {
@@ -276,7 +276,7 @@ function themeWindow(window) {

  var querying = browser.tabs.query({
    currentWindow: true,
-    active: true
+    active: true,
  });
  querying.then(logTabs, onThemeError);
 }
@@ -289,11 +289,11 @@ function setTitle(window) {
  function setTitle(title, privtitle) {
    if (window.incognito) {
      browser.windows.update(window.id, {
-        titlePreface: privtitle + ': '
+        titlePreface: privtitle + ': ',
      });
    } else {
      browser.windows.update(window.id, {
-        titlePreface: title + ': '
+        titlePreface: title + ': ',
      });
    }
  }
@@ -338,18 +338,18 @@ function setTitle(window) {
        .then(onContextGotTitle, onContextError);
    } else if (window.incognito) {
      browser.windows.update(window.id, {
-        titlePreface: ''
+        titlePreface: '',
      });
    } else {
      browser.windows.update(window.id, {
-        titlePreface: ''
+        titlePreface: '',
      });
    }
  }

  var querying = browser.tabs.query({
    currentWindow: true,
-    active: true
+    active: true,
  });
  querying.then(logTabs, onContextError);
 }
@@ -362,13 +362,13 @@ gettingListenerInfo.then((got) => {
  if (got.os != 'android') {
    browser.tabs.onCreated.addListener(() => {
      var getting = browser.windows.getCurrent({
-        populate: true
+        populate: true,
      });
      getting.then(setTitle, onPlatformError);
    });
    browser.tabs.onActivated.addListener(() => {
      var getting = browser.windows.getCurrent({
-        populate: true
+        populate: true,
      });
      getting.then(setTitle, onPlatformError);
    });
@@ -446,8 +446,7 @@ function onOpenedWindowCheck() {
  function checkTabs(ctx) {
    for (let context in ctx) {
      function conditionallyDelete(tabs) {
-        if (tabs.length == 0 && context != 0) {
-          console.log(context)
+        if (tabs.length == 0) {
          browser.contextualIdentities.remove(context.cookieStoreId);
        }
      }
@@ -461,9 +460,5 @@ function onOpenedWindowCheck() {
 onOpenedWindowCheck();

 browser.tabs.onRemoved.addListener(onClosedWindowCheck);
-
-if (browser.windows != undefined){
-  console.log("windows unavailable on android", browser.runtime.PlatformOs)
-  browser.windows.onRemoved.addListener(onClosedWindowCheck);
-  browser.windows.onCreated.addListener(onOpenedWindowCheck);
-}
+browser.windows.onRemoved.addListener(onClosedWindowCheck);
+browser.windows.onCreated.addListener(onOpenedWindowCheck);
--- a/bookmarks.js
+++ b/bookmarks.js
@@ -13,14 +13,14 @@ function bookmarksSetup() {
                let createRhizomeBookmark = browser.bookmarks.create({
                  url: 'about:I2p',
                  title: 'I2P Extension Home Page',
-                  parentId: bookmarkToolbar[0].id
+                  parentId: bookmarkToolbar[0].id,
                });
                createRhizomeBookmark.then(onCreated);
              } else {
                let createBookmark = browser.bookmarks.create({
                  url: browser.runtime.getURL('home.html'),
                  title: 'I2P Extension Home Page',
-                  parentId: bookmarkToolbar[0].id
+                  parentId: bookmarkToolbar[0].id,
                });
                createBookmark.then(onCreated);
              }
@@ -41,7 +41,7 @@ function bookmarksSetup() {
                let createBookmark = browser.bookmarks.create({
                  url: 'http://localhost:7657/i2psnark',
                  title: 'Bittorrent',
-                  parentId: bookmarkToolbar[0].id
+                  parentId: bookmarkToolbar[0].id,
                });
                createBookmark.then(onCreated);
              } else {
@@ -49,7 +49,7 @@ function bookmarksSetup() {
                  url:
                    'http://' + control_host + ':' + control_port + '/i2psnark',
                  title: 'Bittorrent',
-                  parentId: bookmarkToolbar[0].id
+                  parentId: bookmarkToolbar[0].id,
                });
                createRhizomeBookmark.then(onCreated);
              }
@@ -69,14 +69,14 @@ function bookmarksSetup() {
                let createBookmark = browser.bookmarks.create({
                  url: 'http://localhost:7657/home',
                  title: 'I2P Console',
-                  parentId: bookmarkToolbar[0].id
+                  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
+                  parentId: bookmarkToolbar[0].id,
                });
                createRhizomeBookmark.then(onCreated);
              }
@@ -96,7 +96,7 @@ function bookmarksSetup() {
                let createBookmark = browser.bookmarks.create({
                  url: 'http://localhost:7657/webmail',
                  title: 'Web Mail',
-                  parentId: bookmarkToolbar[0].id
+                  parentId: bookmarkToolbar[0].id,
                });
                createBookmark.then(onCreated);
              } else {
@@ -104,7 +104,7 @@ function bookmarksSetup() {
                  url:
                    'http://' + control_host + ':' + control_port + '/webmail',
                  title: 'Web Mail',
-                  parentId: bookmarkToolbar[0].id
+                  parentId: bookmarkToolbar[0].id,
                });
                createRhizomeBookmark.then(onCreated);
              }
@@ -125,7 +125,7 @@ function bookmarksSetup() {
                var createBookmark = browser.bookmarks.create({
                  url: 'http://localhost:7657/i2ptunnel',
                  title: 'Hidden Services Manager',
-                  parentId: bookmarkToolbar[0].id
+                  parentId: bookmarkToolbar[0].id,
                });
                createBookmark.then(onCreated);
              } else {
@@ -137,7 +137,7 @@ function bookmarksSetup() {
                    control_port +
                    '/i2ptunnel',
                  title: 'Hidden Services Manager',
-                  parentId: bookmarkToolbar[0].id
+                  parentId: bookmarkToolbar[0].id,
                });
                createRhizomeBookmark.then(onCreated);
              }
@@ -159,39 +159,39 @@ function bookmarksSetup() {
        }

        var b0 = browser.bookmarks.search({
-          title: 'I2P Extension 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);
        defaultSettings['bookmarks_state'] = true;
      }

      var bt = browser.bookmarks.search({
-        query: 'Toolbar'
+        query: 'Toolbar',
      });

      function toolDir(bookmarkToolbar) {
        let defaultSettings = {};
-        chrome.storage.local.set(defaultSettings);
+        browser.storage.local.set(defaultSettings);
        console.log('(bookmarks) created');
        var ibbt = browser.bookmarks.search('I2P Toolbar');
        function setupDir(ibbt) {
@@ -202,7 +202,7 @@ function bookmarksSetup() {
          if (ibbt[0] == null) {
            let createBookmark = browser.bookmarks.create({
              title: 'I2P Toolbar',
-              parentId: bookmarkToolbar[0].id
+              parentId: bookmarkToolbar[0].id,
            });
            createBookmark.then(onToolbarCreated);
          }
@@ -235,10 +235,8 @@ function conditionalBookmarksSetup(obj) {
 }

 if (browser != null) {
-  if (browser.windows != undefined) {
-    let gettingStorage = browser.storage.local.get('bookmarks_state');
-    gettingStorage.then(conditionalBookmarksSetup, bookmarksSetup);
-  }
+  let gettingStorage = browser.storage.local.get('bookmarks_state');
+  gettingStorage.then(conditionalBookmarksSetup, bookmarksSetup);
 }

 const bookmarksButton = document.getElementById('bookmarksButton');
--- a/cert.js
+++ b/cert.js
@@ -9,7 +9,7 @@ function blankContent(id) {

 function contentUpdateById(id, message) {
  let infoTitle = document.getElementById(id);
-  let messageContent = chrome.i18n.getMessage(message);
+  let messageContent = browser.i18n.getMessage(message);
  if (infoTitle === null) {
    console.log('content error', id, messageContent);
    return;
--- a/content.js
+++ b/content.js
@@ -1,6 +1,6 @@
 function contentUpdateById(id, message) {
  let infoTitle = document.getElementById(id);
-  let messageContent = chrome.i18n.getMessage(message);
+  let messageContent = browser.i18n.getMessage(message);
  if (infoTitle === null) {
    console.log('content error', id, messageContent);
    return;
--- a/context.js
+++ b/context.js
@@ -1,5 +1,5 @@
 //var windowIds = []
-var titlepref = chrome.i18n.getMessage('titlePreface');
+var titlepref = browser.i18n.getMessage('titlePreface');

 function onError(error) {
  console.log(`Error : ${error}`);
@@ -11,19 +11,19 @@ function eventHandler(event) {
    browser.tabs.create({
      windowId: windowInfo.id,
      url: 'about:blank',
-      cookieStoreId: event.target.dataset.identity
+      cookieStoreId: event.target.dataset.identity,
    });
  }
  if (event.target.dataset.action == 'create') {
    var creating = browser.tabs.create({
-      cookieStoreId: event.target.dataset.identity
+      cookieStoreId: event.target.dataset.identity,
    });
    creating.then(onCreated, onError);
  }
  if (event.target.dataset.action == 'close-all') {
    browser.tabs
      .query({
-        cookieStoreId: event.target.dataset.identity
+        cookieStoreId: event.target.dataset.identity,
      })
      .then((tabs) => {
        browser.tabs.remove(tabs.map((rem) => rem.id));
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-i2psetproxy.js (0.113-1) UNRELEASED; urgency=low
-
-  * Fix checks on BRB, railroad containers
-
- -- idk <hankhill19580@gmail.com> Sun, 26 Sep 2021 00:37:22 -0400
-
 i2psetproxy.js (0.111-1) UNRELEASED; urgency=low

  * simplify background theme issue fix
--- a/host.js
+++ b/host.js
@@ -24,14 +24,12 @@ function localHost(url) {
    hostname = url.split('/')[0];
  }
  hostname = hostname.split(':')[0];
-  console.log('(urlcheck) hostname localhost', hostname);
-  console.log('(urlcheck) url localhost', url);
+  console.log('(isolate) hostname localhost', hostname);
+  console.log('(isolate) url localhost', url);
  if (hostname === '127.0.0.1') {
-    if (url.indexOf('\:8084') != -1) return 'blog';
-    if (url.indexOf('\:7669') != -1) return 'irc';
+    if (url.indexOf('7669') != -1) return 'irc';
  } else if (hostname === 'localhost') {
-    if (url.indexOf('\:8084') != -1) return 'blog';
-    if (url.indexOf('\:7669') != -1) return 'irc';
+    if (url.indexOf('8084') != -1) return 'blog';
  }

  return false;
--- a/i2pcontrol/i2pcontrol.js
+++ b/i2pcontrol/i2pcontrol.js
@@ -1,5 +1,3 @@
-
-if (browser.windows != undefined) {
 var hello = 'hello i2pcontrol';

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

 var done = Echo(hello);
-done.then(Done).catch (Done);
+done.then(Done).catch(Done);

 function Done(output) {
  function hide(elements) {
@@ -412,4 +410,3 @@ function Done(output) {
  }
  return output;
 }
-}
--- a/icons/i2plogo.png
+++ b/icons/i2plogo.png
--- a/info.js
+++ b/info.js
@@ -225,11 +225,9 @@ function goHome() {
    }
    console.log("(bookmarks) adding home page bookmark");
  }
-  if (browser.windows != undefined){
-    console.log("(bookmarks) checking if we're running in an I2P Browser");
-    var gettingProxyInfo = browser.proxy.settings.get({});
-    gettingProxyInfo.then(gotProxyInfo);
-  }
+  console.log("(bookmarks) checking if we're running in an I2P Browser");
+  var gettingProxyInfo = browser.proxy.settings.get({});
+  gettingProxyInfo.then(gotProxyInfo);
 }

 function goIndex() {
--- a/location.js
+++ b/location.js
@@ -6,7 +6,7 @@ function gotCurrent(tab) {
  }
  console.log(tab);
  var gettingTitle = browser.pageAction.getTitle({
-    tabId: tab[0].id
+    tabId: tab[0].id,
  });
  gettingTitle.then(gotTitle);
 }
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
  "applications": {
    "gecko": {
      "id": "i2ppb@eyedeekay.github.io",
-      "strict_min_version": "85.0"
+      "strict_min_version": "64.0"
    }
  },
  "permissions": [
@@ -27,7 +27,7 @@
  ],
  "manifest_version": 2,
  "name": "__MSG_extensionName__",
-  "version": "0.113",
+  "version": "0.112.1",
  "description": "__MSG_extensionDescription__",
  "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
  "icons": {
--- a/privacy.js
+++ b/privacy.js
@@ -1,4 +1,4 @@
-var titlepref = chrome.i18n.getMessage('titlePreface');
+var titlepref = browser.i18n.getMessage('titlePreface');

 function onSet(result) {
  if (result) {
@@ -12,10 +12,10 @@ function onSet(result) {
   risky sites in your browser */
 function disableHyperlinkAuditing() {
  var setting = browser.privacy.websites.hyperlinkAuditingEnabled.set({
-    value: false
+    value: false,
  });
  console.log('Disabling hyperlink auditing/val=', {
-    value: false
+    value: false,
  });
  setting.then(onSet);
 }
@@ -24,7 +24,7 @@ function disableHyperlinkAuditing() {
 function enableHyperlinkAuditing() {
  var setting = browser.privacy.websites.hyperlinkAuditingEnabled.clear();
  console.log('Disabling hyperlink auditing/val=', {
-    value: false
+    value: false,
  });
  setting.then(onSet);
 }
@@ -32,10 +32,10 @@ function enableHyperlinkAuditing() {
 // This enables first-party isolation
 function enableFirstPartyIsolation() {
  var setting = browser.privacy.websites.firstPartyIsolate.set({
-    value: true
+    value: true,
  });
  console.log('Enabling first party isolation/val=', {
-    value: true
+    value: true,
  });
  setting.then(onSet);
 }
@@ -44,7 +44,7 @@ function enableFirstPartyIsolation() {
 function disableFirstPartyIsolation() {
  var setting = browser.privacy.websites.firstPartyIsolate.clear();
  console.log('Enabling first party isolation/val=', {
-    value: true
+    value: true,
  });
  setting.then(onSet);
 }
@@ -58,14 +58,14 @@ function disableEvilCookies() {
    var setting = browser.privacy.websites.cookieConfig.set({
      value: {
        behavior: 'reject_third_party',
-        nonPersistentCookies: got.value.nonPersistentCookies
-      }
+        nonPersistentCookies: got.value.nonPersistentCookies,
+      },
    });
    console.log('Setting cookie behavior/val=', {
      value: {
        behavior: 'reject_third_party',
-        nonPersistentCookies: got.value.nonPersistentCookies
-      }
+        nonPersistentCookies: got.value.nonPersistentCookies,
+      },
    });
    setting.then(onSet);
  });
@@ -241,7 +241,7 @@ function AssurePeerConnection() {
    browser.privacy.network.peerConnectionEnabled.set({
      value: true,
    });
-    chrome.privacy.network.webRTCIPHandlingPolicy.set({
+    browser.privacy.network.webRTCIPHandlingPolicy.set({
      value: "disable_non_proxied_udp",
    });
  }
@@ -255,7 +255,7 @@ function UnsetPeerConnection() {
    browser.privacy.network.peerConnectionEnabled.set({
      value: true,
    });
-    chrome.privacy.network.webRTCIPHandlingPolicy.set({
+    browser.privacy.network.webRTCIPHandlingPolicy.set({
      value: "default",
    });
  }
--- a/proxy.js
+++ b/proxy.js
@@ -1,25 +1,25 @@
-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 ircpref = chrome.i18n.getMessage('ircPreface');
-var extensionpref = chrome.i18n.getMessage('extensionPreface');
-var muwirepref = chrome.i18n.getMessage('muwirePreface');
-var botepref = chrome.i18n.getMessage('botePreface');
-var blogpref = chrome.i18n.getMessage('blogPreface');
-var blogprefpriv = chrome.i18n.getMessage('blogPrefacePrivate');
+var titlepref = browser.i18n.getMessage('titlePreface');
+var webpref = browser.i18n.getMessage('webPreface');
+var routerpref = browser.i18n.getMessage('routerPreface');
+var mailpref = browser.i18n.getMessage('mailPreface');
+var torrentpref = browser.i18n.getMessage('torrentPreface');
+var tunnelpref = browser.i18n.getMessage('i2ptunnelPreface');
+var ircpref = browser.i18n.getMessage('ircPreface');
+var extensionpref = browser.i18n.getMessage('extensionPreface');
+var muwirepref = browser.i18n.getMessage('muwirePreface');
+var botepref = browser.i18n.getMessage('botePreface');
+var blogpref = browser.i18n.getMessage('blogPreface');
+var blogprefpriv = browser.i18n.getMessage('blogPrefacePrivate');

 browser.privacy.network.peerConnectionEnabled.set({
-  value: true
+  value: true,
 });

-chrome.privacy.network.networkPredictionEnabled.set({
-  value: false
+browser.privacy.network.networkPredictionEnabled.set({
+  value: false,
 });
-chrome.privacy.network.webRTCIPHandlingPolicy.set({
-  value: 'disable_non_proxied_udp'
+browser.privacy.network.webRTCIPHandlingPolicy.set({
+  value: 'disable_non_proxied_udp',
 });
 console.log('Disabled unproxied UDP.');

@@ -33,7 +33,7 @@ var handleContextProxyRequest = async function(requestDetails) {
      proxy = {
        type: getScheme(),
        host: getHost(),
-        port: getPort()
+        port: getPort(),
      };
      return proxy;
    }
@@ -47,7 +47,7 @@ var handleContextProxyRequest = async function(requestDetails) {
      proxy = {
        type: getScheme(),
        host: getHost(),
-        port: getPort()
+        port: getPort(),
      };
      return proxy;
    }
@@ -71,7 +71,7 @@ var handleContextProxyRequest = async function(requestDetails) {
    proxy = {
      type: getScheme(),
      host: getHost(),
-      port: getPort()
+      port: getPort(),
    };
    let url = new URL(requestDetails.url);
    if (
@@ -93,7 +93,7 @@ var handleContextProxyRequest = async function(requestDetails) {
      proxy = {
        type: getScheme(),
        host: getHost(),
-        port: getPort()
+        port: getPort(),
      };
      return proxy;
    }
@@ -103,7 +103,7 @@ var handleContextProxyRequest = async function(requestDetails) {
      proxy = {
        type: getScheme(),
        host: getHost(),
-        port: getPort()
+        port: getPort(),
      };

      if (context == 'firefox-default' || context == 'firefox-private') {
@@ -157,7 +157,7 @@ var handleContextProxyRequest = async function(requestDetails) {
          proxy = {
            type: getScheme(),
            host: getHost(),
-            port: getPort()
+            port: getPort(),
          };
        } else {
          proxy = null;
@@ -175,7 +175,7 @@ var handleContextProxyRequest = async function(requestDetails) {
        context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
        return context;
      } catch (error) {
-        console.warn(error);
+        console.error(error);
        return 'firefox-default';
      }
    };
@@ -191,7 +191,7 @@ var handleContextProxyRequest = async function(requestDetails) {
      proxy = {
        type: getScheme(),
        host: getHost(),
-        port: getPort()
+        port: getPort(),
      };
      return proxy;
    }
@@ -199,7 +199,7 @@ var handleContextProxyRequest = async function(requestDetails) {
      proxy = {
        type: getScheme(),
        host: getHost(),
-        port: getPort()
+        port: getPort(),
      };
      return proxy;
    }
@@ -207,9 +207,7 @@ var handleContextProxyRequest = async function(requestDetails) {
      requestDetails.cookieStoreId == 'firefox-default' ||
      requestDetails.cookieStoreId == 'firefox-private'
    ) {
-      if (browser.windows != undefined) {
-        return browser.proxy.settings.get({});
-      }
+      return browser.proxy.settings.get({});
    }
    if (requestDetails.tabId > 0) {
      if (requestDetails.url.includes('MuWire')) {
@@ -219,7 +217,7 @@ var handleContextProxyRequest = async function(requestDetails) {
        proxy = {
          type: getScheme(),
          host: getHost(),
-          port: getPort()
+          port: getPort(),
        };
        return proxy;
      } else if (i2pHost(requestDetails.url)) {
@@ -245,9 +243,9 @@ var handleContextProxyRequest = async function(requestDetails) {
      proxy = {
        type: getScheme(),
        host: getHost(),
-        port: getPort()
+        port: getPort(),
      };
-      //console.log('(proxy for rpc url)', rpc);
+      console.log('(proxy for rpc url)', rpc);
      return proxy;
    }
  } catch (error) {
@@ -305,9 +303,8 @@ function SetupSettings() {
    console.log('Initialising Control Host', storedSettings.control_host);
    setupProxy();
  }
-  var gettingControlHostStoredSettings = browser.storage.local.get(
-    'control_host'
-  );
+  var gettingControlHostStoredSettings =
+    browser.storage.local.get('control_host');
  gettingControlHostStoredSettings.then(
    checkControlHostStoredSettings,
    onSetupError
@@ -322,9 +319,8 @@ function SetupSettings() {
    console.log('Initialising Control Port', storedSettings.control_port);
    setupProxy();
  }
-  var gettingControlPortStoredSettings = browser.storage.local.get(
-    'control_port'
-  );
+  var gettingControlPortStoredSettings =
+    browser.storage.local.get('control_port');
  gettingControlPortStoredSettings.then(
    checkControlPortStoredSettings,
    onSetupError
@@ -342,9 +338,8 @@ function SetupSettings() {
    );
    setupProxy();
  }
-  var gettingHistoryStoredSettings = browser.storage.local.get(
-    'disable_history'
-  );
+  var gettingHistoryStoredSettings =
+    browser.storage.local.get('disable_history');
  gettingHistoryStoredSettings.then(checkHistoryStoredSettings, onSetupError);
 }

@@ -384,7 +379,7 @@ function getConsolePort() {
 function setupProxy() {
  console.log('Setting up Firefox WebExtension proxy');
  browser.proxy.onRequest.addListener(handleContextProxyRequest, {
-    urls: ['<all_urls>']
+    urls: ['<all_urls>'],
  });
  console.log('i2p settings created for WebExtension Proxy');
 }
@@ -399,7 +394,7 @@ function update() {

 function updateFromStorage() {
  console.log('updating settings from storage');
-  chrome.storage.local.get(function() {
+  browser.storage.local.get(function() {
    SetupSettings();
    update();
    setupProxy();
@@ -413,11 +408,9 @@ setupProxy();

 var gettingListenerInfo = browser.runtime.getPlatformInfo();
 gettingListenerInfo.then((got) => {
-  if (browser.windows != undefined) {
-    browser.windows.onCreated.addListener(() => {
-      chrome.storage.local.get(function() {
-        setupProxy();
-      });
+  browser.windows.onCreated.addListener(() => {
+    browser.storage.local.get(function() {
+      setupProxy();
    });
-  }
+  });
 });
--- a/scrub.js
+++ b/scrub.js
@@ -1,15 +1,15 @@
-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 ircpref = chrome.i18n.getMessage('ircPreface');
-var extensionpref = chrome.i18n.getMessage('extensionPreface');
-var muwirepref = chrome.i18n.getMessage('muwirePreface');
-var botepref = chrome.i18n.getMessage('botePreface');
-var blogpref = chrome.i18n.getMessage('blogPreface');
-var blogprefpriv = chrome.i18n.getMessage('blogPrefacePrivate');
+var titlepref = browser.i18n.getMessage('titlePreface');
+var webpref = browser.i18n.getMessage('webPreface');
+var routerpref = browser.i18n.getMessage('routerPreface');
+var mailpref = browser.i18n.getMessage('mailPreface');
+var torrentpref = browser.i18n.getMessage('torrentPreface');
+var tunnelpref = browser.i18n.getMessage('i2ptunnelPreface');
+var ircpref = browser.i18n.getMessage('ircPreface');
+var extensionpref = browser.i18n.getMessage('extensionPreface');
+var muwirepref = browser.i18n.getMessage('muwirePreface');
+var botepref = browser.i18n.getMessage('botePreface');
+var blogpref = browser.i18n.getMessage('blogPreface');
+var blogprefpriv = browser.i18n.getMessage('blogPrefacePrivate');

 var contextScrub = async function(requestDetails) {
  function onHeaderError() {
@@ -26,7 +26,7 @@ var contextScrub = async function(requestDetails) {
          }
        }
        return {
-          requestHeaders: requestDetails.requestHeaders
+          requestHeaders: requestDetails.requestHeaders,
        };
      }
    };
@@ -65,31 +65,31 @@ var contextScrub = async function(requestDetails) {
 var notMyContextNotMyProblem = async function() {
  var contexts = await browser.contextualIdentities.query({});
  var context1 = await browser.contextualIdentities.query({
-    name: titlepref
+    name: titlepref,
  });
  var context2 = await browser.contextualIdentities.query({
-    name: routerpref
+    name: routerpref,
  });
  var context3 = await browser.contextualIdentities.query({
-    name: mailpref
+    name: mailpref,
  });
  var context4 = await browser.contextualIdentities.query({
-    name: torrentpref
+    name: torrentpref,
  });
  var context5 = await browser.contextualIdentities.query({
-    name: tunnelpref
+    name: tunnelpref,
  });
  var context6 = await browser.contextualIdentities.query({
-    name: ircpref
+    name: ircpref,
  });
  var context7 = await browser.contextualIdentities.query({
-    name: muwirepref
+    name: muwirepref,
  });
  var context7 = await browser.contextualIdentities.query({
-    name: botepref
+    name: botepref,
  });
  var context8 = await browser.contextualIdentities.query({
-    name: blogpref
+    name: blogpref,
  });
  var othercontexts = [];
  console.log('Contexts:', contexts);
@@ -129,7 +129,7 @@ var contextSetup = function(requestDetails) {
    );
    try {
      var context = await browser.contextualIdentities.query({
-        name: contextidentifier
+        name: contextidentifier,
      });
      if (tabId.cookieStoreId != context[0].cookieStoreId) {
        function Create() {
@@ -148,7 +148,7 @@ var contextSetup = function(requestDetails) {
              }
              browser.pageAction.setPopup({
                tabId: tabId.id,
-                popup: 'security.html'
+                popup: 'security.html',
              });
              browser.pageAction.show(tabId.id);
            }
@@ -158,7 +158,7 @@ var contextSetup = function(requestDetails) {
            active: true,
            cookieStoreId: context[0].cookieStoreId,
            url: requestDetails.url,
-            pinned: pin
+            pinned: pin,
          });
          created.then(onCreated, onContextError);
        }
@@ -175,7 +175,7 @@ var contextSetup = function(requestDetails) {
      console.info('(isolate)Context Discovery browser');
      try {
        var context = await browser.contextualIdentities.query({
-          name: titlepref
+          name: titlepref,
        });
        return forceIntoIsolation(tabId, titlepref, tab, false);
      } catch (error) {
@@ -186,7 +186,7 @@ var contextSetup = function(requestDetails) {
      console.info('(isolate)Context Discovery console');
      try {
        var context = await browser.contextualIdentities.query({
-          name: routerpref
+          name: routerpref,
        });
        return forceIntoIsolation(tabId, routerpref, tab);
      } catch (error) {
@@ -197,7 +197,7 @@ var contextSetup = function(requestDetails) {
      console.info('(isolate)Context Discovery browser');
      try {
        var context = await browser.contextualIdentities.query({
-          name: tunnelpref
+          name: tunnelpref,
        });
        return forceIntoIsolation(tabId, tunnelpref, tab);
      } catch (error) {
@@ -208,11 +208,11 @@ var contextSetup = function(requestDetails) {
      console.info('(isolate)Context Discovery torrents');
      try {
        var context = await browser.contextualIdentities.query({
-          name: torrentpref
+          name: torrentpref,
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
          var exemptContext = await browser.contextualIdentities.query({
-            name: titlepref
+            name: titlepref,
          });
          let tmp = new URL(tabId.url);
          console.log('(isolate)tabid host', tmp.host);
@@ -239,7 +239,7 @@ var contextSetup = function(requestDetails) {
                  }
                }
                var pins = browser.tabs.query({
-                  cookieStoreId: context[0].cookieStoreId
+                  cookieStoreId: context[0].cookieStoreId,
                });
                pins.then(closeOldTab, onError);
              }
@@ -252,7 +252,7 @@ var contextSetup = function(requestDetails) {
                active: true,
                pinned: true,
                cookieStoreId: context[0].cookieStoreId,
-                url: requestDetails.url
+                url: requestDetails.url,
              });
              created.then(onCreated, onContextError);
            }
@@ -269,7 +269,7 @@ var contextSetup = function(requestDetails) {
      console.info('(isolate)Context Discovery muwire');
      try {
        var context = await browser.contextualIdentities.query({
-          name: muwirepref
+          name: muwirepref,
        });
        return forceIntoIsolation(tabId, muwirepref, tab);
      } catch (error) {
@@ -280,7 +280,7 @@ var contextSetup = function(requestDetails) {
      console.info('(isolate)Context Discovery bote');
      try {
        var context = await browser.contextualIdentities.query({
-          name: botepref
+          name: botepref,
        });
        return forceIntoIsolation(tabId, botepref, tab);
      } catch (error) {
@@ -291,7 +291,7 @@ var contextSetup = function(requestDetails) {
      console.info('(isolate)Context Discovery mail');
      try {
        var context = await browser.contextualIdentities.query({
-          name: mailpref
+          name: mailpref,
        });
        return forceIntoIsolation(tabId, mailpref, tab);
      } catch (error) {
@@ -302,7 +302,7 @@ var contextSetup = function(requestDetails) {
      console.info('(isolate)Context Discovery irc');
      try {
        var context = await browser.contextualIdentities.query({
-          name: ircpref
+          name: ircpref,
        });
        return forceIntoIsolation(tabId, ircpref, tab);
      } catch (error) {
@@ -313,7 +313,7 @@ var contextSetup = function(requestDetails) {
      console.info('(isolate)Context Discovery blog');
      try {
        var context = await browser.contextualIdentities.query({
-          name: blogpref
+          name: blogpref,
        });
        return forceIntoIsolation(tabId, blogpref, tab);
      } catch (error) {
@@ -336,7 +336,7 @@ var contextSetup = function(requestDetails) {
      setcookie = browser.cookies.set({
        firstPartyDomain: i2pHostName(requestDetails.url),
        url: requestDetails.url,
-        secure: true
+        secure: true,
      });
      setcookie.then(onContextGotLog, onContextError);
      return requestDetails;
@@ -402,7 +402,7 @@ var contextSetup = function(requestDetails) {
          var setcookie = browser.cookies.set({
            firstPartyDomain: i2pHostName(requestDetails.url),
            url: requestDetails.url,
-            secure: true
+            secure: true,
          });
          setcookie.then(onContextGotLog, onContextError);
          if (!routerhost) {
@@ -446,16 +446,16 @@ var coolheadersSetup = function(e) {
              let url = new URL(header.value);
              browser.pageAction.setPopup({
                tabId: e.tabId,
-                popup: 'location.html'
+                popup: 'location.html',
              });
              browser.pageAction.setIcon({
                path: 'icons/i2plogo.png',
-                tabId: e.tabId
+                tabId: e.tabId,
              });
              let eurl = new URL(tab.url);
              browser.pageAction.setTitle({
                tabId: e.tabId,
-                title: 'http://' + url.host + eurl.pathname
+                title: 'http://' + url.host + eurl.pathname,
              });
              browser.pageAction.show(e.tabId);
            }
@@ -511,22 +511,22 @@ var coolheadersSetup = function(e) {
            }
            browser.pageAction.setPopup({
              tabId: e.tabId,
-              popup: 'torrent.html'
+              popup: 'torrent.html',
            });
            if (tab.url.startsWith('https')) {
              browser.pageAction.setIcon({
                path: 'icons/infotoopiesbt.png',
-                tabId: e.tabId
+                tabId: e.tabId,
              });
            } else {
              browser.pageAction.setIcon({
                path: 'icons/infotoopiebt.png',
-                tabId: e.tabId
+                tabId: e.tabId,
              });
            }
            browser.pageAction.setTitle({
              tabId: e.tabId,
-              title: header.value
+              title: header.value,
            });
            browser.pageAction.show(e.tabId);
            break;
--- a/torrent.js
+++ b/torrent.js
@@ -6,7 +6,7 @@ function gotCurrent(tab) {
  }
  console.log(tab);
  var gettingTitle = browser.pageAction.getTitle({
-    tabId: tab[0].id
+    tabId: tab[0].id,
  });
  gettingTitle.then(gotTitle);
 }
--- a/torrent/background.js
+++ b/torrent/background.js
@@ -126,8 +126,7 @@ function createContextMenu() {
  });
 }

-if (browser.windows != undefined){
-  createContextMenu();
+createContextMenu();

 browser.contextMenus.onClicked.addListener((info, tab) => {
  if (info.menuItemId === "transmitter-add") {
@@ -140,7 +139,7 @@ browser.contextMenus.onClicked.addListener((info, tab) => {
    });
  }
 });
-}
+
 ////// Badge

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

  /*.then(function(response) {
Author	SHA1	Message	Date
idk	7fbfa52109	add hidden manifest to .gitignore	2021-08-30 22:35:51 -04:00
idk	c926d3a5f0	check in point release change	2021-08-30 22:35:13 -04:00
idk	1c318eb384	Re-enable closure compiler	2021-08-08 11:36:35 -04:00
idk	00da7107bd	re-enable the better linter(requires docker)	2021-07-24 20:43:55 -04:00
idk	b402dc10e6	This is never getting Chrome compatibility back. The Chrome, Chromium, Brave, edgium(<--Worst browser ever, and I'm including IE, the second-worst browser ever) is going to have to be a completely different codebase basically forever	2021-07-24 19:11:35 -04:00