pare this branch down to only the manifest.json and the Makefile

Fix checks on blog and port containers

See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!24

.circleci/config.yml

@@ -0,0 +1,12 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: eyedeekay/builders
+
+    steps:
+      - checkout
+
+      - run:
+          name: Build
+          command: make zip

.eslintrc.js

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

.gitignore

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

.web-extension-id

@@ -0,0 +1,3 @@
+# This file was created by https://github.com/mozilla/web-ext
+# Your auto-generated extension ID for addons.mozilla.org is:
+i2ppb@eyedeekay.github.io

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 idk
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

Makefile

@@ -1,58 +1,380 @@
+
+PREFIX?=/usr
+
 default: zip
 
+PWD=`pwd`
+
 install: uninstall
-	mkdir -p /usr/share/webext/i2psetproxy.js@eyedeekay.github.io \
-		/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/
-	cp -rv options /usr/share/webext/i2psetproxy.js@eyedeekay.github.io/options
-	cp -rv icons /usr/share/webext/i2psetproxy.js@eyedeekay.github.io/icons
-	cp -rv _locales /usr/share/webext/i2psetproxy.js@eyedeekay.github.io/_locales
-	cp background.js /usr/share/webext/i2psetproxy.js@eyedeekay.github.io
-	cp proxy.js /usr/share/webext/i2psetproxy.js@eyedeekay.github.io
-	cp info.js /usr/share/webext/i2psetproxy.js@eyedeekay.github.io
-	cp content.js /usr/share/webext/i2psetproxy.js@eyedeekay.github.io
-	cp info.css /usr/share/webext/i2psetproxy.js@eyedeekay.github.io
-	cp window.html /usr/share/webext/i2psetproxy.js@eyedeekay.github.io
-	cp manifest.json /usr/share/webext/i2psetproxy.js@eyedeekay.github.io/
-	cp README.md /usr/share/webext/i2psetproxy.js@eyedeekay.github.io
-	cp LICENSE /usr/share/webext/i2psetproxy.js@eyedeekay.github.io
-	ln -sf /usr/share/webext/i2psetproxy.js@eyedeekay.github.io \
-		/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/i2psetproxy.js@eyedeekay.github.io
+	mkdir -p $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
+		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+	@echo $(PWD)
+	cp -v ./* $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/; true
+	cp -vr ./i2pcontrol $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol
+	cp -vr ./torrent $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/torrent
+	cp -vr ./_locales $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/_locales
+	cp -vr ./icons $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/icons
+	cp -vr ./options $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/options
+	make link
+
+link:
+	ln -sf  $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
+		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/i2ppb@eyedeekay.github.io
 
 uninstall:
-	rm -rf /usr/share/webext/i2psetproxy.js@eyedeekay.github.io \
-		/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/i2psetproxy.js@eyedeekay.github.io
+	rm -rf $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
+		$(PREFIX)/share/webext/i2psetproxy.js@eyedeekay.github.io \
+		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/i2ppb@eyedeekay.github.io
 
-clobber:
-	rm -f ../i2psetproxy.js.zip ../i2p_proxy*.xpi
 
-VERSION=1.26
+ls:
+	ls -lah $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io; \
+	ls -lah $(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 
-xpi:
-	mv ~/Downloads/i2p_proxy-$(VERSION)-an+fx.xpi ../i2psetproxy.js@eyedeekay.github.io.xpi
+clean: rc clean-artifacts
+	rm -fr ../i2psetproxy.js.zip ../i2p_proxy*.xpi *.torrent #../i2psetproxy.js_*.*
 
-cp:
-	cp ../i2psetproxy.js@eyedeekay.github.io.xpi ./i2psetproxy.js@eyedeekay.github.io.xpi
+## EVEN RELEASES are AMO RELEASES
+## ODD RELEASES are SELFHOSTED RELEASES
+
+MOZ_VERSION=0.114
+VERSION=0.113
+
+## INCREMENT THIS EVERY TIME YOU DO A RELEASE
+LAST_VERSION=0.111.1
+
+YELLOW=F7E59A
+ORANGE=FFC56D
+GREY=D9D9D6
+BLUE=A4C8E1
+PURPLE=A48fE1
+
+colors:
+	@echo " yellow $(YELLOW) \n orange $(ORANGE) \n grey $(GREY) \n blue $(BLUE) \n purple $(PURPLE)"
+
+amo-readme:
+	markdown README.md | \
+		sed 's|<p>||g' | \
+		sed 's|</p>||g' | \
+		sed 's|<h1>|<strong>|g' | \
+		sed 's|</h1>|</strong>|g' | \
+		sed 's|<h2>|<strong>|g' | \
+		sed 's|</h2>|</strong>|g' | \
+		sed 's|<h3>|<strong>|g' | \
+		sed 's|</h3>|</strong>|g' | \
+		grep -v '<img' > amo-index.html
+
+MAGNET=`rhash --magnet i2ppb@eyedeekay.github.io.xpi.torrent`
+
+index:
+	@echo "<!DOCTYPE html>" > index.html
+	@echo "<html>" >> index.html
+	@echo "<head>" >> index.html
+	@echo "  <title>I2P in Private Browsing Mode</title>" >> index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"home.css\" />" >> index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"sidebar.css\" />" >> index.html
+	@echo "</head>" >> index.html
+	@echo "<body>" >> index.html
+	sed "s|magnetsub|[Magnet Link]($(MAGNET))|g" README.md | sed 's|README.md|index.html|g' | markdown >> index.html
+	@echo "</body>" >> index.html
+	@echo "</html>" >> index.html
+
+torrenthelp:
+	@echo "<!DOCTYPE html>" > torrent/index.html
+	@echo "<html>" >> torrent/index.html
+	@echo "<head>" >> torrent/index.html
+	@echo "  <title>I2P in Private Browsing Mode</title>" >> torrent/index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"../home.css\" />" >> torrent/index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"../sidebar.css\" />" >> torrent/index.html
+	@echo "</head>" >> torrent/index.html
+	@echo "<body>" >> torrent/index.html
+	sed "s|magnetsub|[Magnet Link]($(MAGNET))|g" torrent/README.md | markdown >> torrent/index.html
+	@echo "</body>" >> torrent/index.html
+	@echo "</html>" >> torrent/index.html
+
+xpi: getxpi
 
 version:
+	sed -i 's|7647|7657|g' *.js* torrent/*.js*
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)\",|g' manifest.json
+#	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)\",|g' manifest.json
+	find . -name 'messages.json' -exec sed -i 's|$(LAST_VERSION)|$(VERSION)|g' {} \;
+	find . -name 'messages.json' -exec sed -i 's|$(MOZ_VERSION)|$(VERSION)|g' {} \;
+
+moz-version:
+	sed -i 's|7647|7657|g' *.js* torrent/*.js*
+	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(MOZ_VERSION)\",|g' manifest.json
+#	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(MOZ_VERSION)\",|g' manifest.json
+	find . -name 'messages.json' -exec sed -i 's|$(LAST_VERSION)|$(MOZ_VERSION)|g' {} \;
+	find . -name 'messages.json' -exec sed -i 's|$(VERSION)|$(MOZ_VERSION)|g' {} \;
+
+rhz-version:
+	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)1\",|g' manifest.json
+#	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)1-rhizome\",|g' manifest.json
+	sed -i 's|7657|7647|g' *.js* torrent/*.js*
 
 zip: version
-	zip --exclude="./i2psetproxy.js@eyedeekay.github.io.xpi" \
-		--exclude="i2psetproxy.js.png" -r -FS ../i2psetproxy.js.zip *
+	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" \
+		--exclude="*/*.xpi" \
+		--exclude="web-ext-artifacts" \
+		--exclude="./*.pdf" -r -FS ../i2psetproxy.js.zip *
 
-profile-install:
-	cp ./i2psetproxy.js@eyedeekay.github.io.xpi $(HOME)/.mozilla/firefox/firefox.profile.i2p/firefox.profile.i2p/extensions
-	cp ./i2psetproxy.js@eyedeekay.github.io.xpi $(HOME)/.mozilla/firefox/.firefox.profile.i2p.default/extensions
+rc:
+	@grep "$(VERSION)" debian/changelog
+	@echo "changelog is prepared"
+	rm -f *.xpi
 
-to-profile:
-	 cp ./i2psetproxy.js@eyedeekay.github.io.xpi /usr/local/lib/firefox.profile.i2p/firefox.profile.i2p/extensions/
+rtest: rc index torrenthelp
 
-pi: profile-install
+release: rc index torrenthelp
+	cat desc debian/changelog | grep -B 10 "$(LAST_VERSION)" | gothub release -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n $(VERSION) -d -; true
 
-DESC="A simple plugin for configuring an i2p browser."
+update-release:
+	cat desc debian/changelog | grep -B 10 "$(LAST_VERSION)" | gothub edit -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n $(VERSION) -d -; true
 
-release:
-	gothub release -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n $(VERSION) -d $(DESC)
+delete-release:
+	gothub delete -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION); true
 
-upload:
-	gothub upload -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2psetproxy.js@eyedeekay.github.io.xpi" -f "../i2psetproxy.js@eyedeekay.github.io.xpi"
+recreate-release: delete-release release upload
+
+upload: upload-xpi upload-deb
+
+full-release: release submit upload-xpi torrent upload-torrent deb upload-deb upload-rss seed
+
+WEB_EXT_API_KEY=AMO_KEY
+WEB_EXT_API_SECRET=AMO_SECRET
+
+
+-include ../api_keys_moz.mk
+
+tk:
+	echo $(WEB_EXT_API_KEY)
+
+submit: moz-submit moz-sign
+
+clean-artifacts:
+	rm -fr web-ext-artifacts/*
+
+##ODD NUMBERED, SELF-DISTRIBUTED VERSIONS HERE!
+moz-sign: version clean-artifacts
+	@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
+	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
+	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
+	$(HOME)/web-ext/bin/web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET) --timeout 900000 #--api-url-prefix http://localhost:3000/api/v4
+	make copyss
+	sleep 5
+
+copyss:
+	cp web-ext-artifacts/*.xpi ../i2ppb@eyedeekay.github.io.xpi; true
+
+##EVEN NUMBERED, MOZILLA-DISTRIBUTED VERSIONS HERE!
+moz-submit: moz-version
+	@echo "Using the 'submit' target to instantly sign an extension for Mozilla distribution"
+	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
+	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
+	mv manifest.json .manifest.json
+	grep -v update_url .manifest.json > manifest.json
+	$(HOME)/web-ext/bin/web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET) --timeout 900000 --verbose #--api-url-prefix http://localhost:3000/api/v4
+	sleep 5
+	mv .manifest.json manifest.json
+
+rhz-submit: rhz-version
+	@echo "Rhizome releases are disabled while browser is completed."
+	#@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
+	#@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
+	#@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
+	#$HOME/node_modules/web-ext-submit/extender.sh --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	#cp web-ext-artifacts/*.xpi ./i2ppb@eyedeekay.github.io.xpi
+
+getxpi:
+	gothub download -t $(VERSION) -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -n i2ppb@eyedeekay.github.io.xpi
+	mv ./i2ppb@eyedeekay.github.io.xpi ../i2ppb-$(VERSION)@eyedeekay.github.io.xpi
+	cp ../i2ppb-$(VERSION)@eyedeekay.github.io.xpi ../i2ppb@eyedeekay.github.io.xpi
+
+torrent: getxpi
+	rm -f "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent"
+	mktorrent -a http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
+		-a http://zviyq72xcmjupynn5y2f5qa3u7bxyu34jnqmwt6czte2l7idxm7q.b32.i2p/announce \
+		-a http://s5ikrdyjwbcgxmqetxb3nyheizftms7euacuub2hic7defkh3xhq.b32.i2p/a \
+		-a http://uajd4nctepxpac4c4bdyrdw7qvja2a5u3x25otfhkptcjgd53ioq.b32.i2p/announce \
+		-a http://explodie.org:6969/announce \
+		-a http://tracker.opentrackr.org:1337/announce \
+		-a http://tracker.kamigami.org:2710/announce \
+		-a http://tracker.internetwarriors.net:1337/announce \
+		-a http://tracker.darli.net:6611/announce \
+		-a http://tracker.corpscorp.online:80/announce \
+		-a http://tracker.bz:80/announce \
+		-a http://tracker.bt4g.com:2095/announce \
+		-a http://retracker.sevstar.net:2710/announce \
+		-a http://h4.trakx.nibba.trade:80/announce \
+		-a http://www.proxmox.com:6969/announce \
+		-a http://www.loushao.net:8080/announce \
+		-a http://vps02.net.orel.ru:80/announce \
+		-a http://tracker4.itzmx.com:2710/announce \
+		-a http://tracker3.itzmx.com:6961/announce \
+		-a http://tracker2.itzmx.com:6961/announce \
+		-a http://tracker1.itzmx.com:8080/announce \
+		-a http://tracker01.loveapp.com:6789/announce \
+		-a http://tracker.zerobytes.xyz:1337/announce \
+		-a http://tracker.yoshi210.com:6969/announce \
+		-a http://tracker.torrentyorg.pl:80/announce \
+		-a http://tracker.nyap2p.com:8080/announce \
+		-a http://tracker.lelux.fi:80/announce \
+		-a http://tracker.gbitt.info:80/announce \
+		-a http://pow7.com:80/announce \
+		-a http://opentracker.i2p.rocks:6969/announce \
+		-a http://open.acgtracker.com:1096/announce \
+		-a http://open.acgnxtracker.com:80/announce \
+		-a http://mail2.zelenaya.net:80/announce \
+		-a http://acg.rip:6699/announce \
+		-n "i2ppb-$(VERSION)@eyedeekay.github.io.xpi" \
+		-o "i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" \
+		-w https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/$(VERSION)/i2ppb@eyedeekay.github.io.xpi \
+		../i2ppb@eyedeekay.github.io.xpi; true
+	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "./i2ppb@eyedeekay.github.io.xpi.torrent"
+	make index
+
+upload-torrent:
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi.torrent" -f "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent"
+
+upload-xpi:
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi" -f "../i2ppb@eyedeekay.github.io.xpi"
+
+upload-deb:
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.deb" -f "../i2psetproxy.js_$(VERSION)-1_amd64.deb"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION).orig.tar.gz" -f "../i2psetproxy.js_$(VERSION).orig.tar.gz"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1.debian.tar.xz" -f "../i2psetproxy.js_$(VERSION)-1.debian.tar.xz"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1.dsc" -f "../i2psetproxy.js_$(VERSION)-1.dsc"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.changes" -f "../i2psetproxy.js_$(VERSION)-1_amd64.changes"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.buildinfo" -f "../i2psetproxy.js_$(VERSION)-1_amd64.buildinfo"
+
+upload-docs:
+	gothub release -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "Documentation" -d "PDF's and text about the extension"; true
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "Landing Page Documentation.pdf" -f ../smartlander.pdf
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "Browser Design Documentation.pdf" -f ../browser.pdf
+
+fmt: fmt-css fmt-html fmt-js
+
+fmt-css:
+	cleancss -O1 all -O2 all --format beautify home.css -o .home.css && mv .home.css home.css
+	cleancss -O1 all -O2 all --format beautify info.css -o .info.css && mv .info.css info.css
+	cleancss -O1 all -O2 all --format beautify search.css -o .search.css && mv .search.css search.css
+	cleancss -O1 all -O2 all --format beautify sidebar.css -o .sidebar.css && mv .sidebar.css sidebar.css
+	cleancss -O1 all -O2 all --format beautify options/options.css -o options/.options.css && mv options/.options.css options/options.css
+
+fmt-html:
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes index.html > .index.html; mv .index.html index.html
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes window.html > .window.html; mv .window.html window.html
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes home.html > .home.html; mv .home.html home.html
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes toopie.html > .toopie.html; mv .toopie.html toopie.html
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes security.html > .security.html; mv .security.html security.html
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes options/options.html > options/.options.html; mv options/.options.html options/options.html
+
+fmt-js:
+	fixjsstyle *.js
+	fixjsstyle options/*.js
+	fixjsstyle torrent/*.js
+	fixjsstyle i2pcontrol/*.js
+	fixjsstyle manifest.json
+	#find . -path ./node_modules -prune -o -name '*.json' -exec fixjsstyle --write {} \;
+
+fmt-prettier:
+	find . -name '*.js*' -exec $(HOME)/node_modules/.bin/prettier -w {} \;
+
+lint:
+
+	gjslint *.js; true
+	#eslint --color *.js
+
+deborig: version
+	rm -rf ../i2psetproxy.js-$(VERSION)
+	mkdir -p ../i2psetproxy.js-$(VERSION)
+	cp -r ./* ../i2psetproxy.js-$(VERSION)
+	cd ../i2psetproxy.js-$(VERSION) && \
+	rm -rf web-ext-artifacts .git node_modules && \
+	tar \
+		-cvz \
+		--exclude=i2psetproxy.js.gif \
+		--exclude=*.pdf \
+		-f ../i2psetproxy.js_$(VERSION).orig.tar.gz \
+		.
+
+deb: deborig
+	cd ../i2psetproxy.js-$(VERSION) && debuild -us -uc -rfakeroot
+
+-include mirrors.mk
+
+dat:
+	wget -c -O dat.js https://bundle.run/dat-js
+
+rss: torrent
+	rm -f releases.diff
+	mv releases.atom .releases.atom
+	wget https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases.atom
+	sed -i "s|<title>$(VERSION)</title>|<title>$(VERSION)</title>\n    <enclosure url=\"$(MAGNET)\" type=\"application/x-bittorrent\" />|g" releases.atom
+
+upload-rss: rss
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "releases.atom" -f releases.atom
+
+upload-updatemanifest:
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "updateManifest.json" -f updateManifest.json
+
+webext:
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"
+
+snark-mirror:
+	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc.su3
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psnark-rpc.su3" -f ../i2psnark-rpc.su3
+	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc-update.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc-update.su3
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psnark-rpc-update.su3" -f ../i2psnark-rpc-update.su3
+
+seed:
+	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "$(HOME)/.i2p/i2psnark"
+	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/.i2p/i2psnark"
+
+wire:
+	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "$(HOME)/i2p/MuWireDownloads/"
+	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/i2p/MuWireDownloads/"
+
+ndtest:
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
+		-u http://127.0.0.1:7657/home \
+		-u http://127.0.0.1:7657/i2ptunnel \
+		-u http://127.0.0.1:7657/i2psnark \
+		-u http://127.0.0.1:7657/webmail \
+		-u http://127.0.0.1:7657/MuWire \
+		-u http://idk.i2p/video.html \
+		-u http://idk.i2p \
+		-u http://stats.i2p \
+		-u http://tvndxxkxcstbtqfxg7iigco6bj22ff2y6jxikmk7wqkyadkhrd4a.b32.i2p \
+		-u https://ramble.pw \
+		-u https://ramble.pw/f/i2p \
+
+lht-test:
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
+		-u http://localhost:7657/home \
+		-u http://localhost:7657/i2ptunnel \
+		-u http://localhost:7657/i2psnark \
+		-u http://localhost:7657/webmail \
+		-u http://localhost:7657/MuWire/ \
+		-u http://idk.i2p
+
+android:
+	$(HOME)/web-ext/bin/web-ext run --target firefox-android \
+		--android-device NE1GAM7780819544 \
+		--browser-console
+
+run:
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging
+
+chromium:
+	$(HOME)/web-ext/bin/web-ext run --target chromium
+	

README.md

@@ -1,68 +0,0 @@
-i2psetproxy.js
-==============
-
-WebExtension that does extended configuration of a dedicated i2p browser. It's
-still not good enough to use on it's own, and should be combined with the Tor
-Browser or the I2P Firefox Profile for now.
-
-Features
---------
-
-  * [done] **Indicate** the i2p browser is in use visually
-  * [done] **Set** the http proxy to use the local i2p proxy
-  * [done] **Disable** risky webRTC features
-  * [done] **Change** the color of the browser window to indicate that i2p is in use
-  * [done-ish] **Reset** the HTTP Proxy tunnel to generate a new destination on-demand
-   * it does this by working in conjunction with this [standalone HTTP proxy](https://github.com/eyedeekay/httptunnel), currently disabled*
-  * [ready] **Provide** help in a variety of languages.
-
-Usage with standalone HTTP Proxy
---------------------------------
-
-This functionality is currently disabled.
-
-I developed a simple HTTP proxy that can be used with this extension to enable the
-user to initiate a re-start of the HTTP proxy tunnel, with a new set of keys and a
-new destination. This, combined with re-setting the browser settings back to the
-original defaults(which is also done by the HTTP Proxy when re-initiated), amounts
-to a "Fresh Identity" feature for the I2P browser.
-
-Before you begin, get the [Standalone HTTP proxy from here](http://github.com/eyedeekay/httptunnel)
-and run it like so:
-
-        httpproxy -littleboss=start
-
-You can also use 'go get'
-
-        go get -u github.com/eyedeekay/httptunnel/httpproxy
-
-If you change the default host and port, you will need to alter the following guide.
-
-In order to use it with the custom HTTP proxy, open the "Add-On's" menu and select
-the options for the i2psetproxy.js plugin. Change the "Proxy" configuration from
-
-        Host: 127.0.0.1
-        Port: 4444
-
-to
-
-        Host: 127.0.0.1
-        Port: 7950
-
-and change the "Control" configuration from:
-
-        Host: 127.0.0.1
-        Port: 4444
-
-to
-
-        Host: 127.0.0.1
-        Port: 7951
-
-Now, when you press the Toopie button in the toolbar, you will see in the output
-of the HTTP proxy that it has been re-started.
-
-Screenshot
-----------
-
-![Visiting i2p-projekt.i2p](i2psetproxy.js.png)

_locales/en/messages.json

@@ -1,66 +0,0 @@
-{
-  "extensionName": {
-    "message": "i2psetproxy.js",
-    "description": "Name of the extension."
-  },
-  "extensionDescription": {
-    "message": "Set up a browser to use the i2p http proxy automatically",
-    "description": "Description of the extension."
-  },
-  "titlePreface": {
-    "message": "I2P Browser - ",
-    "description": "Preface for the browser titlebar"
-  },
-  "titlePrefacePrivate": {
-    "message": "I2P Browser (Private) - ",
-    "description": "Preface for the browser titlebar"
-  },
-  "resetMessage": {
-    "message": "Reset Tunnel",
-    "description": "Message for the Reset Tunnel button"
-  },
-  "infoTitle": {
-    "message": "I2P Help",
-    "description": "Title for the help menu"
-  },
-  "infoMessage": {
-    "message": "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.",
-    "description": "Help Message"
-  },
-  "helpMessage": {
-    "message": "Get additional help",
-    "description": "Help Message"
-  },
-  "newsMessage": {
-    "message": "Visit the I2P Blog to learn the latest about i2p.",
-    "description": "Help Message"
-  },
-  "forumMessage": {
-    "message": "Visit the I2P Forum to learn more or ask for assistance",
-    "description": "Help Message"
-  },
-  "clearData": {
-    "message": "Clear all browsing data",
-    "description": "Help Message"
-  },
-  "hostText": {
-    "message": "Host: ",
-    "description": "Host for the HTTP or SOCKS5 Proxy"
-  },
-  "portText": {
-    "message": "Port: ",
-    "description": "Port for the HTTP or SOCKS5 Proxy"
-  },
-  "controlHelpText": {
-    "message": "These options will be inert if used with the default i2p HTTP or SOCKS proxy.",
-    "description": "Help for configuring the options for the Reset Tunnel button"
-  },
-  "controlHostText": {
-    "message": "Control Host: ",
-    "description": "Host for the Reset Tunnel button"
-  },
-  "controlPortText": {
-    "message": "Control Port: ",
-    "description": "Port for the Reset Tunnel button"
-  }
-}

background.js

@@ -1,73 +0,0 @@
-
-function isDroid() {
-    var gettingInfo = browser.runtime.getPlatformInfo();
-    gettingInfo.then((got) => {
-        if (got.os == "android") {
-            console.log("android detected")
-            return true
-        }else{
-            console.log("desktop detected")
-            return false
-        }
-    });
-}
-
-if (!isDroid()) {
-    chrome.windows.onCreated.addListener(themeWindow);
-}
-
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
-
-function themeWindow(window) {
-    // Check if the window is in private browsing
-    if (window.incognito) {
-        chrome.theme.update(window.id, {
-            colors: {
-                frame: "#2D4470",
-                toolbar: "#2D4470",
-            }
-        });
-        chrome.windows.update(window.id, {
-            titlePreface: titleprefpriv
-        });
-    }
-    else {
-        chrome.theme.update(window.id, {
-            colors: {
-                frame: "#9DABD5",
-                toolbar: "#9DABD5",
-            }
-        });
-        chrome.windows.update(window.id, {
-            titlePreface: titlepref
-        });
-    }
-}
-
-function setTitle(window){
-    if (window.incognito) {
-        chrome.windows.update(window.id, {
-            titlePreface: titleprefpriv
-        });
-    }
-    else {
-        chrome.windows.update(window.id, {
-            titlePreface: titlepref
-        });
-    }
-}
-
-function setTitleError(window){
-    alert("plugin error setting title on", window.id)
-}
-
-chrome.windows.onCreated.addListener(() => {
-    const gettingStoredSettings = chrome.storage.local.get();
-    gettingStoredSettings.then(setupProxy, onError);
-});
-
-chrome.tabs.onCreated.addListener(() => {
-    const getting = browser.windows.getCurrent({populate: true});
-    getting.then(setTitle, setTitleError);
-});

content.js

@@ -1,17 +0,0 @@
-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 = documents.getElementByID("clear-browser-data")
-cleardata.textContent = chrome.i18n.getMessage("clearData");

info.css

@@ -1,12 +0,0 @@
-html, body {
-  width: 350px;
-}
-
-a {
-  margin: 10px;
-  display: inline-block;
-}
-
-.panel {
-  margin: 5px;
-}

info.js

@@ -1,49 +0,0 @@
-document.addEventListener("click", (e) => {
-  function getCurrentWindow() {
-    return chrome.windows.getCurrent();
-  }
-
-  if (e.target.id === "window-create-help-panel") {
-    let createData = {
-      type: "panel",
-      incognito: true,
-    };
-    let creating = chrome.windows.create(createData);
-    creating.then(() => {
-      console.log("The help panel has been created");
-    });
-  } else if (e.target.id === "window-create-news-panel") {
-    let createData = {
-      type: "panel",
-      incognito: true,
-    };
-    let creating = chrome.windows.create(createData);
-    creating.then(() => {
-      console.log("The news panel has been created");
-    });
-  } else if (e.target.id === "generate-fresh-tunnel") {
-    function RefreshIdentity(){
-        console.log("Generating new identity")
-        const Http = new XMLHttpRequest();
-        const url='http://' + controlHost + ":" + controlPort
-        Http.open("GET", url);
-        Http.send();
-        Http.onreadystatechange=(e)=>{
-            console.log(Http.responseText)
-        }
-    }
-    RefreshIdentity();
-  } else if (e.target.id === "window-preface-title") {
-    getCurrentWindow().then((currentWindow) => {
-      let updateInfo = {
-        titlePreface: "I2P Help | "
-      }
-      chrome.windows.update(currentWindow.id, updateInfo);
-    });
-  }else if (e.target.id === "clear-browser-data") {
-      forgetBrowsingData()
-  }
-
-  e.preventDefault();
-
-});

manifest.json

@@ -1,41 +1,80 @@
 {
   "applications": {
     "gecko": {
-      "id": "i2psetproxy.js@eyedeekay.github.io",
-      "strict_min_version": "60.0"
+      "id": "i2ppb@eyedeekay.github.io",
+      "strict_min_version": "85.0"
     }
   },
   "permissions": [
     "theme",
+    "alarms",
     "browsingData",
+    "management",
     "notifications",
     "proxy",
     "privacy",
     "storage",
+    "webNavigation",
     "webRequest",
+    "webRequestBlocking",
     "contextualIdentities",
+    "cookies",
+    "tabs",
     "<all_urls>"
   ],
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "1.26",
+  "version": "0.113",
   "description": "__MSG_extensionDescription__",
-  "homepage_url": "https://github.com/eyedeekay/i2psetproxy.js",
+  "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
   "icons": {
-    "48": "icons/toopie.png"
+    "48": "icons/i2plogo.png"
   },
   "browser_action": {
     "browser_style": true,
-    "default_icon": "icons/toopie.png",
+    "default_icon": "icons/i2plogo.png",
     "default_title": "__MSG_extensionName__",
     "default_popup": "window.html"
   },
+  "page_action": {
+    "browser_style": true,
+    "default_title": "__MSG_toopieTLS__",
+    "default_icon": "icons/i2plogo.png",
+    "show_matches": [
+      "http://*.i2p/*",
+      "https://*.i2p/*",
+      "http://*.b32.i2p/*",
+      "https://*.b32.i2p/*"
+    ],
+    "pinned": true
+  },
   "options_ui": {
     "page": "options/options.html"
   },
+  "content_scripts": [
+    {
+      "matches": ["<all_urls>"],
+      "js": ["script.js"]
+    }
+  ],
   "background": {
-    "scripts": ["background.js", "proxy.js", "info.js", "privacy.js" ]
+    "persistent": true,
+    "scripts": [
+      "config.js",
+      "torrent/common.js",
+      "torrent/background.js",
+      "i2pcontrol/i2pcontrol.js",
+      "host.js",
+      "privacy.js",
+      "platform.js",
+      "background.js",
+      "handler.js",
+      "proxy.js",
+      "info.js",
+      "home.js",
+      "scrub.js",
+      "bookmarks.js"
+    ]
   },
   "default_locale": "en"
 }
-

options/options.css

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

options/options.html

@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-  <head>
-    <meta charset="utf-8">
-    <link rel="stylesheet" href="options.css"/>
-  </head>
-  <body>
-
-    <section class="scheme-options">
-      <span class="title">Proxy Scheme:</span>
-      <select id="proxy_scheme">
-        <option value="http" selected="selected">HTTP</option>
-        <option value="socks5">SOCKS5</option>
-      </select>
-    </section>
-
-    <section class="scheme-options proxy-options">
-      <div class="title" >Proxy Options</div>
-
-      <label id="portText">Host: </label>
-      <input type="text" data="host" id="host" value="127.0.0.1"/>
-      <br>
-      <label id="hostText">Port: </label>
-      <input type="text" data="port" id="port" value="4444"/>
-
-    </section>
-    <section class="scheme-options identity-options">
-      <div class="panel">
-        <div id="identity-list">Identity list?</div>
-      </div>
-    </section>
-
-    <section class="scheme-options control-options">
-      <div class="title" >Controller Options</div>
-      <p id="controlHelpText"> These options will be inert if used with the default i2p HTTP or SOCKS
-      proxy. </p>
-      <label id="controlPortText">Control Host: </label>
-      <input type="text" data="controlhost" id="controlhost" value="127.0.0.1"/>
-      <br>
-      <label id="controlHostText">Control Port: </label>
-      <input type="text" data="controlport" id="controlport" value="4444"/>
-
-    </section>
-
-    <input type="button" value="Save preferences" id="save-button"/>
-
-    <script src="options.js"></script>
-  </body>
-
-</html>

options/options.js

@@ -1,189 +0,0 @@
-
-function isDroid() {
-    var gettingInfo = browser.runtime.getPlatformInfo();
-    gettingInfo.then((got) => {
-        if (got.os == "android") {
-            return true
-        }else{
-            return false
-        }
-    });
-}
-
-function SetHostText(){
-    var hostid = document.getElementById('hostText');
-    hostid.textContent = chrome.i18n.getMessage("hostText");
-}
-
-function SetPortText(){
-    var portid = document.getElementById('portText');
-    portid.textContent = chrome.i18n.getMessage("portText");
-}
-
-function SetControlHostText(){
-    var controlhostid = document.getElementById('controlHostText');
-    controlhostid.textContent = chrome.i18n.getMessage("controlHostText");
-}
-
-function setupProxy() {
-    var controlHost = getControlHost()
-    var controlPort = getControlPort();
-    var Host = getHost()
-    var Port = getPort()
-    var Scheme = getScheme()
-    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")
-}
-
-function SetControlPortText(){
-    var controlportid = document.getElementById('controlPortText');
-    controlportid.textContent = chrome.i18n.getMessage("controlPortText");
-}
-
-function SetControlHelpText(){
-    var portid = document.getElementById('controlHelpText');
-    portid.textContent = chrome.i18n.getMessage("controlHelpText");
-}
-
-function getScheme() {
-    const proxy_scheme = document.querySelector("#proxy_scheme");
-    console.log("Got i2p proxy scheme:", proxy_scheme.value);
-    if (proxy_scheme == "HTTP") {
-        return "http"
-    }
-    if (proxy_scheme == "SOCKS") {
-        return "socks"
-    }
-    return proxy_scheme.value;
-}
-
-function getHost() {
-    proxy_host = document.getElementById("host").value
-    console.log("Got i2p proxy host:", proxy_host);
-    if (proxy_host == undefined) {
-        return "127.0.0.1"
-    }
-    return proxy_host;
-}
-
-function getPort() {
-    proxy_port = document.getElementById("port").value
-    console.log("Got i2p proxy port:", proxy_port);
-    if (proxy_port == undefined) {
-        return "4444"
-    }
-    return proxy_port;
-}
-
-function getControlHost() {
-    control_host = document.getElementById("controlhost").value
-    console.log("Got i2p control host:", control_host);
-    if (control_host == undefined) {
-        return "127.0.0.1"
-    }
-    return control_host;
-}
-
-function getControlPort() {
-    control_port = document.getElementById("controlport").value
-    console.log("Got i2p control port:", control_port);
-    if (control_port == undefined) {
-        return "4444"
-    }
-    return control_port;
-}
-
-function checkStoredSettings(storedSettings) {
-    let defaultSettings = {};
-    if (!storedSettings.proxy_scheme){
-        defaultSettings["proxy_scheme"] = "http"
-    }
-    if (!storedSettings.proxy_host) {
-        defaultSettings["proxy_host"] = "127.0.0.1"
-    }
-    if (!storedSettings.proxy_port) {
-        defaultSettings["proxy_port"] = 4444
-    }
-    if (!storedSettings.control_host) {
-        defaultSettings["control_host"] = "127.0.0.1"
-    }
-    if (!storedSettings.control_port) {
-        defaultSettings["control_port"] = 4444
-    }
-    chrome.storage.local.set(defaultSettings);
-}
-
-function onError(e) {
-    console.error(e);
-}
-
-function storeSettings() {
-    let proxy_scheme = getScheme()
-    let proxy_host = getHost()
-    let proxy_port = getPort()
-    let control_host = getControlHost()
-    let control_port = getControlPort()
-    chrome.storage.local.set({
-        proxy_scheme,
-        proxy_host,
-        proxy_port,
-        control_host,
-        control_port,
-    });
-    console.log("storing proxy scheme:", proxy_scheme)
-    console.log("storing proxy host:", proxy_host)
-    console.log("storing proxy port:", proxy_port)
-    console.log("storing control host:", control_host)
-    console.log("storing control port:", control_port)
-    setupProxy()
-}
-
-function updateUI(restoredSettings) {
-
-    const selectList = document.querySelector("#proxy_scheme")
-    selectList.value = restoredSettings.proxy_scheme
-    console.log("showing proxy scheme:", selectList.value)
-
-    const hostitem = document.getElementById("host")
-    hostitem.value = restoredSettings.proxy_host
-    console.log("showing proxy host:", hostitem.value)
-
-    const portitem = document.getElementById("port")
-    portitem.value = restoredSettings.proxy_port
-    console.log("showing proxy port:", portitem.value)
-
-    const controlhostitem = document.getElementById("controlhost")
-    controlhostitem.value = restoredSettings.control_host
-    console.log("showing control host:", controlhostitem.value)
-
-    const controlportitem = document.getElementById("controlport")
-    controlportitem.value = restoredSettings.control_port
-    console.log("showing control port:", controlportitem.value)
-
-    SetHostText()
-    SetPortText()
-    SetControlHostText()
-    SetControlPortText()
-    SetControlHelpText()
-    setupProxy()
-}
-
-function onError(e) {
-    console.error(e);
-}
-chrome.storage.local.get(function(got){
-    checkStoredSettings(got)
-    updateUI(got)
-});
-
-const saveButton = document.querySelector("#save-button");
-saveButton.addEventListener("click", storeSettings);
-
-//EXPERIMENTAL: Open in I2P Tab
-

privacy.js

@@ -1,214 +0,0 @@
-
-function onSet(result) {
-  if (result) {
-    console.log("->: Value was updated");
-  } else {
-    console.log("-X: Value was not updated");
-  }
-}
-
-// 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
-    });
-    console.log("Disabling hyperlink auditing/val=", {
-      value: false
-    })
-    setting.then(onSet);
-}
-
-// This enables first-party isolation
-function enableFirstPartyIsolation() {
-    var setting = browser.privacy.websites.firstPartyIsolate.set({
-      value: true
-    });
-    console.log("Enabling first party isolation/val=", {
-      value: true
-    })
-    setting.then(onSet);
-}
-
-// This rejects tracking cookies and third-party cookies but it
-// LEAVES "Persistent" Cookies unmodified in favor of an option in the content
-// interface for now
-function disableEvilCookies() {
-    var getting = browser.privacy.websites.cookieConfig.get({});
-    getting.then((got) => {
-        var setting = browser.privacy.websites.cookieConfig.set(
-            {value: {behavior: "reject_third_party",
-            nonPersistentCookies: got.value.nonPersistentCookies}}
-        );
-        console.log("Setting cookie behavior/val=", {value: {behavior: "reject_third_party",
-            nonPersistentCookies: got.value.nonPersistentCookies}})
-        setting.then(onSet);
-    });
-}
-
-// Make sure that they're gone
-/*function disableBadCookies(){
-    var setting = browser.privacy.websites.thirdPartyCookiesAllowed.set({
-      value: false
-    });
-    console.log("Disabling third party cookies/val=", {
-      value: false
-    })
-    setting.then(onSet);
-}*/
-
-// this disables the use of referrer headers
-function disableReferrers() {
-    var setting = browser.privacy.websites.referrersEnabled.set({
-      value: false
-    });
-    console.log("Disabling referrer headers/val=", {
-      value: false
-    })
-    setting.then(onSet);
-}
-
-// enable fingerprinting resistent features(letterboxing and stuff)
-function enableResistFingerprinting() {
-    var setting = browser.privacy.websites.referrersEnabled.set({
-      value: true
-    });
-    console.log("Enabling resist fingerprinting/val=", {
-      value: true
-    })
-    setting.then(onSet);
-}
-
-// This is essentially a blocklist of clearnet web-sites known to do bad tracking
-function enableTrackingProtection() {
-    var setting = browser.privacy.websites.trackingProtectionMode.set({
-      value: "always"
-    });
-    console.log("Enabling tracking protection/val=", {
-      value: "always"
-    })
-    setting.then(onSet);
-}
-
-// This disables protected content, which is a form of digital restrictions
-// management dependent on identifying information
-function disableDigitalRestrictionsManagement() {
-    var gettingInfo = browser.runtime.getPlatformInfo();
-    gettingInfo.then((got) => {
-        if (got.os == "win") {
-            var setting = browser.privacy.websites.protectedContentEnabled.set({
-              value: false
-            });
-            console.log("Setting Protected Content(Digital Restrictions Management) false/val=", {
-              value: false
-            })
-            setting.then(onSet);
-        }
-    });
-}
-
-function setAllPrivacy() {
-    disableHyperlinkAuditing()
-    enableFirstPartyIsolation()
-    disableEvilCookies()
-    disableReferrers()
-    enableTrackingProtection()
-    enableResistFingerprinting()
-    disableDigitalRestrictionsManagement()
-}
-
-setAllPrivacy()
-
-function ResetPeerConnection(){
-    browser.privacy.network.peerConnectionEnabled.set({value: false});
-    browser.privacy.network.networkPredictionEnabled.set({value: false});
-    browser.privacy.network.webRTCIPHandlingPolicy.set({value: "disable_non_proxied_udp"});
-    console.log("Re-disabled WebRTC")
-}
-
-function EnablePeerConnection(){
-    browser.privacy.network.peerConnectionEnabled.set({value: true});
-    browser.privacy.network.networkPredictionEnabled.set({value: false});
-    browser.privacy.network.webRTCIPHandlingPolicy.set({value: "disable_non_proxied_udp"});
-    console.log("Enabled WebRTC")
-}
-
-ResetPeerConnection()
-
-function ResetDisableSavePasswords(){
-    browser.privacy.services.passwordSavingEnabled.set({value: false});
-    console.log("Re-disabled saved passwords")
-}
-
-function EnableSavePasswords(){
-    browser.privacy.services.passwordSavingEnabled.set({value: true});
-    console.log("Enabled saved passwords")
-}
-
-//ResetDisableSavePasswords()
-
-
-var defaultSettings = {
-  since: "forever",
-  dataTypes: ["history", "downloads", "cache", "cookies", "passwords", "pluginData", "formData", "serviceWorkers"]
-};
-
-var appSettings = {
-  since: "forever",
-  dataTypes: [""]
-};
-
-function onError(e) {
-  console.error(e);
-}
-
-function checkStoredSettings(storedSettings) {
-  browser.storage.local.set(appSettings);
-}
-
-const gettingStoredSettings = browser.storage.local.get();
-gettingStoredSettings.then(checkStoredSettings, onError);
-
-function forgetBrowsingData(storedSettings) {
-
-  function getSince(selectedSince) {
-    if (selectedSince === "forever") {
-      return 0;
-    }
-
-    const times = {
-      hour: () => { return 1000 * 60 * 60 },
-      day: () => { return 1000 * 60 * 60 * 24 },
-      week: () => { return 1000 * 60 * 60 * 24 * 7}
-    }
-
-    const sinceMilliseconds = times[selectedSince].call();
-    return Date.now() - sinceMilliseconds;
-  }
-
-  function getTypes(selectedTypes) {
-    let dataTypes = {};
-    for (let item of selectedTypes) {
-      dataTypes[item] = true;
-    }
-    return dataTypes;
-  }
-
-  const since = getSince(defaultSettings.since);
-  const dataTypes = getTypes(defaultSettings.dataTypes);
-
-  function notify() {
-    let dataTypesString = Object.keys(dataTypes).join(", ");
-    let sinceString = new Date(since).toLocaleString();
-    browser.notifications.create({
-      "type": "basic",
-      "title": "Removed browsing data",
-      "message": `Removed ${dataTypesString}\nsince ${sinceString}`
-    });
-  }
-
-  browser.browsingData.remove({since}, dataTypes).then(notify);
-
-  setAllPrivacy()
-  ResetPeerConnection()
-}

