Merge pull request #100 from eyedeekay/bookmarks

make the bookmarks part of a subdirectory

.eslintrc.js

@@ -0,0 +1,252 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+    webextensions: true
+  },
+  extends: "eslint:recommended",
+  globals: {
+    Atomics: "readonly",
+    SharedArrayBuffer: "readonly"
+  },
+  parserOptions: {
+    ecmaVersion: 2018
+  },
+  rules: {
+    "accessor-pairs": "error",
+    "array-bracket-newline": "error",
+    "array-bracket-spacing": ["error", "never"],
+    "array-callback-return": "error",
+    "array-element-newline": "error",
+    "arrow-body-style": "error",
+    "arrow-parens": ["error", "as-needed"],
+    "arrow-spacing": [
+      "error",
+      {
+        after: true,
+        before: true
+      }
+    ],
+    "block-scoped-var": "off",
+    "block-spacing": "error",
+    "brace-style": ["error", "1tbs"],
+    "callback-return": "error",
+    camelcase: "off",
+    "capitalized-comments": "off",
+    "class-methods-use-this": "error",
+    "comma-dangle": "error",
+    "comma-spacing": [
+      "error",
+      {
+        after: true,
+        before: false
+      }
+    ],
+    "comma-style": ["error", "last"],
+    complexity: "error",
+    "computed-property-spacing": ["error", "never"],
+    "consistent-return": "off",
+    "consistent-this": "error",
+    curly: "error",
+    "default-case": "error",
+    "default-param-last": "error",
+    "dot-location": "off",
+    "dot-notation": "off",
+    "eol-last": "error",
+    eqeqeq: "off",
+    "func-call-spacing": "error",
+    "func-name-matching": "error",
+    "func-names": "off",
+    "func-style": "off",
+    "function-call-argument-newline": ["error", "consistent"],
+    "function-paren-newline": "off",
+    "generator-star-spacing": "error",
+    "global-require": "error",
+    "guard-for-in": "error",
+    "handle-callback-err": "error",
+    "id-blacklist": "error",
+    "id-length": "error",
+    "id-match": "error",
+    "implicit-arrow-linebreak": ["error", "beside"],
+    indent: "off",
+    "indent-legacy": "off",
+    "init-declarations": "error",
+    "jsx-quotes": "error",
+    "key-spacing": "error",
+    "keyword-spacing": [
+      "error",
+      {
+        after: true,
+        before: true
+      }
+    ],
+    "line-comment-position": "error",
+    "linebreak-style": ["error", "unix"],
+    "lines-around-comment": "off",
+    "lines-around-directive": "error",
+    "lines-between-class-members": "error",
+    "max-classes-per-file": "error",
+    "max-depth": "error",
+    "max-len": "error",
+    "max-lines": "off",
+    "max-lines-per-function": "off",
+    "max-nested-callbacks": "error",
+    "max-params": "error",
+    "max-statements": "off",
+    "max-statements-per-line": "error",
+    "multiline-comment-style": ["error", "bare-block"],
+    "multiline-ternary": "error",
+    "new-cap": "off",
+    "new-parens": "error",
+    "newline-after-var": "off",
+    "newline-before-return": "off",
+    "newline-per-chained-call": "error",
+    "no-alert": "error",
+    "no-array-constructor": "error",
+    "no-await-in-loop": "error",
+    "no-bitwise": "error",
+    "no-buffer-constructor": "error",
+    "no-caller": "error",
+    "no-catch-shadow": "error",
+    "no-confusing-arrow": "error",
+    "no-console": "off",
+    "no-continue": "error",
+    "no-div-regex": "error",
+    "no-duplicate-imports": "error",
+    "no-else-return": "off",
+    "no-empty-function": "error",
+    "no-eq-null": "error",
+    "no-eval": "error",
+    "no-extend-native": "error",
+    "no-extra-bind": "error",
+    "no-extra-label": "error",
+    "no-extra-parens": "error",
+    "no-floating-decimal": "error",
+    "no-implicit-coercion": "error",
+    "no-implicit-globals": "off",
+    "no-implied-eval": "error",
+    "no-import-assign": "error",
+    "no-inline-comments": "error",
+    "no-inner-declarations": "off",
+    "no-invalid-this": "error",
+    "no-iterator": "error",
+    "no-label-var": "error",
+    "no-labels": "error",
+    "no-lone-blocks": "error",
+    "no-lonely-if": "error",
+    "no-loop-func": "error",
+    "no-magic-numbers": "off",
+    "no-mixed-operators": "error",
+    "no-mixed-requires": "error",
+    "no-multi-assign": "error",
+    "no-multi-spaces": "error",
+    "no-multi-str": "error",
+    "no-multiple-empty-lines": "error",
+    "no-native-reassign": "error",
+    "no-negated-condition": "error",
+    "no-negated-in-lhs": "error",
+    "no-nested-ternary": "error",
+    "no-new": "error",
+    "no-new-func": "error",
+    "no-new-object": "error",
+    "no-new-require": "error",
+    "no-new-wrappers": "error",
+    "no-octal-escape": "error",
+    "no-param-reassign": "error",
+    "no-path-concat": "error",
+    "no-plusplus": "error",
+    "no-process-env": "error",
+    "no-process-exit": "error",
+    "no-proto": "error",
+    "no-restricted-globals": "error",
+    "no-restricted-imports": "error",
+    "no-restricted-modules": "error",
+    "no-restricted-properties": "error",
+    "no-restricted-syntax": "error",
+    "no-return-assign": "error",
+    "no-return-await": "error",
+    "no-script-url": "error",
+    "no-self-compare": "error",
+    "no-sequences": "error",
+    "no-shadow": "error",
+    "no-spaced-func": "error",
+    "no-sync": "error",
+    "no-tabs": "error",
+    "no-template-curly-in-string": "error",
+    "no-ternary": "error",
+    "no-throw-literal": "error",
+    "no-trailing-spaces": "error",
+    "no-undef-init": "error",
+    "no-undefined": "off",
+    "no-underscore-dangle": "error",
+    "no-unmodified-loop-condition": "error",
+    "no-unneeded-ternary": "error",
+    "no-unused-expressions": "error",
+    "no-unused-vars": "off",
+    "no-use-before-define": "off",
+    "no-useless-call": "error",
+    "no-useless-computed-key": "error",
+    "no-useless-concat": "error",
+    "no-useless-constructor": "error",
+    "no-useless-rename": "error",
+    "no-useless-return": "error",
+    "no-var": "off",
+    "no-void": "error",
+    "no-warning-comments": "error",
+    "no-whitespace-before-property": "error",
+    "nonblock-statement-body-position": "error",
+    "object-curly-newline": "error",
+    "object-curly-spacing": "off",
+    "object-property-newline": "error",
+    "object-shorthand": "error",
+    "one-var": "off",
+    "one-var-declaration-per-line": "error",
+    "operator-assignment": "error",
+    "operator-linebreak": "error",
+    "padded-blocks": "off",
+    "padding-line-between-statements": "error",
+    "prefer-arrow-callback": "off",
+    "prefer-const": "off",
+    "prefer-destructuring": "off",
+    "prefer-named-capture-group": "error",
+    "prefer-numeric-literals": "error",
+    "prefer-object-spread": "error",
+    "prefer-promise-reject-errors": "error",
+    "prefer-reflect": "error",
+    "prefer-regex-literals": "error",
+    "prefer-rest-params": "error",
+    "prefer-spread": "error",
+    "prefer-template": "off",
+    "quote-props": "off",
+    quotes: ["error", "double"],
+    radix: "error",
+    "require-await": "error",
+    "require-jsdoc": "off",
+    "require-unicode-regexp": "error",
+    "rest-spread-spacing": "error",
+    semi: "error",
+    "semi-spacing": "error",
+    "semi-style": ["error", "last"],
+    "sort-imports": "error",
+    "sort-keys": "off",
+    "sort-vars": "error",
+    "space-before-blocks": "error",
+    "space-before-function-paren": "off",
+    "space-in-parens": ["error", "never"],
+    "space-infix-ops": "error",
+    "space-unary-ops": "error",
+    "spaced-comment": "off",
+    strict: ["error", "never"],
+    "switch-colon-spacing": "error",
+    "symbol-description": "error",
+    "template-curly-spacing": "error",
+    "template-tag-spacing": "error",
+    "unicode-bom": ["error", "never"],
+    "valid-jsdoc": "error",
+    "vars-on-top": "off",
+    "wrap-iife": "error",
+    "wrap-regex": "error",
+    "yield-star-spacing": "error",
+    yoda: ["error", "never"]
+  }
+};

.gitignore

@@ -1,2 +1,5 @@
 README.md.asc
-
+node_modules/
+web-ext-artifacts
+releases.diff
+.releases.atom

COLORS.md

