Merge pull request #32 from eyedeekay/smart-home

Smart home

.eslintrc.js

@@ -0,0 +1,251 @@
+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": "error",
+    "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": "error",
+    "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": "error",
+    "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": "error",
+    "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": ["error", "functions"],
+    "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-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": "error",
+    "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,2 @@
 README.md.asc
-
+node_modules/

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

@@ -4,12 +4,14 @@ default: zip
 
 install: uninstall
 	mkdir -p $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
+		$(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol \
 		$(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 ./i2pcontrol/i2pcontrol.js $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol/i2pcontrol.js
 	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/
@@ -29,29 +31,58 @@ ls:
 	ls -lah $(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 
 clean:
-	rm -f ../i2psetproxy.js.zip ../i2p_proxy*.xpi
+	rm -fr ../i2psetproxy.js.zip ../i2p_proxy*.xpi ../i2p*.xpi #../i2psetproxy.js_*.*
 
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES
 
-MOZ_VERSION=0.38
-VERSION=0.39
-VERSION=$(MOZ_VERSION)
+MOZ_VERSION=0.42
+VERSION=0.43
+#VERSION=$(MOZ_VERSION)
 #VERSION=1.27
 
+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' > index.html
+
 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
+	#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
+	cp ~/Downloads/i2p_in_private_browsing-$(VERSION)-an+fx.xpi ./i2ppb@eyedeekay.github.io.xpi
 
 version:
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)\",|g' manifest.json
 
+moz-version:
+	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(MOZ_VERSION)\",|g' manifest.json
+
 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="./package.json" \
+		--exclude="./package-lock.json" \
+		--exclude="./.node_modules" \
+		--exclude="./node_modules" \
 		--exclude="./.git" -r -FS ../i2psetproxy.js.zip *
 
 release:
@@ -64,6 +95,30 @@ recreate-release: delete-release release upload
 
 upload: upload-xpi upload-deb
 
+
+WEB_EXT_API_KEY=AMO_KEY
+WEB_EXT_API_SECRET=AMO_SECRET
+
+
+-include ../api_keys_moz.mk
+
+tk:
+	echo $(WEB_EXT_API_KEY)
+
+##ODD NUMBERED, SELF-DISTRIBUTED VERSIONS HERE!
+sign: version
+	@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
+	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
+	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
+	web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
+
+##EVEN NUMBERED, MOZILLA-DISTRIBUTED VERSIONS HERE!
+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."
+	web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
+
 upload-xpi:
 	gothub upload -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi" -f "./i2ppb@eyedeekay.github.io.xpi"
 
@@ -76,8 +131,14 @@ libpolyfill:
 	wget -O chromium/browser-polyfill.js https://unpkg.com/webextension-polyfill/dist/browser-polyfill.js
 
 fmt:
+	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
+	#find . -path ./node_modules -prune -o -name '*.css' -exec cleancss -O1 --format beautify {} \;
 	find . -path ./node_modules -prune -o -name '*.js' -exec prettier --write {} \;
 
+lint:
+	eslint --fix *.js
+
 deborig:
 	rm -rf ../i2psetproxy.js-$(VERSION)
 	cp -r . ../i2psetproxy.js-$(VERSION)
@@ -85,8 +146,11 @@ deborig:
 		-cvz \
 		--exclude=.git \
 		--exclude=i2psetproxy.js.gif \
+		--exclude=node_modules \
 		-f ../i2psetproxy.js_$(VERSION).orig.tar.gz \
 		.
 
 deb: deborig
 	cd ../i2psetproxy.js-$(VERSION) && debuild -us -uc -rfakeroot
+
+-include mirrors.mk

README.md

@@ -40,6 +40,15 @@ 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.
 
+Debian usage:
+-------------
+
+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:
+
+        make deb
+
 ### Features
 
   * [done] **Provide** a way to launch into an I2P-Specific contextual identity
@@ -63,7 +72,10 @@ submission to AMO.
     disabled*.
   * [ready] **Provide** help in a variety of languages.
   * [wip] **Monitor** the health and readiness of the I2P router it is
-   instructed to use.
+   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.
   * [1/2] **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
@@ -77,6 +89,16 @@ submission to AMO.
 
 ![Visiting i2p-projekt.i2p](i2psetproxy.js.png)
 
+![Visiting routerconsole](routerconsole.png)
+
+![Visiting webmail](susimail.png)
+
+![Visiting i2psnark](i2psnark.png)
+
+![Visiting i2ptunnel](i2ptunnel.png)
+
+![Visiting clearweb](clearweb.png)
+
 ![Video of the plugin in action](i2psetproxy.js.gif)
 
 Super Extra Important Background Info:

_locales/en/messages.json

@@ -8,11 +8,51 @@
     "description": "Description of the extension."
   },
   "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"
+  },
+  "webPreface": {
+    "message": "Web Browser",
+    "description": "Preface for the browser titlebar"
+  },
+  "webPrefacePrivate": {
+    "message": "Web 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"
   },
   "resetMessage": {

background.js

@@ -1,3 +1,16 @@
+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");
+
 function onGot(contexts) {
   var ids = [];
   for (let context of contexts) {
@@ -5,24 +18,60 @@ function onGot(contexts) {
     ids.push(context.name);
   }
   console.log("Checking new contexts");
-  if (ids.indexOf("i2pbrowser") == -1) {
+  if (ids.indexOf(titlepref) == -1) {
     browser.contextualIdentities
       .create({
-        name: "i2pbrowser",
-        color: "purple",
+        name: titlepref,
+        color: "orange",
         icon: "fingerprint"
       })
       .then(onCreated, onError);
   }
-  if (ids.indexOf("routerconsole") == -1) {
+  if (ids.indexOf(webpref) == -1) {
     browser.contextualIdentities
       .create({
-        name: "routerconsole",
-        color: "turquoise",
+        name: webpref,
+        color: "red",
+        icon: "circle"
+      })
+      .then(onCreated, onError);
+  }
+  if (ids.indexOf(routerpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: routerpref,
+        color: "blue",
         icon: "briefcase"
       })
       .then(onCreated, onError);
   }
+  if (ids.indexOf(tunnelpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: tunnelpref,
+        color: "green",
+        icon: "tree"
+      })
+      .then(onCreated, onError);
+  }
+  if (ids.indexOf(mailpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: mailpref,
+        color: "yellow",
+        icon: "briefcase"
+      })
+      .then(onCreated, onError);
+  }
+  if (ids.indexOf(torrentpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: torrentpref,
+        color: "purple",
+        icon: "chill"
+      })
+      .then(onCreated, onError);
+  }
 }
 
 function onCreated(context) {
@@ -43,9 +92,6 @@ if (!isDroid()) {
   chrome.tabs.onActivated.addListener(themeWindowByTab);
 }
 
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
-
 function themeWindowByTab(tabId) {
   function tabWindow(tab) {
     getwindow = browser.windows.get(tab.windowId);
@@ -63,45 +109,100 @@ function themeWindow(window) {
   // Check if the window is in private browsing
   function logTabs(tabInfo) {
     function onGot(context) {
-      if (context.name == "i2pbrowser") {
+      if (context.name == titlepref) {
         console.log("Active in I2P window");
         if (window.incognito) {
           chrome.theme.update(window.id, {
             colors: {
-              frame: "#2D4470",
-              toolbar: "#2D4470"
+              frame: "#FFC56D",
+              toolbar: "#FFC56D"
             }
           });
         } else {
           chrome.theme.update(window.id, {
             colors: {
-              frame: "#9DABD5",
-              toolbar: "#9DABD5"
+              frame: "#FFC56D",
+              toolbar: "#FFC56D"
             }
           });
         }
-      } else if (context.name == "routerconsole") {
-        console.log("Active in I2P window");
+      } else if (context.name == routerpref) {
+        console.log("Active in Router Console window");
         if (window.incognito) {
           chrome.theme.update(window.id, {
             colors: {
-              frame: "#00CED1",
-              toolbar: "#00CED1"
+              frame: "#A4C8E1",
+              toolbar: "#A4C8E1"
             }
           });
         } else {
           chrome.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) {
+          chrome.theme.update(window.id, {
+            colors: {
+              frame: "#D9D9D6",
+              toolbar: "#D9D9D6"
+            }
+          });
+        } else {
+          chrome.theme.update(window.id, {
+            colors: {
+              frame: "#D9D9D6",
+              toolbar: "#D9D9D6"
+            }
+          });
+        }
+      } else if (context.name == mailpref) {
+        console.log("Active in Web Mail window");
+        if (window.incognito) {
+          chrome.theme.update(window.id, {
+            colors: {
+              frame: "#F7E59A",
+              toolbar: "#F7E59A"
+            }
+          });
+        } else {
+          chrome.theme.update(window.id, {
+            colors: {
+              frame: "#F7E59A",
+              toolbar: "#F7E59A"
+            }
+          });
+        }
+      } else if (context.name == torrentpref) {
+        console.log("Active in Bittorrent window");
+        if (window.incognito) {
+          chrome.theme.update(window.id, {
+            colors: {
+              frame: "#A48FE1",
+              toolbar: "#A48FE1"
+            }
+          });
+        } else {
+          chrome.theme.update(window.id, {
+            colors: {
+              frame: "#A48FE1",
+              toolbar: "#A48FE1"
             }
           });
         }
       } else {
         console.log("Not active in I2P window");
+        chrome.theme.reset(window.id);
       }
     }
-    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);
@@ -122,10 +223,9 @@ function setTitle(window) {
     console.log(tabInfo);
 
     function onGot(context) {
-      if (context.name == "i2pbrowser") {
+      if (context.name == titlepref) {
         console.log("Active in I2P window");
 
-        console.log("Active in I2P window");
         if (window.incognito) {
           chrome.windows.update(window.id, {
             titlePreface: titleprefpriv
@@ -135,13 +235,86 @@ function setTitle(window) {
             titlePreface: titlepref
           });
         }
+      } else if (context.name == webpref) {
+        console.log("Active in Web window");
+
+        if (window.incognito) {
+          chrome.windows.update(window.id, {
+            titlePreface: ""
+          });
+        } else {
+          chrome.windows.update(window.id, {
+            titlePreface: ""
+          });
+        }
+      } else if (context.name == routerpref) {
+        console.log("Active in Router Console window");
+        if (window.incognito) {
+          chrome.windows.update(window.id, {
+            titlePreface: routerprefpriv
+          });
+        } else {
+          chrome.windows.update(window.id, {
+            titlePreface: routerpref
+          });
+        }
+      } else if (context.name == tunnelpref) {
+        console.log("Active in Hidden Services Manager window");
+
+        if (window.incognito) {
+          chrome.windows.update(window.id, {
+            titlePreface: tunnelprefpriv
+          });
+        } else {
+          chrome.windows.update(window.id, {
+            titlePreface: tunnelpref
+          });
+        }
+      } else if (context.name == mailpref) {
+        console.log("Active in Web Mail window");
+
+        if (window.incognito) {
+          chrome.windows.update(window.id, {
+            titlePreface: mailprefpriv
+          });
+        } else {
+          chrome.windows.update(window.id, {
+            titlePreface: mailpref
+          });
+        }
+      } else if (context.name == torrentpref) {
+        console.log("Active in I2P window");
+
+        if (window.incognito) {
+          chrome.windows.update(window.id, {
+            titlePreface: torrentprefpriv
+          });
+        } else {
+          chrome.windows.update(window.id, {
+            titlePreface: torrentpref
+          });
+        }
       }
     }
 
-    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);
+    } else {
+      if (window.incognito) {
+        chrome.windows.update(window.id, {
+          titlePreface: ""
+        });
+      } else {
+        chrome.windows.update(window.id, {
+          titlePreface: ""
+        });
+      }
+    }
   }
 
   var querying = browser.tabs.query({
@@ -152,8 +325,8 @@ function setTitle(window) {
 }
 
 chrome.windows.onCreated.addListener(() => {
-  //var gettingStoredSettings = chrome.storage.local.get();
-  //gettingStoredSettings.then(setupProxy, onError);
+  /* var gettingStoredSettings = chrome.storage.local.get();
+     gettingStoredSettings.then(setupProxy, onError); */
   chrome.storage.local.get(function(got) {
     setupProxy();
   });
@@ -165,3 +338,20 @@ chrome.tabs.onCreated.addListener(() => {
   });
   getting.then(setTitle, onError);
 });
+
+chrome.tabs.onActivated.addListener(() => {
+  var getting = browser.windows.getCurrent({
+    populate: true
+  });
+  getting.then(setTitle, onError);
+});
+
+function handleUpdated(updateInfo) {
+  if (updateInfo.theme.colors) {
+    console.log(`Theme was applied: ${updateInfo.theme}`);
+  } else {
+    console.log(`Theme was removed`);
+  }
+}
+
+browser.theme.onUpdated.addListener(handleUpdated);

bookmarks.js

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

chromium/browser-polyfill.js

@@ -17,6 +17,7 @@
   /* 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/. */
+
   "use strict";
 
   if (
@@ -28,15 +29,15 @@
     const SEND_RESPONSE_DEPRECATION_WARNING =
       "Returning a Promise is the preferred way to send a reply from an onMessage/onMessageExternal listener, as the sendResponse will be removed from the specs (See https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/runtime/onMessage)";
 
-    // Wrapping the bulk of this polyfill in a one-time-use function is a minor
-    // optimization for Firefox. Since Spidermonkey does not fully parse the
-    // contents of a function until the first time it's called, and since it will
-    // never actually need to be called, this allows the polyfill to be included
-    // in Firefox nearly for free.
+    /* Wrapping the bulk of this polyfill in a one-time-use function is a minor
+       optimization for Firefox. Since Spidermonkey does not fully parse the
+       contents of a function until the first time it's called, and since it will
+       never actually need to be called, this allows the polyfill to be included
+       in Firefox nearly for free. */
     const wrapAPIs = extensionAPIs => {
-      // NOTE: apiMetadata is associated to the content of the api-metadata.json file
-      // at build time by replacing the following "include" with the content of the
-      // JSON file.
+      /* NOTE: apiMetadata is associated to the content of the api-metadata.json file
+         at build time by replacing the following "include" with the content of the
+         JSON file. */
       const apiMetadata = {
         alarms: {
           clear: {
@@ -734,12 +735,8 @@
        * @param {*} value The value to test.
        * @returns {boolean} True if the value is thenable.
        */
-      const isThenable = value => {
-        return (
-          value && typeof value === "object" && typeof value.then === "function"
-        );
-      };
-
+      const isThenable = value =>
+        value && typeof value === "object" && typeof value.then === "function";
       /**
        * Creates and returns a function which, when called, will resolve or reject
        * the given promise based on how it is called:
@@ -767,19 +764,17 @@
        * @returns {function}
        *        The generated callback function.
        */
-      const makeCallback = (promise, metadata) => {
-        return (...callbackArgs) => {
-          if (extensionAPIs.runtime.lastError) {
-            promise.reject(extensionAPIs.runtime.lastError);
-          } else if (
-            metadata.singleCallbackArg ||
-            (callbackArgs.length <= 1 && metadata.singleCallbackArg !== false)
-          ) {
-            promise.resolve(callbackArgs[0]);
-          } else {
-            promise.resolve(callbackArgs);
-          }
-        };
+      const makeCallback = (promise, metadata) => (...callbackArgs) => {
+        if (extensionAPIs.runtime.lastError) {
+          promise.reject(extensionAPIs.runtime.lastError);
+        } else if (
+          metadata.singleCallbackArg ||
+          (callbackArgs.length <= 1 && metadata.singleCallbackArg !== false)
+        ) {
+          promise.resolve(callbackArgs[0]);
+        } else {
+          promise.resolve(callbackArgs);
+        }
       };
 
       const pluralizeArguments = numArgs =>
@@ -807,8 +802,8 @@
        * @returns {function(object, ...*)}
        *       The generated wrapper function.
        */
-      const wrapAsyncFunction = (name, metadata) => {
-        return function asyncFunctionWrapper(target, ...args) {
+      const wrapAsyncFunction = (name, metadata) =>
+        function asyncFunctionWrapper(target, ...args) {
           if (args.length < metadata.minArgs) {
             throw new Error(
               `Expected at least ${metadata.minArgs} ${pluralizeArguments(
@@ -827,9 +822,9 @@
 
           return new Promise((resolve, reject) => {
             if (metadata.fallbackToNoCallback) {
-              // This API method has currently no callback on Chrome, but it return a promise on Firefox,
-              // and so the polyfill will try to call it with a callback first, and it will fallback
-              // to not passing the callback if the first call fails.
+              /* This API method has currently no callback on Chrome, but it return a promise on Firefox,
+                 and so the polyfill will try to call it with a callback first, and it will fallback
+                 to not passing the callback if the first call fails. */
               try {
                 target[name](
                   ...args,
@@ -844,8 +839,8 @@
 
                 target[name](...args);
 
-                // Update the API method metadata, so that the next API calls will not try to
-                // use the unsupported callback anymore.
+                /* Update the API method metadata, so that the next API calls will not try to
+                   use the unsupported callback anymore. */
                 metadata.fallbackToNoCallback = false;
                 metadata.noCallback = true;
 
@@ -862,7 +857,6 @@
             }
           });
         };
-      };
 
       /**
        * Wraps an existing method of the target object, so that calls to it are
@@ -883,13 +877,12 @@
        *        A Proxy object for the given method, which invokes the given wrapper
        *        method in its place.
        */
-      const wrapMethod = (target, method, wrapper) => {
-        return new Proxy(method, {
+      const wrapMethod = (target, method, wrapper) =>
+        new Proxy(method, {
           apply(targetMethod, thisObj, args) {
             return wrapper.call(thisObj, target, ...args);
           }
         });
-      };
 
       let hasOwnProperty = Function.call.bind(Object.prototype.hasOwnProperty);
 
@@ -935,20 +928,20 @@
             let value = target[prop];
 
             if (typeof value === "function") {
-              // This is a method on the underlying object. Check if we need to do
-              // any wrapping.
+              /* This is a method on the underlying object. Check if we need to do
+                 any wrapping. */
 
               if (typeof wrappers[prop] === "function") {
                 // We have a special-case wrapper for this method.
                 value = wrapMethod(target, target[prop], wrappers[prop]);
               } else if (hasOwnProperty(metadata, prop)) {
-                // This is an async method that we have metadata for. Create a
-                // Promise wrapper for it.
+                /* This is an async method that we have metadata for. Create a
+                   Promise wrapper for it. */
                 let wrapper = wrapAsyncFunction(prop, metadata[prop]);
                 value = wrapMethod(target, target[prop], wrapper);
               } else {
-                // This is a method that we don't know or care about. Return the
-                // original method, bound to the underlying object.
+                /* This is a method that we don't know or care about. Return the
+                   original method, bound to the underlying object. */
                 value = value.bind(target);
               }
             } else if (
@@ -956,13 +949,13 @@
               value !== null &&
               (hasOwnProperty(wrappers, prop) || hasOwnProperty(metadata, prop))
             ) {
-              // This is an object that we need to do some wrapping for the children
-              // of. Create a sub-object wrapper for it with the appropriate child
-              // metadata.
+              /* This is an object that we need to do some wrapping for the children
+                 of. Create a sub-object wrapper for it with the appropriate child
+                 metadata. */
               value = wrapObject(value, wrappers[prop], metadata[prop]);
             } else {
-              // We don't need to do any wrapping for this property,
-              // so just forward all access to the underlying object.
+              /* We don't need to do any wrapping for this property,
+                 so just forward all access to the underlying object. */
               Object.defineProperty(cache, prop, {
                 configurable: true,
                 enumerable: true,
@@ -999,16 +992,15 @@
           }
         };
 
-        // Per contract of the Proxy API, the "get" proxy handler must return the
-        // original value of the target if that value is declared read-only and
-        // non-configurable. For this reason, we create an object with the
-        // prototype set to `target` instead of using `target` directly.
-        // Otherwise we cannot return a custom object for APIs that
-        // are declared read-only and non-configurable, such as `chrome.devtools`.
-        //
-        // The proxy handlers themselves will still use the original `target`
-        // instead of the `proxyTarget`, so that the methods and properties are
-        // dereferenced via the original targets.
+        /* Per contract of the Proxy API, the "get" proxy handler must return the
+           original value of the target if that value is declared read-only and
+           non-configurable. For this reason, we create an object with the
+           prototype set to `target` instead of using `target` directly.
+           Otherwise we cannot return a custom object for APIs that
+           are declared read-only and non-configurable, such as `chrome.devtools`.
+           The proxy handlers themselves will still use the original `target`
+           instead of the `proxyTarget`, so that the methods and properties are
+           dereferenced via the original targets. */
         let proxyTarget = Object.create(target);
         return new Proxy(proxyTarget, handlers);
       };
@@ -1095,17 +1087,17 @@
 
           const isResultThenable = result !== true && isThenable(result);
 
-          // If the listener didn't returned true or a Promise, or called
-          // wrappedSendResponse synchronously, we can exit earlier
-          // because there will be no response sent from this listener.
+          /* If the listener didn't returned true or a Promise, or called
+             wrappedSendResponse synchronously, we can exit earlier
+             because there will be no response sent from this listener. */
           if (result !== true && !isResultThenable && !didCallSendResponse) {
             return false;
           }
 
-          // A small helper to send the message if the promise resolves
-          // and an error if the promise rejects (a wrapped sendMessage has
-          // to translate the message into a resolved promise or a rejected
-          // promise).
+          /* A small helper to send the message if the promise resolves
+             and an error if the promise rejects (a wrapped sendMessage has
+             to translate the message into a resolved promise or a rejected
+             promise). */
           const sendPromisedResult = promise => {
             promise
               .then(
@@ -1114,8 +1106,8 @@
                   sendResponse(msg);
                 },
                 error => {
-                  // Send a JSON representation of the error if the rejected value
-                  // is an instance of error, or the object itself otherwise.
+                  /* Send a JSON representation of the error if the rejected value
+                     is an instance of error, or the object itself otherwise. */
                   let message;
                   if (
                     error &&
@@ -1139,9 +1131,9 @@
               });
           };
 
-          // If the listener returned a Promise, send the resolved value as a
-          // result, otherwise wait the promise related to the wrappedSendResponse
-          // callback to resolve and send it as a response.
+          /* If the listener returned a Promise, send the resolved value as a
+             result, otherwise wait the promise related to the wrappedSendResponse
+             callback to resolve and send it as a response. */
           if (isResultThenable) {
             sendPromisedResult(result);
           } else {
@@ -1155,9 +1147,9 @@
 
       const wrappedSendMessageCallback = ({ reject, resolve }, reply) => {
         if (extensionAPIs.runtime.lastError) {
-          // Detect when none of the listeners replied to the sendMessage call and resolve
-          // the promise to undefined as in Firefox.
-          // See https://github.com/mozilla/webextension-polyfill/issues/130
+          /* Detect when none of the listeners replied to the sendMessage call and resolve
+             the promise to undefined as in Firefox.
+             See https://github.com/mozilla/webextension-polyfill/issues/130 */
           if (
             extensionAPIs.runtime.lastError.message ===
             CHROME_SEND_MESSAGE_CALLBACK_NO_RESPONSE_MESSAGE
@@ -1167,8 +1159,8 @@
             reject(extensionAPIs.runtime.lastError);
           }
         } else if (reply && reply.__mozWebExtensionPolyfillReject__) {
-          // Convert back the JSON representation of the error into
-          // an Error instance.
+          /* Convert back the JSON representation of the error into
+             an Error instance. */
           reject(new Error(reply.message));
         } else {
           resolve(reply);
@@ -1251,8 +1243,8 @@
       );
     }
 
-    // The build process adds a UMD wrapper around this file, which makes the
-    // `module` variable available.
+    /* The build process adds a UMD wrapper around this file, which makes the
+       `module` variable available. */
     module.exports = wrapAPIs(chrome);
   } else {
     module.exports = browser;

content.js

@@ -1,18 +1,17 @@
 var infoTitle = document.getElementById("text-section-header");
 infoTitle.textContent = chrome.i18n.getMessage("infoTitle");
-
-var infoMessage = document.getElementById("text-section-helptext");
-infoMessage.textContent = chrome.i18n.getMessage("infoMessage");
-
+/*
 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");
-
+*/
 var clearData = document.getElementById("clear-browser-data");
 clearData.textContent = chrome.i18n.getMessage("clearData");
 /*

context.js

@@ -1,19 +1,20 @@
 //var windowIds = []
 
+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}`);
+}
+
 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({
       cookieStoreId: event.target.dataset.identity
     });
@@ -51,7 +52,7 @@ if (browser.contextualIdentities === undefined) {
 } else {
   browser.contextualIdentities
     .query({
-      name: "i2pbrowser"
+      name: "I2P Browser"
     })
     .then(identities => {
       if (!identities.length) {

debian/changelog

@@ -1,3 +1,16 @@
+i2psetproxy.js (0.43-1) UNRELEASED; urgency=low
+
+  * Contextualize All the Things
+
+ -- idk <hankhill19580@gmail.com>  Thu, 31 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
@@ -10,7 +23,6 @@ i2psetproxy.js (0.35-1) UNRELEASED; urgency=low
 
  -- 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/rules

@@ -5,12 +5,14 @@
 
 override_dh_auto_install:
 	mkdir -p $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io \
+		$$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol \
 		$$(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 ./i2pcontrol/i2pcontrol.js $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol/
 	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/

debian/source/include-binaries

@@ -0,0 +1 @@
+i2psetproxy.js.gif

home.css

@@ -0,0 +1,285 @@
+* {
+  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
+}
+.extended-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: 50%
+}
+.application-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
+}
+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;
+  width: 90%;
+  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: 1px solid #dee2e6;
+  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 {
+  min-height: 5rem;
+  padding: .5rem;
+  margin: .5rem;
+  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
+}
+#onboarding {
+  min-height: 5rem;
+  padding: .5rem;
+  margin: .5rem;
+  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 {
+  width: 50%;
+  min-width: 50%;
+  min-height: 5rem;
+  padding: .5rem;
+  display: inline;
+  background: #dee2e6;
+  float: right;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#applicationExplain,
+#linksExplain {
+  min-height: 5rem;
+  padding: .5rem;
+  margin: .5rem;
+  width: 30%;
+  min-width: 30%;
+  background: #dee2e6;
+  float: left;
+  text-align: center!important;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#proxyReady {
+  min-height: 3rem;
+  padding: .5rem;
+  margin: .2rem;
+  width: 38%;
+  min-width: 38%;
+  display: inline;
+  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;
+  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;
+  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
+}
+#proxy-check {
+  visibility: hidden
+}
+.consoleOn:hover #proxy-check,
+.proxyReady:hover #proxy-check {
+  visibility: visible;
+  opacity: 1
+}
+img.readyness {
+  height: 100%;
+  width: auto
+}

home.html

@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+
+<html>
+  <head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="home.css"/>
+  </head>
+
+<body>
+  <!--<div>-->
+  <script src="home.js" type="text/javascript"></script>
+    <div class='background'>
+      <div class='content'>
+        <div class='section-header'>
+          <h1>The Invisible Internet Browser</h1>
+        </div>
+        <div id="i2pbrowser-version"></div>
+          <div id="i2pbrowser-description">
+            <p id="description">The Invisible Internet Browser ( I2P Browser ) is preconfigured to get your content using the anonymous and private I2P network and to provide accessible, first-class access to I2P Peer-to-Peer applications.</p>
+            <p class="beta">This is a experimental sub-project of I2P. It is currently Beta software.</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 id="proxyReady" class="hideIfI2PProxyOff">
+              <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>
+          <div id="onboarding" class="hideIfI2PConsoleOff">
+            <h3 id="onboardingTitle">New to I2P? Learn more here.</h3>
+            <h4 id="onboardingZero"><button class="showhider" onclick="flipVisibility('onboardingContentZero')">Protect your Privacy</button></h4>
+            <p id="onboardingContentZero" class="onboardingContent">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" onclick="flipVisibility('onboardingContentOne')">Configure your Experience</button></h4>
+            <p id="onboardingContentOne" class="onboardingContent">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" onclick="flipVisibility('onboardingContentTwo')">Share Files</button></h4>
+            <p id="onboardingContentTwo" class="onboardingContent">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" onclick="flipVisibility('onboardingContentThree')">Hidden e-mail</button></h4>
+            <p id="onboardingContentThree" class="onboardingContent">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" onclick="flipVisibility('onboardingContentFour')">Experience Tips</button></h4>
+            <p id="onboardingContentFour" class="onboardingContent">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">
+            <h3>Applications</h3>
+            <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
+              <ul>
+                <a class="applicationName" href="http://127.0.0.1:7657/i2ptunnel">
+                  <li class="application">
+                    Hidden Services Manager <span class="applicationDesc">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span>
+                  </li>
+                </a>
+                <a class="applicationName" href="http://127.0.0.1:7657/susimail">
+                  <li class="application">
+                  E-Mail <span class="applicationDesc">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span>
+                  </li>
+                </a>
+                <a class="applicationName" href="http://127.0.0.1:7657/i2psnark">
+                  <li class="application">
+                    BitTorrent <span class="applicationDesc">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span>
+                  </li>
+                </a>
+              </ul>
+            </p>
+          </div>
+        <div class="extended-info">
+          <h3 id="links"><button class="showhider" onclick="flipVisibility('info-content')">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>
+              <ul>
+                <a href="https://github.com/i2p/i2p-browser">
+                <li>
+                  I2P Browser Source Code: <span class="applicationDesc">Go here to browse the source code of our Firefox fork.</span>
+                </li>
+                </a>
+                <a href="https://github.com/i2p/i2pbutton">
+                <li>
+                  I2P Button Source Code: <span class="applicationDesc">Much of the functionality of the I2P Browser is implemented in the I2PButton plugin.</span>
+                </li>
+                </a>
+                <a href="https://github.com/mikalv/i2p-browser-build-scripts">
+                <li>
+                  I2P Browser Build Scripts: <span class="applicationDesc">These scripts are used to build the browser.</span>
+                </li>
+                </a>
+                <a href="https://github.com/mikalv/i2p-browser-design-docs">
+                <li>
+                  I2P Browser Design Document: <span class="applicationDesc">This is the I2P Browser Design Document.</span>
+                </li>
+                </a>
+                <a href="http://trac.i2p2.i2p/">
+                <li>
+                  Trac Wiki: <span class="applicationDesc">To report a bug, visit the Trac Wiki.</span>
+                </li>
+                </a>
+                <a href="http://i2p-projekt.i2p/get-involved/donate">
+                <li>
+                  <em>Support Us: </em> <span class="applicationDesc">I2P is funded by donations. In order to make a donation visit the project web site.</span>
+                </li>
+                </a>
+              </ul>
+            </p>
+            </div>
+          </div>
+        </div>
+     </div>
+  <!--</div>-->
+</body>
+</html>

home.js

@@ -0,0 +1,8 @@
+function flipVisibility(div) {
+  var x = document.getElementById(div);
+  if (x.style.display === "none") {
+    x.style.display = "block";
+  } else {
+    x.style.display = "none";
+  }
+}

i2pcontrol/i2pcontrol.js

@@ -4,7 +4,7 @@ function send(json) {
   const url = "http://" + "127.0.0.1" + ":" + "7650";
   Http.open("POST", url);
   Http.send(json);
-  console.log(Http);
+  //console.log(Http);
   return Http;
 }
 
@@ -21,11 +21,12 @@ function authenticate(user, password) {
   return send(json);
 }
 
-username = "";
-password = "";
+var username = "";
+var password = "";
 
 function echo(string, section) {
   var xhr = authenticate(username, password);
+  console.log("(i2pcontrol) echo", xhr);
   xhr.onload = function() {
     resp = JSON.Parse(xhr.responseText);
     json = {
@@ -38,6 +39,9 @@ function echo(string, section) {
       }
     };
     var controlMessage = document.getElementById(section);
+    console.log("(i2pcontrol) reply", xhr.responseText);
     infoMessage.textContent = xhr.responseText;
   };
 }
+
+echo("test", "test");

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,106 @@
+<strong>i2psetproxy.js</strong>
+
+WebExtension that does extended configuration of a dedicated I2P browser. While
+<strong>experimental</strong>, 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.
+
+<strong>The Old Version</strong>
+
+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.
+
+<ul>
+<li>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></li>
+<li>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></li>
+</ul>
+
+<strong>Android usage:</strong>
+
+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.
+
+<strong>addons.mozilla.org</strong>
+
+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.
+
+<strong>Features</strong>
+
+<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>[done/wip] <strong>Indicate</strong> the I2P browser is in use visually. Find an
+acceptable way to indicate it on Android.</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/wip] <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>[done-ish] <strong>Reset</strong> the HTTP Proxy tunnel to generate a new destination
+on-demand
+<ul>
+<li>it does this by working in conjunction with this
+<a href="https://github.com/eyedeekay/httptunnel">standalone HTTP proxy</a>, currently
+disabled*.</li>
+</ul></li>
+<li>[ready] <strong>Provide</strong> help in a variety of languages.</li>
+<li>[wip] <strong>Monitor</strong> the health and readiness of the I2P router it is
+instructed to use.</li>
+<li>[1/2] <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>[not started] <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>
+</ul>
+
+<strong>Screenshot</strong>
+
+
+
+<strong>Super Extra Important Background Info:</strong>
+
+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.
+
+<strong>Links about Project Uplift</strong>
+
+<ul>
+<li>https://wiki.mozilla.org/Security/Tor_Uplift</li>
+<li>https://wiki.mozilla.org/Security/FirstPartyIsolation</li>
+<li>https://wiki.mozilla.org/Security/Fingerprinting</li>
+<li>https://wiki.mozilla.org/Security/Fennec%2BTor_Project</li>
+<li>https://wiki.mozilla.org/Security/Tor_Uplift/Tracking</li>
+</ul>
+
+Project uplift seems to have largely been accomplished?
+
+<strong>Links about Project Fusion</strong>
+
+<ul>
+<li>https://wiki.mozilla.org/Security/Fusion</li>
+<li>https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject</li>
+<li>https://blog.torproject.org/tor-heart-firefox</li>
+</ul>

info.css

@@ -1,18 +1,54 @@
-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
 }

info.js

@@ -40,6 +40,18 @@ document.addEventListener("click", e => {
       };
       chrome.windows.update(currentWindow.id, updateInfo);
     });
+  } else if (e.target.id === "window-visit-homepage") {
+    console.log("attempting to create homepage tab");
+    goHome();
+  } else if (e.target.id === "window-visit-i2ptunnel") {
+    console.log("attempting to create i2ptunnel tab");
+    goTunnel();
+  } else if (e.target.id === "window-visit-susimail") {
+    console.log("attempting to create susimail tab");
+    goMail();
+  } else if (e.target.id === "window-visit-snark") {
+    console.log("attempting to create snark tab");
+    goSnark();
   } else if (e.target.id === "clear-browser-data") {
     forgetBrowsingData();
   } else if (e.target.id === "check-i2p-control") {
@@ -55,3 +67,80 @@ document.addEventListener("click", e => {
 
   e.preventDefault();
 });
+
+function proxyReadiness() {
+  console.log(this.responseText);
+}
+
+function goHome() {
+  let createData = {
+    url: "home.html"
+  };
+  console.log("visiting homepage");
+  let creating = browser.tabs.create(createData);
+}
+
+function goTunnel() {
+  let createData = {
+    url: "http://127.0.0.1:7657/i2ptunnel"
+  };
+  console.log("visiting homepage");
+  let creating = browser.tabs.create(createData);
+}
+
+function goMail() {
+  let createData = {
+    url: "http://127.0.0.1:7657/susimail"
+  };
+  console.log("visiting homepage");
+  let creating = browser.tabs.create(createData);
+}
+
+function goSnark() {
+  let createData = {
+    url: "http://127.0.0.1:7657/i2psnark"
+  };
+  console.log("visiting homepage");
+  let creating = browser.tabs.create(createData);
+}
+/*
+//document.addEventListener("onpageshow", e => {
+console.log("(Check) Checking Proxy Readiness");
+const Http = new XMLHttpRequest();
+Http.addEventListener("load", proxyReadiness);
+const url = "http://proxy.i2p"; ///themes/console/images/favicon.ico";
+Http.open("GET", url);
+Http.send();
+//});
+
+function transferComplete(evt) {
+  console.log(
+    "The transfer is complete.",
+    this.status,
+    this.statusText,
+    this.responseText
+  );
+}
+
+function transferFailed(evt) {
+  console.log(
+    "An error occurred while transferring the file.",
+    this.status,
+    this.statusText,
+    this.responseText
+  );
+}
+
+function transferCanceled(evt) {
+  console.log(
+    "The transfer has been canceled by the user.",
+    this.status,
+    this.statusText,
+    this.responseText
+  );
+}
+
+Http.addEventListener("load", transferComplete);
+Http.addEventListener("error", transferFailed);
+Http.addEventListener("abort", transferCanceled);
+*/

manifest.json

@@ -5,9 +5,11 @@
       "strict_min_version": "60.0"
     }
   },
+  "content_security_policy": "script-src 'self' 'sha256-AT9pbzcnD9T9Agf3fMgPh55nsx/xONoULxPFvOb93Uo='; object-src 'self'",
   "permissions": [
     "theme",
     "browsingData",
+    "bookmarks",
     "notifications",
     "proxy",
     "privacy",
@@ -22,7 +24,7 @@
   ],
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "0.37",
+  "version": "0.43",
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://github.com/eyedeekay/i2psetproxy.js",
   "icons": {
@@ -44,8 +46,10 @@
       "background.js",
       "proxy.js",
       "info.js",
-      "i2pcontrol.js",
-      "scrub.js"
+      "home.js",
+      "i2pcontrol/i2pcontrol.js",
+      "scrub.js",
+      "bookmarks.js"
     ]
   },
   "protocol_handlers": [{

options/options.js

@@ -24,47 +24,172 @@ function SetControlHostText() {
   controlhostid.textContent = chrome.i18n.getMessage("controlHostText");
 }
 
+var handleContextProxyRequest = async function(requestDetails) {
+  console.log("(proxy)Searching for proxy by context");
+  try {
+    var handleProxyRequest = function(context) {
+      proxy = {
+        failoverTimeout: 0,
+        proxyDns: false
+      };
+      if (context != undefined) {
+        if (context.name == "i2pbrowser") {
+          proxy = {
+            type: getScheme(),
+            host: getHost(),
+            port: getPort()
+          };
+          console.log(
+            "(proxy)",
+            context.name,
+            "Using",
+            proxy.type,
+            "proxy ",
+            proxy.host + ":" + proxy.port
+          );
+          return proxy;
+        } else if (context.name == "routerconsole") {
+          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,
+            "Using",
+            proxy.type,
+            "proxy ",
+            proxy.host + ":" + proxy.port
+          );
+          return proxy;
+        } else if (context.name == "fenced-default") {
+          if (localHost(requestDetails.url)) {
+            if (!routerHost(requestDetails.url)) {
+              proxy = {
+                type: "http",
+                host: "localhost",
+                port: "65535"
+              };
+            }
+          }
+          console.log(
+            "(proxy)",
+            context.name,
+            "Using",
+            proxy.type,
+            "proxy ",
+            proxy.host + ":" + proxy.port
+          );
+          return proxy;
+        }
+      }
+      if (!routerHost(requestDetails.url)) {
+        proxy = {
+          type: "http",
+          host: "localhost",
+          port: "65535"
+        };
+      } else if (i2pHost(requestDetails.url)) {
+        proxy = {
+          type: getScheme(),
+          host: getHost(),
+          port: getPort()
+        };
+      }
+      return proxy;
+    };
+    var contextGet = async function(tabInfo) {
+      try {
+        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);
+      }
+    };
+    var tabGet = async function(tabId) {
+      try {
+        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);
+      }
+    };
+
+    if (requestDetails.tabId > 0) {
+      if (proxyHost(requestDetails.url)) {
+        console.log("(Proxy)I2P Proxy test URL detected, ", requestDetails.url);
+        return {
+          type: getScheme(),
+          host: getHost(),
+          port: getPort()
+        };
+      } else 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 proxy = await context.then(handleProxyRequest);
+        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);
+        return proxy;
+      }
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort()
+      };
+      console.log("(proxy)Returning I2P Proxy", proxy);
+      return proxy;
+    }
+  } catch (error) {
+    console.log("(proxy)Not using I2P Proxy.", error);
+  }
+};
+
 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() {}
-    );
-  }
+
+  /**/
+  console.log("Setting up Firefox WebExtension proxy");
+  browser.proxy.onRequest.addListener(handleContextProxyRequest, {
+    urls: ["<all_urls>"]
+  });
+  console.log("i2p settings created for WebExtension Proxy");
+  /**/
 }
 
 function SetControlPortText() {
@@ -126,23 +251,77 @@ function getControlPort() {
 }
 
 function checkStoredSettings(storedSettings) {
-  let defaultSettings = {};
-  if (!storedSettings.proxy_scheme) {
-    defaultSettings["proxy_scheme"] = "http";
+  function gotProxyInfo(info) {
+    let defaultSettings = {};
+    let host = info.value.http.split(":")[0];
+    let port = info.value.http.split(":")[1];
+    console.log("proxy", "'" + host + "'", ":", port);
+    if (!storedSettings.proxy_scheme) {
+      defaultSettings["proxy_scheme"] = "http";
+    }
+    if (!storedSettings.proxy_host) {
+      if (host == "") {
+        defaultSettings["proxy_host"] = "127.0.0.1";
+      } else {
+        defaultSettings["proxy_host"] = host;
+      }
+    } else {
+      if (host != "") {
+        defaultSettings["proxy_host"] = host;
+      } else {
+        defaultSettings["proxy_host"] = storedSettings.proxy_host;
+      }
+    }
+    if (!storedSettings.proxy_port) {
+      if (port == undefined) {
+        defaultSettings["proxy_port"] = 4444;
+      } else {
+        defaultSettings["proxy_port"] = port;
+      }
+    } else {
+      if (port != undefined) {
+        defaultSettings["proxy_port"] = port;
+      } 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 {
+      if (host != "") {
+        defaultSettings["control_host"] = host;
+      } else {
+        defaultSettings["control_host"] = storedSettings.control_host;
+      }
+    }
+    if (!storedSettings.control_port) {
+      if (port == undefined) {
+        defaultSettings["control_port"] = 4444;
+      } else {
+        defaultSettings["control_port"] = port;
+      }
+    } else {
+      if (port != undefined) {
+        defaultSettings["control_port"] = port;
+      } else {
+        defaultSettings["control_port"] = storedSettings.control_port;
+      }
+    }
+    console.log("(browserinfo) NATIVE PROXYSETTINGS", info.value);
+    console.log(
+      defaultSettings["proxy_host"],
+      defaultSettings["proxy_port"],
+      defaultSettings["control_host"],
+      defaultSettings["control_port"]
+    );
+    chrome.storage.local.set(defaultSettings);
   }
-  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);
+  var gettingInfo = browser.proxy.settings.get({});
+  gettingInfo.then(gotProxyInfo);
 }
 
 function onError(e) {

privacy.js

@@ -1,3 +1,14 @@
+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");
+
 function onSet(result) {
   if (result) {
     console.log("->: Value was updated");
@@ -6,8 +17,8 @@ function onSet(result) {
   }
 }
 
-// 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() {
   var setting = browser.privacy.websites.hyperlinkAuditingEnabled.set({
     value: false
@@ -29,9 +40,9 @@ function enableFirstPartyIsolation() {
   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() {
   var getting = browser.privacy.websites.cookieConfig.get({});
   getting.then(got => {
@@ -95,8 +106,8 @@ function enableTrackingProtection() {
   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() {
   var gettingInfo = browser.runtime.getPlatformInfo();
   gettingInfo.then(got => {
@@ -201,15 +212,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();
@@ -233,7 +238,7 @@ 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`
     });
   }
 
@@ -249,34 +254,34 @@ function forgetBrowsingData(storedSettings) {
         browser.browsingData
           .removePasswords({
             hostnames: [i2pHostName(item.url)],
-            since: since
+            since
           })
           .then(onGot);
         console.log("cleared Passwords");
         browser.browsingData
           .removeDownloads({
             hostnames: [i2pHostName(item.url)],
-            since: since
+            since
           })
           .then(onGot);
         console.log("cleared Downloads");
         browser.browsingData
           .removeFormData({
             hostnames: [i2pHostName(item.url)],
-            since: since
+            since
           })
           .then(onGot);
         console.log("cleared Form Data");
         browser.browsingData
           .removeLocalStorage({
             hostnames: [i2pHostName(item.url)],
-            since: since
+            since
           })
           .then(onGot);
         console.log("cleared Local Storage");
 
         contexts = browser.contextualIdentities.query({
-          name: "i2pbrowser"
+          name: titlepref
         });
 
         function deepCleanCookies(cookies) {

proxy.js

@@ -1,3 +1,14 @@
+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");
+
 browser.privacy.network.peerConnectionEnabled.set({
   value: false
 });
@@ -20,22 +31,87 @@ var handleContextProxyRequest = async function(requestDetails) {
     var handleProxyRequest = function(context) {
       proxy = {
         failoverTimeout: 0,
-        type: "direct",
         proxyDns: false
       };
-      if (context.name == "i2pbrowser") {
+      if (context != undefined) {
+        if (context.name == titlepref) {
+          proxy = {
+            type: getScheme(),
+            host: getHost(),
+            port: getPort()
+          };
+          console.log(
+            "(proxy)",
+            context.name,
+            "Using",
+            proxy.type,
+            "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,
+            "Using",
+            proxy.type,
+            "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,
+            "Using",
+            proxy.type,
+            "proxy ",
+            proxy.host + ":" + proxy.port
+          );
+          return proxy;
+        }
+      }
+      if (!routerHost(requestDetails.url)) {
+        if (localHost(requestDetails.url)) {
+          console.log(
+            "(proxy) non-routerconsole localhost url, dropping",
+            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;
     };
@@ -50,10 +126,6 @@ var handleContextProxyRequest = async function(requestDetails) {
     };
     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) {
@@ -71,12 +143,14 @@ var handleContextProxyRequest = async function(requestDetails) {
     };
 
     if (requestDetails.tabId > 0) {
+      console.log("manifest", requestDetails);
       if (proxyHost(requestDetails.url)) {
-        return {
+        proxy = {
           type: getScheme(),
           host: getHost(),
           port: getPort()
         };
+        return proxy;
       } else if (i2pHost(requestDetails.url)) {
         console.log("(Proxy)I2P URL detected, ");
         var tab = tabGet(requestDetails.tabId);
@@ -93,6 +167,9 @@ var handleContextProxyRequest = async function(requestDetails) {
         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);
@@ -175,25 +252,86 @@ function setupProxy() {
 }
 
 function checkStoredSettings(storedSettings) {
-  let defaultSettings = {};
-  if (!storedSettings.proxy_scheme) {
-    defaultSettings["proxy_scheme"] = "http";
+  function gotProxyInfo(info) {
+    let defaultSettings = {};
+    let host = info.value.http.split(":")[0];
+    let port = info.value.http.split(":")[1];
+    console.log("proxy", "'" + host + "'", ":", port);
+    if (!storedSettings.proxy_scheme) {
+      defaultSettings["proxy_scheme"] = "http";
+    }
+    if (!storedSettings.proxy_host) {
+      if (host == "") {
+        defaultSettings["proxy_host"] = "127.0.0.1";
+      } else {
+        defaultSettings["proxy_host"] = host;
+      }
+    } else {
+      if (host != "") {
+        defaultSettings["proxy_host"] = host;
+      } else {
+        defaultSettings["proxy_host"] = storedSettings.proxy_host;
+      }
+    }
+    if (!storedSettings.proxy_port) {
+      if (port == undefined) {
+        defaultSettings["proxy_port"] = 4444;
+      } else {
+        defaultSettings["proxy_port"] = port;
+      }
+    } else {
+      if (port != undefined) {
+        defaultSettings["proxy_port"] = port;
+      } 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 {
+      if (host != "") {
+        defaultSettings["control_host"] = host;
+      } else {
+        defaultSettings["control_host"] = storedSettings.control_host;
+      }
+    }
+    if (!storedSettings.control_port) {
+      if (port == undefined) {
+        defaultSettings["control_port"] = 4444;
+      } else {
+        defaultSettings["control_port"] = port;
+      }
+    } else {
+      if (port != undefined) {
+        defaultSettings["control_port"] = port;
+      } else {
+        defaultSettings["control_port"] = storedSettings.control_port;
+      }
+    }
+    console.log("(browserinfo) NATIVE PROXYSETTINGS", info.value);
+    console.log(
+      defaultSettings["proxy_host"],
+      defaultSettings["proxy_port"],
+      defaultSettings["control_host"],
+      defaultSettings["control_port"]
+    );
+    chrome.storage.local.set(defaultSettings);
   }
-  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);
+  var gettingInfo = browser.proxy.settings.get({});
+  gettingInfo.then(gotProxyInfo);
 }
 
+//function gotProxyInfo(info) {
+//console.log("(browserinfo)", info.value);
+//}
+
+//var gettingInfo = browser.proxy.settings.get({});
+//gettingInfo.then(gotProxyInfo);
+
 function update(restoredSettings) {
   proxy_scheme = restoredSettings.proxy_scheme;
   console.log("restoring proxy scheme:", proxy_scheme);

scrub.js

@@ -1,24 +1,49 @@
+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 contextScrub = async function(requestDetails) {
   console.log("(scrub)Scrubbing info from contextualized request");
   try {
     var headerScrub = function(context) {
       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) {
+        var ua = "MYOB/6.66 (AN/ON)";
+        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) {
+        var ua = "MYOB/6.66 (AN/ON)";
+        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);
+            }
+          }
+        } else if (routerHost(requestDetails.url)) {
+        }
+        return {
+          requestHeaders: requestDetails.requestHeaders
+        };
       }
     };
     var contextGet = async function(tabInfo) {
@@ -33,7 +58,7 @@ var contextScrub = async function(requestDetails) {
     var tabFind = async function(tabId) {
       try {
         context = await browser.contextualIdentities.query({
-          name: "i2pbrowser"
+          name: titlepref
         });
         tabId.cookieStoreId = context[0].cookieStoreId;
         console.log("(scrub) forcing context", tabId.cookieStoreId);
@@ -52,22 +77,26 @@ var contextScrub = async function(requestDetails) {
       }
     };
     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);
+        tab = tabGet(requestDetails.tabId);
         var mtab = tab.then(tabFind);
         requestDetails.tabId = mtab;
-        var context = mtab.then(contextGet);
-        var req = await context.then(headerScrub);
+        context = mtab.then(contextGet);
+        req = await context.then(headerScrub);
         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);
+        req = await context.then(headerScrub);
+        console.log("(scrub)Scrubbing non-I2P Request", req);
         return req;
       }
+      return req;
     }
   } catch (error) {
     console.log("(scrub)Not scrubbing non-I2P request.", error);
@@ -79,12 +108,12 @@ var contextSetup = async function(requestDetails) {
   try {
     var tabFind = 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",
+            "(isolate) forcing I2P Browsing",
             requestDetails.url,
             " context",
             tabId.cookieStoreId,
@@ -92,14 +121,14 @@ var contextSetup = async function(requestDetails) {
           );
           function Create(window) {
             function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab");
+              console.log("(isolate) Closing old, un-isolated tab", window);
               browser.tabs.remove(tabId.id);
               browser.tabs.remove(window.tabs[0].id);
             }
             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,
@@ -107,7 +136,7 @@ var contextSetup = async function(requestDetails) {
             });
             created.then(onCreated, onError);
           }
-          getting = browser.windows.getCurrent();
+          var getting = browser.windows.getCurrent();
           getting.then(Create);
           return tabId;
         }
@@ -117,12 +146,12 @@ var contextSetup = async function(requestDetails) {
     };
     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",
+            "(isolate) forcing Router Console",
             requestDetails.url,
             " context",
             tabId.cookieStoreId,
@@ -137,7 +166,7 @@ var contextSetup = async function(requestDetails) {
             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,
@@ -145,7 +174,7 @@ var contextSetup = async function(requestDetails) {
             });
             created.then(onCreated, onError);
           }
-          getting = browser.windows.getCurrent();
+          var getting = browser.windows.getCurrent();
           getting.then(Create);
           return tabId;
         }
@@ -153,6 +182,166 @@ var contextSetup = async function(requestDetails) {
         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) {
+          console.log(
+            "(isolate) forcing HSM context",
+            requestDetails.url,
+            " context",
+            tabId.cookieStoreId,
+            context[0].cookieStoreId
+          );
+          function Create(window) {
+            function onCreated(tab) {
+              console.log("(isolate) Closing old, un-isolated tab");
+              browser.tabs.remove(tabId.id);
+              if (window != undefined) {
+                browser.tabs.remove(window.tabs[0].id);
+              }
+            }
+            function onError(error) {
+              console.log(`Error: ${error}`);
+            }
+            var created = browser.tabs.create({
+              active: true,
+              cookieStoreId: context[0].cookieStoreId,
+              url: requestDetails.url,
+              windowId: window.id
+            });
+            created.then(onCreated, onError);
+          }
+          var getting = browser.windows.getCurrent();
+          getting.then(Create);
+          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) {
+          console.log(
+            "(isolate) forcing Bittorrent",
+            requestDetails.url,
+            " context",
+            tabId.cookieStoreId,
+            context[0].cookieStoreId
+          );
+          function Create(window) {
+            function onCreated(tab) {
+              console.log("(isolate) Closing old, un-isolated tab");
+              browser.tabs.remove(tabId.id);
+              browser.tabs.remove(window.tabs[0].id);
+            }
+            function onError(error) {
+              console.log(`Error: ${error}`);
+            }
+            var created = browser.tabs.create({
+              active: true,
+              cookieStoreId: context[0].cookieStoreId,
+              url: requestDetails.url,
+              windowId: window.id
+            });
+            created.then(onCreated, onError);
+          }
+          var getting = browser.windows.getCurrent();
+          getting.then(Create);
+          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) {
+          console.log(
+            "(isolate) forcing Web Mail",
+            requestDetails.url,
+            " context",
+            tabId.cookieStoreId,
+            context[0].cookieStoreId
+          );
+          function Create(window) {
+            function onCreated(tab) {
+              console.log("(isolate) Closing old, un-isolated tab");
+              browser.tabs.remove(tabId.id);
+              browser.tabs.remove(window.tabs[0].id);
+            }
+            function onError(error) {
+              console.log(`Error: ${error}`);
+            }
+            var created = browser.tabs.create({
+              active: true,
+              cookieStoreId: context[0].cookieStoreId,
+              url: requestDetails.url,
+              windowId: window.id
+            });
+            created.then(onCreated, onError);
+          }
+          var getting = browser.windows.getCurrent();
+          getting.then(Create);
+          return tabId;
+        }
+      } catch (error) {
+        console.log("(isolate)Context Error", error);
+      }
+    };
+    var anyTabFind = async function(tabId) {
+      try {
+        var context = await browser.contextualIdentities.query({
+          name: webpref
+        });
+        console.log("(ISOLATE)", tabId.cookieStoreId);
+        if (
+          tabId.cookieStoreId == "firefox-default" ||
+          tabId.cookieStoreId == "firefox-private"
+        ) {
+          if (tabId.cookieStoreId != context[0].cookieStoreId) {
+            console.log(
+              "(isolate) forcing Web Browsing",
+              requestDetails.url,
+              " context",
+              tabId.cookieStoreId,
+              context[0].cookieStoreId
+            );
+            function Create(window) {
+              function onCreated(tab) {
+                console.log("(isolate) Closing old, un-isolated tab");
+                browser.tabs.remove(tabId.id);
+                browser.tabs.remove(window.tabs[0].id);
+              }
+              function onError(error) {
+                console.log(`Error: ${error}`);
+              }
+              var created = browser.tabs.create({
+                active: true,
+                cookieStoreId: context[0].cookieStoreId,
+                url: requestDetails.url,
+                windowId: window.id
+              });
+              created.then(onCreated, onError);
+            }
+            var getting = browser.windows.getCurrent();
+            getting.then(Create);
+            return tabId;
+          }
+        }
+      } catch (error) {
+        console.log("(isolate)Context Error", error);
+      }
+    };
     var tabGet = async function(tabId) {
       try {
         console.log("(isolate)Tab ID from Request", tabId);
@@ -163,22 +352,56 @@ var contextSetup = async function(requestDetails) {
       }
     };
     if (requestDetails.tabId > 0) {
+      if (proxyHost(requestDetails.url)) {
+        setcookie = browser.cookies.set({
+          firstPartyDomain: i2pHostName(requestDetails.url),
+          url: requestDetails.url,
+          secure: true
+        });
+        setcookie.then(onGot, onError);
+        return requestDetails;
+      }
       if (i2pHost(requestDetails.url)) {
+        var setcookie = browser.cookies.set({
+          firstPartyDomain: i2pHostName(requestDetails.url),
+          url: requestDetails.url,
+          secure: true
+        });
+        setcookie.then(onGot, onError);
         var tab = tabGet(requestDetails.tabId);
         var mtab = tab.then(tabFind);
         return requestDetails;
       }
-      if (routerHost(requestDetails.url)) {
+      let routerhost = routerHost(requestDetails.url);
+      if (routerhost) {
+        if (routerhost === "i2ptunnelmgr") {
+          var tab = tabGet(requestDetails.tabId);
+          var mtab = tab.then(i2ptunnelTabFind);
+          return requestDetails;
+        } else if (routerhost === "i2psnark") {
+          var tab = tabGet(requestDetails.tabId);
+          var mtab = tab.then(snarkTabFind);
+          return requestDetails;
+        } else if (routerhost === "webmail") {
+          var tab = tabGet(requestDetails.tabId);
+          var mtab = tab.then(mailTabFind);
+          return requestDetails;
+        } else if (routerhost === "routerconsole") {
+          var tab = tabGet(requestDetails.tabId);
+          var mtab = tab.then(routerTabFind);
+          return requestDetails;
+        }
+      } else {
         var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(routerTabFind);
+        var mtab = tab.then(anyTabFind);
         return requestDetails;
       }
     }
+    //var tab = tabGet(requestDetails.tabId);
+    //var mtab = tab.then(anyTabFind);
+    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);
   }
 };
 
@@ -210,23 +433,69 @@ function proxyHost(url) {
   return false;
 }
 
-function routerHost(url) {
+function localHost(url) {
   let hostname = "";
   if (url.indexOf("://") > -1) {
     hostname = url.split("/")[2];
   } else {
     hostname = url.split("/")[0];
   }
-  if (hostname === "127.0.0.1:7657") {
+  hostname = hostname.split(":")[0];
+  if (hostname === "127.0.0.1") {
     return true;
-  } else if (hostname === "localhost:7657") {
+  } else if (hostname === "localhost") {
     return true;
   }
 
+  return false;
+}
+
+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) application path", final);
+        return "i2ptunnelmgr";
+      } else if (final === "i2psnark" || final === "torrents") {
+        console.log("(urlcheck) application path", final);
+        return "i2psnark";
+      } else if (final === "webmail" || final === "susimail") {
+        console.log("(urlcheck) application path", final);
+        return "webmail";
+      } else if (final == "") {
+        console.log("(urlcheck) application path", final);
+        return "routerconsole";
+      }
+    }
+    return true;
+  }
+  if (url.indexOf("://") > -1) {
+    hostname = url.split("/")[2];
+    prefix = url.substr(0, url.indexOf("://") + 3);
+    path = url.replace(prefix + hostname + "/", "");
+  } else {
+    hostname = url.split("/")[0];
+    path = url.replace(hostname + "/", "");
+  }
+  if (hostname === "127.0.0.1:7657") {
+    return pathcheck(path);
+  } else if (hostname === "localhost:7657") {
+    return pathcheck(path);
+  }
+
+  if (hostname === "127.0.0.1:7647") {
+    return pathcheck(path);
+  } else if (hostname === "localhost:7647") {
+    return pathcheck(path);
+  }
+
   if (hostname === "127.0.0.1:7070") {
-    return true;
+    return pathcheck(path);
   } else if (hostname === "localhost:7070") {
-    return true;
+    return pathcheck(path);
   }
 
   return false;

window.html

@@ -3,52 +3,81 @@
 <html>
   <head>
     <meta charset="utf-8">
+    <link rel="stylesheet" href="home.css"/>
     <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 class="section-header panel-section panel-section-header">
+          <div id="text-section-header" class="text-section-header"><h1>The Invisible Internet Browser</h1></div>
+        </div>
+      <div class="panel-section-separator"></div>
+        <div id="i2pbrowser-version"></div>
+          <div id="i2pbrowser-description">
+            <p id="description">You are now able to use I2P in this browser.</p>
+            <p class="beta">It is experimental.</p>
+          </div>
+          <div id="readyness">
+              <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>
+              <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>
+      <div class="panel-section-separator"></div>
+        <div class="browser-info">
+          <p class="hideIfI2PConsoleOff">
+            <h3>Controls</h3>
+            <p id="applicationExplain">These controls are used to tailor your I2P Browsing Experience</p>
+              <ul>
+                <a id="clear-browser-data" href="#">
+                  <li class="application">
+                    Clear Browsing Data: <span class="applicationDesc">Use this to erase your browsing data.</span>
+                  </li>
+                </a>
+                <li class="application">
+                  <input type="checkbox" id="enable-web-rtc" name="enablewebrtc" value="webrtc">
+                  <label for="enable-web-rtc">Enable WebRTC <strong>with Proxy?</strong></label>
+                  <span class="applicationDesc">For more information about this extension, go here:</span>
+                </li>
+                <li class="application">
+                  <div class="panel-section-separator"></div>
+                  <div class="panel-section-identity">
+                  <div id="identity-list"></div>
+                </li>
+              </ul>
+            </p>
+          </p>
+        </div>
+      <div class="panel-section-separator"></div>
+        <div class="application-info">
+          <p class="hideIfI2PConsoleOff">
+            <h3>Applications</h3>
+            <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
+              <ul>
+                <li class="application"><button id="window-visit-homepage" class="applicationName window-visit-homepage" href="#">
+                    Home Page <span class="applicationDesc">For more information about this extension, go here:</span>
+                </button></li>
+                <li class="application"><button id="window-visit-i2ptunnel" class="applicationName">
+                    Hidden Services Manager <span class="applicationDesc">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span>
+                </button></li>
+                <li class="application"><button id="window-visit-susimail" class="applicationName">
+                  E-Mail <span class="applicationDesc">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span>
+                </button></li>
+                <li class="application"><button id="window-visit-snark" class="applicationName">
+                  BitTorrent <span class="applicationDesc">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span>
+                </button></li>
+              </ul>
+            </p>
+          </p>
+        </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>
-      <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>
-          <!--<div id="proxy-health">Proxy is:</div>-->
-          <input type="checkbox" id="enable-web-rtc" name="enablewebrtc" value="webrtc">
-          <label for="enable-web-rtc">Enable WebRTC <strong>with Proxy?</strong></label>
-      <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>
-
-    </div>
-
-
   <script src="context.js"></script>
   <script src="privacy.js"></script>
   <script src="info.js"></script>
   <script src="content.js" crossorigin="anonymous"></script>
-  <script src="i2pcontrol.js"></script>
+  <script src="i2pcontrol/i2pcontrol.js"></script>
 
 </body>