proxy.js

@@ -1,144 +0,0 @@
-
-function isDroid() {
-    var gettingInfo = browser.runtime.getPlatformInfo();
-    gettingInfo.then((got) => {
-        if (got.os == "android") {
-            return true
-        }else{
-            return false
-        }
-    });
-}
-
-browser.privacy.network.peerConnectionEnabled.set({value: false});
-
-chrome.privacy.network.networkPredictionEnabled.set({value: false});
-chrome.privacy.network.webRTCIPHandlingPolicy.set({value: "disable_non_proxied_udp"});
-
-console.log("Preliminarily disabled WebRTC.")
-
-function shouldProxyRequest(requestInfo) {
-  return requestInfo.parentFrameId != -1;
-}
-
-function handleProxyRequest(requestInfo) {
-    console.log(`Proxying: ${requestInfo.url}`);
-    console.log("   ", getScheme(), getHost(), ":", getPort(),)
-    return {type: getScheme(), host: getHost(), port: getPort()};
-}
-
-var proxy_scheme = "HTTP"
-
-function getScheme() {
-    if (proxy_scheme == undefined) {
-        proxy_scheme = "http"
-    }
-    if (proxy_scheme == "HTTP") {
-        proxy_scheme = "http"
-    }
-    if (proxy_scheme == "SOCKS") {
-        proxy_scheme = "socks"
-    }
-    console.log("Got i2p proxy scheme:", proxy_scheme);
-    return proxy_scheme;
-}
-
-var proxy_host = "127.0.0.1"
-
-function getHost() {
-    if (proxy_host == undefined){
-        proxy_host = "127.0.0.1"
-    }
-    console.log("Got i2p proxy host:", proxy_host);
-    return proxy_host;
-}
-
-var proxy_port = "4444"
-
-function getPort() {
-    if (proxy_port == undefined){
-        proxy_port = "4444"
-    }
-    console.log("Got i2p proxy port:", proxy_port);
-    return proxy_port;
-}
-
-var control_host = "127.0.0.1"
-
-function getControlHost() {
-    if (control_host == undefined){
-        return "127.0.0.1"
-    }
-    console.log("Got i2p control host:", control_host);
-    return control_host;
-}
-
-var control_port = "4444"
-
-function getControlPort() {
-    if (control_port == undefined){
-        return "4444"
-    }
-    console.log("Got i2p control port:", control_port);
-    return control_port;
-}
-
-function setupProxy() {
-    var controlHost = getControlHost()
-    var controlPort = getControlPort();
-    var Host = getHost()
-    var Port = getPort()
-    var Scheme = getScheme()
-    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")
-}
-
-function checkStoredSettings(storedSettings) {
-    let defaultSettings = {};
-    if (!storedSettings.proxy_scheme){
-        defaultSettings["proxy_scheme"] = "http"
-    }
-    if (!storedSettings.proxy_host) {
-        defaultSettings["proxy_host"] = "127.0.0.1"
-    }
-    if (!storedSettings.proxy_port) {
-        defaultSettings["proxy_port"] = 4444
-    }
-    if (!storedSettings.control_host) {
-        defaultSettings["control_host"] = "127.0.0.1"
-    }
-    if (!storedSettings.control_port) {
-        defaultSettings["control_port"] = 4444
-    }
-    chrome.storage.local.set(defaultSettings);
-}
-
-function update(restoredSettings) {
-    proxy_scheme = restoredSettings.proxy_scheme
-    console.log("restoring proxy scheme:", proxy_scheme)
-    proxy_host = restoredSettings.proxy_host
-    console.log("restoring proxy host:", proxy_host)
-    proxy_port = restoredSettings.proxy_port
-    console.log("restoring proxy port:", proxy_port)
-    control_host = restoredSettings.control_host
-    console.log("restoring control host:", control_host)
-    control_port = restoredSettings.control_port
-    console.log("restoring control port:", control_port)
-}
-
-chrome.storage.local.get(function(got){
-    checkStoredSettings(got)
-    update(got)
-    setupProxy()
-});
-
-// Theme all currently open windows
-if (!isDroid()) {
-    browser.windows.getAll().then(wins => wins.forEach(themeWindow));
-}