@@ -0,0 +1,94 @@
+WIP Style guidelines
+--------------------
+
+
+Colors currently in use from CSS
+--------------------------------
+
+        home.css:100:  color: #41465f;
+        home.css:10:  color: #3b6bbf;
+        home.css:113:  color: #41465f;
+        home.css:125:  color: #41465f;
+        home.css:139:  color: #3b6bbf;
+        home.css:17:  color: #81888f;
+        home.css:26:  color: #495057;
+        home.css:35:  color: #3b6bbf;
+        home.css:49:  color: #495057;
+        home.css:58:  background-color: #f8f8ff;
+        home.css:66:  color: #495057;
+        search.css:20:  background-color: #ddd
+        search.css:23:  background-color: #2196f3;
+        search.css:24:  color: #fff
+
+        home.css:135:  background: 0 0!important;
+        home.css:161:  background: #dee2e6;
+        home.css:175:  background: #dee2e6;
+        home.css:188:  background: #a48fe1;
+        home.css:200:  background: #dee2e6;
+        home.css:214:  background: #dee2e6;
+        home.css:228:  background: #d9d9d6;
+        home.css:246:  background: #ffc56d;
+        home.css:260:  background: #f7e59a;
+        home.css:50:  background-attachment: fixed;
+        home.css:51:  background-size: 100% 100%;
+        home.css:57:.background {
+        home.css:58:  background-color: #f8f8ff;
+        home.css:79:  background: #f8f8ff;
+        home.css:91:  background: #f8f8ff;
+        search.css:20:  background-color: #ddd
+        search.css:23:  background-color: #2196f3;
+        search.css:5:  background: #dee2e6;
+
+
+Colors currently in use from Javascript
+---------------------------------------
+
+        background.js:172:            colors: {
+        background.js-173-              frame: "#FFC56D",
+        background.js-174-              toolbar: "#FFC56D"
+        background.js-175-            }
+        --
+        background.js:179:            colors: {
+        background.js-180-              frame: "#FFC56D",
+        background.js-181-              toolbar: "#FFC56D"
+        background.js-182-            }
+        --
+        background.js:189:            colors: {
+        background.js-190-              frame: "#A4C8E1",
+        background.js-191-              toolbar: "#A4C8E1"
+        background.js-192-            }
+        --
+        background.js:196:            colors: {
+        background.js-197-              frame: "#A4C8E1",
+        background.js-198-              toolbar: "#A4C8E1"
+        background.js-199-            }
+        --
+        background.js:206:            colors: {
+        background.js-207-              frame: "#D9D9D6",
+        background.js-208-              toolbar: "#D9D9D6"
+        background.js-209-            }
+        --
+        background.js:213:            colors: {
+        background.js-214-              frame: "#D9D9D6",
+        background.js-215-              toolbar: "#D9D9D6"
+        background.js-216-            }
+        --
+        background.js:223:            colors: {
+        background.js-224-              frame: "#F7E59A",
+        background.js-225-              toolbar: "#F7E59A"
+        background.js-226-            }
+        --
+        background.js:230:            colors: {
+        background.js-231-              frame: "#F7E59A",
+        background.js-232-              toolbar: "#F7E59A"
+        background.js-233-            }
+        --
+        background.js:240:            colors: {
+        background.js-241-              frame: "#A48FE1",
+        background.js-242-              toolbar: "#A48FE1"
+        background.js-243-            }
+        --
+        background.js:247:            colors: {
+        background.js-248-              frame: "#A48FE1",
+        background.js-249-              toolbar: "#A48FE1"
+        background.js-250-            }

GOALS.md

@@ -0,0 +1,114 @@
+These are the goals of the I2P Browser, and not really this plugin in-and-of-itself
+===================================================================================
+
+A
+
+User Interface:
+---------------
+
+ * Remove search engines
+ * Replace bookmarks
+ * Donate banner / UI
+ * Patch Firefox to have relative (from the binary) profile directory
+ * Start use the Firefox update process to update browser installations
+ * Mark .i2p cookies as secure
+ * Mark .i2p domains as secure connection
+ * Add tests for .i2p secure marking
+ * Improve the delay-the-user XUL dialogs to be more accurate in regards
+  of where the router is in it’s bootup progress
+ * Disable the WebIDE
+ * Disable GamePad API by default
+ * Disable Web Speech API by default
+ * Disable the Web Audio API by default
+ * UI redesign bootstrapping and configuration screens (delay-the-user dialogs)
+ * Default browser choose wining should de disabled like
+  browser.shell.checkDefaultBrowser, it can be default, but then
+  choosen by the user without any begging ahead
+ * Extend the firefox preferences UI for I2P router configuration thought
+  of as "must have" or "very nice to have"
+ * Shrink the BroadcastChannel API's boundaries of access or disable completely
+ * Make a API white/grey/black -list, in super paranoia mode we should
+  probably disable almost all, while in most cases the user probably want
+  to be as close to a normal browser/web experinence that
+  they are used to from before
+
+Leak Avoidance:
+---------------
+
+ * Stop web socket DNS leak
+ * If doable, slim down the CA store from unnecessary CAs
+ * Disable the microphone by default
+ * Ensure WebRTC is disabled in compile time
+ * Disable mDNS features
+ * Ensure links like sftp:// and smb:// ,
+  as well as \\samba-share is blocked/denied
+ * Don’t allow IndexedDB storage for third party domains (likability issue)
+ * Patch the DNS service to prevent any browser or addon DNS resolution
+ * Restrict what MIME types that are exposed to content scripts
+
+General Security:
+-----------------
+
+ * Backport any security patches that might appear from Mozilla
+ * Don’t allow XHR/Websockets requests towards 127.0.0.1/localhost
+ * Always use the  most sane form of preferences defaults in context
+  of privacy and security.
+
+Unnecessary Connections:
+------------------------
+
+ * Disable getpocket.com features and alike
+ * Remove sync option from preferences
+ * Clear state when the app exits, by default
+ * Disable updater telemetry
+ * Make firefox stop call home to mozilla for different reasons
+ * Prevent non-Necko network connections
+ * Figure out how to approach prerender, preconnect, and prefetch link tags
+
+Disk Avoidance:
+---------------
+
+ * Don’t allow SSL key logging
+ * Only cache media in memory
+ * Disable the password saving functionality to avoid such being written to disk
+ * Disable the Auto form-fill to keep as much as possible not written to disk
+
+Platforms:
+----------
+
+ * Support for Android?
+ * Support for iOS?
+
+Anti-Fingerprinting:
+--------------------
+
+ * Test for preferences which ensures a sane default and
+  something to tell when/if we break it
+ * Disable support for system adding
+ * Disable Firefox enterprise policies
+ * Disable NTLM authentication
+ * Disable SPNEGO authentication
+ * Handle privacy issues regarding window.name
+ * Test runner for I2P Browser test cases
+ * Block loading of plugins
+ * Disable OS spesific firefox features that can help fingerprint
+  the end user's operating system
+ * Block html5 canvas by default
+ * Block by default or disable WebGL completely?
+ * Never start fullscreen, always start with fixed width/height to
+  avoid expose screen resolution
+ * Report fake system uptime to content scripts
+ * Spoof Accept-Language and Accept-Charset headers no matter browser language
+ * Spoof timezone to always be UTC
+ * Develop methods to reduce the accuracy of JavaScript
+  performance fingerprinting
+ * Always report only one CPU core (dom.maxHardwareConcurrencys)
+ * Avoid Keystroke fingerprinting by messing with the event resolution
+ * Disable GeoIP-based search results
+
+???
+---
+
+ * SVG drawing
+ * MathML drawing
+ * I2Pd flavor

Makefile

@@ -1,86 +1,341 @@
-PREFIX:=/usr
+
+PREFIX?=/usr
 
 default: zip
 
+PWD=`pwd`
+
 install: uninstall
 	mkdir -p $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
 		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-	cp -r ./chromium/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./icons/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./_locales/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./options/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.js $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.html $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.css $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.md $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.xpi $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./manifest.json $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./LICENSE $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	ln -s $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
-		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+	@echo $(PWD)
+	cp -v ./* $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/; true
+	cp -vr ./i2pcontrol $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol
+	cp -vr ./torrent $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/torrent
+	cp -vr ./_locales $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/_locales
+	cp -vr ./icons $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/icons
+	cp -vr ./options $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/options
+	make link
+
+link:
+	ln -sf  $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
+		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/i2ppb@eyedeekay.github.io
 
 uninstall:
 	rm -rf $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
 		$(PREFIX)/share/webext/i2psetproxy.js@eyedeekay.github.io \
-		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/i2ppb@eyedeekay.github.io
+
 
 ls:
 	ls -lah $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io; \
 	ls -lah $(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 
-clean:
-	rm -f ../i2psetproxy.js.zip ../i2p_proxy*.xpi
+clean: rc clean-artifacts
+	rm -fr ../i2psetproxy.js.zip ../i2p_proxy*.xpi ../i2p*.xpi *.torrent #../i2psetproxy.js_*.*
 
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES
 
-MOZ_VERSION=0.36
-VERSION=0.36
-#VERSION=1.27
+MOZ_VERSION=0.76
+VERSION=0.75
 
-xpi:
-	wget -O ../i2ppb@eyedeekay.github.io.xpi \
-		https://addons.mozilla.org/firefox/downloads/file/3419789/i2psetproxyjs-$(MOZ_VERSION)-an+fx.xpi
-	cp ../i2ppb@eyedeekay.github.io.xpi ./i2ppb@eyedeekay.github.io.xpi
+## INCREMENT THIS EVERY TIME YOU DO A RELEASE
+LAST_VERSION=0.73
+
+YELLOW=F7E59A
+ORANGE=FFC56D
+GREY=D9D9D6
+BLUE=A4C8E1
+PURPLE=A48fE1
+
+colors:
+	@echo " yellow $(YELLOW) \n orange $(ORANGE) \n grey $(GREY) \n blue $(BLUE) \n purple $(PURPLE)"
+
+amo-readme:
+	markdown README.md | \
+		sed 's|<p>||g' | \
+		sed 's|</p>||g' | \
+		sed 's|<h1>|<strong>|g' | \
+		sed 's|</h1>|</strong>|g' | \
+		sed 's|<h2>|<strong>|g' | \
+		sed 's|</h2>|</strong>|g' | \
+		sed 's|<h3>|<strong>|g' | \
+		sed 's|</h3>|</strong>|g' | \
+		grep -v '<img' > amo-index.html
+
+MAGNET=`torrent2magnet i2ppb@eyedeekay.github.io.xpi.torrent`
+
+index:
+	@echo "<!DOCTYPE html>" > index.html
+	@echo "<html>" >> index.html
+	@echo "<head>" >> index.html
+	@echo "  <title>I2P in Private Browsing Mode</title>" >> index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"home.css\" />" >> index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"sidebar.css\" />" >> index.html
+	@echo "</head>" >> index.html
+	@echo "<body>" >> index.html
+	sed "s|magnetsub|[Magnet Link]($(MAGNET))|g" README.md | sed 's|README.md|index.html|g' | markdown >> index.html
+	@echo "</body>" >> index.html
+	@echo "</html>" >> index.html
+
+torrenthelp:
+	@echo "<!DOCTYPE html>" > torrent/index.html
+	@echo "<html>" >> torrent/index.html
+	@echo "<head>" >> torrent/index.html
+	@echo "  <title>I2P in Private Browsing Mode</title>" >> torrent/index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"../home.css\" />" >> torrent/index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"../sidebar.css\" />" >> torrent/index.html
+	@echo "</head>" >> torrent/index.html
+	@echo "<body>" >> torrent/index.html
+	sed "s|magnetsub|[Magnet Link]($(MAGNET))|g" torrent/README.md | markdown >> torrent/index.html
+	@echo "</body>" >> torrent/index.html
+	@echo "</html>" >> torrent/index.html
+
+xpi: getxpi
 
 version:
+	sed -i 's|7647|7657|g' *.js* torrent/*.js*
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)\",|g' manifest.json
+	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)\",|g' manifest.json
+	sed -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
+	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)1-rhizome\",|g' manifest.json
+	sed -i 's|7657|7647|g' *.js* torrent/*.js*
 
 zip: version
 	zip --exclude="./i2ppb@eyedeekay.github.io.xpi" \
 		--exclude="./i2psetproxy.js@eyedeekay.github.io.xpi" \
 		--exclude="./i2psetproxy.js.png" \
 		--exclude="./i2psetproxy.js.gif" \
-		--exclude="./.git" -r -FS ../i2psetproxy.js.zip *
+		--exclude="./package.json" \
+		--exclude="./package-lock.json" \
+		--exclude="./.node_modules" \
+		--exclude="./node_modules" \
+		--exclude="./.git" \
+		--exclude="*/*.xpi" \
+		--exclude="web-ext-artifacts" \
+		--exclude="./*.pdf" -r -FS ../i2psetproxy.js.zip *
 
-release:
-	cat desc | gothub release -p -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n $(VERSION) -d -
+rc:
+	@grep "$(VERSION)" debian/changelog
+	@echo "changelog is prepared"
+	rm -f *.xpi
+
+rtest: rc index torrenthelp
+
+release: rc index torrenthelp
+	cat desc debian/changelog | grep -B 10 "$(LAST_VERSION)" | gothub release -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n $(VERSION) -d -; true
+
+update-release:
+	cat desc debian/changelog | grep -B 10 "$(LAST_VERSION)" | gothub edit -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n $(VERSION) -d -; true
 
 delete-release:
-	gothub delete -u eyedeekay -r i2psetproxy.js -t $(VERSION); true
+	gothub delete -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION); true
 
 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 seed
+
+WEB_EXT_API_KEY=AMO_KEY
+WEB_EXT_API_SECRET=AMO_SECRET
+
+
+-include ../api_keys_moz.mk
+
+tk:
+	echo $(WEB_EXT_API_KEY)
+
+submit: moz-submit moz-sign
+
+clean-artifacts:
+	rm -fr web-ext-artifacts/*
+
+##ODD NUMBERED, SELF-DISTRIBUTED VERSIONS HERE!
+moz-sign: version clean-artifacts
+	@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
+	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
+	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
+	$HOME/node_modules/web-ext-submit/extender.sh --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
+	make copyss
+	sleep 5
+
+copyss:
+	cp web-ext-artifacts/*.xpi ../i2ppb@eyedeekay.github.io.xpi; true
+
+##EVEN NUMBERED, MOZILLA-DISTRIBUTED VERSIONS HERE!
+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."
+	#@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
+	#@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
+	#@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
+	#$HOME/node_modules/web-ext-submit/extender.sh --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	#cp web-ext-artifacts/*.xpi ./i2ppb@eyedeekay.github.io.xpi
+
+getxpi:
+	gothub download -t $(VERSION) -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -n i2ppb@eyedeekay.github.io.xpi
+	mv ./i2ppb@eyedeekay.github.io.xpi ../i2ppb-$(VERSION)@eyedeekay.github.io.xpi
+	cp ../i2ppb-$(VERSION)@eyedeekay.github.io.xpi ../i2ppb@eyedeekay.github.io.xpi
+
+torrent: getxpi
+	rm -f "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent"
+	mktorrent -a http://zviyq72xcmjupynn5y2f5qa3u7bxyu34jnqmwt6czte2l7idxm7q.b32.i2p/announce \
+		-a http://s5ikrdyjwbcgxmqetxb3nyheizftms7euacuub2hic7defkh3xhq.b32.i2p/a \
+		-a http://uajd4nctepxpac4c4bdyrdw7qvja2a5u3x25otfhkptcjgd53ioq.b32.i2p/announce \
+		-a http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
+		-a http://explodie.org:6969/announce \
+		-a http://tracker.opentrackr.org:1337/announce \
+		-a http://tracker.kamigami.org:2710/announce \
+		-a http://tracker.internetwarriors.net:1337/announce \
+		-a http://tracker.darli.net:6611/announce \
+		-a http://tracker.corpscorp.online:80/announce \
+		-a http://tracker.bz:80/announce \
+		-a http://tracker.bt4g.com:2095/announce \
+		-a http://retracker.sevstar.net:2710/announce \
+		-a http://h4.trakx.nibba.trade:80/announce \
+		-a http://www.proxmox.com:6969/announce \
+		-a http://www.loushao.net:8080/announce \
+		-a http://vps02.net.orel.ru:80/announce \
+		-a http://tracker4.itzmx.com:2710/announce \
+		-a http://tracker3.itzmx.com:6961/announce \
+		-a http://tracker2.itzmx.com:6961/announce \
+		-a http://tracker1.itzmx.com:8080/announce \
+		-a http://tracker01.loveapp.com:6789/announce \
+		-a http://tracker.zerobytes.xyz:1337/announce \
+		-a http://tracker.yoshi210.com:6969/announce \
+		-a http://tracker.torrentyorg.pl:80/announce \
+		-a http://tracker.nyap2p.com:8080/announce \
+		-a http://tracker.lelux.fi:80/announce \
+		-a http://tracker.gbitt.info:80/announce \
+		-a http://pow7.com:80/announce \
+		-a http://opentracker.i2p.rocks:6969/announce \
+		-a http://open.acgtracker.com:1096/announce \
+		-a http://open.acgnxtracker.com:80/announce \
+		-a http://mail2.zelenaya.net:80/announce \
+		-a http://acg.rip:6699/announce \
+		-n "i2ppb-$(VERSION)@eyedeekay.github.io.xpi" \
+		-o "i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" \
+		-w https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/$(VERSION)/i2ppb@eyedeekay.github.io.xpi \
+		../i2ppb@eyedeekay.github.io.xpi; true
+	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "./i2ppb@eyedeekay.github.io.xpi.torrent"
+	make index
+
+upload-torrent:
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi.torrent" -f "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent"
+
 upload-xpi:
-	gothub upload -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi" -f "./i2ppb@eyedeekay.github.io.xpi"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi" -f "../i2ppb@eyedeekay.github.io.xpi"
 
 upload-deb:
-	gothub upload -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.deb" -f "../i2psetproxy.js_$(VERSION)-1_amd64.deb"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.deb" -f "../i2psetproxy.js_$(VERSION)-1_amd64.deb"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION).orig.tar.gz" -f "../i2psetproxy.js_$(VERSION).orig.tar.gz"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1.debian.tar.xz" -f "../i2psetproxy.js_$(VERSION)-1.debian.tar.xz"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1.dsc" -f "../i2psetproxy.js_$(VERSION)-1.dsc"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.changes" -f "../i2psetproxy.js_$(VERSION)-1_amd64.changes"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.buildinfo" -f "../i2psetproxy.js_$(VERSION)-1_amd64.buildinfo"
 
-lib: libpolyfill
+upload-docs:
+	gothub release -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "Documentation" -d "PDF's and text about the extension"; true
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "Landing Page Documentation.pdf" -f ../smartlander.pdf
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "Browser Design Documentation.pdf" -f ../browser.pdf
 
-libpolyfill:
-	wget -O chromium/browser-polyfill.js https://unpkg.com/webextension-polyfill/dist/browser-polyfill.js
+fmt: fmt-css fmt-html fmt-js
 
-fmt:
-	find . -path ./node_modules -prune -o -name '*.js' -exec prettier --write {} \;
+fmt-css:
+	cleancss -O1 all -O2 all --format beautify home.css -o .home.css && mv .home.css home.css
+	cleancss -O1 all -O2 all --format beautify info.css -o .info.css && mv .info.css info.css
+	cleancss -O1 all -O2 all --format beautify search.css -o .search.css && mv .search.css search.css
+	cleancss -O1 all -O2 all --format beautify sidebar.css -o .sidebar.css && mv .sidebar.css sidebar.css
+	cleancss -O1 all -O2 all --format beautify options/options.css -o options/.options.css && mv options/.options.css options/options.css
 
-deborig:
-	rm -rfv ../i2psetproxy.js-$(VERSION)
-	cp -rv . ../i2psetproxy.js-$(VERSION)
-	tar --exclude='./.git' --exclude="./node_modules" -cvzf ../i2psetproxy.js_$(VERSION).orig.tar.gz .
+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 index.html > .index.html; mv .index.html index.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 window.html > .window.html; mv .window.html window.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 home.html > .home.html; mv .home.html home.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 toopie.html > .toopie.html; mv .toopie.html toopie.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 security.html > .security.html; mv .security.html security.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:
+	fixjsstyle *.js
+	fixjsstyle options/*.js
+	fixjsstyle torrent/*.js
+	fixjsstyle i2pcontrol/*.js
+	#find . -path ./node_modules -prune -o -name '*.json' -exec fixjsstyle --write {} \;
+
+lint:
+
+	gjslint *.js; true
+	#eslint --color *.js
+
+deborig: version
+	rm -rf ../i2psetproxy.js-$(VERSION)
+	mkdir -p ../i2psetproxy.js-$(VERSION)
+	cp -r ./* ../i2psetproxy.js-$(VERSION)
+	cd ../i2psetproxy.js-$(VERSION) && \
+	rm -rf web-ext-artifacts .git node_modules && \
+	tar \
+		-cvz \
+		--exclude=i2psetproxy.js.gif \
+		--exclude=*.pdf \
+		-f ../i2psetproxy.js_$(VERSION).orig.tar.gz \
+		.
 
 deb: deborig
 	cd ../i2psetproxy.js-$(VERSION) && debuild -us -uc -rfakeroot
+
+-include mirrors.mk
+
+dat:
+	wget -c -O dat.js https://bundle.run/dat-js
+
+rss: torrent
+	rm -f releases.diff
+	mv releases.atom .releases.atom
+	wget https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases.atom
+	sed -i "s|<title>$(VERSION)</title>|<title>$(VERSION)</title>\n    <enclosure url=\"$(MAGNET)\" type=\"application/x-bittorrent\" />|g" releases.atom
+
+upload-rss: rss
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "releases.atom" -f releases.atom
+
+upload-updatemanifest:
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "updateManifest.json" -f updateManifest.json
+
+webext:
+	web-ext run -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"
+
+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
+
+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/"

PLAN.md

@@ -0,0 +1,70 @@
+The I2P Browser has made strides at improving users anonymity when browsing
+the anonymous web inside of I2P. However, it has in many ways simply re-hashed
+the existing work of Tor on the Tor Browser. This is mostly a good thing, but it
+is unfortunate because in a sense we have failed to add I2P specific features
+that could improve the user experience and set us apart from the Tor Browser.
+
+I think that moving forward, we should try to extend the functionality of I2P
+Browser into more I2P-specific realms and make an effort to make those things
+more accessible and highlight that they are in use. I don't really know how to
+explain what I mean without describing what I want to do, so
+
+Let's avoid *adding* features to i2pbutton
+------------------------------------------
+
+i2pbutton contains alot of code from Tor which even they don't really want to
+maintain. It's dying the same long, slow death it's always been dying, since
+back before there was a Tor Browser and torbutton was just an easy way to
+configure Tor in your Firefox browser. I don't relish the thought of being one
+the last two groups on the planet maintaining an XUL extension, so I think that
+we should always be trying to do less with i2pbutton and more with a modern
+extension. Other advantages of modern extensions are better debugging tools
+and easier-to-use, more understandable API's for doing the following other
+things.
+
+Contexts for Security and Placing Router Applications under their own Origin
+----------------------------------------------------------------------------
+
+It is possible, however unlikely, for an attack on a local service or a router
+plugin to leak information about what's going on on the router console because
+they will share the same origin. We can resolve this issue, though, by placing
+applications each into their own origin under a so-called "Container Tab,"
+completely separating eepWeb traffic and Router Console administration. The
+origin of the application will be the same as the part of the application URL
+*after* localhost:7657, so for instance "http://localhost:7657/torrents"
+would become just "torrents" in the URL bar and have that origin.
+
+Dynamic Themes
+--------------
+
+Since I2P Browsing and Router Console Administration are going to be separated
+to their own contextual identities, we can manipulate the appearance of the
+Firefox browser to accomplish 2 things: We can indicate which context we are in
+both by manipulating the UI text and color, and manipulate UI elements based on
+what context we're in or even what URL(In the router console) we're on. We can
+use this to make router console applications appear more tightly integrated with
+the functionality of the browser. It's kind of obliquely like how many
+applications are written with user-interfaces that are actually just
+browsers(Including Mattermost), but with us using the whole browser,
+acknowledging it's presence and utility but quite literally highlighting(in
+color) our unique features. So for instance, when the user is using snark it
+could change color to match snark and change text to say "Torrent Client."
+
+Application Integration - Torrents
+----------------------------------
+
+I2P's strengths are in it's applications, but many users never even make it to
+the applications, and even if they do, the I2P applications often lack the
+familiar workflows that people are used to. For instance, when one downloads
+a torrent on the non-anonymous internet, you simply click a link and the browser
+"Handles" the link, automatically launching the torrent client, adding the
+torrent, and sometimes prompting the user for more actions. This isn't possible
+yet with i2psnark and an external browser, but in I2P browser we can write a
+"Protocol Handler" which talks to snark-rpc, replicating the ease of just
+clicking a torrent link to automatically add it to a torrent client. Of course
+that does require us to bundle the snark-rpc plugin. Besides that, once we've
+added the torrent, we can keep talking to snark-rpc to keep track of the
+download progress and display information about that in the already-available
+Firefox downloads menu that users are already familiar with, so that they can
+keep track of the files they are downloading after navigating away from the
+snark interface, or perhaps even without needing to interact with snark at all.

README.md

@@ -1,38 +1,68 @@
-i2psetproxy.js
-==============
+I2P in Private Browsing Mode(Firefox-Only)
+==========================================
 
-WebExtension that does extended configuration of a dedicated I2P browser. While
-**experimental**, it's capable of enforcing the use of the I2P Proxy without
-needing to touch about:config and disables several
-fingerprinting/de-anonymization vectors on it's own. It is also the easiest way
-to configure an I2P browser on Android without requiring the user to root their
-device.
+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.
 
-The Old Version
----------------
+Installation(Cross-Platform):
+-----------------------------
 
-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.
+For desktop users this addon is available from addons.mozilla.org, where you
+will be able to recive automatic updates:
+[I2P in Private Browsing](https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/).
 
-Android usage:
---------------
+Debian Installation:
+--------------------
 
-Open the following link [Github Releases Version](https://github.com/eyedeekay/i2psetproxy.js/releases/download/1.26/i2psetproxy.js@eyedeekay.github.io.xpi)
-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.
+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:
 
-### addons.mozilla.org
+        make deb
 
-If you would prefer to recieve automatic updates from AMO, the correct product
-page for this plugin is [I2P-proxy](https://addons.mozilla.org/en-US/firefox/addon/I2P-proxy/).
-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.
+and then you can install it with:
+
+        sudo apt install ../i2psetproxy.js_*.deb
+
+Bittorrent Download:
+--------------------
+
+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).
+
+  * magnetsub
+  * [Get the .torrent file](./i2ppb@eyedeekay.github.io.xpi.torrent)
+
+Usage:
+------
+
+  * 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.
+  * 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:
+  * ![Landing page](lander.png)
+  * Also, there's a menu for accessing I2P functionality while you're browsing.
+   It lets you control a few settings in a granular way.
+  * ![Menu](menu.png)
+  * You can re-enable WebRTC but force it to always use the proxy that is
+   enforced by the tab.
+  * 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.
+  * That's all there is to it! Your browser is configured to safely use and
+   administer I2P.
+  * 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:
+   [Torrent guide](torrent/README.md)
 
 ### Features
 
@@ -41,33 +71,69 @@ submission to AMO.
    to the I2P container. Isolate the router console from other local
    applications by automatically intercepting requests to the router console to
    another container.
-  * [done/wip] **Indicate** the I2P browser is in use visually. Find an
+  * ![Visiting i2p-projekt.i2p](i2psetproxy.js.png)
+  * [done] **Indicate** the I2P browser is in use visually. Find an
    acceptable way to indicate it on Android.
+  * ![Visiting webmail](susimail.png)
   * [done] **Set** the http proxy to use the local I2P proxy automatically.
    Provide specific configuration for other types of I2P proxies(SOCKS,
    isolating HTTP)
-  * [done/wip] **Disable** risky webRTC features/offer the option to re-enable
+  * [done] **Disable** risky webRTC features/offer the option to re-enable
    them with the proxy enforced.
-  * [done] **Change** the color of the browser window to indicate that I2P is in use
-  * [done-ish] **Reset** the HTTP Proxy tunnel to generate a new destination on-demand
-   * it does this by working in conjunction with this [standalone HTTP proxy](https://github.com/eyedeekay/httptunnel), currently disabled*.
+  * [done] **Change** the color of the browser window to indicate that I2P is in
+   use
+  * ![Visiting i2ptunnel](i2ptunnel.png)
   * [ready] **Provide** help in a variety of languages.
-  * [wip] **Monitor** the health and readiness of the I2P router it is
-   instructed to use.
-  * [1/2] **Handle** router console applications under their own origins and
+  * [done] **Monitor** 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.
+  * ![Visiting toopie.html](toopie.png)
+  * [Done] **Handle** 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.
-  * [not started] **Handle Torrents** by talking to i2psnark-rpc plugin and then
+  * ![Visiting routerconsole](routerconsole.png)
+  * [Done] **Handle Torrents** by talking to i2psnark-rpc plugin and then
    adding them directly into the Firefox downloads drop-downs, menus, etc. If I
    can.
+  * ![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
+   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
+    - 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.
+    - 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.
+    - I2P Blogging: Use this for posting content to the web interface of your
+    blog or to other similar websites that you create content on.
+  * ![Visiting clearweb](clearweb.png)
 
-### Screenshot
+### Video
 
-![Visiting i2p-projekt.i2p](i2psetproxy.js.png)
+  * ![Video of the plugin in action](i2psetproxy.js.gif)
 
-![Video of the plugin in action](i2psetproxy.js.gif)
+Documents
+------------
+
+  * **[Browser Outline](https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Browser.Design.Documentation.pdf)**: This document is an outline of each of
+  the browser extension's feature panels in presentation form.
+  * **[Smart Lander Design](https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Landing.Page.Documentation.pdf)**: 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.
+  * **[Other extensions](https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/wiki/Other-Extensions)**: and how they work with this one.
 
 Super Extra Important Background Info:
 --------------------------------------
@@ -78,16 +144,63 @@ Tor's work on hardening Firefox itself and of particular interest are the
 
 ### Links about Project Uplift
 
- * https://wiki.mozilla.org/Security/Tor_Uplift
- * https://wiki.mozilla.org/Security/FirstPartyIsolation
- * https://wiki.mozilla.org/Security/Fingerprinting
- * https://wiki.mozilla.org/Security/Fennec%2BTor_Project
- * https://wiki.mozilla.org/Security/Tor_Uplift/Tracking
+ * [Tor Uplift](https://wiki.mozilla.org/Security/Tor_Uplift) 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.
+ * [First Party Isolation](https://wiki.mozilla.org/Security/FirstPartyIsolation)
+  is a feature in Firefox and other browsers which keeps information from
+  leaking across first-party domains.
+ * [Fingerprinting](https://wiki.mozilla.org/Security/Fingerprinting) 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.
+ * [Fennec](https://wiki.mozilla.org/Security/Fennec%2BTor_Project) is Firefox
+  for Android and this link has some analysis of the privacy consequences of the
+  Android platform.
+ * [Tracking](https://wiki.mozilla.org/Security/Tor_Uplift/Tracking) in Firefox
+  is surveyed here.
 
 Project uplift seems to have largely been accomplished?
 
 ### Links about Project Fusion
 
- * https://wiki.mozilla.org/Security/Fusion
- * https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject
- * https://blog.torproject.org/tor-heart-firefox
+ * [Project Fusion](https://wiki.mozilla.org/Security/Fusion) or Firefox using
+  Onions is a joint Mozilla/Tor effort to create an enhanced Private Browsing
+  mode for Firefox which uses Tor.
+ * [Notes](https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject)
+  from a meeting about Fusion.
+ * [Tor at the Heart: Firefox](https://blog.torproject.org/tor-heart-firefox) is
+  a blog about Tor and the relationship they have to Firefox re: TBB, Fusion.
+
+The Old Version
+---------------
+
+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.
+
+ * This is the new version: [[link]](https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/)
+
+ * This is the old version: [[link]](https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/)
+
+Android usage:
+--------------
+
+Open the following link
+[Github Releases Version](https://github.com/eyedeekay/i2psetproxy.js/releases/)
+in the browser you want to use for I2P. Firefox will warn you that it is about
+to install an extension and indicate the permissions required. Read them over
+and when you're ready, accept them. That's all it should take, your browser is
+now configured to use I2P.
+
+### Android addons.mozilla.org(Temporarily Disabled)
+
+If you would prefer to recieve automatic updates from AMO, the correct product
+page for this plugin is
+[I2P In Private Browsing](https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/).
+This absolutely requires a working outproxy. If you want to avoid the use of AMO
+for updates, you can download the identical plugin from this repository's
+releases page. The latest AMO Plugin will always be identical to the latest
+github release, except for the version number, which must be incremented for
+submission to AMO.

_locales/en/messages.json

@@ -3,16 +3,212 @@
     "message": "I2P In Private Browsing",
     "description": "Name of the extension."
   },
+  "toopieName": {
+    "message": "toopie.html",
+    "description": "Name of the sidebar."
+  },
+  "toopieTLS": {
+    "message": "Site Properties",
+    "description": "Name of the security panel."
+  },
   "extensionDescription": {
-    "message": "Set up a browser to use the i2p http proxy automatically",
+    "message": "Your browser is now set up to use I2P.",
     "description": "Description of the extension."
   },
+  "extensionVersion": {
+    "message": "0.71",
+    "description": "Version of the extension."
+  },
+  "extensionStatus": {
+    "message": "It is a labs project for enhancing your I2P browsing experience.",
+    "description": "Release status of the extension."
+  },
+  "proxyFailedStatus": {
+    "message": "Proxy is not ready",
+    "description": "Proxy failed status."
+  },
+  "proxySuccessStatus": {
+    "message": "Proxy is ready",
+    "description": "Proxy failed status."
+  },
+  "controlHeader": {
+    "message": "Control",
+    "description": "Headline for control panel."
+  },
+  "controlExplain": {
+    "message": "These controls are used to tailor your I2P Browsing Experience",
+    "description": "Introduce the control panel."
+  },
+  "clearData": {
+    "message": "Clear Browsing Data: ",
+    "description": "Clear Browsing Data menu item."
+  },
+  "clearDesc": {
+    "message": "Use this to erase your I2P browsing data.",
+    "description": "Clear browsing data action description."
+  },
+  "enableWebRTC": {
+    "message": "Enable WebRTC with proxy?",
+    "description": "WebRTC checkbox label."
+  },
+  "rtcDesc": {
+    "message": "WebRTC is disabled by default, but you can turn it back on and force it to honor the proxy. If you are a user of the Snowflake browser extension, this option is disabled and WebRTC is turned on by default.",
+    "description": "WebRTC action description"
+  },
+  "disableHistory": {
+    "message": "Disable History in I2P Tabs?",
+    "description": "History checkbox label."
+  },
+  "histDesc": {
+    "message": "History is automatically cleared when your I2P tabs are closed. If you want to clear history as you go, check this box.",
+    "description": "History action description"
+  },
+  "applicationHeader": {
+    "message": "Applications",
+    "description": "Header for applications section."
+  },
+  "applicationExplain": {
+    "message": "These applications work with I2P directly to provide them with security and privacy.",
+    "description": "Description for application section."
+  },
+  "windowVisitConsole": {
+    "message": "Router Console: ",
+    "description": "Router Console label."
+  },
+  "routerConsole": {
+    "message": "The entrypoint for all other I2P applications is the I2P Router Console. To visit it, click here.",
+    "description": "Description for the router console."
+  },
+  "windowVisitHomepage": {
+    "message": "Home Page: ",
+    "description": "Home page for the extension label."
+  },
+  "abouthome": {
+    "message": "For more information about this extension, visit this page.",
+    "description": "Description for the extension button page."
+  },
+  "windowVisitHelppage": {
+    "message": "Help Page: ",
+    "description": "Help page for the extension label."
+  },
+  "help": {
+    "message": "For more information about this extension, visit this page.",
+    "description": "Description for the extension button page."
+  },
+  "windowVisitI2ptunnel": {
+    "message": "Hidden Services Manager: ",
+    "description": "Title for i2ptunnel"
+  },
+  "i2ptunnel": {
+    "message": "I2P has a web-based interface for configuring .i2p services like web sites which you can set up.",
+    "description": "Description for i2ptunnel"
+  },
+  "windowVisitSusimail": {
+    "message": "E-Mail: ",
+    "description": "Title for e-mail"
+  },
+  "susimail": {
+    "message": "I2P also bundles a webmail client which can be used to access in-I2P e-mail.",
+    "description": "Description for e-mail"
+  },
+  "windowVisitSnark": {
+    "message": "Bittorrent: ",
+    "description": "Title for Bittorrent"
+  },
+  "snark": {
+    "message": "I2P is capable of anonymous Peer-to-Peer file sharing using the built-in bittorrent application.",
+    "description": "Description for Bittorrent"
+  },
+  "windowVisitSources": {
+    "message": "Extension Source Code: ",
+    "description": "Title for source code link"
+  },
+  "sources": {
+    "message": "Browse the source code here",
+    "description": "Description for the Source code link"
+  },
+  "windowVisitWebPage": {
+    "message": "Extension Home Page: ",
+    "description": "Visit extension homepage on Github"
+  },
+  "homepage": {
+    "message": "More information is available here",
+    "description": "Find more information"
+  },
+  "windowVisitReleases": {
+    "message": "Extension Releases: ",
+    "description": "Visit the release page"
+  },
+  "releases": {
+    "message": "Check for new releases here",
+    "description": "Description for new release page"
+  },
   "titlePreface": {
-    "message": "I2P Browser - ",
+    "message": "I2P Browser",
     "description": "Preface for the browser titlebar"
   },
   "titlePrefacePrivate": {
-    "message": "I2P Browser (Private) - ",
+    "message": "I2P Browser (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "extensionPreface": {
+    "message": "I2P Management",
+    "description": "Preface for the browser titlebar"
+  },
+  "webPreface": {
+    "message": "Web Browser",
+    "description": "Preface for the browser titlebar"
+  },
+  "webPrefacePrivate": {
+    "message": "Web Browser (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "localPreface": {
+    "message": "Localhost Browser",
+    "description": "Preface for the browser titlebar"
+  },
+  "localPrefacePrivate": {
+    "message": "Localhost Browser (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "routerPreface": {
+    "message": "Router Console",
+    "description": "Preface for the browser titlebar"
+  },
+  "routerPrefacePrivate": {
+    "message": "Router Console (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "torrentPreface": {
+    "message": "Bittorrent",
+    "description": "Preface for the browser titlebar"
+  },
+  "torrentPrefacePrivate": {
+    "message": "Bittorrent (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "mailPreface": {
+    "message": "Web Mail",
+    "description": "Preface for the browser titlebar"
+  },
+  "mailPrefacePrivate": {
+    "message": "Web Mail (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "i2ptunnelPreface": {
+    "message": "Hidden Services Manager",
+    "description": "Preface for the browser titlebar"
+  },
+  "i2ptunnelPrefacePrivate": {
+    "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": {
@@ -39,9 +235,9 @@
     "message": "Visit the I2P Forum to learn more or ask for assistance",
     "description": "Help Message"
   },
-  "clearData": {
-    "message": "Clear all browsing data",
-    "description": "Help Message"
+  "proxyHelpText": {
+    "message": "Configure your I2P proxy here.",
+    "description": "Help for configuring the options for the Reset Tunnel button"
   },
   "hostText": {
     "message": "Host: ",
@@ -52,15 +248,51 @@
     "description": "Port for the HTTP or SOCKS5 Proxy"
   },
   "controlHelpText": {
-    "message": "These options will be inert if used with the default i2p HTTP or SOCKS proxy.",
+    "message": "Configure your router console here.",
     "description": "Help for configuring the options for the Reset Tunnel button"
   },
   "controlHostText": {
     "message": "Control Host: ",
-    "description": "Host for the Reset Tunnel button"
+    "description": "Host for the Router Console"
   },
   "controlPortText": {
     "message": "Control Port: ",
-    "description": "Port for the Reset Tunnel button"
+    "description": "Port for the Router Console"
+  },
+  "controlHostValue": {
+    "message": "127.0.0.1",
+    "description": "Host for the Router Console"
+  },
+  "controlPortValue": {
+    "message": "7657",
+    "description": "Port for the Router Console"
+  },
+  "isBase32": {
+    "message": "I2P Base32-Formatted Address",
+    "description": "Message for site info panel base32"
+  },
+  "isHostName": {
+    "message": "I2P Jump Hostname",
+    "description": "Message for the site info panel hostname"
+  },
+  "siteLabel": {
+    "message": "Address/Site Information:",
+    "description": "Label for i2p site info"
+  },
+  "certLabel": {
+    "message": "Certificate Information:",
+    "description": "Label for certificate info"
+  },
+  "certAbsent": {
+    "message": "This site is not using HTTPS. It is still verified cryptographically by I2P.",
+    "description": "Content for certificate info if absent"
+  },
+  "certPresent": {
+    "message": "This site is using HTTPS. HTTPS over I2P is experimental and requires self-signed certificates or alternate root authorites.",
+    "description": "Content for certificate info if present"
+  },
+  "protocolHandlerValue": {
+    "message": "http://127.0.0.1:7657/i2psnark/?nofilter_newURL=%s&action=Add&foo=Add+torrent",
+    "description": "Value for the magnet protocol handler"
   }
 }

background.js

@@ -1,182 +1,495 @@
-function onGot(contexts) {
+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 = [];
   for (let context of contexts) {
-    console.log(`Name: ${context.name}`);
+    console.log(`Name : ${context.name}`);
     ids.push(context.name);
   }
-  console.log("Checking new contexts");
-  if (ids.indexOf("i2pbrowser") == -1) {
-    function onCreated(context) {
-      console.log(`New identity's ID: ${context.cookieStoreId}.`);
-    }
-
-    function onError(e) {
-      console.error(e);
-    }
+  console.log('Checking new contexts');
+  if (ids.indexOf(titlepref) == -1) {
     browser.contextualIdentities
       .create({
-        name: "i2pbrowser",
-        color: "purple",
-        icon: "fingerprint"
+        name: titlepref,
+        color: 'orange',
+        icon: 'fingerprint'
       })
-      .then(onCreated, onError);
+      .then(onCreated, onNotCreated);
   }
-  if (ids.indexOf("routerconsole") == -1) {
-    function onCreated(context) {
-      console.log(`New identity's ID: ${context.cookieStoreId}.`);
-    }
-
-    function onError(e) {
-      console.error(e);
-    }
+  if (ids.indexOf(webpref) == -1) {
     browser.contextualIdentities
       .create({
-        name: "routerconsole",
-        color: "turquoise",
-        icon: "briefcase"
+        name: webpref,
+        color: 'red',
+        icon: 'circle'
       })
-      .then(onCreated, onError);
+      .then(onCreated, onNotCreated);
+  }
+  if (ids.indexOf(routerpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: routerpref,
+        color: 'blue',
+        icon: 'briefcase'
+      })
+      .then(onCreated, onNotCreated);
+  }
+  if (ids.indexOf(tunnelpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: tunnelpref,
+        color: 'green',
+        icon: 'tree'
+      })
+      .then(onCreated, onNotCreated);
+  }
+  if (ids.indexOf(mailpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: mailpref,
+        color: 'yellow',
+        icon: 'briefcase'
+      })
+      .then(onCreated, onNotCreated);
+  }
+  if (ids.indexOf(torrentpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: torrentpref,
+        color: 'purple',
+        icon: 'chill'
+      })
+      .then(onCreated, onNotCreated);
+  }
+  if (ids.indexOf(localpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: localpref,
+        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 onError(e) {
-  console.error(e);
+function onContextsError() {
+  console.log('Error finding contextual identities, is the API enabled?');
 }
 
-browser.contextualIdentities.query({}).then(onGot, onError);
-
-if (!isDroid()) {
-  chrome.windows.onCreated.addListener(themeWindow);
-  chrome.tabs.onUpdated.addListener(themeWindowByTab);
-  chrome.tabs.onActivated.addListener(themeWindowByTab);
+function onCreated(context) {
+  console.log(' ID:', context.cookieStoreId, 'created.');
 }
 
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
-
-function themeWindowByTab(tab) {
-  getwindow = browser.windows.get(tab.windowId);
-  getwindow.then(themeWindow);
+function onNotCreated(context) {
+  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') {
+    browser.windows.onCreated.addListener(themeWindow);
+    browser.windows.onFocusChanged.addListener(themeWindow);
+    browser.windows.onRemoved.addListener(themeWindow);
+    browser.tabs.onUpdated.addListener(themeWindowByTab);
+    browser.tabs.onActivated.addListener(themeWindowByTab);
+  }
+});
+
+function themeWindowByTab(tabId) {
+  function tabWindow(tab) {
+    var gettingPlatformInfo = browser.runtime.getPlatformInfo();
+    gettingPlatformInfo.then(got => {
+      if (got.os == 'android') {
+        let getwindow = browser.tabs.get(tab.tabId);
+        getwindow.then(themeWindow);
+      } else {
+        let getwindow = browser.windows.get(tab.windowId);
+        getwindow.then(themeWindow);
+      }
+    });
+  }
+  if (typeof tabId === 'number') {
+    let tab = browser.tabs.get(tabId);
+    tab.then(tabWindow);
+  } else {
+    tabWindow(tabId);
+  }
+}
+
+function isEmpty(obj) {
+  if (obj === undefined || obj === null) {
+    return true;
+  }
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+var oldtheme = null;
+
+var getOldTheme = async function getOldTheme() {
+  let foundtheme = await browser.theme.getCurrent();
+  if (!isEmpty(foundtheme)) {
+    oldtheme = foundtheme;
+    console.log('Found old theme', oldtheme);
+  }
+  return oldtheme;
+}
+
+getOldTheme();
+
 function themeWindow(window) {
   // Check if the window is in private browsing
+  function onThemeError() {
+    console.log('got theme', oldtheme);
+    browser.theme.update(oldtheme);
+  }
   function logTabs(tabInfo) {
-    console.log(tabInfo);
-
-    function onGot(context) {
-      if (context.name == "i2pbrowser") {
-        console.log("Active in I2P window");
+    function onContextGotTheme(context) {
+      if (context.name == titlepref) {
+        console.log('Active in I2P window');
         if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
-              frame: "#2D4470",
-              toolbar: "#2D4470"
+              frame: '#FFC56D',
+              toolbar: '#FFC56D'
             }
           });
         } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
-              frame: "#9DABD5",
-              toolbar: "#9DABD5"
+              frame: '#FFC56D',
+              toolbar: '#FFC56D'
             }
           });
         }
-      } else if (context.name == "routerconsole") {
-        console.log("Active in I2P window");
+        browser.pageAction.setPopup({
+          tabId: tabInfo[0].id,
+          popup: 'security.html'
+        });
+        //console.log("(background) tabinfo", tabInfo[0].id)
+        browser.pageAction.show(tabInfo[0].id);
+      } else if (context.name == routerpref) {
+        console.log('Active in Router Console window');
         if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
-              frame: "#00CED1",
-              toolbar: "#00CED1"
+              frame: '#A4C8E1',
+              toolbar: '#A4C8E1'
             }
           });
         } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
             colors: {
-              frame: "#40E0D0",
-              toolbar: "#40E0D0"
+              frame: '#A4C8E1',
+              toolbar: '#A4C8E1'
+            }
+          });
+        }
+      } else if (context.name == tunnelpref) {
+        console.log('Active in Hidden Services Manager window');
+        if (window.incognito) {
+          browser.theme.update(window.id, {
+            colors: {
+              frame: '#D9D9D6',
+              toolbar: '#D9D9D6'
+            }
+          });
+        } else {
+          browser.theme.update(window.id, {
+            colors: {
+              frame: '#D9D9D6',
+              toolbar: '#D9D9D6'
+            }
+          });
+        }
+      } else if (context.name == mailpref) {
+        console.log('Active in Web Mail window');
+        if (window.incognito) {
+          browser.theme.update(window.id, {
+            colors: {
+              frame: '#F7E59A',
+              toolbar: '#F7E59A'
+            }
+          });
+        } else {
+          browser.theme.update(window.id, {
+            colors: {
+              frame: '#F7E59A',
+              toolbar: '#F7E59A'
+            }
+          });
+        }
+      } else if (context.name == torrentpref) {
+        console.log('Active in Bittorrent window');
+        if (window.incognito) {
+          browser.theme.update(window.id, {
+            colors: {
+              frame: '#A48FE1',
+              toolbar: '#A48FE1'
+            }
+          });
+        } else {
+          browser.theme.update(window.id, {
+            colors: {
+              frame: '#A48FE1',
+              toolbar: '#A48FE1'
             }
           });
         }
       } else {
-        console.log("Not active in I2P window");
+        console.log('Not active in I2P window');
+        if (isEmpty(oldtheme)) {
+          browser.theme.reset();
+        } else {
+          browser.theme.update(window.id, oldtheme);
+        }
       }
     }
-
-    function onError(e) {
-      console.error(e);
-    }
-    if (tabInfo[0].cookieStoreId != "firefox-default") {
+    if (
+      tabInfo[0].cookieStoreId != 'firefox-default' &&
+      tabInfo[0].cookieStoreId != 'firefox-private'
+    ) {
       browser.contextualIdentities
         .get(tabInfo[0].cookieStoreId)
-        .then(onGot, onError);
+        .then(onContextGotTheme, onThemeError);
+    } else if (isEmpty(oldtheme)) {
+      browser.theme.reset();
     } else {
-      chrome.theme.reset(window.id);
+      browser.theme.update(window.id, oldtheme);
     }
   }
 
-  function onError(error) {
-    console.log(`Error: ${error}`);
-  }
   var querying = browser.tabs.query({
     currentWindow: true,
     active: true
   });
-  querying.then(logTabs, onError);
+  querying.then(logTabs, onThemeError);
 }
 
 function setTitle(window) {
+  // Check if the window is in private browsing
+  function onContextError() {
+    console.log('Context Error');
+  }
   function logTabs(tabInfo) {
-    console.log(tabInfo);
+    function onContextGotTitle(context) {
+      if (context.name == titlepref) {
+        console.log('Active in I2P window');
 
-    function onGot(context) {
-      if (context.name == "i2pbrowser") {
-        console.log("Active in I2P window");
-
-        console.log("Active in I2P window");
         if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: titleprefpriv
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + ': '
           });
         } else {
-          chrome.windows.update(window.id, {
-            titlePreface: titlepref
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + ': '
+          });
+        }
+      } else if (context.name == webpref) {
+        console.log('Active in Web window');
+        if (window.incognito) {
+          browser.windows.update(window.id, {
+            titlePreface: webprefpriv + ' - '
+          });
+        } else {
+          browser.windows.update(window.id, {
+            titlePreface: webpref + ' - '
+          });
+        }
+      } else if (context.name == routerpref) {
+        console.log('Active in Router Console window');
+        if (window.incognito) {
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + ' - ' + routerprefpriv + ': '
+          });
+        } else {
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + ' - ' + routerpref + ': '
+          });
+        }
+      } else if (context.name == tunnelpref) {
+        console.log('Active in Hidden Services Manager window');
+
+        if (window.incognito) {
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + ' - ' + tunnelprefpriv + ': '
+          });
+        } else {
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + ' - ' + tunnelpref + ': '
+          });
+        }
+      } else if (context.name == mailpref) {
+        console.log('Active in I2P Web Mail window');
+
+        if (window.incognito) {
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + ' - ' + mailprefpriv + ': '
+          });
+        } else {
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + ' - ' + mailpref + ': '
+          });
+        }
+      } else if (context.name == torrentpref) {
+        console.log('Active in I2P Torrent window');
+
+        if (window.incognito) {
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + ' - ' + torrentprefpriv + ': '
+          });
+        } else {
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + ' - ' + torrentpref + ': '
+          });
+        }
+      } else if (context.name == localpref) {
+        console.log('Active in Localhost window');
+
+        if (window.incognito) {
+          browser.windows.update(window.id, {
+            titlePreface: localprefpriv + ' - ' + localprefpriv + ': '
+          });
+        } else {
+          browser.windows.update(window.id, {
+            titlePreface: localpref + ' - ' + localpref + ': '
           });
         }
       }
     }
 
-    function onError(e) {
-      console.error(e);
-    }
-    if (tabInfo[0].cookieStoreId != "firefox-default")
+    if (
+      tabInfo[0].cookieStoreId != 'firefox-default' &&
+      tabInfo[0].cookieStoreId != 'firefox-private'
+    ) {
       browser.contextualIdentities
         .get(tabInfo[0].cookieStoreId)
-        .then(onGot, onError);
+        .then(onContextGotTitle, onContextError);
+    } else if (window.incognito) {
+      browser.windows.update(window.id, {
+        titlePreface: ''
+      });
+    } else {
+      browser.windows.update(window.id, {
+        titlePreface: ''
+      });
+    }
   }
 
-  function onError(error) {
-    console.log(`Error: ${error}`);
-  }
   var querying = browser.tabs.query({
     currentWindow: true,
     active: true
   });
-  querying.then(logTabs, onError);
+  querying.then(logTabs, onContextError);
 }
 
-chrome.windows.onCreated.addListener(() => {
-  //var gettingStoredSettings = chrome.storage.local.get();
-  //gettingStoredSettings.then(setupProxy, onError);
-  chrome.storage.local.get(function(got) {
-    setupProxy();
-  });
+var gettingListenerInfo = browser.runtime.getPlatformInfo();
+gettingListenerInfo.then(got => {
+  function onPlatformError() {
+    console.log('Error finding platform info');
+  }
+  if (got.os != 'android') {
+    browser.tabs.onCreated.addListener(() => {
+      var getting = browser.windows.getCurrent({
+        populate: true
+      });
+      getting.then(setTitle, onPlatformError);
+    });
+    browser.tabs.onActivated.addListener(() => {
+      var getting = browser.windows.getCurrent({
+        populate: true
+      });
+      getting.then(setTitle, onPlatformError);
+    });
+  }
 });
 
-chrome.tabs.onCreated.addListener(() => {
-  var getting = browser.windows.getCurrent({
-    populate: true
-  });
-  getting.then(setTitle, onError);
-});
+function handleUpdated(updateInfo) {
+  if (updateInfo.theme) {
+    console.log(`Theme was applied: ${updateInfo.theme}`);
+  } else {
+    console.log("Theme was removed");
+  }
+}
+
+browser.theme.onUpdated.addListener(handleUpdated);
+
+function handleClick() {
+  console.log("Opening page action");
+  browser.pageAction.openPopup();
+}
+browser.pageAction.onClicked.addListener(handleClick);
+
+async function certCheck(details) {
+  if (details.url.startsWith("https")) {
+    console.log("(cert) https site", details.url);
+  } else {
+    return;
+  }
+
+  if (!details.url.includes(".i2p")) {
+    return;
+  }
+
+  var tabs = await browser.tabs.query({ active: true });
+
+  if (tabs == null) {
+    return;
+  }
+
+  console.log("(cert) checking cert", tabs);
+
+  for (tab in tabs) {
+    if (details.url == tabs[tab].url) {
+      console.log("(cert) right tab", tabs[tab].id);
+      try {
+        let securityInfo = await browser.webRequest.getSecurityInfo(
+          details.requestId,
+          { certificateChain: true }
+        );
+        console.log("(cert) state is complete", securityInfo);
+        console.log("(cert) certificates", securityInfo.certificates);
+      } catch (error) {
+        console.error(error);
+      }
+    }
+  }
+}
+
+// Listen for onHeaderReceived for the target page.
+// Set "blocking" and "responseHeaders".
+browser.webRequest.onHeadersReceived.addListener(
+  certCheck,
+  { urls: ["<all_urls>"] },
+  ["blocking", "responseHeaders"]
+);

bookmarks.js

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

cert.js

@@ -0,0 +1,52 @@
+function blankContent(id) {
+  let infoTitle = document.getElementById(id);
+  if (infoTitle === null) {
+    console.log('content error', id);
+    return;
+  }
+  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);
+    return;
+  }
+  infoTitle.textContent = messageContent;
+}
+
+contentUpdateById('TypeLabel', 'siteLabel');
+
+contentUpdateById('CertLabel', 'certLabel');
+
+function tabCheck(tabInfo) {
+  // Information Section
+  console.log('(cert) checking tab');
+  var host = tabInfo[0].url.split('.i2p')[0] + '.i2p';
+  if (host.length < 51) {
+    contentUpdateById('AddressInfo', 'isHostName');
+  } else {
+    if (host.endsWith('b32.i2p')) {
+      contentUpdateById('AddressInfo', 'isBase32');
+    }
+  }
+  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);
+    });
+  } else {
+    contentUpdateById("AddressCertInfo", "certAbsent");
+    blankContent("SignedLabel");
+  }
+}
+
+function tabError(error) {
+  console.log(`Error: ${error}`);
+}
+
+const gettingCurrent = browser.tabs.query({ active: true });
+gettingCurrent.then(tabCheck, tabError);

chromium/LICENSE

@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.

config.js

@@ -0,0 +1,18 @@
+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 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 disable_history = false;

content.js

@@ -1,17 +1,55 @@
-var infoTitle = document.getElementById("text-section-header");
-infoTitle.textContent = chrome.i18n.getMessage("infoTitle");
+function contentUpdateById(id, message) {
+  let infoTitle = document.getElementById(id);
+  let messageContent = chrome.i18n.getMessage(message);
+  if (infoTitle === null) {
+    console.log('content error', id, messageContent);
+    return;
+  }
+  infoTitle.textContent = messageContent;
+}
 
-var infoMessage = document.getElementById("text-section-helptext");
-infoMessage.textContent = chrome.i18n.getMessage("infoMessage");
+// Information Section
+contentUpdateById('text-section-header', 'extensionName');
+contentUpdateById('description', 'extensionDescription');
+contentUpdateById('i2pbrowser-version', 'extensionVersion');
+contentUpdateById('beta', 'extensionStatus');
+contentUpdateById('proxy-check', 'proxyFailedStatus');
 
-var helpMessage = document.getElementById("window-create-forum-panel");
-helpMessage.textContent = chrome.i18n.getMessage("forumMessage");
-/*
-var helpMessage = document.getElementById('window-create-help-panel');
-helpMessage.textContent = chrome.i18n.getMessage("helpMessage")
-*/
-var newsMessage = document.getElementById("window-create-news-panel");
-newsMessage.textContent = chrome.i18n.getMessage("newsMessage");
+// 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');
 
-var clearData = document.getElementById("clear-browser-data");
-clearData.textContent = chrome.i18n.getMessage("clearData");
+// 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');
+
+// 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');
+
+fetch('http://proxy.i2p').then(myJson => {
+  console.log('FETCH RESULT', myJson);
+  contentUpdateById('proxy-check', 'proxySuccessStatus');
+});

context.js

@@ -1,31 +1,32 @@
 //var windowIds = []
+var titlepref = chrome.i18n.getMessage('titlePreface');
+
+function onError(error) {
+  console.log(`Error : ${error}`);
+}
 
 function eventHandler(event) {
-  if (event.target.dataset.action == "create") {
-    function onCreated(windowInfo) {
-      console.log(`Created window: ${windowInfo.id}`);
-      browser.tabs.create({
-        windowId: windowInfo.id,
-        url: "about:blank",
-        cookieStoreId: event.target.dataset.identity
-      });
-    }
-
-    function onError(error) {
-      console.log(`Error: ${error}`);
-    }
-    var creating = browser.windows.create({
+  function onCreated(windowInfo) {
+    console.log(`Created window : ${windowInfo.id}`);
+    browser.tabs.create({
+      windowId: windowInfo.id,
+      url: 'about:blank',
+      cookieStoreId: event.target.dataset.identity
+    });
+  }
+  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
       })
       .then(tabs => {
-        browser.tabs.remove(tabs.map(i => i.id));
+        browser.tabs.remove(tabs.map(rem => rem.id));
       });
   }
   event.preventDefault();
@@ -33,13 +34,13 @@ function eventHandler(event) {
 
 function createOptions(node, identity) {
   for (let option of ["Create", "Close All"]) {
-    let a = document.createElement("a");
-    a.href = "#";
-    a.innerText = option;
-    a.dataset.action = option.toLowerCase().replace(" ", "-");
-    a.dataset.identity = identity.cookieStoreId;
-    a.addEventListener("click", eventHandler);
-    node.appendChild(a);
+    let alink = document.createElement("a");
+    alink.href = "#";
+    alink.innerText = option;
+    alink.dataset.action = option.toLowerCase().replace(" ", "-");
+    alink.dataset.identity = identity.cookieStoreId;
+    alink.addEventListener("click", eventHandler);
+    node.appendChild(alink);
   }
 }
 
@@ -51,7 +52,7 @@ if (browser.contextualIdentities === undefined) {
 } else {
   browser.contextualIdentities
     .query({
-      name: "i2pbrowser"
+      name: titlepref
     })
     .then(identities => {
       if (!identities.length) {

debian/changelog

@@ -1,10 +1,140 @@
+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
+
+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
+
+i2psetproxy.js (0.61-1) UNRELEASED; urgency=low
+
+  * other containerizers bugfix
+
+ -- 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
+
+i2psetproxy.js (0.57-1) UNRELEASED; urgency=low
+
+  * Snowflake compatibility
+  * Lots of small compatibility fixes
+  * More linter errors
+  * Make it multilingual again
+  * Distribute a torrent and a magnet link with the plugin of the plugin
+
+ -- idk <hankhill19580@gmail.com>  Thu, 4 JAN 2020 16:43:58 -0400
+
+i2psetproxy.js (0.55-1) UNRELEASED; urgency=low
+
+  * Get rid of Web Browsing context launcher
+  * Fix linter errors
+  * Tolerate themes
+  * Tolerate other containerizers
+
+ -- idk <hankhill19580@gmail.com>  Thu, 2 JAN 2020 16:47:33 -0400
+
+i2psetproxy.js (0.53-1) UNRELEASED; urgency=low
+
+  * Quick Fix
+
+ -- idk <hankhill19580@gmail.com>  Sat, 23 NOV 2019 20:11:30 -0400
+
+i2psetproxy.js (0.51-1) UNRELEASED; urgency=low
+
+  * Numerous code cleanups, compatibility fixes
+  * enable-disable history
+  * better homepage, better control panel, saner options
+
+ -- idk <hankhill19580@gmail.com>  Sat, 23 NOV 2019 20:10:30 -0400
+
+i2psetproxy.js (0.49-1) UNRELEASED; urgency=low
+
+  * fix tabs
+
+ -- idk <hankhill19580@gmail.com>  Sat, 23 NOV 2019 22:51:11 -0400
+
+i2psetproxy.js (0.47-1) UNRELEASED; urgency=low
+
+  * Improve android compatibility
+  * Improve code organization
+  * Partial protocol handlers implementation
+
+ -- idk <hankhill19580@gmail.com>  Sat, 23 NOV 2019 18:53:11 -0400
+
+i2psetproxy.js (0.45-1) UNRELEASED; urgency=low
+
+  * Improve the user interface a whole bunch
+
+ -- idk <hankhill19580@gmail.com>  Fri, 22 NOV 2019 18:17:33 -0400
+
+i2psetproxy.js (0.43-1) UNRELEASED; urgency=low
+
+  * Contextualize All the Things
+
+ -- idk <hankhill19580@gmail.com>  Mon, 11 OCT 2019 12:41:33 -0400
+
+i2psetproxy.js (0.41-1) UNRELEASED; urgency=low
+
+  * Only open tabs, not windows
+  * Optionally enable WebRTC
+
+ -- idk <hankhill19580@gmail.com>  Thu, 31 OCT 2019 12:41:33 -0400
+
+i2psetproxy.js (0.37-1) UNRELEASED; urgency=low
+
+  * Honor contextual ID when deleting history
+
+ -- idk <hankhill19580@gmail.com>  Thu, 17 OCT 2019 00:52:19 -0400
+
 i2psetproxy.js (0.35-1) UNRELEASED; urgency=low
 
   * Automatically activate contexts
 
  -- idk <hankhill19580@gmail.com>  Thu, 01 Aug 2019 00:32:39 -0400
 
-
 i2psetproxy.js (0.31-1) UNRELEASED; urgency=low
 
   * Initial release. Closes: #nnnn

debian/copyright

@@ -28,6 +28,7 @@ Files:     .gitignore
            scrub.js
            window.html
            debian/*
+           *
 Copyright: MIT
 License:   MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy

debian/postinst

@@ -0,0 +1,6 @@
+#! /bin/sh
+
+ln -sf /usr/share/webext/i2ppb@eyedeekay.github.io \
+/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/i2ppb@eyedeekay.github.io
+
+touch /usr/share/webext/i2ppb@eyedeekay.github.io/manifest.json

debian/rules

@@ -3,18 +3,7 @@
 %:
 	dh $@
 
+export PREFIX=debian/i2psetproxy.js/usr
+
 override_dh_auto_install:
-	mkdir -p $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io \
-		$$(pwd)/debian/i2psetproxy.js/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-	cp -r ./chromium/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./icons/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./options/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./_locales/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.js $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.html $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.css $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.md $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./manifest.json $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./LICENSE $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	ln -sf $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io \
-		$$(pwd)/debian/i2psetproxy.js/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+	make install

debian/source/include-binaries

@@ -0,0 +1,3 @@
+i2psetproxy.js.gif
+smartlander.pdf
+browser.pdf

geti2p.url

@@ -0,0 +1 @@
+0.9.43

handler.js

@@ -0,0 +1,103 @@
+function routerHost(url) {
+  let hostname = '';
+  let path = '';
+  function pathcheck(str) {
+    if (str != undefined) {
+      let final = str.split('/')[0];
+      if (final === 'i2ptunnelmgr' || final === 'i2ptunnel') {
+        console.log('(urlcheck) Tunnel application path', final);
+        return 'i2ptunnelmgr';
+      } else if (final === 'i2psnark' || final === 'torrents') {
+        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')
+      ) {
+        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 + '/', '');
+  } else if (identifyProtocolHandler(url)) {
+    let newurl = identifyProtocolHandler(url);
+    return routerHost(newurl);
+  } else {
+    hostname = url.split('/')[0];
+    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);
+  }
+
+  return false;
+}
+
+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:', '');
+    }
+  } 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];
+  } else {
+    hostname = url.split('/')[0];
+  }
+  let path = url.replace(prefix + hostname, '');
+  console.log('(handler) path', prefix + hostname, path);
+  return path;
+}
+
+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);
+    requestDetails.redirectUrl = rwurl;
+    requestDetails.url = trimHost(rwurl);
+    requestDetails.originUrl = trimHost(rwurl);
+  }
+  return requestDetails;
+};
+
+browser.webRequest.onBeforeRequest.addListener(
+  handlerSetup,
+  { urls: ['<all_urls>'] },
+  ['blocking']
+);

home.css

@@ -0,0 +1,300 @@
+* {
+  padding: 0;
+  margin: 0
+}
+html {
+  height: 100%
+}
+a,
+button {
+  color: #3b6bbf;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+.applicationDesc {
+  color: #81888f;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+.applicationDesc:hover,
+a:hover,
+button:hover {
+  color: #495057;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+button {
+  border: none;
+  cursor: pointer;
+  color: #3b6bbf;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+body {
+  display: flex;
+  flex-direction: column;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  width: 100%;
+  height: 100%;
+  margin: 0 auto;
+  padding: 0;
+  color: #495057;
+  background-attachment: fixed;
+  background-size: 100% 100%;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+.background {
+  background-color: #f8f8ff;
+  height: 100%
+}
+p {
+  line-height: 32px;
+  font-size: 17px;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  text-decoration: none;
+  color: #495057;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+.content {
+  min-height: 3rem;
+  padding: 1rem;
+  margin: 1.5rem;
+  display: inline-block;
+  border: 1px solid #d9d9d6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  background: #f8f8ff;
+  min-width: 95%
+}
+#header,
+.application-info,
+.browser-info,
+.extended-info,
+.search-info {
+  min-height: 3rem;
+  padding: 1rem;
+  margin-top: 1.5rem;
+  display: inline-block;
+  border: 1px solid #d9d9d6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  background: #f8f8ff;
+  min-width: 95%
+}
+h1 {
+  margin-right: auto;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  font-weight: 600;
+  font-size: 32px;
+  text-transform: uppercase;
+  color: #41465f;
+  border: 1px solid #dee2e6;
+  border-radius: 2px 2px 0 0;
+  padding-left: 5%
+}
+h2,
+h3 {
+  margin-right: auto;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  font-weight: 600;
+  font-size: 25px;
+  text-transform: uppercase;
+  color: #41465f;
+  border-radius: 2px 2px 0 0;
+  width: 90%;
+  padding-left: 5%
+}
+h4 {
+  margin-right: auto;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  font-weight: 600;
+  font-size: 20px!important;
+  text-transform: uppercase;
+  color: #41465f;
+  border: 1px solid #dee2e6;
+  border-radius: 2px 2px 0 0;
+  width: 90%;
+  padding-left: 5%
+}
+.showhider {
+  margin-right: auto;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  text-transform: uppercase;
+  background: 0 0!important;
+  border: none;
+  padding: 0!important;
+  width: 90%;
+  color: #3b6bbf;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0;
+  text-align: left
+}
+#links .showhider {
+  font-size: 25px
+}
+.section-header {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 80px
+}
+ul {
+  margin-left: 2rem;
+  list-style: none
+}
+li {
+  min-height: 3rem;
+  padding: .5rem;
+  background: #dee2e6;
+  border: 1px solid #dee2e6;
+  width: 64%;
+  min-width: 64%;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  margin: .5rem .5rem .5rem 32%
+}
+#readyness {
+  padding-top: 1rem;
+  padding-bottom: 1rem;
+  margin: 1rem;
+  width: 42%;
+  min-width: 42%;
+  background: #dee2e6;
+  text-align: center!important;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  display: inline-block
+}
+#onboarding {
+  min-height: 5rem;
+  padding: .5rem;
+  margin: .5rem;
+  margin-top: 4rem;
+  width: 42%;
+  min-width: 42%;
+  font-size: 2rem;
+  background: #a48fe1;
+  text-align: center!important;
+  border: 1px solid #a48fe1;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#i2pbrowser-description {
+  padding-top: 1rem;
+  padding-bottom: 1rem;
+  width: 50%;
+  min-width: 50%;
+  display: inline-block;
+  background: #dee2e6;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#linksExplain {
+  min-height: 5rem;
+  padding: .5rem;
+  margin: .5rem;
+  width: 30%;
+  min-width: 30%;
+  background: #dee2e6;
+  text-align: center!important;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#applicationExplain,
+#controlExplain {
+  min-height: 5rem;
+  padding: .5rem;
+  margin: .5rem;
+  width: 30%;
+  min-width: 30%;
+  background: #dee2e6;
+  text-align: center!important;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  float: left
+}
+#proxyReady {
+  min-height: 3rem;
+  padding: .5rem;
+  margin: .2rem;
+  width: 38%;
+  min-width: 38%;
+  display: inline-block;
+  background: #d9d9d6;
+  float: right;
+  text-align: center!important;
+  border: 1px solid #d9d9d6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#proxyUnready {
+  min-height: 3rem;
+  padding: .5rem;
+  margin: .2rem;
+  width: 38%;
+  min-width: 38%;
+  display: inline-block;
+  float: right;
+  text-align: center!important;
+  border: 1px solid #ffc56d;
+  border-radius: 2px;
+  background: #ffc56d;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#consoleOn {
+  min-height: 3rem;
+  padding: .5rem;
+  margin: .2rem;
+  width: 38%;
+  min-width: 38%;
+  display: inline-block;
+  float: left;
+  text-align: center!important;
+  border: 1px solid #f7e59a;
+  border-radius: 2px;
+  background: #f7e59a;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+.onboardingContent {
+  font-size: .8rem!important;
+  text-align: left;
+  display: none
+}
+#info-content {
+  display: none
+}
+.consoleOn:hover #proxy-check,
+.proxyReady:hover #proxy-check {
+  visibility: visible;
+  opacity: 1
+}
+img {
+  max-width: 100%
+}
+img.readyness {
+  height: 100%;
+  width: auto
+}
+@media only screen and (max-width: 399px) {
+  .application-info {
+    display: none
+  }
+}

home.html

@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <link href="home.css" rel="stylesheet">
+    <link href="search.css" rel="stylesheet">
+    <link href="sidebar.css" rel="stylesheet">
+    <title>
+    </title>
+</head>
+<body>
+    <!--<div>-->
+
+    <div class='background'>
+        <div class='content'>
+            <div class="text-section-header">
+                <h1 id="text-section-header">I2P Browsing</h1>
+            </div>
+
+            <div id="i2pbrowser-version">
+            </div>
+
+            <div id="i2pbrowser-description">
+                <p id="description">I2P in Private Browsing is a webextension to secure and enhance your I2P use in the browser.</p>
+
+                <p id="beta">This is an experimental product.</p>
+            </div>
+
+            <div id="readyness">
+                <!--<div id="consoleOn" class="hideIfI2PConsoleOff">
+              <img class="readyness" src="http://proxy.i2p/themes/console/images/local_up.png" alt="Proxy is not ready."/>
+              <span id="proxy-check">Proxy is ready.</span>
+            </div>-->
+                <!--<div id="proxyUnready" class="hideIfI2PProxyOn">The proxy is not ready yet.</div>-->
+
+                <div class="hideIfI2PProxyOff" id="proxyReady">
+                    <img alt="Proxy is not ready." class="readyness" src="http://proxy.i2p/themes/console/images/local_up.png"> <span id="proxy-check">Proxy is ready.</span>
+                </div>
+            </div>
+
+            <div class="hideIfI2PConsoleOff" id="onboarding">
+                <h3 id="onboardingTitle">New to I2P? Learn more here.</h3>
+
+                <h4 id="onboardingZero"><button class="showhider" id="onboardingButtonZero">Protect your Privacy</button>
+                </h4>
+
+                <p class="onboardingContent" id="onboardingContentZero">I2P Browser allows you to surf the internet using the private and secure I2P network. When using it, you are protected against tracking, surveillance, and censorship as a first-class participant in the I2P network. I2P Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser.</p>
+
+                <h4 id="onboardingOne"><button class="showhider" id="onboardingButtonOne">Configure your Experience</button>
+                </h4>
+
+                <p class="onboardingContent" id="onboardingContentOne">We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. With all the security and privacy features provided by I2P, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.</p>
+
+                <h4 id="onboardingTwo"><button class="showhider" id="onboardingButtonTwo">Share Files</button>
+                </h4>
+
+                <p class="onboardingContent" id="onboardingContentTwo">I2P is capable of using peer-to-peer applications like BitTorrent, protecting your identity when you share files. Our anonymous bittorrent client is available in the browser.</p>
+
+                <h4 id="onboardingThree"><button class="showhider" id="onboardingButtonThree">Hidden e-mail</button>
+                </h4>
+
+                <p class="onboardingContent" id="onboardingContentThree">There is also an anonymous e-mail service available inside of I2P, which is accessible from our browser via the menu directly below.</p>
+
+                <h4 id="onboardingFour"><button class="showhider" id="onboardingButtonFour">Experience Tips</button>
+                </h4>
+
+                <p class="onboardingContent" id="onboardingContentFour">With all the security and privacy features provided by I2P, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.</p>
+            </div>
+            <!--<p class="hideIfI2POn">&aboutI2p.warn_not_running; <a href="about:i2p">&aboutI2p.refresh_text;</a> &aboutI2p.reccommend_not_running;</p>-->
+
+            <div class="application-info">
+                <p class="hideIfI2PConsoleOff">
+                </p>
+
+                <h3 id="applicationHeader">Applications</h3>
+
+                <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
+
+                <ul>
+                    <!--<li class="application">
+                        <a class="applicationName" href="http://legwork.i2p" id="window-link-toopie" target="_blank">Search:</a> <span class="applicationDesc" id="search">Legwork is an in-I2P search engine.</span>
+                        <div class="topnav">
+                            <form action="http://legwork.i2p/yacysearch.html?" method="get">
+                                <input id="search-query" name="query" placeholder="Search on legwork.i2p(Opens a new tab)" type="search"> <input id="search-submit" text="Submit" type="submit">
+                            </form>
+                        </div>
+                    </li>-->
+
+                    <li class="application">
+                        <a class="applicationName" href="toopie.html" id="window-visit-toopie">Toopie</a> <span class="applicationDesc" id="toopie">For information about your I2P router status, go here:</span>
+                    </li>
+
+                    <li class="application">
+                        <a class="applicationName" href="http://127.0.0.1:7657/" id="window-visit-router">Router Console</a> <span class="applicationDesc" id="routerConsole">The entrypoint for all other I2P applications is the I2P Router Console. To visit it, click here.</span>
+                    </li>
+
+                    <li class="application">
+                        <a class="applicationName" href="http://127.0.0.1:7657/i2ptunnel" id="window-visit-i2ptunnel">Hidden Services Manager</a> <span class="applicationDesc" id="i2ptunnel">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span>
+                    </li>
+
+                    <li class="application">
+                        <a class="applicationName" href="http://127.0.0.1:7657/susimail" id="window-visit-susimail">E-Mail</a> <span class="applicationDesc" id="susimail">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span>
+                    </li>
+
+                    <li class="application">
+                        <a class="applicationName" href="http://127.0.0.1:7657/i2psnark" id="window-visit-snark">BitTorrent</a> <span class="applicationDesc" id="snark">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span>
+                    </li>
+                </ul>
+
+                <p>
+                </p>
+            </div>
+
+            <div class="extended-info">
+                <h3 id="links"><button class="showhider" id="fliplinks">Links</button>
+                </h3>
+
+                <div id="info-content">
+                    <p id="linksExplain">If you want to get more information about I2P, you can visit these links.</p>
+
+                    <p>
+                    </p>
+
+                    <ul>
+                        <li>
+                            <a href="http://i2p-projekt.i2p/" id="window-visit-i2p">I2P Project Homepage:</a> <span class="applicationDesc" id="i2ppage">More information is available here.</span>
+                        </li>
+
+                        <li>
+                            <a href="/index.html" id="window-visit-homepage">Webextension Homepage:</a> <span class="applicationDesc" id="webpage">More information is available here.</span>
+                        </li>
+
+                        <li>
+                            <a href="http://gittest.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox" id="window-visit-sources">Source Code:</a> <span class="applicationDesc" id="sources">Browse the source of this webextension or contribute here.</span>
+                        </li>
+
+                        <li>
+                            <a href="http://gittest.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox/-/releases" id="window-visit-releases">Releases:</a> <span class="applicationDesc" id="releases">Check for new releases here.</span>
+                        </li>
+                    </ul>
+
+                    <p>
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="home.js" type="text/javascript"></script> 
+    <script src="content.js" type="text/javascript"></script> <!--</div>-->
+</body>
+</html>

home.js

@@ -0,0 +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');
+  }
+});
+
+function flipVisibility(div) {
+  console.log('(home) seeking flippable', div);
+  let flippable = document.getElementById(div);
+  if (flippable.style.display !== 'block') {
+    flippable.style.display = 'block';
+  } else {
+    flippable.style.display = 'none';
+  }
+}

host.js

@@ -0,0 +1,126 @@
+function proxyHost(url) {
+  let hostname = '';
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
+  } else {
+    hostname = url.split('/')[0];
+  }
+  if (hostname == 'proxy.i2p') {
+    return true;
+  }
+  if (
+    hostname == 'c6lilt4cr5x7jifxridpkesf2zgfwqfchtp6laihr4pdqomq25iq.b32.i2p'
+  ) {
+    return true;
+  }
+  return false;
+}
+
+function localHost(url) {
+  let hostname = '';
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
+  } else {
+    hostname = url.split('/')[0];
+  }
+  hostname = hostname.split(':')[0];
+  if (hostname === '127.0.0.1') {
+    return true;
+  } else if (hostname === 'localhost') {
+    return true;
+  }
+
+  return false;
+}
+
+function extensionHost(url) {
+  if (url.originUrl !== undefined) {
+    var res = url.originUrl.startsWith(browser.runtime.getURL(''));
+    if (res) return res;
+  }
+  if (url.url !== undefined) {
+    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];
+  } else {
+    hostname = url.split('/')[0];
+  }
+  return hostname;
+}
+
+function i2pHost(url) {
+  let hostname = i2pHostName(url);
+  return hostname.endsWith('.i2p');
+}
+
+function routerHost(url) {
+  let hostname = '';
+  let path = '';
+  function pathcheck(str) {
+    if (str != undefined) {
+      let final = str.split('/')[0];
+      if (final === 'i2ptunnelmgr' || final === 'i2ptunnel') {
+        console.log('(urlcheck) Tunnel application path', final);
+        return 'i2ptunnelmgr';
+      } else if (
+        final === 'i2psnark' ||
+        final === 'torrents' ||
+        final.startsWith('transmission')
+      ) {
+        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 === 'sitemap' ||
+        final.startsWith('config')
+      ) {
+        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 + '/', '');
+  } else if (identifyProtocolHandler(url)) {
+    let newurl = identifyProtocolHandler(url);
+    return routerHost(newurl);
+  } else {
+    hostname = url.split('/')[0];
+    path = url.replace(hostname + '/', '');
+  }
+  if (hostname === control_host + ':' + control_port) {
+    return pathcheck(path);
+  }
+  if (hostname === 'localhost' + ':' + control_port) {
+    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;
+}

i2pcontrol/README.md

@@ -0,0 +1,5 @@
+i2pcontrol.js
+=============
+
+This is inside of the webextension for now, but it's actually a fully-fledged,
+standalone library for talking to i2pcontrol.

i2pcontrol/i2pcontrol.js

@@ -0,0 +1,391 @@
+var hello = 'hello i2pcontrol';
+
+function makeid(length) {
+  var result = '';
+  var characters =
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  var charactersLength = characters.length;
+  for (var i = 0; i < length; i++) {
+    result += characters.charAt(Math.floor(Math.random() * charactersLength));
+  }
+  return result;
+}
+
+function send(
+  message,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc"
+) {
+  async function postData(url = "", data = {}) {
+    // Default options are marked with *
+    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
+      headers: {
+        '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
+    };
+    const response = await fetch(url, opts);
+    return await response.json(); // parses JSON response into native JavaScript objects
+  }
+
+  //console.log("http://" + control_host + ":" + control_port + "/" + control_path)
+  return postData(
+    'http://' + control_host + ':' + control_port + '/' + control_path + '/',
+    message
+  );
+}
+
+async function authenticate(
+  password = "itoopie",
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  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;
+  return send(json, control_host, control_port, control_path);
+}
+
+async function GetToken(
+  password = "itoopie",
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc"
+) {
+  function gettoken(authtoken) {
+    return authtoken.result.Token;
+  }
+  let me = authenticate(password, control_host, control_port, control_path);
+  return await me.then(gettoken);
+}
+
+async function Echo(
+  message,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function echo(token) {
+    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;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(echo);
+  return done;
+}
+
+function UpdateEchoElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc"
+) {
+  function updateelement(update) {
+    //console.log("(i2pcontrol)", update);
+    if (document.getElementById(ID) !== null)
+      document.getElementById(ID).innerText = update;
+  }
+  let net = Echo(Query, control_host, control_port, control_path, password);
+  net.then(updateleement);
+}
+
+async function GetRate(
+  Query,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  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;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(getrate);
+  return done;
+}
+
+function UpdateGetRateElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc"
+) {
+  function updateelement(update) {
+    //console.log("(i2pcontrol)", update);
+    if (document.getElementById(ID) !== null)
+      document.getElementById(ID).innerText = update;
+  }
+  let net = GetRate(Query, control_host, control_port, control_path, password);
+  net.then(updateleement);
+}
+
+async function I2PControl(
+  Query,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  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;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(i2pcontrol);
+  return done;
+}
+
+function UpdateI2PControlElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc"
+) {
+  function updateelement(update) {
+    //console.log("(i2pcontrol)", update);
+    if (document.getElementById(ID) !== null)
+      document.getElementById(ID).innerText = update;
+  }
+  let net = I2PControl(
+    Query,
+    control_host,
+    control_port,
+    control_path,
+    password
+  );
+  net.then(updateleement);
+}
+
+async function RouterInfo(
+  Query,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  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;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(routerinfo);
+  return done;
+}
+
+function UpdateRouterInfoElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function updateelement(update) {
+    /*console.log(
+      "(i2pcontrol) element",
+      update.result[Query],
+      ID,
+      document.getElementById(ID)
+    );*/
+    if (document.getElementById(ID) !== null)
+      document.getElementById(ID).innerText = update.result[Query];
+  }
+
+  let net = RouterInfo(
+    Query,
+    control_host,
+    control_port,
+    control_path,
+    password
+  );
+  net.then(updateelement);
+}
+
+async function RouterManager(
+  Query,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  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;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(routermanager);
+  return done;
+}
+
+function UpdateRouterManagerElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function updateelement(update) {
+    //console.log("(i2pcontrol)", update);
+    if (document.getElementById(ID) !== null)
+      document.getElementById(ID).innerText = update;
+  }
+  let net = RouterManager(
+    Query,
+    control_host,
+    control_port,
+    control_path,
+    password
+  );
+  net.then(updateleement);
+}
+
+async function NetworkSetting(
+  Query,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  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;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(networksetting);
+  return done;
+}
+
+function UpdateNetworkSettingElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function updateelement(update) {
+    //console.log("(i2pcontrol)", update);
+    document.getElementById(ID).innerText = update;
+  }
+  let net = NetworkSetting(
+    Query,
+    control_host,
+    control_port,
+    control_path,
+    password
+  );
+  net.then(updateleement);
+}
+
+function UpdateContents() {
+  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'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.net.bw.inbound.15s',
+    'router-net-bw-inbound-15s'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.net.bw.outbound.1s',
+    'router-net-bw-outbound-1s'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.net.bw.outbound.15s',
+    'router-net-bw-outbound-15s'
+  );
+  UpdateRouterInfoElementByID('i2p.router.net.status', 'router-net-status');
+  UpdateRouterInfoElementByID(
+    'i2p.router.net.tunnels.participating',
+    'router-net-tunnels-participating'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.netdb.activepeers',
+    'router-netdb-activepeers'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.netdb.fastpeers',
+    'router-netdb-fastpeers'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.netdb.highcapacitypeers',
+    'router-netdb-highcapacitypeers'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.netdb.isreseeding',
+    'router-netdb-isreseeding'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.netdb.knownpeers',
+    'router-netdb-knownpeers'
+  );
+}
+
+var done = Echo(hello);
+done.then(Done);
+
+function Done(output) {
+  console.log('(i2pcontrol) I2PControl connection tested,', output);
+  return output;
+}

icons/i2plogo.svg

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

index.html

@@ -0,0 +1,209 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <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>
+
+    <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>
+
+    <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>
+
+    <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
+</code></pre>
+    <p>and then you can install it with:</p>
+
+    <pre><code>    sudo apt install ../i2psetproxy.js_*.deb
+</code></pre>
+    <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>
+
+    <ul>
+        <li>
+            <a href="">Magnet Link</a>
+        </li>
+
+        <li>
+            <a href="./i2ppb@eyedeekay.github.io.xpi.torrent">Get the .torrent file</a>
+        </li>
+    </ul>
+
+    <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 alt="Landing page" src="lander.png" 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 alt="Menu" src="menu.png" 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>
+
+    <h3>Features</h3>
+
+    <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 alt="Visiting i2p-projekt.i2p" src="i2psetproxy.js.png" 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 alt="Visiting webmail" src="susimail.png" 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 alt="Visiting i2ptunnel" src="i2ptunnel.png" 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 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.css

@@ -1,18 +1,60 @@
-html, body {
-  width: 350px;
+body,
+html {
+  width: 50rem
 }
-
 a {
-  margin: 10px;
-  display: inline-block;
+  margin: 10px
 }
-
 .panel {
-  margin: 5px;
+  margin: 5px
 }
-
 span.identity {
   width: 100px;
   display: inline-block;
-  margin-left: 1em;
+  margin-left: 1em
 }
+figcaption {
+  display: inline
+}
+.section-header {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 8px
+}
+p {
+  font-size: 12px
+}
+h1 {
+  font-size: 25px
+}
+h2,
+h3 {
+  font-size: 18px
+}
+h4 {
+  font-size: 13px!important
+}
+#links .showhider {
+  font-size: 18px
+}
+#onboarding {
+  font-size: 2rem
+}
+img.readyness {
+  height: 2rem
+}
+#proxyUnready {
+  min-height: 2rem
+}
+#proxyReady {
+  min-height: 2rem
+}
+#consoleOn {
+  min-height: 2rem
+}
+#torrentpanel {
+  display: none
+}
+.torrent-progress {
+  width: 100%
+}

info.js

@@ -1,50 +1,299 @@
-document.addEventListener("click", e => {
-  function getCurrentWindow() {
-    return chrome.windows.getCurrent();
-  }
+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;
+  });
+}
 
-  if (e.target.id === "window-create-help-panel") {
+checkPeerConnection();
+
+function checkSnowflake() {
+  try {
+    function snowflake(snowflake) {
+      console.log("snowflake plugin found, leaving WebRTC alone", snowflake);
+      EnablePeerConnection();
+    }
+    var snowflakeInfo = browser.management.get(
+      "{b11bea1f-a888-4332-8d8a-cec2be7d24b9}" // string
+    );
+    snowflakeInfo.then(snowflake);
+  } catch {
+    console.log("snowflake not found");
+  }
+}
+
+checkSnowflake();
+
+function checkHistory() {
+  let getting = browser.storage.local.get("disable_history");
+  getting.then(got => {
+    let disable_history = got.disable_history;
+    if (disable_history == undefined) {
+      disable_history = false;
+    }
+    console.log("checking history", disable_history);
+    if (document.getElementById("disable-history") !== null)
+      document.getElementById("disable-history").checked = disable_history;
+  });
+}
+
+checkHistory();
+
+document.addEventListener("click", clickEvent => {
+  if (clickEvent.target.id === "window-create-help-panel") {
     let createData = {
       type: "panel",
       incognito: true
     };
-    let creating = chrome.windows.create(createData);
+    let creating = browser.tabs.create(createData);
     creating.then(() => {
       console.log("The help panel has been created");
     });
-  } else if (e.target.id === "window-create-news-panel") {
+  } else if (clickEvent.target.id === "window-create-news-panel") {
     let createData = {
       type: "panel",
       incognito: true
     };
-    let creating = chrome.windows.create(createData);
+    let creating = browser.tabs.create(createData);
     creating.then(() => {
       console.log("The news panel has been created");
     });
-  } else if (e.target.id === "generate-fresh-tunnel") {
-    function RefreshIdentity() {
+  } else if (clickEvent.target.id === "generate-fresh-tunnel") {
+    function refreshIdentity() {
       console.log("Generating new identity");
       const Http = new XMLHttpRequest();
       const url = "http://" + controlHost + ":" + controlPort;
       Http.open("GET", url);
       Http.send();
-      Http.onreadystatechange = e => {
+      Http.onreadystatechange = event => {
         console.log(Http.responseText);
       };
     }
-    RefreshIdentity();
-  } else if (e.target.id === "window-preface-title") {
-    getCurrentWindow().then(currentWindow => {
-      let updateInfo = {
-        titlePreface: "I2P Help | "
-      };
-      chrome.windows.update(currentWindow.id, updateInfo);
-    });
-  } else if (e.target.id === "clear-browser-data") {
+    refreshIdentity();
+  } else if (clickEvent.target.id === "label-router-restart") {
+    console.log("attempting to initiate graceful restart");
+    RouterManager("RestartGraceful");
+  } else if (clickEvent.target.id === "label-router-shutdown") {
+    console.log("attempting to initiate graceful shutdown");
+    RouterManager("ShutdownGraceful");
+  } else if (clickEvent.target.id === "search-submit") {
+    console.log("attempting to create search tab");
+    goSearch();
+  } else if (clickEvent.target.id === "browser-action") {
+    console.log("showing a browser action");
+    showBrowsing();
+  } else if (clickEvent.target.id === "torrent-action") {
+    console.log("showing a torrent action");
+    showTorrentsMenu();
+  } else if (clickEvent.target.id === "window-preface-title") {
+    console.log("attempting to create homepage tab");
+    goHome();
+  } else if (clickEvent.target.id === "window-visit-index") {
+    console.log("attempting to create index tab");
+    goIndex();
+  } else if (clickEvent.target.id === "window-visit-homepage") {
+    console.log("attempting to create homepage tab");
+    goHome();
+  } else if (clickEvent.target.id === "window-visit-toopie") {
+    console.log("attempting to create toopie tab");
+    goToopie();
+  } else if (clickEvent.target.id === "window-visit-i2ptunnel") {
+    console.log("attempting to create i2ptunnel tab");
+    goTunnel();
+  } else if (clickEvent.target.id === "window-visit-susimail") {
+    console.log("attempting to create susimail tab");
+    goMail();
+  } else if (clickEvent.target.id === "window-visit-snark") {
+    console.log("attempting to create snark tab");
+    goSnark();
+  } else if (clickEvent.target.id === "clear-browser-data") {
     forgetBrowsingData();
-  } else if (e.target.id === "check-i2p-control") {
-    echo("I2P Router Detected", "panel-section-i2pcontrol-check");
+  } else if (clickEvent.target.id === "check-i2p-control") {
+    //echo("I2P Router Detected", "panel-section-i2pcontrol-check");
+  } else if (clickEvent.target.id === "enable-web-rtc") {
+    if (clickEvent.target.checked) {
+      browser.runtime.sendMessage({ rtc: "enableWebRTC" });
+    } else {
+      browser.runtime.sendMessage({ rtc: "disableWebRTC" });
+    }
+    checkPeerConnection();
+    return;
+  } else if (clickEvent.target.id === "disable-history") {
+    if (clickEvent.target.checked) {
+      browser.runtime.sendMessage({ history: "disableHistory" });
+    } else {
+      browser.runtime.sendMessage({ history: "enableHistory" });
+    }
+    return;
   }
 
-  e.preventDefault();
+  clickEvent.preventDefault();
 });
+
+function proxyReadiness() {
+  console.log(this.responseText);
+}
+
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os != "android") {
+    browser.history.onVisited.addListener(onVisited);
+  }
+});
+
+function showBrowsing() {
+  var x = document.getElementById("browserpanel");
+  x.style.display = "block";
+  var y = document.getElementById("torrentpanel");
+  y.style.display = "none";
+}
+
+function showTorrentsMenu() {
+  var x = document.getElementById("browserpanel");
+  x.style.display = "none";
+  var y = document.getElementById("torrentpanel");
+  y.style.display = "block";
+}
+
+function goHome() {
+  function gotProxyInfo(info) {
+    let port = info.value.http.split(":")[1];
+    if (port == "7644") {
+      let createRhizomeData = {
+        url: "about:I2p"
+      };
+      console.log("visiting homepage");
+      let creating = browser.tabs.create(createRhizomeData);
+      creating.then(onTabCreated, onTabError);
+    } else {
+      let createData = {
+        url: "home.html"
+      };
+      console.log("visiting homepage");
+      let creating = browser.tabs.create(createData);
+      creating.then(onTabCreated, onTabError);
+    }
+    console.log("(bookmarks) adding home page bookmark");
+  }
+  console.log("(bookmarks) checking if we're running in an I2P Browser");
+  var gettingProxyInfo = browser.proxy.settings.get({});
+  gettingProxyInfo.then(gotProxyInfo);
+}
+
+function goIndex() {
+  function onTabError() {
+    console.log("Help tab created");
+  }
+  let createData = {
+    url: "index.html"
+  };
+  console.log("visiting help");
+  let creating = browser.tabs.create(createData);
+  creating.then(onTabCreated, onTabError);
+}
+
+function goToopie() {
+  function onTabError() {
+    console.log("Toopie tab created");
+  }
+  console.log("visiting toopie");
+  let creating = browser.sidebarAction.open();
+  creating.then(onTabCreated, onTabError);
+}
+
+function onTabCreated() {
+  console.log("Tab Created");
+}
+
+function goSearch() {
+  function onTabError() {
+    console.log("Search tab created");
+  }
+  let createData = {
+    url:
+      "http://yacy.idk.i2p/yacysearch.html?" +
+      "query=" +
+      document.getElementById("search-query").value
+  };
+  console.log("visiting legwork");
+  let creating = browser.tabs.create(createData);
+  creating.then(onTabCreated, onTabError);
+}
+
+function routerAddr() {
+  if (!control_host) var control_host = "127.0.0.1";
+  if (!control_port) var control_port = "7657";
+  return control_host + ":" + control_port;
+}
+
+function goTunnel() {
+  function onTabError() {
+    console.log("I2PTunnel tab created");
+  }
+  let createData = {
+    url: "http://" + routerAddr() + "/i2ptunnel"
+  };
+  console.log("visiting i2ptunnel");
+  let creating = browser.tabs.create(createData);
+  creating.then(onTabCreated, onTabError);
+}
+
+function goMail() {
+  function onTabError() {
+    console.log("Mail tab created");
+  }
+  let createData = {
+    url: "http://" + routerAddr() + "/susimail"
+  };
+  console.log("visiting mail");
+  let creating = browser.tabs.create(createData);
+  creating(onTabCreated, onTabError);
+}
+
+function goSnark() {
+  function onTabError() {
+    console.log("Snark tab created");
+  }
+  let createData = {
+    url: "http://" + routerAddr() + "/i2psnark"
+  };
+  console.log("visiting snark");
+  let creating = browser.tabs.create(createData);
+  creating.then(onTabCreated, onTabError);
+}
+
+function onVisited(historyItem) {
+  function onCleaned(results) {
+    if (results.length) {
+      console.log(" was not removed");
+    } else {
+      console.log(" was removed");
+    }
+  }
+
+  function onRemoved() {
+    var searching = browser.history.search({
+      text: historyItem.url,
+      startTime: 0
+    });
+    searching.then(onCleaned);
+  }
+  if (!history) {
+    if (i2pHost(historyItem.url)) {
+      var deletingUrl = browser.history.deleteUrl(historyItem.url);
+    }
+    deletingUrl.then(onRemoved);
+  }
+}
+
+if (UpdateContents !== undefined) UpdateContents();
+
+const minutes = 0.2;
+const interval = minutes * 60 * 1000;
+
+setInterval(function() {
+  if (UpdateContents !== undefined) UpdateContents();
+}, interval);