window.html

@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-  <head>
-    <meta charset="utf-8">
-    <link rel="stylesheet" href="info.css"/>
-  </head>
-
-  <body>
-    <div class="panel">
-      <div class="panel-section panel-section-header">
-        <div id="text-section-header" class="text-section-header">I2P Assistance</div>
-      </div>
-
-      <div id="text-section-helptext">
-      You are now free to browse the eepWeb!
-
-      Your browser is now configured to browse anonymously on the I2P network.
-      As you browse, your traffic will be routed through other network nodes
-      to disguise it's origin, both from the server and from the nodes
-      themselves.
-
-      </div>
-
-      <div class="panel-section-separator"></div>
-          <!-- This is where I'll eventually put the tunnel control panel -->
-          <!-- <a href="#" id="generate-fresh-tunnel> Generate a Fresh Tunnel</a>"-->
-          <!-- -->
-          <strong><a href="#" id="clear-browser-data">Clear all browsing data</a></strong><br>
-          <!--<strong><a href="#" id="temp-enable-webrtc">Temporarily enable WebRTC</a></strong><br>-->
-      <div class="panel-section-separator"></div>
-          <a href="http://i2pforum.i2p" id="window-create-forum-panel">Visit the I2P Forums</a><br>
-          <a href="http://i2p-projekt.i2p/blog" id="window-create-news-panel">Get the latest I2P News</a><br>
-      <div class="panel-section-separator"></div>
-
-    </div>
-
-  <script src="privacy.js"></script>
-  <script src="info.js"></script>
-  <script src="content.js"></script>
-
-</body>
-
-</html>