manifest.json

@@ -7,7 +7,11 @@
   },
   "permissions": [
     "theme",
+    "alarms",
     "browsingData",
+    "bookmarks",
+    "contextMenus",
+    "management",
     "notifications",
     "proxy",
     "privacy",
@@ -22,9 +26,10 @@
   ],
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "0.36",
+  "version": "0.73",
+  "version_name": "0.73",
   "description": "__MSG_extensionDescription__",
-  "homepage_url": "https://github.com/eyedeekay/i2psetproxy.js",
+  "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
   "icons": {
     "48": "icons/toopie.png"
   },
@@ -34,26 +39,59 @@
     "default_title": "__MSG_extensionName__",
     "default_popup": "window.html"
   },
+  "sidebar_action": {
+    "browser_style": true,
+    "default_icon": "icons/logo.png",
+    "default_title": "__MSG_toopieName__",
+    "default_panel": "toopie.html",
+    "open_at_install": false
+  },
+  "page_action": {
+    "browser_style": true,
+    "default_title": "__MSG_toopieTLS__",
+    "default_icon": "icons/toopie.png",
+    "show_matches": [
+      "http://*.i2p/*",
+      "https://*.i2p/*",
+      "http://*.b32.i2p/*",
+      "https://*.b32.i2p/*"
+    ],
+    "default_panel": "security.html",
+    "pinned": true
+  },
   "options_ui": {
     "page": "options/options.html"
   },
   "background": {
+    "persistent": true,
     "scripts": [
-      "chromium/browser-polyfill.js",
+      "config.js",
+      "torrent/common.js",
+      "torrent/background.js",
+      "i2pcontrol/i2pcontrol.js",
+      "host.js",
       "privacy.js",
       "platform.js",
       "background.js",
+      "handler.js",
       "proxy.js",
       "info.js",
-      "i2pcontrol.js",
-      "scrub.js"
+      "home.js",
+      "scrub.js",
+      "bookmarks.js"
     ]
   },
-  "protocol_handlers": [{
-    "protocol": "web+rc",
-    "name": "RouterConsole",
-    "uriTemplate": "http://router.console/?%s"
-  }],
+  "protocol_handlers": [
+    {
+      "protocol": "ext+rc",
+      "name": "RouterConsole",
+      "uriTemplate": "http://127.0.0.1:7657/%s"
+    },
+    {
+      "protocol": "magnet",
+      "name": "I2PTorrent",
+      "uriTemplate": "http://127.0.0.1:7657/i2psnark/?nofilter_newURL=%s&action=Add&foo=Add+torrent"
+    }
+  ],
   "default_locale": "en"
 }
-

options/options.css

@@ -1,62 +1,51 @@
 body {
   width: 25em;
-  font-family: "Open Sans Light", sans-serif;
+  font-family: "Open Sans Light",sans-serif;
   font-size: 0.9em;
-  font-weight: 300;
+  font-weight: 300
 }
-
 section.scheme-options {
   padding: 0.5em 0;
-  margin: 1em 0;
+  margin: 1em 0
 }
-
 #clear-button {
-  margin: 0 1.3em 1em 0;
+  margin: 0 1.3em 1em 0
 }
-
+#clear-button,
 section.scheme-options input,
-section.scheme-options>select,
-#clear-button {
-  float: right;
+section.scheme-options>select {
+  float: right
 }
-
 label {
   display: block;
-  padding: 0.2em 0;
+  margin-top: 1em
 }
-
 label:hover {
-  background-color: #EAEFF2;
+  background-color: #eaeff2
 }
-
 .title {
   font-size: 1.2em;
-  margin-bottom: 0.5em;
+  margin-bottom: 0.5em
 }
-
-html, body {
-  width: 350px;
+body,
+html {
+  width: 350px
 }
-
 a {
   margin: 10px;
-  display: inline-block;
+  display: inline-block
 }
-
 .panel {
-  margin: 5px;
+  margin: 5px
 }
-
 span.identity {
   width: 100px;
   display: inline-block;
-  margin-left: 1em;
+  margin-left: 1em
 }
-
-.control-options {
-  display: none;
-}
-
 .identity-options {
-  display: none;
+  display: none
 }
+input {
+  display: inline
+}

options/options.html

@@ -1,51 +1,89 @@
 <!DOCTYPE html>
-
 <html>
-  <head>
+<head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="options.css"/>
-  </head>
-  <body>
-
+    <link href="/home.css" rel="stylesheet">
+    <link href="options.css" rel="stylesheet">
+    <title>
+    </title>
+</head>
+<body>
     <section class="scheme-options">
-      <span class="title">Proxy Scheme:</span>
-      <select id="proxy_scheme">
-        <option value="http" selected="selected">HTTP</option>
-        <option value="socks5">SOCKS5</option>
-      </select>
+        <span class="title">Proxy Scheme:</span> <select id="proxy_scheme">
+            <option selected value="http">
+                HTTP
+            </option>
+            <option value="socks5">
+                SOCKS5
+            </option>
+        </select>
     </section>
 
-    <section class="scheme-options proxy-options">
-      <div class="title" >Proxy Options</div>
-
-      <label id="portText">Host: </label>
-      <input type="text" data="host" id="host" value="127.0.0.1"/>
-      <br>
-      <label id="hostText">Port: </label>
-      <input type="text" data="port" id="port" value="4444"/>
+    <section class="scheme-options proxy-options" id="proxy-options">
+        <div class="title">
+            Proxy Options
+        </div>
 
+        <p id="proxyHelpText">
+        </p>
+        <label id="portText">Host:</label> <input data="host" id="host" type="text" value="127.0.0.1">
+        <br>
+        <label id="hostText">Port:</label> <input data="port" id="port" type="text" value="4444">
     </section>
-    <section class="scheme-options identity-options">
+    <!--<section class="scheme-options identity-options">
       <div class="panel">
         <div id="identity-list">Identity list?</div>
       </div>
+    </section>-->
+
+    <section class="scheme-options console-options" id="console-options">
+        <div>
+            <div class="title">
+                Router Console Options
+            </div>
+
+            <p id="controlHelpText">Configure your router console options here.</p>
+            <label id="controlPortText">Console Host:</label> <input data="controlhost" id="controlhost" type="text" value="127.0.0.1">
+            <br>
+            <label id="controlHostText">Console Port:</label> <input data="controlport" id="controlport" type="text" value="7657">
+        </div>
     </section>
 
-    <section class="scheme-options control-options">
-      <div class="title" >Controller Options</div>
-      <p id="controlHelpText"> These options will be inert if used with the default i2p HTTP or SOCKS
-      proxy. </p>
-      <label id="controlPortText">Control Host: </label>
-      <input type="text" data="controlhost" id="controlhost" value="127.0.0.1"/>
-      <br>
-      <label id="controlHostText">Control Port: </label>
-      <input type="text" data="controlport" id="controlport" value="4444"/>
+    <section class="scheme-options control-options" id="control-options">
+        <div>
+            <div class="title">
+                I2PControl RPC Client Options
+            </div>
 
+            <p id="rpcHelpText">Configure your I2PControl options here.</p>
+            <label id="rpcPortText">Control Host:</label> <input data="rpchost" id="rpchost" type="text" value="127.0.0.1">
+            <br>
+            <label id="rpcHostText">Control Port:</label> <input data="rpcport" id="rpcport" type="text" value="7657">
+            <br>
+            <label id="rpcPathText">Control Path:</label> <input data="rpcpath" id="rpcpath" type="text" value="jsonrpc">
+            <br>
+            <label id="rpcPassText">Control Password:</label> <input data="rpcpass" id="rpcpass" type="text" value="itoopie">
+        </div>
     </section>
 
-    <input type="button" value="Save preferences" id="save-button"/>
-
-    <script src="options.js"></script>
-  </body>
+    <section class="scheme-options transmission-options" id="transmission-options">
+        <div>
+            <div class="title">
+                Bittorrent RPC Client Options
+            </div>
 
+            <p id="rpcHelpText">Configure your Bittorrent options here.</p>
+            <label id="btRpcHostText">Torrent RPC Host:</label> <input data="btrpchost" id="btrpchost" type="text" value="127.0.0.1">
+            <br>
+            <label id="btRpcPortText">Torrent RPC Port:</label> <input data="btrpcport" id="btrpcport" type="text" value="7657">
+            <br>
+            <label id="btRpcPathText">Torrent RPC Path:</label> <input data="btrpcpath" id="btrpcpath" type="text" value="transmission/">
+            <br>
+            <label id="rpcPassText">Torrent RPC Password:</label> <input data="btrpcpass" id="btrpcpass" type="text" value="">
+        </div>
+    </section>
+    <input id="save-button" type="button" value="Save preferences"> 
+    <script src="options.js"></script> <!--<script src="/torrent/browser-polyfill.min.js"></script>
+    <script src="/torrent/options.js"></script>-->
+</body>
 </html>

options/options.js

@@ -1,148 +1,317 @@
-function isDroid() {
-  var gettingInfo = browser.runtime.getPlatformInfo();
-  gettingInfo.then(got => {
-    if (got.os == "android") {
-      return true;
-    } else {
-      return false;
-    }
-  });
-}
-
 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');
 }
 
 function SetControlHostText() {
-  var controlhostid = document.getElementById("controlHostText");
-  controlhostid.textContent = chrome.i18n.getMessage("controlHostText");
-}
-
-function setupProxy() {
-  var controlHost = getControlHost();
-  var controlPort = getControlPort();
-  var Host = getHost();
-  var Port = getPort();
-  var Scheme = getScheme();
-  if (!getChrome()) {
-    function handleProxyRequest(requestInfo) {
-      console.log("proxying request via listener");
-      console.log("   ", Scheme, Host, ":", Port);
-      return {
-        type: Scheme,
-        host: Host,
-        port: Port,
-        proxyDns: true
-      };
-    }
-    console.log("Setting up Firefox WebExtension proxy");
-    browser.proxy.onRequest.addListener(handleProxyRequest, {
-      urls: ["<all_urls>"]
-    });
-    console.log("i2p settings created for WebExtension Proxy");
-  } else {
-    var config = {
-      mode: "fixed_servers",
-      rules: {
-        singleProxy: {
-          scheme: Scheme,
-          host: Host,
-          port: parseInt(Port)
-        }
-      }
-    };
-    chrome.proxy.settings.set(
-      {
-        value: config,
-        scope: "regular"
-      },
-      function() {}
-    );
-  }
+  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("Got i2p proxy scheme:", proxy_scheme.value);
-  if (proxy_scheme == "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 == "SOCKS") {
-    return "socks";
+  if (proxy_scheme.value == 'SOCKS') {
+    return 'socks';
   }
-  return proxy_scheme.value;
+  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("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("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("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("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);
+  if (rpc_host == undefined) {
+    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);
+  if (rpc_port == undefined) {
+    return '7657';
+  }
+  return rpc_port;
+}
+
+function getRPCPath() {
+  rpc_path = document.getElementById('rpcpath').value;
+  console.log('(options)Got i2pcontrol rpc path:', rpc_path);
+  if (rpc_path == undefined) {
+    return 'jsonrpc';
+  }
+  return rpc_path;
+}
+
+function getRPCPass() {
+  rpc_pass = document.getElementById('rpcpass').value;
+  console.log('(options)Got i2pcontrol rpc password:');
+  if (rpc_pass == undefined) {
+    return 'itoopie';
+  }
+  return rpc_pass;
+}
+
+function getBTRPCHost() {
+  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 bt_rpc_host;
+}
+
+function getBTRPCPort() {
+  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 bt_rpc_port;
+}
+
+function getBTRPCPath() {
+  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 bt_rpc_path;
+}
+
+function getBTRPCPass() {
+  bt_rpc_pass = document.getElementById('btrpcpass').value;
+  console.log('(options)Got torrent rpc password:');
+  if (bt_rpc_pass == undefined) {
+    return 'itoopie';
+  }
+  return bt_rpc_pass;
+}
+
 function checkStoredSettings(storedSettings) {
+  function gotProxyInfo(info) {
+    let defaultSettings = {};
+    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'];
+
+    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_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_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_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_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_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)',
+      defaultSettings['proxy_scheme'],
+      defaultSettings['proxy_host'],
+      defaultSettings['proxy_port'],
+      defaultSettings['control_host'],
+      defaultSettings['control_port'],
+      defaultSettings['base_url']
+    );
+
+    chrome.storage.local.set(defaultSettings);
+    return defaultSettings;
+  }
+  var gettingInfo = browser.proxy.settings.get({});
+  return gettingInfo.then(gotProxyInfo);
+}
+
+function checkAndroidStoredSettings(storedSettings) {
   let defaultSettings = {};
-  if (!storedSettings.proxy_scheme) {
-    defaultSettings["proxy_scheme"] = "http";
-  }
-  if (!storedSettings.proxy_host) {
-    defaultSettings["proxy_host"] = "127.0.0.1";
-  }
-  if (!storedSettings.proxy_port) {
-    defaultSettings["proxy_port"] = 4444;
-  }
-  if (!storedSettings.control_host) {
-    defaultSettings["control_host"] = "127.0.0.1";
-  }
-  if (!storedSettings.control_port) {
-    defaultSettings["control_port"] = 4444;
-  }
+  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['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['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_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['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_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;
+
+  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']
+  );
   chrome.storage.local.set(defaultSettings);
+  return defaultSettings;
 }
 
 function onError(e) {
@@ -150,64 +319,111 @@ 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();
-  chrome.storage.local.set({
-    proxy_scheme,
-    proxy_host,
-    proxy_port,
-    control_host,
-    control_port
-  });
-  console.log("storing proxy scheme:", proxy_scheme);
-  console.log("storing proxy host:", proxy_host);
-  console.log("storing proxy port:", proxy_port);
-  console.log("storing control host:", control_host);
-  console.log("storing control port:", control_port);
-  setupProxy();
+  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");
-  selectList.value = restoredSettings.proxy_scheme;
-  console.log("showing proxy scheme:", selectList.value);
+  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");
-  hostitem.value = restoredSettings.proxy_host;
-  console.log("showing proxy host:", hostitem.value);
+  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");
-  portitem.value = restoredSettings.proxy_port;
-  console.log("showing proxy port:", portitem.value);
+  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");
-  controlhostitem.value = restoredSettings.control_host;
-  console.log("showing control host:", controlhostitem.value);
+  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");
-  controlportitem.value = restoredSettings.control_port;
-  console.log("showing control port:", controlportitem.value);
+  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');
+  if (rpchostitem == undefined) rpchostitem.value = restoredSettings.rpc_host;
+  //console.log("(options)showing rpc host:", rpchostitem.value);
+
+  const rpcportitem = document.getElementById('rpcport');
+  if (rpcportitem == undefined) rpcportitem.value = restoredSettings.rpc_port;
+  //console.log("(options)showing rpc port:", rpcportitem.value);
+
+  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');
+  if (rpcpassitem == undefined) rpcpassitem.value = restoredSettings.rpc_pass;
+  //console.log("(options)showing rpc pass:");
+
+  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');
+  if (btrpcportitem == undefined)
+    btrpcportitem.value = restoredSettings.rpc_port;
+  //console.log("(options)showing rbt pc port:", rpcportitem.value);
+
+  const btrpcpathitem = document.getElementById('btrpcpath');
+  if (btrpcpathitem == undefined)
+    btrpcpathitem.value = restoredSettings.rpc_path;
+  //console.log("(options)showing bt rpc path:", btrpcpathitem.value);
+
+  const btrpcpassitem = document.getElementById('btrpcpass');
+  if (btrpcpassitem == undefined)
+    btrpcpassitem.value = restoredSettings.rpc_pass;
+  //console.log("(options)showing bt rpc pass:");
 
   SetHostText();
   SetPortText();
+  SetPortHelpText();
   SetControlHostText();
   SetControlPortText();
   SetControlHelpText();
-  setupProxy();
 }
 
 function onError(e) {
   console.error(e);
 }
-chrome.storage.local.get(function(got) {
-  checkStoredSettings(got);
-  updateUI(got);
+
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os != 'android') {
+    chrome.storage.local.get(function(got) {
+      let settings = checkStoredSettings(got);
+      settings.then(updateUI);
+    });
+  } else {
+    chrome.storage.local.get(function(got) {
+      checkAndroidStoredSettings(got);
+      updateUI(got);
+    });
+  }
 });
 
-const saveButton = document.querySelector("#save-button");
-saveButton.addEventListener("click", storeSettings);
-
-//EXPERIMENTAL: Open in I2P Tab
+const saveButton = document.querySelector('#save-button');
+saveButton.addEventListener('click', storeSettings);

platform.js

@@ -1,23 +1,26 @@
-function getChrome() {
-  if (browser.runtime.getBrowserInfo == undefined) {
-    console.log("Running in Chrome detected");
+var android = false;
+
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os == 'android') {
+    console.log('Running in Android detected');
+    android = true;
     return true;
+  } else {
+    console.log('Running in Desktop detected');
+    android = false;
+    return false;
   }
-  return false;
-}
+});
 
 function isDroid() {
-  if (!getChrome()) {
-    var gettingInfo = browser.runtime.getPlatformInfo();
-    gettingInfo.then(got => {
-      if (got.os == "android") {
-        console.log("Running in Android detected");
-        return true;
-      } else {
-        console.log("Running in Desktop detected");
-        return false;
-      }
-    });
+  console.log('android?', android);
+  if (android == undefined) {
+    return false;
   }
+  return android;
+}
+
+function notClosable() {
   return false;
 }

privacy.js

@@ -1,67 +1,56 @@
-function getChrome() {
-  if (chrome.runtime.getBrowserInfo == undefined) {
-    return true;
-  }
-  return false;
-}
+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');
   }
 }
 
-// This disables queries to centralized databases of bad URLs to screen for
-// risky sites in your browser
+/* This disables queries to centralized databases of bad URLs to screen for
+   risky sites in your browser */
 function disableHyperlinkAuditing() {
-  if (!getChrome()) {
-    var setting = browser.privacy.websites.hyperlinkAuditingEnabled.set({
-      value: false
-    });
-    console.log("Disabling hyperlink auditing/val=", {
-      value: false
-    });
-    setting.then(onSet);
-  }
+  var setting = browser.privacy.websites.hyperlinkAuditingEnabled.set({
+    value: false
+  });
+  console.log('Disabling hyperlink auditing/val=', {
+    value: false
+  });
+  setting.then(onSet);
 }
 
 // This enables first-party isolation
 function enableFirstPartyIsolation() {
-  if (!getChrome()) {
-    var setting = browser.privacy.websites.firstPartyIsolate.set({
-      value: true
-    });
-    console.log("Enabling first party isolation/val=", {
-      value: true
-    });
-    setting.then(onSet);
-  }
+  var setting = browser.privacy.websites.firstPartyIsolate.set({
+    value: true
+  });
+  console.log('Enabling first party isolation/val=', {
+    value: true
+  });
+  setting.then(onSet);
 }
 
-// This rejects tracking cookies and third-party cookies but it
-// LEAVES "Persistent" Cookies unmodified in favor of an option in the content
-// interface for now
+/* This rejects tracking cookies and third-party cookies but it
+   LEAVES "Persistent" Cookies unmodified in favor of an option in the content
+   interface for now */
 function disableEvilCookies() {
-  if (!getChrome()) {
-    var getting = browser.privacy.websites.cookieConfig.get({});
-    getting.then(got => {
-      var setting = browser.privacy.websites.cookieConfig.set({
-        value: {
-          behavior: "reject_third_party",
-          nonPersistentCookies: got.value.nonPersistentCookies
-        }
-      });
-      console.log("Setting cookie behavior/val=", {
-        value: {
-          behavior: "reject_third_party",
-          nonPersistentCookies: got.value.nonPersistentCookies
-        }
-      });
-      setting.then(onSet);
+  var getting = browser.privacy.websites.cookieConfig.get({});
+  getting.then(got => {
+    var setting = browser.privacy.websites.cookieConfig.set({
+      value: {
+        behavior: 'reject_third_party',
+        nonPersistentCookies: got.value.nonPersistentCookies
+      }
     });
-  }
+    console.log('Setting cookie behavior/val=', {
+      value: {
+        behavior: 'reject_third_party',
+        nonPersistentCookies: got.value.nonPersistentCookies
+      }
+    });
+    setting.then(onSet);
+  });
 }
 
 // Make sure that they're gone
@@ -77,63 +66,55 @@ function disableEvilCookies() {
 
 // this disables the use of referrer headers
 function disableReferrers() {
-  if (!getChrome()) {
-    var setting = browser.privacy.websites.referrersEnabled.set({
-      value: false
-    });
-    console.log("Disabling referrer headers/val=", {
-      value: false
-    });
-    setting.then(onSet);
-  }
+  var setting = browser.privacy.websites.referrersEnabled.set({
+    value: false
+  });
+  console.log("Disabling referrer headers/val=", {
+    value: false
+  });
+  setting.then(onSet);
 }
 
 // enable fingerprinting resistent features(letterboxing and stuff)
 function enableResistFingerprinting() {
-  if (!getChrome()) {
-    var setting = browser.privacy.websites.referrersEnabled.set({
-      value: true
-    });
-    console.log("Enabling resist fingerprinting/val=", {
-      value: true
-    });
-    setting.then(onSet);
-  }
+  var setting = browser.privacy.websites.resistFingerprinting.set({
+    value: true
+  });
+  console.log("Enabling resist fingerprinting/val=", {
+    value: true
+  });
+  setting.then(onSet);
 }
 
 // This is essentially a blocklist of clearnet web-sites known to do bad tracking
 function enableTrackingProtection() {
-  if (!getChrome()) {
-    var setting = browser.privacy.websites.trackingProtectionMode.set({
-      value: "always"
-    });
-    console.log("Enabling tracking protection/val=", {
-      value: "always"
-    });
-    setting.then(onSet);
-  }
+  var setting = browser.privacy.websites.trackingProtectionMode.set({
+    value: "always"
+  });
+  console.log("Enabling tracking protection/val=", {
+    value: "always"
+  });
+  setting.then(onSet);
 }
 
-// This disables protected content, which is a form of digital restrictions
-// management dependent on identifying information
+/* This disables protected content, which is a form of digital restrictions
+   management dependent on identifying information */
 function disableDigitalRestrictionsManagement() {
-  if (!getChrome()) {
-    var gettingInfo = browser.runtime.getPlatformInfo();
-    gettingInfo.then(got => {
-      if (got.os == "win") {
-        var setting = browser.privacy.websites.protectedContentEnabled.set({
+  var gettingInfo = browser.runtime.getPlatformInfo();
+  gettingInfo.then(got => {
+    if (got.os == "win") {
+      var setting = browser.privacy.websites.protectedContentEnabled.set({
+        value: false
+      });
+      console.log(
+        "Setting Protected Content(Digital Restrictions Management) false/val=",
+        {
           value: false
-        });
-        console.log(
-          "Setting Protected Content(Digital Restrictions Management) false/val=",
-          {
-            value: false
-          }
-        );
-        setting.then(onSet);
-      }
-    });
-  }
+        }
+      );
+      setting.then(onSet);
+    }
+  });
 }
 
 function setAllPrivacy() {
@@ -149,36 +130,58 @@ function setAllPrivacy() {
 setAllPrivacy();
 
 function ResetPeerConnection() {
-  if (!getChrome()) {
-    browser.privacy.network.peerConnectionEnabled.set({
-      value: false
-    });
-    browser.privacy.network.networkPredictionEnabled.set({
-      value: false
+  function reset(snowflake) {
+    var webrtc = true;
+    console.log("No snowflake plugin found, pre-disabled WebRTC");
+    var rtc = browser.privacy.network.peerConnectionEnabled.set({
+      value: webrtc
     });
+    rtc.then(AssurePeerConnection);
   }
-  chrome.privacy.network.webRTCIPHandlingPolicy.set({
-    value: "disable_non_proxied_udp"
-  });
-  console.log("Re-disabled WebRTC");
+  function snowflake(snowflake) {
+    console.log("snowflake plugin found, leaving WebRTC alone", snowflake);
+    EnablePeerConnection();
+  }
+  var snowflakeInfo = browser.management.get(
+    "{b11bea1f-a888-4332-8d8a-cec2be7d24b9}" // string
+  );
+  snowflakeInfo.then(snowflake, reset);
 }
 
 function EnablePeerConnection() {
-  if (!getChrome()) {
+  var webrtc = true;
+  var rtc = browser.privacy.network.peerConnectionEnabled.set({
+    value: webrtc
+  });
+  rtc.then(AssurePeerConnection);
+  console.log("Enabled WebRTC");
+}
+
+function AssurePeerConnection() {
+  function assure(webrtc) {
     browser.privacy.network.peerConnectionEnabled.set({
       value: true
     });
     browser.privacy.network.networkPredictionEnabled.set({
       value: false
     });
+    chrome.privacy.network.webRTCIPHandlingPolicy.set({
+      value: "proxy_only"
+    });
   }
-  chrome.privacy.network.webRTCIPHandlingPolicy.set({
-    value: "disable_non_proxied_udp"
-  });
-  console.log("Enabled WebRTC");
+  let rtc = browser.privacy.network.peerConnectionEnabled.get({});
+  rtc.then(assure);
 }
 
-ResetPeerConnection();
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os == "android") {
+    browser.tabs.onCreated.addListener(ResetPeerConnection);
+  } else {
+    browser.windows.onCreated.addListener(ResetPeerConnection);
+  }
+});
+//AssurePeerConnection();
 
 function ResetDisableSavePasswords() {
   browser.privacy.services.passwordSavingEnabled.set({
@@ -201,26 +204,10 @@ var defaultSettings = {
   dataTypes: ["downloads", "passwords", "formData", "localStorage", "history"]
 };
 
-var appSettings = {
-  since: "forever",
-  dataTypes: [""]
-};
-
-function onError(e) {
-  console.error(e);
+function onError(therror) {
+  console.error(therror);
 }
 
-function checkStoredSettings(storedSettings) {
-  chrome.storage.local.set(appSettings);
-}
-
-if (!getChrome()) {
-  const gettingStoredSettings = browser.storage.local.get();
-  gettingStoredSettings.then(checkStoredSettings, onError);
-}
-
-function clearCookiesContext(cookieStoreId) {}
-
 function forgetBrowsingData(storedSettings) {
   function getSince(selectedSince) {
     if (selectedSince === "forever") {
@@ -228,15 +215,9 @@ function forgetBrowsingData(storedSettings) {
     }
 
     const times = {
-      hour: () => {
-        return 1000 * 60 * 60;
-      },
-      day: () => {
-        return 1000 * 60 * 60 * 24;
-      },
-      week: () => {
-        return 1000 * 60 * 60 * 24 * 7;
-      }
+      hour: () => 1000 * 60 * 60,
+      day: () => 1000 * 60 * 60 * 24,
+      week: () => 1000 * 60 * 60 * 24 * 7
     };
 
     const sinceMilliseconds = times[selectedSince].call();
@@ -260,13 +241,13 @@ function forgetBrowsingData(storedSettings) {
     browser.notifications.create({
       type: "basic",
       title: "Removed browsing data",
-      message: `Removed ${dataTypesString}\n for i2pbrowser`
+      message: `Removed ${dataTypesString}\n for I2P Browsing`
     });
   }
 
   function deepCleanHistory(historyItems) {
     console.log("Deep cleaning history");
-    for (item of historyItems) {
+    for (let item of historyItems) {
       if (i2pHost(item.url)) {
         browser.history.deleteUrl({
           url: item.url
@@ -276,50 +257,50 @@ function forgetBrowsingData(storedSettings) {
         browser.browsingData
           .removePasswords({
             hostnames: [i2pHostName(item.url)],
-            since: since
+            since
           })
-          .then(onGot);
+          .then(onContextGotLog);
         console.log("cleared Passwords");
         browser.browsingData
           .removeDownloads({
             hostnames: [i2pHostName(item.url)],
-            since: since
+            since
           })
-          .then(onGot);
+          .then(onContextGotLog);
         console.log("cleared Downloads");
         browser.browsingData
           .removeFormData({
             hostnames: [i2pHostName(item.url)],
-            since: since
+            since
           })
-          .then(onGot);
+          .then(onContextGotLog);
         console.log("cleared Form Data");
         browser.browsingData
           .removeLocalStorage({
             hostnames: [i2pHostName(item.url)],
-            since: since
+            since
           })
-          .then(onGot);
+          .then(onContextGotLog);
         console.log("cleared Local Storage");
 
-        contexts = browser.contextualIdentities.query({
-          name: "i2pbrowser"
+        let contexts = browser.contextualIdentities.query({
+          name: titlepref
         });
 
         function deepCleanCookies(cookies) {
-          for (cookie of cookies) {
+          for (let cookie of cookies) {
             var removing = browser.cookies.remove({
               firstPartyDomain: cookie.firstPartyDomain,
               name: cookie.name,
               url: item.url
             });
-            removing.then(onGot, onError);
+            removing.then(onContextGotLog, onError);
           }
-          console.log("Cleared cookies")
+          console.log("Cleared cookies");
         }
 
         function deepCleanContext(cookieStoreIds) {
-          for (cookieStoreId of cookieStoreIds) {
+          for (let cookieStoreId of cookieStoreIds) {
             var removing = browser.cookies.getAll({
               firstPartyDomain: null,
               storeId: cookieStoreId.cookieStoreId
@@ -360,7 +341,7 @@ function i2pHost(url) {
   return hostname.endsWith(".i2p");
 }
 
-function onGot(contexts) {
+function onContextGotLog(contexts) {
   if (contexts != null) {
     for (let context of contexts) {
       console.log(context);
@@ -368,8 +349,50 @@ function onGot(contexts) {
   }
 }
 
-function onError(e) {
-  console.error(e);
+browser.runtime.onMessage.addListener(message);
+
+function enableHistory() {
+  function checkStoredSettings(storedSettings) {
+    storedSettings["disable_history"] = false;
+    console.log(storedSettings);
+    function enablehistory(settings) {
+      console.log("Store History:", settings);
+    }
+    let setting = browser.storage.local.set(storedSettings);
+    setting.then(enablehistory);
+  }
+  const gettingStoredSettings = browser.storage.local.get();
+  gettingStoredSettings.then(checkStoredSettings, onError);
 }
 
-//browser.contextualIdentities.query("i2pbrowser").then(clearCookiesContext, onError);
+function disableHistory() {
+  function checkStoredSettings(storedSettings) {
+    storedSettings["disable_history"] = true;
+    console.log(storedSettings);
+    function enablehistory(settings) {
+      console.log("Store History:", settings);
+    }
+    var setting = browser.storage.local.set(storedSettings);
+    setting.then(enablehistory);
+  }
+  const gettingStoredSettings = browser.storage.local.get();
+  gettingStoredSettings.then(checkStoredSettings, onError);
+}
+
+function message(recieved) {
+  console.log(recieved);
+  if (recieved.rtc === "enableWebRTC") {
+    console.log("enableWebRTC");
+    EnablePeerConnection();
+  } else if (recieved.rtc === "disableWebRTC") {
+    console.log("disableWebRTC");
+    ResetPeerConnection();
+  }
+  if (recieved.history === "enableHistory") {
+    console.log("enableHistory");
+    enableHistory();
+  } else if (recieved.history === "disableHistory") {
+    console.log("disableHistory");
+    disableHistory();
+  }
+}

proxy.js

@@ -1,15 +1,18 @@
-if (!getChrome()) {
-  browser.privacy.network.peerConnectionEnabled.set({
-    value: false
-  });
-  console.log("Preliminarily disabled WebRTC.");
-}
+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.');
 
 chrome.privacy.network.networkPredictionEnabled.set({
   value: false
 });
 chrome.privacy.network.webRTCIPHandlingPolicy.set({
-  value: "disable_non_proxied_udp"
+  value: 'proxy_only'
 });
 
 function shouldProxyRequest(requestInfo) {
@@ -17,113 +20,265 @@ function shouldProxyRequest(requestInfo) {
 }
 
 var handleContextProxyRequest = async function(requestDetails) {
-  console.log("(proxy)Searching for proxy by context");
   try {
     var handleProxyRequest = function(context) {
       proxy = {
         failoverTimeout: 0,
-        type: "direct",
         proxyDns: false
       };
-      if (context.name == "i2pbrowser") {
+      if (context == 'firefox-default' || context == 'firefox-private') {
+        proxy = null;
+        return proxy;
+      }
+      if (context != undefined) {
+        if (context.name == titlepref) {
+          proxy = {
+            type: getScheme(),
+            host: getHost(),
+            port: getPort()
+          };
+          /*console.log("(proxy)", context.name);
+          console.log("Using", proxy.type);
+          console.log("proxy ", proxy.host + ":" + proxy.port);*/
+          return proxy;
+        } else if (context.name == routerpref) {
+          if (routerHost(requestDetails.url)) {
+            return proxy;
+          } else if (!routerHost(requestDetails.url)) {
+            proxy = {
+              type: 'http',
+              host: 'localhost',
+              port: '65535'
+            };
+          }
+          proxy = {
+            type: getScheme(),
+            host: getHost(),
+            port: getPort()
+          };
+          /*console.log("(proxy)", context.name);
+          console.log("Using", proxy.type);
+          console.log("proxy ", proxy.host + ":" + proxy.port);*/
+          return proxy;
+        } else if (context.name == webpref) {
+          if (localHost(requestDetails.url)) {
+            if (!routerHost(requestDetails.url)) {
+              proxy = {
+                type: 'http',
+                host: 'localhost',
+                port: '65535'
+              };
+            }
+          }
+          console.log('(proxy)', context.name);
+          console.log('Using', proxy.type);
+          console.log('proxy ', proxy.host + ':' + proxy.port);
+          return proxy;
+        }
+      }
+      if (!routerHost(requestDetails.url)) {
+        if (localHost(requestDetails.url)) {
+          console.log(
+            '(proxy) non-routerconsole localhost url, will not interfere',
+            requestDetails.url
+          );
+          /*proxy = {
+            type: "http",
+            host: "localhost",
+            port: "65535"
+          };*/
+        }
+      } else if (i2pHost(requestDetails.url)) {
         proxy = {
           type: getScheme(),
           host: getHost(),
           port: getPort()
         };
-        console.log(
-          "(proxy)Using",
-          proxy.type,
-          "proxy ",
-          proxy.host + ":" + proxy.port
-        );
-        return proxy;
       }
       return proxy;
     };
     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.log("(proxy)Context Error", error);
-      }
-    };
-    var tabFind = async function(tabId) {
-      try {
-        context = await browser.contextualIdentities.query({
-          name: "i2pbrowser"
-        });
-        tabId.cookieStoreId = context[0].cookieStoreId;
-        console.log("(proxy) forcing context", tabId.cookieStoreId);
-        return tabId;
-      } catch (error) {
-        console.log("(proxy)Context Error", error);
+        console.error(error);
+        return 'firefox-default';
       }
     };
     var tabGet = async function(tabId) {
       try {
-        console.log("(proxy)Tab ID from Request", tabId);
+        //console.log("(proxy)Tab ID from Request", tabId);
         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)) {
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort()
+      };
+      return proxy;
+    }
+    if (requestDetails.originUrl == browser.runtime.getURL('security.html')) {
+      console.log(
+        '(proxy) extension security URL',
+        browser.runtime.getURL('security.html')
+      );
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort()
+      };
+      return proxy;
+    }
+    if (
+      requestDetails.cookieStoreId == 'firefox-default' ||
+      requestDetails.cookieStoreId == 'firefox-private'
+    ) {
+      return browser.proxy.settings.get({});
+    }
     if (requestDetails.tabId > 0) {
-      if (i2pHost(requestDetails.url)) {
-        console.log("(Proxy)I2P URL detected, ");
+      if (proxyHost(requestDetails.url)) {
+        proxy = {
+          type: getScheme(),
+          host: getHost(),
+          port: getPort()
+        };
+        return proxy;
+      } else if (extensionHost(requestDetails.url)) {
+        return;
+      } else if (i2pHost(requestDetails.url)) {
         var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
-        requestDetails.tabId = mtab;
-        var context = mtab.then(contextGet);
+        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);
         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;
       }
+      /*proxy = {};
+      console.log("(proxy)Returning unset Proxy", proxy);
+      return proxy;*/
     }
   } catch (error) {
-    console.log("(proxy)Not using I2P Proxy.", error);
+    console.log('(proxy)Not using I2P Proxy.', error);
   }
-};
-
-var proxy_scheme = "HTTP";
-
-function getScheme() {
-  if (proxy_scheme == undefined) {
-    proxy_scheme = "http";
-  }
-  if (proxy_scheme == "HTTP") {
-    proxy_scheme = "http";
-  }
-  if (proxy_scheme == "SOCKS") {
-    proxy_scheme = "socks";
-  }
-  if (proxy_scheme != "http" && proxy_scheme != "socks") {
-    proxy_scheme = "http";
-  }
-  //console.log("Got i2p proxy scheme:", proxy_scheme);
-  return proxy_scheme;
 }
 
-/*
-var proxy_host = "127.0.0.1";
-var proxy_port = "4444";
-var control_host = "127.0.0.1";
-var control_port = "4444";
-*/
+function SetupSettings() {
+  console.log('Initialising Settings');
+  function onSetupError() {
+    console.log('Settings initialization error');
+  }
+  //
+  function checkSchemeStoredSettings(storedSettings) {
+    if (storedSettings.proxy_scheme == undefined)
+      storedSettings.proxy_scheme = 'http';
+    else proxy_scheme = storedSettings.proxy_scheme;
+
+    console.log('Initialising Proxy Scheme', storedSettings.proxy_scheme);
+    setupProxy();
+  }
+  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';
+    else proxy_host = storedSettings.proxy_host;
+
+    console.log('Initialising Host', storedSettings.proxy_host);
+    setupProxy();
+  }
+  var gettingHostStoredSettings = browser.storage.local.get('proxy_host');
+  gettingHostStoredSettings.then(checkHostStoredSettings, onSetupError);
+
+  //
+  function checkPortStoredSettings(storedSettings) {
+    if (storedSettings.proxy_port == undefined)
+      storedSettings.proxy_port = '4444';
+    else proxy_port = storedSettings.proxy_port;
+
+    console.log('Initialising Port', storedSettings.proxy_port);
+    setupProxy();
+  }
+  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';
+    else control_host = storedSettings.control_host;
+
+    console.log('Initialising Control Host', storedSettings.control_host);
+    setupProxy();
+  }
+  var gettingControlHostStoredSettings = browser.storage.local.get(
+    'control_host'
+  );
+  gettingControlHostStoredSettings.then(
+    checkControlHostStoredSettings,
+    onSetupError
+  );
+
+  //
+  function checkControlPortStoredSettings(storedSettings) {
+    if (storedSettings.control_port == undefined)
+      storedSettings.control_port = '7657';
+    else control_port = storedSettings.control_port;
+
+    console.log('Initialising Control Port', storedSettings.control_port);
+    setupProxy();
+  }
+  var gettingControlPortStoredSettings = browser.storage.local.get(
+    'control_port'
+  );
+  gettingControlPortStoredSettings.then(
+    checkControlPortStoredSettings,
+    onSetupError
+  );
+
+  //
+  function checkHistoryStoredSettings(storedSettings) {
+    if (storedSettings.disable_history == undefined)
+      storedSettings.disable_history = false;
+    else disable_history = storedSettings.disable_history;
+
+    console.log(
+      'Initialising Disabled History',
+      storedSettings.disable_history
+    );
+    setupProxy();
+  }
+  var gettingHistoryStoredSettings = browser.storage.local.get(
+    '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';
+}
 
 function getHost() {
   if (proxy_host == undefined) {
-    proxy_host = "127.0.0.1";
+    proxy_host = '127.0.0.1';
   }
   return proxy_host;
 }
@@ -131,106 +286,53 @@ 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 getControlHost() {
-  if (control_host == undefined) {
-    return "127.0.0.1";
-  }
-  return control_host;
-}
-
-function getControlPort() {
-  if (control_port == undefined) {
-    return "4444";
-  }
-  return control_port;
-}
-
 function setupProxy() {
-  var controlHost = getControlHost();
-  var controlPort = getControlPort();
-  var Host = getHost();
-  var Port = getPort();
-  var Scheme = getScheme();
-  if (!getChrome()) {
-    /**/
-    console.log("Setting up Firefox WebExtension proxy");
-    browser.proxy.onRequest.addListener(handleContextProxyRequest, {
-      urls: ["<all_urls>"]
+  console.log('Setting up Firefox WebExtension proxy');
+  browser.proxy.onRequest.addListener(handleContextProxyRequest, {
+    urls: ['<all_urls>']
+  });
+  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);
+}
+
+function updateFromStorage() {
+  console.log('updating settings from storage');
+  chrome.storage.local.get(function() {
+    SetupSettings();
+    update();
+    setupProxy();
+  });
+  var gettingInfo = browser.runtime.getPlatformInfo();
+  gettingInfo.then(got => {
+    if (got.os != 'android') {
+      browser.windows.getAll().then(wins => wins.forEach(themeWindow));
+    }
+  });
+}
+
+updateFromStorage();
+browser.storage.onChanged.addListener(updateFromStorage);
+SetupSettings();
+setupProxy();
+
+var gettingListenerInfo = browser.runtime.getPlatformInfo();
+gettingListenerInfo.then(got => {
+  browser.windows.onCreated.addListener(() => {
+    chrome.storage.local.get(function() {
+      setupProxy();
     });
-    console.log("i2p settings created for WebExtension Proxy");
-    /**/
-  } else {
-    var config = {
-      mode: "fixed_servers",
-      rules: {
-        singleProxy: {
-          scheme: Scheme,
-          host: Host,
-          port: parseInt(Port)
-        }
-      }
-    };
-    chrome.proxy.settings.set(
-      {
-        value: config,
-        scope: "regular"
-      },
-      function() {}
-    );
-  }
-}
-
-function checkStoredSettings(storedSettings) {
-  let defaultSettings = {};
-  if (!storedSettings.proxy_scheme) {
-    defaultSettings["proxy_scheme"] = "http";
-  }
-  if (!storedSettings.proxy_host) {
-    defaultSettings["proxy_host"] = "127.0.0.1";
-  }
-  if (!storedSettings.proxy_port) {
-    defaultSettings["proxy_port"] = 4444;
-  }
-  if (!storedSettings.control_host) {
-    defaultSettings["control_host"] = "127.0.0.1";
-  }
-  if (!storedSettings.control_port) {
-    defaultSettings["control_port"] = 4444;
-  }
-  chrome.storage.local.set(defaultSettings);
-}
-
-function update(restoredSettings) {
-  proxy_scheme = restoredSettings.proxy_scheme;
-  console.log("restoring proxy scheme:", proxy_scheme);
-  proxy_host = restoredSettings.proxy_host;
-  console.log("restoring proxy host:", proxy_host);
-  proxy_port = restoredSettings.proxy_port;
-  console.log("restoring proxy port:", proxy_port);
-  control_host = restoredSettings.control_host;
-  console.log("restoring control host:", control_host);
-  control_port = restoredSettings.control_port;
-  console.log("restoring control port:", control_port);
-}
-
-chrome.storage.local.get(function(got) {
-  checkStoredSettings(got);
-  update(got);
-  setupProxy();
+  });
 });
-
-// Theme all currently open windows
-if (!getChrome()) {
-  if (!isDroid()) {
-    browser.windows.getAll().then(wins => wins.forEach(themeWindow));
-  }
-}

releases.atom

@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/" xml:lang="en-US">
+  <id>tag:github.com,2008:https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases</id>
+  <link type="text/html" rel="alternate" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases"/>
+  <link type="application/atom+xml" rel="self" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases.atom"/>
+  <title>Release notes from I2P-in-Private-Browsing-Mode-Firefox</title>
+  <updated>2020-03-24T04:22:27Z</updated>
+  <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>
+    <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>
+    <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>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.61</id>
+    <updated>2020-03-02T22:48:06Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.61"/>
+    <title>0.61</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.61-1) UNRELEASED; urgency=low&lt;/p&gt;
+&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:46:24 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.59-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.59</id>
+    <updated>2020-02-26T03:10:23Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.59"/>
+    <title>0.59</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.59-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;transmission-rpc based torrent controls&lt;/li&gt;
+&lt;li&gt;bugfixes&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Tue, 25 FEB 2020 20:52:19 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.57-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.57</id>
+    <updated>2020-01-06T17:16:33Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.57"/>
+    <title>0.57</title>
+    <content type="html">&lt;h1&gt;I2P in Private Browsing Mode&lt;/h1&gt;
+&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.57-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Snowflake compatibility&lt;/li&gt;
+&lt;li&gt;Lots of small compatibility fixes&lt;/li&gt;
+&lt;li&gt;More linter errors&lt;/li&gt;
+&lt;li&gt;Make it multilingual again&lt;/li&gt;
+&lt;li&gt;Distribute a torrent and a magnet link with the plugin of the plugin&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Thu, 4 JAN 2019 16:43:58 -0400&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/docs</id>
+    <updated>2020-01-03T18:01:49Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/docs"/>
+    <title>Documentation</title>
+    <content type="html">&lt;p&gt;PDF&#39;s and text about the extension&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.55</id>
+    <updated>2020-01-06T17:17:01Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.55"/>
+    <title>0.55</title>
+    <content type="html">&lt;h1&gt;I2P in Private Browsing Mode&lt;/h1&gt;
+&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.55-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Get rid of Web Browsing context launcher&lt;/li&gt;
+&lt;li&gt;Fix linter errors&lt;/li&gt;
+&lt;li&gt;Tolerate themes&lt;/li&gt;
+&lt;li&gt;Tolerate other containerizers&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Thu, 2 JAN 2019 16:47:33 -0400&lt;/p&gt;</content>
+    <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,232 +1,576 @@
+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) {
-  console.log("(scrub)Scrubbing info from contextualized request");
+  function onHeaderError() {
+    console.log('Header scrub error');
+  }
+  //console.log("(scrub)Scrubbing info from contextualized request");
   try {
     var headerScrub = function(context) {
+      var ua = 'MYOB/6.66 (AN/ON)';
       if (!context) {
-        console.error("Context not found");
-      } else {
-        if ((context.name = "i2pbrowser")) {
-          var ua = "MYOB/6.66 (AN/ON)";
-          if (i2pHost(requestUrl.url)) {
-            for (var header of requestDetails.requestHeaders) {
-              if (header.name.toLowerCase() === "user-agent") {
-                header.value = ua;
-                console.log("(scrub)User-Agent header modified", header.value);
-              }
+      } else if (context.name == titlepref) {
+        if (i2pHost(requestDetails.url)) {
+          for (var header of requestDetails.requestHeaders) {
+            if (header.name.toLowerCase() === 'user-agent') {
+              header.value = ua;
+              console.log('(scrub)User-Agent header modified', header.value);
             }
           }
-          return {
-            requestHeaders: requestDetails.requestHeaders
-          };
         }
+        return {
+          requestHeaders: requestDetails.requestHeaders
+        };
+      } else if (context.name == routerpref) {
+        if (i2pHost(requestDetails.url)) {
+          for (var header of requestDetails.requestHeaders) {
+            if (header.name.toLowerCase() === 'user-agent') {
+              header.value = ua;
+              console.log('(scrub)User-Agent header modified', header.value);
+            }
+          }
+        }
+        return {
+          requestHeaders: requestDetails.requestHeaders
+        };
       }
     };
     var contextGet = async function(tabInfo) {
       try {
-        console.log("(scrub)Tab info from Function", tabInfo);
-        context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
+        //console.log("(scrub)Tab info from Function", tabInfo);
+        let context = await browser.contextualIdentities.get(
+          tabInfo.cookieStoreId
+        );
         return context;
       } catch (error) {
-        console.log("(scrub)Conext Error", error);
-      }
-    };
-    var tabFind = async function(tabId) {
-      try {
-        context = await browser.contextualIdentities.query({
-          name: "i2pbrowser"
-        });
-        tabId.cookieStoreId = context[0].cookieStoreId;
-        console.log("(scrub) forcing context", tabId.cookieStoreId);
-        return tabId;
-      } catch (error) {
-        console.log("(scrub)Context Error", error);
+        return undefined;
       }
     };
     var tabGet = async function(tabId) {
       try {
-        console.log("(scrub)Tab ID from Request", tabId);
+        //console.log("(scrub)Tab ID from Request", tabId);
         let tabInfo = await browser.tabs.get(tabId);
         return tabInfo;
       } catch (error) {
-        console.log("(scrub)Tab error", error);
+        return undefined;
       }
     };
     if (requestDetails.tabId > 0) {
+      var tab = {};
+      var context = {};
+      var req = {};
       if (i2pHost(requestDetails.url)) {
-        console.log("(Proxy)I2P URL detected, ");
-        var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
-        requestDetails.tabId = mtab;
-        var context = mtab.then(contextGet);
-        var req = await context.then(headerScrub);
-        console.log("(scrub)Scrubbing I2P Request", req);
+        //console.log("(scrub)I2P URL detected, ");
+        tab = tabGet(requestDetails.tabId);
+        context = tab.then(contextGet, onHeaderError);
+        req = await context.then(headerScrub, onHeaderError);
+        //console.log("(scrub)Scrubbing I2P Request", req);
         return req;
-      } else {
-        var tab = tabGet(requestDetails.tabId);
-        var context = tab.then(contextGet);
-        var req = await context.then(headerScrub);
-        console.log("(scrub)Scrubbing I2P Request", req);
+      } else if (routerHost(requestDetails.url)) {
+        tab = tabGet(requestDetails.tabId);
+        context = tab.then(contextGet, onHeaderError);
+        req = await context.then(headerScrub, onHeaderError);
+        //console.log("(scrub)Scrubbing non-I2P Request", req);
         return req;
       }
+      return req;
     }
   } catch (error) {
-    console.log("(scrub)Not scrubbing non-I2P request.", error);
+    console.log('(scrub)Not scrubbing non-I2P request.', error);
   }
-};
+}
 
-var contextSetup = async function(requestDetails) {
-  console.log("(isolate)Forcing I2P requests into context");
+var notMyContextNotMyProblem = async function() {
+  var contexts = await browser.contextualIdentities.query({});
+  var context1 = await browser.contextualIdentities.query({
+    name: titlepref
+  });
+  var context2 = await browser.contextualIdentities.query({
+    name: routerpref
+  });
+  var context3 = await browser.contextualIdentities.query({
+    name: mailpref
+  });
+  var context4 = await browser.contextualIdentities.query({
+    name: torrentpref
+  });
+  var context5 = await browser.contextualIdentities.query({
+    name: tunnelpref
+  });
+  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) {
+    if (
+      contexts[context].cookieStoreId == context1[0].cookieStoreId ||
+      contexts[context].cookieStoreId == context2[0].cookieStoreId ||
+      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 == context7[0].cookieStoreId
+    ) {
+      console.log(
+        'Context found',
+        contexts[context].cookieStoreId,
+        'is my responsibility'
+      );
+    } else {
+      //console.log("Context found", contexts[context].cookieStoreId, "is not my responsibility")
+      othercontexts.push(contexts[context]);
+    }
+  }
+  return othercontexts;
+}
+
+var contextSetup = function(requestDetails) {
+  function onContextError() {
+    console.log('Context launcher error');
+  }
+  //console.log("(isolate)Forcing I2P requests into context");
   try {
-    var tabFind = async function(tabId) {
+    var i2pTabFind = async function(tabId) {
       try {
-        context = await browser.contextualIdentities.query({
-          name: "i2pbrowser"
+        var context = await browser.contextualIdentities.query({
+          name: titlepref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
-          function Create(window) {
+          function Create() {
             function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab");
-              browser.tabs.remove(tabId.id);
-              browser.tabs.remove(window.tabs[0].id);
+              function closeOldTab() {
+                if (tabId.id != tab.id) {
+                  console.log('(isolate) Closing un-isolated tab', tabId.id);
+                  console.log('in favor of', tab.id);
+                  console.log('with context', tab.cookieStoreId);
+                  browser.tabs.remove(tabId.id);
+                }
+                browser.pageAction.setPopup({
+                  tabId: tabId.id,
+                  popup: 'security.html'
+                });
+                browser.pageAction.show(tabId.id);
+              }
+              closeOldTab(tab);
             }
-            function onError(error) {
-              console.log(`Error: ${error}`);
-            }
-            created = browser.tabs.create({
+            var created = browser.tabs.create({
               active: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
             });
-            created.then(onCreated, onError);
+            created.then(onCreated, onContextError);
           }
-          getting = browser.windows.create();
-          getting.then(Create);
+          var gettab = browser.tabs.get(tabId.id);
+          gettab.then(Create, onContextError);
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var routerTabFind = async function(tabId) {
       try {
-        context = await browser.contextualIdentities.query({
-          name: "routerconsole"
+        var context = await browser.contextualIdentities.query({
+          name: routerpref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
-          function Create(window) {
+          function Create() {
             function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab");
-              browser.tabs.remove(tabId.id);
-              browser.tabs.remove(window.tabs[0].id);
+              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);
             }
-            function onError(error) {
-              console.log(`Error: ${error}`);
-            }
-            created = browser.tabs.create({
+            var created = browser.tabs.create({
               active: true,
+              pinned: true,
               cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
             });
-            created.then(onCreated, onError);
+            created.then(onCreated, onContextError);
           }
-          getting = browser.windows.create();
-          getting.then(Create);
+          var gettab = browser.tabs.get(tabId.id);
+          gettab.then(Create, onContextError);
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
+      }
+    };
+    var i2ptunnelTabFind = async function(tabId) {
+      try {
+        var context = await browser.contextualIdentities.query({
+          name: tunnelpref
+        });
+        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 snarkTabFind = async function(tabId) {
+      try {
+        var context = await browser.contextualIdentities.query({
+          name: torrentpref
+        });
+        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 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({
+          name: mailpref
+        });
+        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 localTabFind = async function(tabId) {
+      try {
+        var context = await browser.contextualIdentities.query({
+          name: localpref
+        });
+        if (tabId.cookieStoreId != context[0].cookieStoreId) {
+          function Create() {
+            function onCreated(tab) {
+              function closeOldTab() {
+                if (tabId.id != tab.id) {
+                  console.log('(isolate) Closing un-isolated tab', tabId.id);
+                  console.log('in favor of', tab.id);
+                  console.log('with context', tab.cookieStoreId);
+                  browser.tabs.remove(tabId.id);
+                }
+              }
+              closeOldTab(tab);
+            }
+            var created = browser.tabs.create({
+              active: true,
+              cookieStoreId: context[0].cookieStoreId,
+              url: requestDetails.url
+            });
+            created.then(onCreated, onContextError);
+          }
+          var gettab = browser.tabs.get(tabId.id);
+          gettab.then(Create, onContextError);
+          return tabId;
+        }
+      } catch (error) {
+        console.log('(isolate)Context Error', error);
+      }
+    };
+    var normalTabFind = async function(tabId) {
+      if (tabId == undefined) {
+        return;
+      }
+      try {
+        var anoncontext = await browser.contextualIdentities.query({
+          name: titlepref
+        });
+        var localcontext = await browser.contextualIdentities.query({
+          name: localpref
+        });
+        var othercontexts = await notMyContextNotMyProblem();
+        var nmp = false;
+        for (context in othercontexts) {
+          if (tabId.cookieStoreId == othercontexts[context].cookieStoreId) {
+            console.log('Not my problem');
+            nmp = true;
+          }
+        }
+        if (
+          tabId.cookieStoreId == 'firefox-default' ||
+          tabId.cookieStoreId == 'firefox-private' ||
+          tabId.cookieStoreId == anoncontext[0].cookieStoreId ||
+          tabId.cookieStoreId == localcontext[0].cookieStoreId ||
+          nmp
+        ) {
+          console.log(
+            '(ISOLATE)',
+            tabId.cookieStoreId,
+            'not',
+            anoncontext[0].cookieStoreId,
+            localcontext[0].cookieStoreId
+          );
+          return;
+        } else {
+          function Create() {
+            function onCreated(tab) {
+              function closeOldTab() {
+                if (
+                  tabId.id != tab.id &&
+                  tabId.cookieStoreId != tab.cookieStoreId
+                ) {
+                  console.log(
+                    '(isolate) Closing isolated tab',
+                    tabId.id,
+                    'with context',
+                    tabId.cookieStoreId
+                  );
+                  console.log(
+                    '(isolate) in favor of',
+                    tab.id,
+                    'with context',
+                    tab.cookieStoreId
+                  );
+                  browser.tabs.remove(tabId.id);
+                }
+              }
+              closeOldTab(tab);
+            }
+            var created = browser.tabs.create({
+              active: true,
+              cookieStoreId: 'firefox-default',
+              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 tabGet = async function(tabId) {
       try {
-        console.log("(isolate)Tab ID from Request", tabId);
+        //console.log("(isolate)Tab ID from Request", tabId);
         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) {
+      return requestDetails;
+    }
+    if (proxyHost(requestDetails.url)) {
+      setcookie = browser.cookies.set({
+        firstPartyDomain: i2pHostName(requestDetails.url),
+        url: requestDetails.url,
+        secure: true
+      });
+      setcookie.then(onContextGotLog, onContextError);
+      return requestDetails;
+    }
+
     if (requestDetails.tabId > 0) {
+      var tab = tabGet(requestDetails.tabId);
       if (i2pHost(requestDetails.url)) {
-        var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
+        var setcookie = browser.cookies.set({
+          firstPartyDomain: i2pHostName(requestDetails.url),
+          url: requestDetails.url,
+          secure: true
+        });
+        setcookie.then(onContextGotLog, onContextError);
+        var i2ptab = tab.then(i2pTabFind, onContextError);
         return requestDetails;
       }
-      if (routerHost(requestDetails.url)) {
-        var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(routerTabFind);
+      if (extensionHost(requestDetails)) {
         return requestDetails;
       }
+      let localhost = localHost(requestDetails.url);
+      let routerhost = routerHost(requestDetails.url);
+      if (routerhost) {
+        if (routerhost === 'i2ptunnelmgr') {
+          var tunneltab = tab.then(i2ptunnelTabFind, onContextError);
+          return requestDetails;
+        } else if (routerhost === 'i2psnark') {
+          var snarktab = tab.then(snarkTabFind, onContextError);
+          return requestDetails;
+        } else if (routerhost === 'webmail') {
+          var mailtab = tab.then(mailTabFind, onContextError);
+          return requestDetails;
+        } else if (routerhost === 'muwire') {
+          var routertab = tab.then(muwireTabFind, onContextError);
+          return requestDetails;
+        } else if (routerhost === 'routerconsole') {
+          var routertab = tab.then(routerTabFind, onContextError);
+          return requestDetails;
+        }
+      } else {
+        if (localhost) {
+          var localtab = tab.then(localTabFind, onContextError);
+          return requestDetails;
+        }
+        var normalTab = tab.then(normalTabFind, onContextError);
+        return requestDetails;
+        //return requestDetails;
+      }
     }
   } catch (error) {
-    console.log(
-      "(isolate)Not an I2P request, no need to force into alternate cookiestore.",
-      error
-    );
+    console.log('(isolate)Not an I2P request, blackholing', error);
   }
 };
 
-function i2pHostName(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-  } else {
-    hostname = url.split("/")[0];
-  }
-  return hostname;
-}
-
-function i2pHost(url) {
-  let hostname = i2pHostName(url);
-  return hostname.endsWith(".i2p");
-}
-
-function routerHost(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-  } else {
-    hostname = url.split("/")[0];
-  }
-  if (hostname === "127.0.0.1:7657") {
-    return true;
-  } else if (hostname === "localhost:7657") {
-    return true;
-  }
-
-  if (hostname === "127.0.0.1:7070") {
-    return true;
-  } else if (hostname === "localhost:7070") {
-    return true;
-  }
-
-  return false;
-}
-
 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']
 );

search.css

@@ -0,0 +1,53 @@
+.topnav {
+  overflow: hidden;
+  min-height: 3rem;
+  padding: .5rem;
+  background: #dee2e6;
+  border: 1px solid #dee2e6;
+  width: 64%;
+  min-width: 64%;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  margin: .5rem .5rem .5rem 32%
+}
+.topnav a {
+  float: left;
+  display: block;
+  text-align: center;
+  padding: 14px 16px
+}
+.topnav a:hover {
+  background-color: #ddd
+}
+.topnav a.active {
+  background-color: #2196f3;
+  color: #fff
+}
+.topnav input[type=search] {
+  float: right;
+  padding: 6px;
+  border: none;
+  margin-top: 8px;
+  margin-right: 16px
+}
+.topnav input[type=submit] {
+  float: right;
+  padding: 6px;
+  border: none;
+  margin-top: 8px;
+  margin-right: 16px
+}
+@media screen and (max-width: 600px) {
+  .topnav a,
+  .topnav input[type=text] {
+    float: none;
+    display: block;
+    text-align: left;
+    width: 100%;
+    margin: 0;
+    padding: 14px
+  }
+  .topnav input[type=text] {
+    border: 1px solid #ccc
+  }
+}

security.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <link href="search.css" rel="stylesheet">
+    <link href="home.css" rel="stylesheet">
+    <link href="info.css" rel="stylesheet"><!--<link href="torrent/popup.css" rel="stylesheet">-->
+
+    <title>
+    </title>
+</head>
+<body>
+    <div id="browserpanel">
+        <div class="panel">
+            <div class="section-header panel-section panel-section-header" id="headline">
+                <div class="text-section-header" id="text-section-header">
+                    <h1 id="text-section-header">I2P Site Properties</h1>
+                </div>
+            </div>
+        </div>
+
+        <div class="panel">
+            <ul>
+                <li>
+                    <div class="address-info">
+                        <div id="addresstype">
+                            <span id="TypeLabel">Address Type:</span> <span id="Type"></span>
+                            <div id="TypeInfo">
+                                <span id="AddressInfo"></span>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <li>
+                    <div class="tls-info">
+                        <div id="sitecert">
+                            <span id="CertLabel">Certificate Information:</span> <span id="Cert"></span>
+                            <div id="CertInfo">
+                                <span id="AddressCertInfo"></span>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <li>
+                    <div id="signingcert">
+                        <span id="SignedLabel">Signed By:</span> <span id="Signed"></span>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <script src="cert.js"></script>
+</body>
+</html>

sidebar.css

@@ -0,0 +1,7 @@
+li {
+  width: 90%;
+  margin-left: 0
+}
+#applicationExplain {
+  float: unset
+}

toopie.html

@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>I2P Router Information</title>
+    <link href="home.css" rel="stylesheet" type="text/css">
+    <link href="sidebar.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+    <h1>I2P Router Information</h1>
+
+    <ul>
+        <li><button id="label-router-restart" target="_blank">Restart: <span id="router-restart">Gracefully restart router</span></button>
+        </li>
+
+        <li><button id="label-router-shutdown" target="_blank">Shutdown: <span id="router-shutdown">Gracefully shutdown router</span></button>
+        </li>
+    </ul>
+
+    <ul>
+        <li><span id="label-router-status">Router Status:</span> <span id="router-status">Replace with Router Status</span></li>
+
+        <li><span id="label-router-uptime">Router Uptime(Ms):</span> <span id="router-uptime">Replace with Router Uptime</span></li>
+
+        <li><span id="label-router-version">Router Version:</span> <span id="router-version">Replace with Router Version</span></li>
+
+        <li>
+            <ul>
+                <li><span id="label-router-bw-outbound-1s">Outbound bw 1s:</span> <span id="router-net-bw-outbound-1s">Replace with Router Bandwidth Outbound 1s</span></li>
+
+                <li><span id="label-router-bw-outbound-15s">Outbound bw 15s:</span> <span id="router-net-bw-outbound-15s">Replace with Router Bandwidth Outbound 15s</span></li>
+
+                <li><span id="label-router-bw-inbound-1s">Inbound bw 1s:</span> <span id="router-net-bw-inbound-1s">Replace with Router Bandwidth Inbound 1s</span></li>
+
+                <li><span id="label-router-bw-inbound-15s">Inbound bw 15s:</span> <span id="router-net-bw-inbound-15s">Replace with Router Bandwidth Outbound 15s</span></li>
+            </ul>
+        </li>
+        <!--<li>
+        <span id="label-router-net-status">Network Status:</span>
+        <span id="router-net-status">Replace with Router Network Status</span>
+      </li>-->
+
+        <li>
+            <ul>
+                <li><span id="label-router-net-tunnels-participating">Participating Tunnels:</span> <span id="router-net-tunnels-participating">Replace with Router Participating Tunnel Count</span></li>
+
+                <li><span id="label-router-activepeers">Active Peers:</span> <span id="router-netdb-activepeers">Replace with Router Active Peers</span></li>
+
+                <li><span id="label-router-netdb-fastpeers">Fast Peers:</span> <span id="router-netdb-fastpeers">Replace with Router Fast Peers</span></li>
+
+                <li><span id="label-router-netdb-highcapacitypeers">High Capacity Peers:</span> <span id="router-netdb-highcapacitypeers">Replace with High Capacity Peers</span></li>
+
+                <li><span id="label-router-netdb-isreseeding">Reseed status:</span> <span id="router-netdb-isreseeding">Replace with Router netDB Reseeding Status</span></li>
+
+                <li><span id="label-router-netdb-knownpeers">Known Peers:</span> <span id="router-netdb-knownpeers">Replace with Router Known Peers</span></li>
+            </ul>
+        </li>
+    </ul>
+    <script src="i2pcontrol/i2pcontrol.js"></script> 
+    <script src="info.js"></script> 
+    <script src="content.js"></script>
+</body>
+</html>

torrent/README.md

@@ -0,0 +1,42 @@
+Acknowledgement
+===============
+
+**Many, many thanks to the [Transmitter](https://github.com/myfreeweb/transmitter)
+webextension.**
+
+This part of this plugin contains code which was adapted from the Transmitter
+webextension, which is a minimal interface to the transmission-rpc interfaces of
+many torrent clients, including for our purposes snark-rpc and BiglyBT.
+
+Transmitter is released under the UNLICENSE. An original copy is available at
+this URL: https://github.com/myfreeweb/transmitter/blob/master/UNLICENSE
+
+A copy has also been included in this directory.
+
+Configuring this extension for use with Snark-RPC!
+--------------------------------------------------
+
+One of the coolest things this extension is able to do is communicate with
+a transmission-rpc enabled torrent client. Since it's an I2P focused plugin,
+the default configuration is set up for use with the I2PSnark-RPC plugin created
+by zzz. Since Snark-RPC isn't part of the main Java I2P distribution, in order
+to do this you'll have to install the plugin. You can get a copy of it from
+inside of I2P here:
+
+ * [stats.i2p main package](http://stats.i2p/i2p/plugins/i2psnark-rpc.su3)
+ * [stats.i2p update package](http://stats.i2p/i2p/plugins/i2psnark-rpc-update.su3)
+
+I also have a mirror of the package with each release of the webextension,
+reflecting the version in use in the webextension at the time of the release.
+
+To install the plugin, go to [http://127.0.0.1:7657/configplugins](http://127.0.0.1:7657/configplugins)
+and scroll down to the section of the page where it says "Installation from URL"
+and paste the following URL:
+
+```http://stats.i2p/i2p/plugins/i2psnark-rpc.su3```
+
+Click the "Install Plugin" button and you'll be ready to go. Now, open the
+extension options menu, and just click "Save." The defaults are correct for use
+with I2PSnark-RPC, but they need to be initialized by saving the settings. If
+I2PSnark-RPC becomes part of Java I2P, these defaults will be initialized when
+the plugin is installed.

torrent/UNLICENSE

@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>

torrent/background.js

@@ -0,0 +1,247 @@
+'use strict';
+
+////// Session extraction
+
+function setupExtractor() {
+  browser.webRequest.onHeadersReceived.removeListener(extractSession);
+  browser.storage.local.get('server').then(({ server }) => {
+    if (!server) {
+      return;
+    }
+    console.log('Session extractor setup for', server.base_url);
+    browser.webRequest.onBeforeSendHeaders.addListener(
+      extractSession,
+      { urls: [server.base_url + '*'] },
+      ['requestHeaders']
+    );
+  });
+}
+
+setupExtractor();
+
+function extractSession(requestDetails) {
+  const hdr = requestDetails.requestHeaders.filter(
+    x => x.name.toLowerCase() === "x-transmission-session-id"
+  )[0];
+  if (!hdr) {
+    return;
+  }
+  browser.storage.local.get("server").then(({ server }) => {
+    server.session = hdr.value;
+    browser.storage.local.set({ server });
+  });
+}
+
+////// Adding
+
+function blobToBase64(blob) {
+  return new Promise((resolve, reject) => {
+    const rdr = new FileReader();
+    rdr.onload = () => resolve(rdr.result.substr(rdr.result.indexOf(",") + 1));
+    rdr.onerror = reject;
+    rdr.readAsDataURL(blob);
+  });
+}
+
+function addUrl(torrentUrl, downloadDir) {
+  let p,
+    params = {};
+  if (downloadDir) {
+    params = { "download-dir": downloadDir };
+  }
+  if (torrentUrl.startsWith("magnet:")) {
+    console.log("Adding magnet", torrentUrl);
+    params.filename = torrentUrl;
+    p = rpcCall("torrent-add", params);
+  } else {
+    // Download the torrent file *in the browser* to support private torrents
+    console.log("Downloading torrent", torrentUrl);
+    p = fetch(torrentUrl, {
+      method: "GET",
+      credentials: "include"
+    })
+      .then(resp => {
+        if (resp.ok) {
+          return resp.blob();
+        }
+        throw new Error("Could not download torrent");
+      })
+      .then(blobToBase64)
+      .then(b64 => {
+        params.metainfo = b64;
+        return rpcCall("torrent-add", params);
+      });
+  }
+  return p.then(x => {
+    updateBadge();
+    return x;
+  });
+}
+
+////// magnet: Handler
+
+function handleUrl(requestDetails) {
+  return addUrl(
+    decodeURIComponent(
+      requestDetails.url.replace("http://transmitter.web-extension/", "")
+    )
+  ).then(x => {
+    return browser.storage.local.get("server").then(({ server }) => {
+      return { redirectUrl: server.base_url + "web/" };
+    });
+  });
+}
+
+browser.webRequest.onBeforeRequest.addListener(
+  handleUrl,
+  { urls: ["http://transmitter.web-extension/*"] },
+  ["blocking"]
+);
+
+////// Context menu
+
+function createContextMenu() {
+  browser.storage.local.get("server").then(({ server }) => {
+    browser.contextMenus.removeAll();
+    if (!server || !server.locations || !server.locations.length) {
+      browser.contextMenus.create({
+        id: "transmitter-add",
+        title: "Download with Transmission remote",
+        contexts: ["link"]
+      });
+    } else {
+      browser.contextMenus.create({
+        id: "transmitter-add",
+        title: "Download to Default location",
+        contexts: ["link"]
+      });
+      server.locations.forEach(location => {
+        browser.contextMenus.create({
+          id: "transmitter-add-loc-" + location.index,
+          title: "Download to " + location.name,
+          contexts: ["link"]
+        });
+      });
+    }
+  });
+}
+
+createContextMenu();
+
+browser.contextMenus.onClicked.addListener((info, tab) => {
+  if (info.menuItemId === "transmitter-add") {
+    return addUrl(info.linkUrl);
+  } else if (info.menuItemId.startsWith("transmitter-add-loc-")) {
+    let index = parseInt(info.menuItemId.substr("transmitter-add-loc-".length));
+    browser.storage.local.get("server").then(({ server }) => {
+      let path = server.locations[index].path;
+      addUrl(info.linkUrl, path);
+    });
+  }
+});
+
+////// Badge
+
+function updateBadge() {
+  browser.storage.local.get("server").then(({ server }) => {
+    if (
+      server.badge !== "num" &&
+      server.badge !== "dl" &&
+      server.badge !== "ul" &&
+      server.badge !== "auto"
+    ) {
+      return;
+    }
+    return rpcCall("session-stats", {}).then(response => {
+      const args = response.arguments; // lol the name 'arguments' means destructuring in strict mode is impossible
+      switch (server.badge) {
+        case "num":
+          browser.browserAction.setBadgeBackgroundColor({ color: "gray" });
+          browser.browserAction.setBadgeText({
+            text: "" + args.activeTorrentCount
+          });
+          break;
+        case "dl":
+          browser.browserAction.setBadgeBackgroundColor({ color: "green" });
+          browser.browserAction.setBadgeText({
+            text: formatSpeed(args.downloadSpeed)
+          });
+          break;
+        case "ul":
+          browser.browserAction.setBadgeBackgroundColor({ color: "blue" });
+          browser.browserAction.setBadgeText({
+            text: formatSpeed(args.uploadSpeed)
+          });
+          break;
+        case "auto":
+          if (args.downloadSpeed > 0) {
+            browser.browserAction.setBadgeBackgroundColor({ color: "green" });
+            browser.browserAction.setBadgeText({
+              text: formatSpeed(args.downloadSpeed)
+            });
+          } else if (args.uploadSpeed > 0) {
+            browser.browserAction.setBadgeBackgroundColor({ color: "blue" });
+            browser.browserAction.setBadgeText({
+              text: formatSpeed(args.uploadSpeed)
+            });
+          } else {
+            browser.browserAction.setBadgeBackgroundColor({ color: "gray" });
+            browser.browserAction.setBadgeText({
+              text: "" + args.activeTorrentCount
+            });
+          }
+          break;
+      }
+    });
+  });
+}
+
+browser.alarms.onAlarm.addListener(alarm => {
+  if (alarm.name === "transmitter-badge-update") {
+    return updateBadge();
+  }
+});
+
+function setupBadge() {
+  browser.alarms.clear("transmitter-badge-update").then(x => {
+    browser.storage.local.get("server").then(({ server }) => {
+      if (!server) {
+        return;
+      }
+      browser.alarms.create("transmitter-badge-update", {
+        periodInMinutes: parseInt(server.badge_interval || "1")
+      });
+      updateBadge();
+    });
+  });
+}
+
+setupBadge();
+
+////// Storage updates
+
+browser.storage.onChanged.addListener((changes, area) => {
+  if (!Object.keys(changes).includes("server")) {
+    return;
+  }
+  const oldv = changes.server.oldValue;
+  const newv = changes.server.newValue;
+  if (
+    !oldv ||
+    oldv.base_url !== newv.base_url ||
+    oldv.username !== newv.username ||
+    oldv.password !== newv.password ||
+    oldv.badge_interval !== newv.badge_interval ||
+    oldv.badge !== newv.badge ||
+    arraysEqualDeep(oldv.locations, newv.locations)
+  ) {
+    setupExtractor();
+    setupBadge();
+    updateBadge();
+    createContextMenu();
+  }
+});
+
+function arraysEqualDeep(arr1, arr2) {
+  return JSON.stringify(arr1) !== JSON.stringify(arr2);
+}

torrent/common.js

@@ -0,0 +1,60 @@
+'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
+    };
+    //console.log("(torrent)", server.session)
+    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',
+      headers: myHeaders,
+      body: JSON.stringify({ method: meth, arguments: args }),
+      credentials: 'include' // allows HTTPS client certs!
+    })
+      .then(function(response) {
+        const session = response.headers.get('x-transmission-session-id');
+        if (session) {
+          browser.storage.local.get({}).then(function(storage) {
+            storage.session = session;
+            browser.storage.local.set(storage);
+          });
+        }
+        if (response.status === 409) {
+          return rpcCall(meth, args);
+        }
+        if (response.status >= 200 && response.status < 300) {
+          return response;
+        }
+        const error = new Error(response.statusText);
+        error.response = response;
+        throw error;
+      })
+      .then(function(response) {
+        return response.json();
+      });
+  });
+}
+
+////// Util
+
+function formatSpeed(s) {
+  // Firefox shows 4 characters max
+  if (s < 1000 * 1000) {
+    return (s / 1000).toFixed() + 'K';
+  }
+  if (s < 1000 * 1000 * 1000) {
+    return (s / 1000 / 1000).toFixed() + 'M';
+  }
+  // You probably don't have that download speed…
+  return (s / 1000 / 1000 / 1000).toFixed() + 'T';
+}

torrent/index.html

@@ -0,0 +1,52 @@
+<!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" />
+</head>
+<body>
+<h1>Acknowledgement</h1>
+
+<p><strong>Many, many thanks to the <a href="https://github.com/myfreeweb/transmitter">Transmitter</a>
+webextension.</strong></p>
+
+<p>This part of this plugin contains code which was adapted from the Transmitter
+webextension, which is a minimal interface to the transmission-rpc interfaces of
+many torrent clients, including for our purposes snark-rpc and BiglyBT.</p>
+
+<p>Transmitter is released under the UNLICENSE. An original copy is available at
+this URL: https://github.com/myfreeweb/transmitter/blob/master/UNLICENSE</p>
+
+<p>A copy has also been included in this directory.</p>
+
+<h2>Configuring this extension for use with Snark-RPC!</h2>
+
+<p>One of the coolest things this extension is able to do is communicate with
+a transmission-rpc enabled torrent client. Since it's an I2P focused plugin,
+the default configuration is set up for use with the I2PSnark-RPC plugin created
+by zzz. Since Snark-RPC isn't part of the main Java I2P distribution, in order
+to do this you'll have to install the plugin. You can get a copy of it from
+inside of I2P here:</p>
+
+<ul>
+<li><a href="http://stats.i2p/i2p/plugins/i2psnark-rpc.su3">stats.i2p main package</a></li>
+<li><a href="http://stats.i2p/i2p/plugins/i2psnark-rpc-update.su3">stats.i2p update package</a></li>
+</ul>
+
+<p>I also have a mirror of the package with each release of the webextension,
+reflecting the version in use in the webextension at the time of the release.</p>
+
+<p>To install the plugin, go to <a href="http://127.0.0.1:7657/configplugins">http://127.0.0.1:7657/configplugins</a>
+and scroll down to the section of the page where it says "Installation from URL"
+and paste the following URL:</p>
+
+<p><code>http://stats.i2p/i2p/plugins/i2psnark-rpc.su3</code></p>
+
+<p>Click the "Install Plugin" button and you'll be ready to go. Now, open the
+extension options menu, and just click "Save." The defaults are correct for use
+with I2PSnark-RPC, but they need to be initialized by saving the settings. If
+I2PSnark-RPC becomes part of Java I2P, these defaults will be initialized when
+the plugin is installed.</p>
+</body>
+</html>

torrent/popup.js

@@ -0,0 +1,153 @@
+'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
+  };
+  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',
+    headers: myHeaders,
+    body: JSON.stringify({ method: meth, arguments: args }),
+    credentials: 'include' // allows HTTPS client certs!
+  });
+
+  /*.then(function(response) {
+    console.log("(torrent) responses", response);
+
+    if (response.status === 409) {
+      return TrpcCall(meth, args);
+    }
+    if (response.status >= 200 && response.status < 300) {
+      return response;
+    }
+    const error = new Error(response.statusText);
+    error.response = response;
+    throw error;
+  });*/
+}
+
+const torrentsPane = document.getElementById('torrents-pane');
+const configPane = document.getElementById('config-pane');
+
+for (const opener of document.querySelectorAll('.config-opener')) {
+  opener.addEventListener('click', e => {
+    browser.runtime.openOptionsPage();
+  });
+}
+
+function showConfig(server) {
+  torrentsPane.hidden = true;
+  configPane.hidden = false;
+}
+
+const torrentsSearch = document.getElementById("torrents-search");
+const torrentsList = document.getElementById("torrents-list");
+const torrentsTpl = document.getElementById("torrents-tpl");
+const torrentsError = document.getElementById("torrents-error");
+const getArgs = {
+  fields: ["name", "percentDone", "rateDownload", "rateUpload", "queuePosition"]
+};
+let cachedTorrents = [];
+
+function renderTorrents(newTorrents) {
+  if (torrentsList.children.length < newTorrents.length) {
+    const dif = newTorrents.length - torrentsList.children.length;
+    for (let i = 0; i < dif; i++) {
+      const node = document.importNode(torrentsTpl.content, true);
+      torrentsList.appendChild(node);
+    }
+  } else if (torrentsList.children.length > newTorrents.length) {
+    const oldLen = torrentsList.children.length;
+    const dif = oldLen - newTorrents.length;
+    for (let i = 1; i <= dif; i++) {
+      torrentsList.removeChild(torrentsList.children[oldLen - i]);
+    }
+  }
+  for (let i = 0; i < newTorrents.length; i++) {
+    const torr = newTorrents[i];
+    const cont = torrentsList.children[i];
+    const speeds =
+      "↓ " +
+      formatSpeed(torr.rateDownload) +
+      "B/s ↑ " +
+      formatSpeed(torr.rateUpload) +
+      "B/s";
+    cont.querySelector(".torrent-name").textContent = torr.name;
+    cont.querySelector(".torrent-speeds").textContent = speeds;
+    cont.querySelector(".torrent-progress").value = torr.percentDone * 100;
+  }
+}
+
+function searchTorrents() {
+  let newTorrents = cachedTorrents;
+  const val = torrentsSearch.value.toLowerCase().trim();
+  if (val.length > 0) {
+    newTorrents = newTorrents.filter(x => x.name.toLowerCase().includes(val));
+  }
+  renderTorrents(newTorrents);
+}
+torrentsSearch.addEventListener("change", searchTorrents);
+torrentsSearch.addEventListener("keyup", searchTorrents);
+
+function refreshTorrents(server) {
+  console.log("(torrent) initiating", server);
+  return TrpcCall("torrent-get", getArgs).then(function(response) {
+    const session = response.headers.get("x-transmission-session-id");
+    if (session) {
+      browser.storage.local.get({}).then(function(storage) {
+        storage.session = session;
+        browser.storage.local.set(storage);
+      });
+    }
+    let sponse = response.json();
+    sponse.then(function(response) {
+      console.log("(torrent) refreshing", response);
+      let newTorrents = response.arguments.torrents;
+      newTorrents.sort((x, y) => y.queuePosition - x.queuePosition);
+      cachedTorrents = newTorrents;
+      torrentsSearch.hidden = newTorrents.length <= 8;
+      if (torrentsSearch.hidden) {
+        torrentsSearch.value = "";
+        renderTorrents(newTorrents);
+      } else {
+        searchTorrents();
+      }
+    });
+  });
+}
+
+function refreshTorrentsLogErr(server) {
+  return refreshTorrents(server).catch(err => {
+    console.error(err);
+    torrentsError.textContent = "Error: " + err.toString();
+  });
+}
+
+function showTorrents(server) {
+  torrentsPane.hidden = false;
+  configPane.hidden = true;
+  for (const opener of document.querySelectorAll(".webui-opener")) {
+    opener.href = server.base_url + "web/";
+  }
+  console.log("(torrent) showing torrents");
+  refreshTorrents(server).catch(_ => refreshTorrentsLogErr(server));
+  setInterval(() => refreshTorrentsLogErr(server), 2000);
+}
+
+//let store =
+browser.storage.local.get(function(server) {
+  console.log("(torrent) querying storage", server);
+  if (server && server.base_url && server.base_url !== "") {
+    showTorrents(server);
+  } else {
+    showConfig(server);
+  }
+});

window.html

@@ -1,53 +1,171 @@
 <!DOCTYPE html>
-
 <html>
-  <head>
+<head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="info.css"/>
-  </head>
-
-  <body>
-    <div class="panel">
-      <div class="panel-section panel-section-header">
-        <div id="text-section-header" class="text-section-header">I2P Assistance</div>
-      </div>
-
-      <div id="text-section-helptext">
-      You are now free to browse the eepWeb!
-
-      Your browser is now configured to browse anonymously on the I2P network.
-      As you browse, your traffic will be routed through other network nodes
-      to disguise it's origin, both from the server and from the nodes
-      themselves.
-
-      </div>
-
-      <div class="panel-section-separator"></div>
-          <!-- This is where I'll eventually put the tunnel control panel -->
-          <!-- <a href="#" id="generate-fresh-tunnel> Generate a Fresh Tunnel</a>"-->
-          <!-- -->
-      <strong><a href="#" id="clear-browser-data">Clear all browsing data</a></strong><br>
-          <!--<strong><a href="#" id="temp-enable-webrtc">Temporarily enable WebRTC</a></strong><br>-->
-      <div class="panel-section-separator"></div>
-          <a href="http://i2pforum.i2p" id="window-create-forum-panel">Visit the I2P Forums</a><br>
-          <a href="http://i2p-projekt.i2p/blog" id="window-create-news-panel">Get the latest I2P News</a><br>
-      <div class="panel-section-separator"></div>
-          <a href="#" id="check-i2p-control">Check I2P Router Health</a><div id="panel-section-i2pcontrol-check"></div>
-      <div class="panel-section-separator"></div>
-
-      <div class="panel-section-identity">
-          <div id="identity-list"></div>
-      </div>
+    <link href="search.css" rel="stylesheet">
+    <link href="home.css" rel="stylesheet">
+    <link href="info.css" rel="stylesheet"><!--<link href="torrent/popup.css" rel="stylesheet">-->
 
+    <title>
+    </title>
+</head>
+<body>
+    <div class="section-header panel-section panel-section-header" id="topbar">
+        <!--<div class="text-section-header" id="text-section-header">-->
+        <img height="32px" src="icons/toopie.png" width="32px"> <a href="#" id="browser-action">Browse</a> <img height="32px" src="icons/torrents.png" width="32px"> <a href="#" id="torrent-action">Download</a> <!--</div>-->
     </div>
 
+    <div id="browserpanel">
+        <div class="panel">
+            <div class="section-header panel-section panel-section-header" id="headline">
+                <div class="text-section-header" id="text-section-header">
+                    <h1 id="text-section-header">The Invisible Internet Browser</h1>
+                </div>
+            </div>
 
-  <script src="context.js"></script>
-  <script src="privacy.js"></script>
-  <script src="info.js"></script>
-  <script src="content.js"></script>
-  <script src="i2pcontrol.js"></script>
+            <div class="search-info">
+                <div id="i2pbrowser-version">
+                </div>
 
+                <div class="topnav">
+                    <a class="applicationName window-visit-homepage" href="#" id="window-visit-homepage" target="_blank">Home Page</a>
+                    <form action="http://yacy.idk.i2p/yacysearch.html?" method="get">
+                        <input id="search-query" name="query" placeholder="Search on yacy.idk.i2p(Opens a new tab)" type="search"> <input id="search-submit" text="Submit" type="submit">
+                    </form>
+                </div>
+
+                <div class="hideIfI2PProxyOff" id="readyness">
+                    <img class="readyness" src="http://proxy.i2p/themes/console/images/local_up.png"> <span id="proxy-check">Proxy is ready.</span>
+                </div>
+
+                <div id="i2pbrowser-description">
+                    <p id="description">You are now able to use I2P in this browser.</p>
+
+                    <p id="beta">It is experimental.</p>
+                </div>
+            </div>
+
+            <div class="browser-info">
+                <p class="hideIfI2PConsoleOff">
+                </p>
+
+                <h3 id="controlHeader">Controls</h3>
+
+                <p id="controlExplain">These controls are used to tailor your I2P Browsing Experience</p>
+
+                <ul>
+                    <!--<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">
+                        <div class="panel-section-separator">
+                        </div>
+
+                        <div class="panel-section-identity">
+                            <div id="identity-list">
+                            </div>
+                        </div>
+                    </li>
+
+                    <li class="application"><input id="disable-history" name="disablehistory" type="checkbox" value="history"> <label for="disable-history">Disable History in I2P Tabs</label> <span class="applicationDesc" id="histDesc">History is automatically cleared when your I2P tabs are closed. If you want to clear history as you go, check this box.</span></li>
+                </ul>
+
+                <p>
+                </p>
+
+                <p>
+                </p>
+            </div>
+
+            <div class="panel-section-separator">
+            </div>
+
+            <div class="application-info">
+                <p class="hideIfI2PConsoleOff">
+                </p>
+
+                <h3 id="applicationHeader">Applications</h3>
+
+                <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
+
+                <ul>
+                    <li class="application"><button class="applicationName window-visit-homepage" href="#" id="window-visit-index" target="_blank">Help Page</button> <span class="applicationDesc" id="abouthome">For more information about this extension, go here:</span></li>
+
+                    <li class="application"><button class="applicationName window-visit-toopie" href="#" id="window-visit-toopie" target="_blank">Toopie</button> <span class="applicationDesc" id="toopie">For information about your I2P router status, go here:</span></li>
+
+                    <li class="application"><button class="applicationName" id="window-visit-i2ptunnel" target="_blank">Hidden Services Manager</button> <span class="applicationDesc" id="i2ptunnel">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span></li>
+
+                    <li class="application"><button class="applicationName" id="window-visit-susimail" target="_blank">E-Mail</button> <span class="applicationDesc" id="susimail">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span></li>
+
+                    <li class="application"><button class="applicationName" id="window-visit-snark" target="_blank">BitTorrent</button> <span class="applicationDesc" id="snark">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span></li>
+                </ul>
+
+                <p>
+                </p>
+
+                <p>
+                </p>
+            </div>
+        </div>
+    </div>
+
+    <div id="torrentpanel">
+        <div class="panel" id="torrentstatus">
+            <div class="section-header panel-section panel-section-header">
+                <div class="text-section-header" id="text-section-torrents-header">
+                    <h3>Torrent Downloads</h3>
+                </div>
+            </div>
+
+            <div hidden="" id="config-pane">
+                <strong>Torrent RPC Configuration</strong>
+                <br>
+                The server address is not set yet.
+                <br>
+                <a class="config-opener" href="#">Open the settings</a> to continue.
+            </div>
+
+            <div hidden="" id="torrents-pane">
+                <header>
+                    <h1>Torrent Controls</h1>
+                    <a class="webui-opener" href="#" target="_blank"><img alt="Open Web UI" src="icon.svg"></a> <!--<a class="config-opener" href="#">
+                            <img alt="Settings" src="gear.svg"></a>
+                            <a class="info-opener" href="https://github.com/myfreeweb/transmitter" target="_blank">
+                            <img alt="Extension Info" src="info.svg"></a>-->
+                </header>
+                <input id="torrents-search" placeholder="Search…" type="search">
+                <template id="torrents-tpl">
+                    <ul>
+                        <li>
+                            <div class="torrent-head">
+                                <div class="torrent-name">
+                                </div>
+
+                                <div class="torrent-speeds">
+                                </div>
+                            </div>
+                            <progress class="torrent-progress" max="100"></progress>
+                        </li>
+                    </ul>
+                </template>
+
+                <ul id="torrents-list">
+                </ul>
+
+                <div id="torrents-error">
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="context.js"></script> 
+    <script src="privacy.js"></script> 
+    <script src="i2pcontrol/i2pcontrol.js"></script> 
+    <script src="info.js"></script> 
+    <script crossorigin="anonymous" src="content.js"></script> 
+    <script src="torrent/popup.js"></script> 
+    <script src="torrent/common.js"></script>
 </body>
-
 </html>