Merge pull request #100 from eyedeekay/bookmarks

make the bookmarks part of a subdirectory

.gitignore

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

COLORS.md

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

Makefile

@@ -1,45 +1,47 @@
-PREFIX:=/usr
+
+PREFIX?=/usr
 
 default: zip
 
+PWD=`pwd`
+
 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 ./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/
-	cp ./*.xpi $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./manifest.json $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./LICENSE $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	ln -s $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
 		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+	@echo $(PWD)
+	cp -v ./* $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/; true
+	cp -vr ./i2pcontrol $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol
+	cp -vr ./torrent $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/torrent
+	cp -vr ./_locales $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/_locales
+	cp -vr ./icons $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/icons
+	cp -vr ./options $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/options
+	make link
+
+link:
+	ln -sf  $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
+		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/i2ppb@eyedeekay.github.io
 
 uninstall:
 	rm -rf $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
 		$(PREFIX)/share/webext/i2psetproxy.js@eyedeekay.github.io \
-		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/i2ppb@eyedeekay.github.io
 
 
 ls:
 	ls -lah $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io; \
 	ls -lah $(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 
-clean:
-	rm -fr ../i2psetproxy.js.zip ../i2p_proxy*.xpi ../i2p*.xpi #../i2psetproxy.js_*.*
+clean: rc clean-artifacts
+	rm -fr ../i2psetproxy.js.zip ../i2p_proxy*.xpi ../i2p*.xpi *.torrent #../i2psetproxy.js_*.*
 
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES
 
-MOZ_VERSION=0.54
-VERSION=0.55
-#VERSION=$(MOZ_VERSION)
-#VERSION=1.27
+MOZ_VERSION=0.76
+VERSION=0.75
+
+## INCREMENT THIS EVERY TIME YOU DO A RELEASE
+LAST_VERSION=0.73
 
 YELLOW=F7E59A
 ORANGE=FFC56D
@@ -62,37 +64,54 @@ amo-readme:
 		sed 's|</h3>|</strong>|g' | \
 		grep -v '<img' > amo-index.html
 
+MAGNET=`torrent2magnet i2ppb@eyedeekay.github.io.xpi.torrent`
+
 index:
 	@echo "<!DOCTYPE html>" > index.html
 	@echo "<html>" >> index.html
 	@echo "<head>" >> index.html
 	@echo "  <title>I2P in Private Browsing Mode</title>" >> index.html
-	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href =\"home.css\" />" >> index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"home.css\" />" >> index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"sidebar.css\" />" >> index.html
 	@echo "</head>" >> index.html
-	markdown README.md >> 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:
-	#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
+xpi: getxpi
 
 version:
-	sed -i 's|7647|7657|g' *.js* */*.js*
+	sed -i 's|7647|7657|g' *.js* torrent/*.js*
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)\",|g' manifest.json
 	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)\",|g' manifest.json
+	sed -si 's|$(shell grep $(LAST_VERSION) _locales/en/messages.json)|    "message": "$(VERSION)",|g' _locales/en/messages.json; true
+	sed -si 's|$(shell grep $(MOZ_VERSION) _locales/en/messages.json)|    "message": "$(VERSION)",|g' _locales/en/messages.json; true
 
 moz-version:
-	sed -i 's|7647|7657|g' *.js* */*.js*
+	sed -i 's|7647|7657|g' *.js* torrent/*.js*
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(MOZ_VERSION)\",|g' manifest.json
 	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(MOZ_VERSION)\",|g' manifest.json
+	sed -si 's|$(shell grep $(LAST_VERSION) _locales/en/messages.json)|    "message": "$(MOZ_VERSION)",|g' _locales/en/messages.json; true
+	sed -si 's|$(shell grep $(VERSION) _locales/en/messages.json)|    "message": "$(MOZ_VERSION)",|g' _locales/en/messages.json; true
 
 rhz-version:
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)1\",|g' manifest.json
 	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)1-rhizome\",|g' manifest.json
-	sed -i 's|7657|7647|g' *.js* */*.js*
+	sed -i 's|7657|7647|g' *.js* torrent/*.js*
 
 zip: version
 	zip --exclude="./i2ppb@eyedeekay.github.io.xpi" \
@@ -108,8 +127,18 @@ zip: version
 		--exclude="web-ext-artifacts" \
 		--exclude="./*.pdf" -r -FS ../i2psetproxy.js.zip *
 
-release:
-	cat desc debian/changelog | gothub release -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n $(VERSION) -d -; true
+rc:
+	@grep "$(VERSION)" debian/changelog
+	@echo "changelog is prepared"
+	rm -f *.xpi
+
+rtest: rc index torrenthelp
+
+release: rc index torrenthelp
+	cat desc debian/changelog | grep -B 10 "$(LAST_VERSION)" | gothub release -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n $(VERSION) -d -; true
+
+update-release:
+	cat desc debian/changelog | grep -B 10 "$(LAST_VERSION)" | gothub edit -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n $(VERSION) -d -; true
 
 delete-release:
 	gothub delete -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION); true
@@ -118,7 +147,7 @@ recreate-release: delete-release release upload
 
 upload: upload-xpi upload-deb
 
-full-release: release submit deb upload
+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
@@ -129,7 +158,7 @@ WEB_EXT_API_SECRET=AMO_SECRET
 tk:
 	echo $(WEB_EXT_API_KEY)
 
-submit: moz-sign rhz-submit moz-submit
+submit: moz-submit moz-sign
 
 clean-artifacts:
 	rm -fr web-ext-artifacts/*
@@ -139,34 +168,39 @@ 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."
-	web-ext-submit --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	$HOME/node_modules/web-ext-submit/extender.sh --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
 	make copyss
+	sleep 5
 
 copyss:
-	cp web-ext-artifacts/*.xpi ./i2ppb@eyedeekay.github.io.xpi; true
+	cp web-ext-artifacts/*.xpi ../i2ppb@eyedeekay.github.io.xpi; true
 
 ##EVEN NUMBERED, MOZILLA-DISTRIBUTED VERSIONS HERE!
 moz-submit: moz-version
 	@echo "Using the 'submit' target to instantly sign an extension for Mozilla distribution"
 	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
+	mv manifest.json .manifest.json
+	grep -v update_url .manifest.json > manifest.json
 	web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	sleep 5
+	mv .manifest.json manifest.json
 
 rhz-submit: rhz-version
 	@echo "Rhizome releases are disabled while browser is completed."
 	#@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
 	#@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
 	#@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
-	#web-ext-submit --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	#$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
 
-#gettorrent:
-#	wget "http://127.0.0.1:7657/i2psnark/i2ppb@eyedeekay.github.io.xpi.torrent"
-
 getxpi:
-	gothub download -t $(VERSION) -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -n "i2ppb@eyedeekay.github.io.xpi"
+	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:
+torrent: getxpi
+	rm -f "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent"
 	mktorrent -a http://zviyq72xcmjupynn5y2f5qa3u7bxyu34jnqmwt6czte2l7idxm7q.b32.i2p/announce \
 		-a http://s5ikrdyjwbcgxmqetxb3nyheizftms7euacuub2hic7defkh3xhq.b32.i2p/a \
 		-a http://uajd4nctepxpac4c4bdyrdw7qvja2a5u3x25otfhkptcjgd53ioq.b32.i2p/announce \
@@ -201,16 +235,18 @@ torrent:
 		-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" \
+		-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
+		../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"
+	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"
@@ -220,28 +256,49 @@ upload-deb:
 	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"
 
-fmt:
+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
-	find . -path ./node_modules -prune -o -name '*.js' -exec prettier --write {} \;
-	find . -path ./node_modules -prune -o -name '*.json' -exec prettier --write {} \;
+	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
+	#find . -path ./node_modules -prune -o -name '*.json' -exec fixjsstyle --write {} \;
 
 lint:
-	eslint --color *.js
 
-deborig: fmt version
+	gjslint *.js; true
+	#eslint --color *.js
+
+deborig: version
 	rm -rf ../i2psetproxy.js-$(VERSION)
-	cp -r . ../i2psetproxy.js-$(VERSION)
+	mkdir -p ../i2psetproxy.js-$(VERSION)
+	cp -r ./* ../i2psetproxy.js-$(VERSION)
 	cd ../i2psetproxy.js-$(VERSION) && \
-	rm -rf web-ext-artifacts && \
+	rm -rf web-ext-artifacts .git node_modules && \
 	tar \
 		-cvz \
-		--exclude=.git \
 		--exclude=i2psetproxy.js.gif \
-		--exclude=node_modules \
-		--exclude=web-ext-artifacts \
-		--exclude=*.xpi \
-		--exclude=*/*.xpi \
 		--exclude=*.pdf \
 		-f ../i2psetproxy.js_$(VERSION).orig.tar.gz \
 		.
@@ -252,4 +309,33 @@ deb: deborig
 -include mirrors.mk
 
 dat:
-	wget -c -O dat.js https://bundle.run/dat-js
+	wget -c -O dat.js https://bundle.run/dat-js
+
+rss: torrent
+	rm -f releases.diff
+	mv releases.atom .releases.atom
+	wget https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases.atom
+	sed -i "s|<title>$(VERSION)</title>|<title>$(VERSION)</title>\n    <enclosure url=\"$(MAGNET)\" type=\"application/x-bittorrent\" />|g" releases.atom
+
+upload-rss: rss
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "releases.atom" -f releases.atom
+
+upload-updatemanifest:
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "updateManifest.json" -f updateManifest.json
+
+webext:
+	web-ext run -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"
+
+snark-mirror:
+	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc.su3
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psnark-rpc.su3" -f ../i2psnark-rpc.su3
+	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc-update.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc-update.su3
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psnark-rpc-update.su3" -f ../i2psnark-rpc-update.su3
+
+seed:
+	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "$(HOME)/.i2p/i2psnark"
+	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/.i2p/i2psnark"
+	
+wire:
+	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "$(HOME)/i2p/MuWireDownloads/"
+	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/i2p/MuWireDownloads/"

README.md

@@ -1,21 +1,21 @@
 I2P in Private Browsing Mode(Firefox-Only)
 ==========================================
 
-This is an **Experimental** webextension which introduces a set of new "Private
-Browsing" modes to Firefox-based browsers(Supporting webextensions) that makes
-it easier to configure a browser to use I2P securely and adds features for
-making I2P applications easier to use. It does this by isolating I2P-specific
-settings to Contextual Identities within Firefox, then loading them
-automatically when the user requests them. It also adds convenience and
-management features specific to I2P like protocol handlers and native messaging
-systems.
+This is an webextension which introduces a set of new "Private Browsing" modes
+to Firefox-based browsers(Supporting webextensions) that makes it easier to
+configure a browser to use I2P securely and adds features for making I2P
+applications easier to use. It does this by isolating I2P-specific settings to
+Contextual Identities within Firefox, then loading them automatically when the
+user requests them. It also adds convenience and management features, like an
+embedded I2P console and Bittorrent integration with clients using the
+transmission-rpc API.
 
 Installation(Cross-Platform):
 -----------------------------
 
 For desktop users this addon is available from addons.mozilla.org, where you
 will be able to recive automatic updates:
-https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/.
+[I2P in Private Browsing](https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/).
 
 Debian Installation:
 --------------------
@@ -30,6 +30,16 @@ and then you can install it with:
 
         sudo apt install ../i2psetproxy.js_*.deb
 
+Bittorrent Download:
+--------------------
+
+The self-hosted plugin is available from bittorrent both within the I2P and
+Clearnet Bittorrent network(With a web seed to support it in case one goes
+dead).
+
+  * magnetsub
+  * [Get the .torrent file](./i2ppb@eyedeekay.github.io.xpi.torrent)
+
 Usage:
 ------
 
@@ -49,7 +59,10 @@ Usage:
    immediately, or you can close all your I2P Browser tabs at once and delete
    the history for I2P browsing when you're done.
   * That's all there is to it! Your browser is configured to safely use and
-   administer I2P
+   administer I2P.
+  * Optionally, you can add I2PSnark-RPC and use Bittorrent-over-I2P via the
+   transmission-rpc interface. To do this, have a look at the torrent guide:
+   [Torrent guide](torrent/README.md)
 
 ### Features
 
@@ -70,23 +83,27 @@ Usage:
   * [done] **Change** the color of the browser window to indicate that I2P is in
    use
   * ![Visiting i2ptunnel](i2ptunnel.png)
-  * [ready/broken/wip] **Provide** help in a variety of languages.
-  * [wip] **Monitor** the health and readiness of the I2P router it is
+  * [ready] **Provide** help in a variety of languages.
+  * [done] **Monitor** the health and readiness of the I2P router it is
    instructed to use. Currently the plugin checks whether the HTTP Proxy is
    working by fetching an image from "http://proxy.i2p" and displaying a result.
    A work-in-progress binding to i2pcontrol is available in ./i2pcontrol, it is
    inert at this time.
+  * ![Visiting toopie.html](toopie.png)
   * [Done] **Handle** router console applications under their own origins and
    within their own contextual identity. (1) The router console is automatically
    confined to it's own container tab. (2) Use a custom protocol handler to
    place each i2p application/plugin under it's own origin, shortening router
    console URL's and placing applications under their own origin.
   * ![Visiting routerconsole](routerconsole.png)
-  * [wip] **Handle Torrents** by talking to i2psnark-rpc plugin and then
+  * [Done] **Handle Torrents** by talking to i2psnark-rpc plugin and then
    adding them directly into the Firefox downloads drop-downs, menus, etc. If I
-   can. Right now instead of talking to snark-rpc, it uses a web-based protocl
-   handler that simply auto-fills the torrent into i2psnark.
+   can.
   * ![Visiting i2psnark](i2psnark.png)
+  * ![Monitoring torrents](transmissionrpc.png)
+  * [Started] Indicate the level of authenticity provided by TLS. TLS is
+   optional on I2P for now, but some sites offer it anyway. TLS support is
+   experimental and in the works.
   * [barely started] **Isolate** traffic by contextual identity to it's own HTTP
    Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The
    contextual identities. For now, the contextual identities used to manage
@@ -111,11 +128,12 @@ Usage:
 Documents
 ------------
 
-  * **[Browser Outline](browser.pdf)**: This document is an outline of each of
+  * **[Browser Outline](https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Browser.Design.Documentation.pdf)**: This document is an outline of each of
   the browser extension's feature panels in presentation form.
-  * **[Smart Lander Design](smartlander.pdf)**: This is the original outline of
+  * **[Smart Lander Design](https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Landing.Page.Documentation.pdf)**: This is the original outline of
   the smart landing page which became the I2P home page within the browser and
   the drop-down control panel.
+  * **[Other extensions](https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/wiki/Other-Extensions)**: and how they work with this one.
 
 Super Extra Important Background Info:
 --------------------------------------
@@ -126,19 +144,34 @@ Tor's work on hardening Firefox itself and of particular interest are the
 
 ### Links about Project Uplift
 
- * https://wiki.mozilla.org/Security/Tor_Uplift
- * https://wiki.mozilla.org/Security/FirstPartyIsolation
- * https://wiki.mozilla.org/Security/Fingerprinting
- * https://wiki.mozilla.org/Security/Fennec%2BTor_Project
- * https://wiki.mozilla.org/Security/Tor_Uplift/Tracking
+ * [Tor Uplift](https://wiki.mozilla.org/Security/Tor_Uplift) is a project which
+  brings important features of the Tor Browser to the mainstream of Firefox
+  users by including patches from Tor Browser Bundle into Firefox where it is
+  appropriate.
+ * [First Party Isolation](https://wiki.mozilla.org/Security/FirstPartyIsolation)
+  is a feature in Firefox and other browsers which keeps information from
+  leaking across first-party domains.
+ * [Fingerprinting](https://wiki.mozilla.org/Security/Fingerprinting) is a
+  technique where a tracker attempts to extract unique information about a user
+  from a side-channel in order to create an identifier that can be used to
+  correlate the user across many sites.
+ * [Fennec](https://wiki.mozilla.org/Security/Fennec%2BTor_Project) is Firefox
+  for Android and this link has some analysis of the privacy consequences of the
+  Android platform.
+ * [Tracking](https://wiki.mozilla.org/Security/Tor_Uplift/Tracking) in Firefox
+  is surveyed here.
 
 Project uplift seems to have largely been accomplished?
 
 ### Links about Project Fusion
 
- * https://wiki.mozilla.org/Security/Fusion
- * https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject
- * https://blog.torproject.org/tor-heart-firefox
+ * [Project Fusion](https://wiki.mozilla.org/Security/Fusion) or Firefox using
+  Onions is a joint Mozilla/Tor effort to create an enhanced Private Browsing
+  mode for Firefox which uses Tor.
+ * [Notes](https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject)
+  from a meeting about Fusion.
+ * [Tor at the Heart: Firefox](https://blog.torproject.org/tor-heart-firefox) is
+  a blog about Tor and the relationship they have to Firefox re: TBB, Fusion.
 
 The Old Version
 ---------------

_locales/en/messages.json

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

background.js

@@ -1,31 +1,33 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
-var webpref = chrome.i18n.getMessage("webPreface");
-var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
-var routerpref = chrome.i18n.getMessage("routerPreface");
-var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
-var mailpref = chrome.i18n.getMessage("mailPreface");
-var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
-var torrentpref = chrome.i18n.getMessage("torrentPreface");
-var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
-var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
-var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
-var localpref = chrome.i18n.getMessage("localPreface");
-var localprefpriv = chrome.i18n.getMessage("localPrefacePrivate");
+var titlepref = chrome.i18n.getMessage('titlePreface');
+var titleprefpriv = chrome.i18n.getMessage('titlePrefacePrivate');
+var webpref = chrome.i18n.getMessage('webPreface');
+var webprefpriv = chrome.i18n.getMessage('webPrefacePrivate');
+var routerpref = chrome.i18n.getMessage('routerPreface');
+var routerprefpriv = chrome.i18n.getMessage('routerPrefacePrivate');
+var mailpref = chrome.i18n.getMessage('mailPreface');
+var mailprefpriv = chrome.i18n.getMessage('mailPrefacePrivate');
+var torrentpref = chrome.i18n.getMessage('torrentPreface');
+var torrentprefpriv = chrome.i18n.getMessage('torrentPrefacePrivate');
+var tunnelpref = chrome.i18n.getMessage('i2ptunnelPreface');
+var tunnelprefpriv = chrome.i18n.getMessage('i2ptunnelPrefacePrivate');
+var localpref = chrome.i18n.getMessage('localPreface');
+var localprefpriv = chrome.i18n.getMessage('localPrefacePrivate');
+var extensionpref = chrome.i18n.getMessage('extensionPreface');
+var muwirepref = chrome.i18n.getMessage('muwirePreface');
 
 function onContextsGot(contexts) {
   var ids = [];
   for (let context of contexts) {
-    console.log(`Name: ${context.name}`);
+    console.log(`Name : ${context.name}`);
     ids.push(context.name);
   }
-  console.log("Checking new contexts");
+  console.log('Checking new contexts');
   if (ids.indexOf(titlepref) == -1) {
     browser.contextualIdentities
       .create({
         name: titlepref,
-        color: "orange",
-        icon: "fingerprint"
+        color: 'orange',
+        icon: 'fingerprint'
       })
       .then(onCreated, onNotCreated);
   }
@@ -33,8 +35,8 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: webpref,
-        color: "red",
-        icon: "circle"
+        color: 'red',
+        icon: 'circle'
       })
       .then(onCreated, onNotCreated);
   }
@@ -42,8 +44,8 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: routerpref,
-        color: "blue",
-        icon: "briefcase"
+        color: 'blue',
+        icon: 'briefcase'
       })
       .then(onCreated, onNotCreated);
   }
@@ -51,8 +53,8 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: tunnelpref,
-        color: "green",
-        icon: "tree"
+        color: 'green',
+        icon: 'tree'
       })
       .then(onCreated, onNotCreated);
   }
@@ -60,8 +62,8 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: mailpref,
-        color: "yellow",
-        icon: "briefcase"
+        color: 'yellow',
+        icon: 'briefcase'
       })
       .then(onCreated, onNotCreated);
   }
@@ -69,8 +71,8 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: torrentpref,
-        color: "purple",
-        icon: "chill"
+        color: 'purple',
+        icon: 'chill'
       })
       .then(onCreated, onNotCreated);
   }
@@ -78,30 +80,39 @@ function onContextsGot(contexts) {
     browser.contextualIdentities
       .create({
         name: localpref,
-        color: "red",
-        icon: "fence"
+        color: 'red',
+        icon: 'fence'
+      })
+      .then(onCreated, onNotCreated);
+  }
+  if (ids.indexOf(localpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: muwirepref,
+        color: 'turquoise',
+        icon: 'gift'
       })
       .then(onCreated, onNotCreated);
   }
 }
 
 function onContextsError() {
-  console.log("Error finding contextual identities, is the API enabled?");
+  console.log('Error finding contextual identities, is the API enabled?');
 }
 
 function onCreated(context) {
-  console.log(`New identity's ID: ${context.cookieStoreId}.`);
+  console.log(' ID:', context.cookieStoreId, 'created.');
 }
 
 function onNotCreated(context) {
-  console.log(`identity ID: ${context.cookieStoreId} not created`);
+  console.log('ID:', context.cookieStoreId, 'not created.');
 }
 
 browser.contextualIdentities.query({}).then(onContextsGot, onContextsError);
 
 var gettingInfo = browser.runtime.getPlatformInfo();
 gettingInfo.then(got => {
-  if (got.os != "android") {
+  if (got.os != 'android') {
     browser.windows.onCreated.addListener(themeWindow);
     browser.windows.onFocusChanged.addListener(themeWindow);
     browser.windows.onRemoved.addListener(themeWindow);
@@ -114,7 +125,7 @@ function themeWindowByTab(tabId) {
   function tabWindow(tab) {
     var gettingPlatformInfo = browser.runtime.getPlatformInfo();
     gettingPlatformInfo.then(got => {
-      if (got.os == "android") {
+      if (got.os == 'android') {
         let getwindow = browser.tabs.get(tab.tabId);
         getwindow.then(themeWindow);
       } else {
@@ -123,7 +134,7 @@ function themeWindowByTab(tabId) {
       }
     });
   }
-  if (typeof tabId === "number") {
+  if (typeof tabId === 'number') {
     let tab = browser.tabs.get(tabId);
     tab.then(tabWindow);
   } else {
@@ -149,108 +160,114 @@ var getOldTheme = async function getOldTheme() {
   let foundtheme = await browser.theme.getCurrent();
   if (!isEmpty(foundtheme)) {
     oldtheme = foundtheme;
-    console.log("Found old theme", oldtheme);
+    console.log('Found old theme', oldtheme);
   }
   return oldtheme;
-};
+}
 
 getOldTheme();
 
 function themeWindow(window) {
   // Check if the window is in private browsing
   function onThemeError() {
-    console.log("got theme", oldtheme);
+    console.log('got theme', oldtheme);
     browser.theme.update(oldtheme);
   }
   function logTabs(tabInfo) {
     function onContextGotTheme(context) {
       if (context.name == titlepref) {
-        console.log("Active in I2P window");
+        console.log('Active in I2P window');
         if (window.incognito) {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#FFC56D",
-              toolbar: "#FFC56D"
+              frame: '#FFC56D',
+              toolbar: '#FFC56D'
             }
           });
         } else {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#FFC56D",
-              toolbar: "#FFC56D"
+              frame: '#FFC56D',
+              toolbar: '#FFC56D'
             }
           });
         }
+        browser.pageAction.setPopup({
+          tabId: tabInfo[0].id,
+          popup: 'security.html'
+        });
+        //console.log("(background) tabinfo", tabInfo[0].id)
+        browser.pageAction.show(tabInfo[0].id);
       } else if (context.name == routerpref) {
-        console.log("Active in Router Console window");
+        console.log('Active in Router Console window');
         if (window.incognito) {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#A4C8E1",
-              toolbar: "#A4C8E1"
+              frame: '#A4C8E1',
+              toolbar: '#A4C8E1'
             }
           });
         } else {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#A4C8E1",
-              toolbar: "#A4C8E1"
+              frame: '#A4C8E1',
+              toolbar: '#A4C8E1'
             }
           });
         }
       } else if (context.name == tunnelpref) {
-        console.log("Active in Hidden Services Manager window");
+        console.log('Active in Hidden Services Manager window');
         if (window.incognito) {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#D9D9D6",
-              toolbar: "#D9D9D6"
+              frame: '#D9D9D6',
+              toolbar: '#D9D9D6'
             }
           });
         } else {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#D9D9D6",
-              toolbar: "#D9D9D6"
+              frame: '#D9D9D6',
+              toolbar: '#D9D9D6'
             }
           });
         }
       } else if (context.name == mailpref) {
-        console.log("Active in Web Mail window");
+        console.log('Active in Web Mail window');
         if (window.incognito) {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#F7E59A",
-              toolbar: "#F7E59A"
+              frame: '#F7E59A',
+              toolbar: '#F7E59A'
             }
           });
         } else {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#F7E59A",
-              toolbar: "#F7E59A"
+              frame: '#F7E59A',
+              toolbar: '#F7E59A'
             }
           });
         }
       } else if (context.name == torrentpref) {
-        console.log("Active in Bittorrent window");
+        console.log('Active in Bittorrent window');
         if (window.incognito) {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#A48FE1",
-              toolbar: "#A48FE1"
+              frame: '#A48FE1',
+              toolbar: '#A48FE1'
             }
           });
         } else {
           browser.theme.update(window.id, {
             colors: {
-              frame: "#A48FE1",
-              toolbar: "#A48FE1"
+              frame: '#A48FE1',
+              toolbar: '#A48FE1'
             }
           });
         }
       } else {
-        console.log("Not active in I2P window");
+        console.log('Not active in I2P window');
         if (isEmpty(oldtheme)) {
           browser.theme.reset();
         } else {
@@ -259,18 +276,16 @@ function themeWindow(window) {
       }
     }
     if (
-      tabInfo[0].cookieStoreId != "firefox-default" &&
-      tabInfo[0].cookieStoreId != "firefox-private"
+      tabInfo[0].cookieStoreId != 'firefox-default' &&
+      tabInfo[0].cookieStoreId != 'firefox-private'
     ) {
       browser.contextualIdentities
         .get(tabInfo[0].cookieStoreId)
         .then(onContextGotTheme, onThemeError);
+    } else if (isEmpty(oldtheme)) {
+      browser.theme.reset();
     } else {
-      if (isEmpty(oldtheme)) {
-        browser.theme.reset();
-      } else {
-        browser.theme.update(window.id, oldtheme);
-      }
+      browser.theme.update(window.id, oldtheme);
     }
   }
 
@@ -284,109 +299,109 @@ function themeWindow(window) {
 function setTitle(window) {
   // Check if the window is in private browsing
   function onContextError() {
-    console.log("Context Error");
+    console.log('Context Error');
   }
   function logTabs(tabInfo) {
     function onContextGotTitle(context) {
       if (context.name == titlepref) {
-        console.log("Active in I2P window");
+        console.log('Active in I2P window');
 
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ": "
+            titlePreface: titleprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: titlepref + ": "
+            titlePreface: titlepref + ': '
           });
         }
       } else if (context.name == webpref) {
-        console.log("Active in Web window");
+        console.log('Active in Web window');
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: webprefpriv + " - "
+            titlePreface: webprefpriv + ' - '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: webpref + " - "
+            titlePreface: webpref + ' - '
           });
         }
       } else if (context.name == routerpref) {
-        console.log("Active in Router Console window");
+        console.log('Active in Router Console window');
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + " - " + routerprefpriv + ": "
+            titlePreface: titleprefpriv + ' - ' + routerprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: titlepref + " - " + routerpref + ": "
+            titlePreface: titlepref + ' - ' + routerpref + ': '
           });
         }
       } else if (context.name == tunnelpref) {
-        console.log("Active in Hidden Services Manager window");
+        console.log('Active in Hidden Services Manager window');
 
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + " - " + tunnelprefpriv + ": "
+            titlePreface: titleprefpriv + ' - ' + tunnelprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: titlepref + " - " + tunnelpref + ": "
+            titlePreface: titlepref + ' - ' + tunnelpref + ': '
           });
         }
       } else if (context.name == mailpref) {
-        console.log("Active in I2P Web Mail window");
+        console.log('Active in I2P Web Mail window');
 
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + " - " + mailprefpriv + ": "
+            titlePreface: titleprefpriv + ' - ' + mailprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: titlepref + " - " + mailpref + ": "
+            titlePreface: titlepref + ' - ' + mailpref + ': '
           });
         }
       } else if (context.name == torrentpref) {
-        console.log("Active in I2P Torrent window");
+        console.log('Active in I2P Torrent window');
 
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + " - " + torrentprefpriv + ": "
+            titlePreface: titleprefpriv + ' - ' + torrentprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: titlepref + " - " + torrentpref + ": "
+            titlePreface: titlepref + ' - ' + torrentpref + ': '
           });
         }
       } else if (context.name == localpref) {
-        console.log("Active in Localhost window");
+        console.log('Active in Localhost window');
 
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: localprefpriv + " - " + localprefpriv + ": "
+            titlePreface: localprefpriv + ' - ' + localprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: localpref + " - " + localpref + ": "
+            titlePreface: localpref + ' - ' + localpref + ': '
           });
         }
       }
     }
 
     if (
-      tabInfo[0].cookieStoreId != "firefox-default" &&
-      tabInfo[0].cookieStoreId != "firefox-private"
+      tabInfo[0].cookieStoreId != 'firefox-default' &&
+      tabInfo[0].cookieStoreId != 'firefox-private'
     ) {
       browser.contextualIdentities
         .get(tabInfo[0].cookieStoreId)
         .then(onContextGotTitle, onContextError);
     } else if (window.incognito) {
       browser.windows.update(window.id, {
-        titlePreface: ""
+        titlePreface: ''
       });
     } else {
       browser.windows.update(window.id, {
-        titlePreface: ""
+        titlePreface: ''
       });
     }
   }
@@ -401,14 +416,9 @@ function setTitle(window) {
 var gettingListenerInfo = browser.runtime.getPlatformInfo();
 gettingListenerInfo.then(got => {
   function onPlatformError() {
-    console.log("Error finding platform info");
+    console.log('Error finding platform info');
   }
-  if (got.os != "android") {
-    browser.windows.onCreated.addListener(() => {
-      chrome.storage.local.get(function() {
-        setupProxy();
-      });
-    });
+  if (got.os != 'android') {
     browser.tabs.onCreated.addListener(() => {
       var getting = browser.windows.getCurrent({
         populate: true
@@ -423,30 +433,7 @@ gettingListenerInfo.then(got => {
     });
   }
 });
-/*
-var gettingInfo = browser.runtime.getPlatformInfo();
-gettingInfo.then(got => {
-  if (got.os != "android") {
-    browser.tabs.onCreated.addListener(() => {
-      var getting = browser.windows.getCurrent({
-        populate: true
-      });
-      getting.then(setTitle, onError);
-    });
-  }
-});
-var gettingInfo = browser.runtime.getPlatformInfo();
-gettingInfo.then(got => {
-  if (got.os != "android") {
-    browser.tabs.onActivated.addListener(() => {
-      var getting = browser.windows.getCurrent({
-        populate: true
-      });
-      getting.then(setTitle, onError);
-    });
-  }
-});
-*/
+
 function handleUpdated(updateInfo) {
   if (updateInfo.theme) {
     console.log(`Theme was applied: ${updateInfo.theme}`);
@@ -456,3 +443,53 @@ function handleUpdated(updateInfo) {
 }
 
 browser.theme.onUpdated.addListener(handleUpdated);
+
+function handleClick() {
+  console.log("Opening page action");
+  browser.pageAction.openPopup();
+}
+browser.pageAction.onClicked.addListener(handleClick);
+
+async function certCheck(details) {
+  if (details.url.startsWith("https")) {
+    console.log("(cert) https site", details.url);
+  } else {
+    return;
+  }
+
+  if (!details.url.includes(".i2p")) {
+    return;
+  }
+
+  var tabs = await browser.tabs.query({ active: true });
+
+  if (tabs == null) {
+    return;
+  }
+
+  console.log("(cert) checking cert", tabs);
+
+  for (tab in tabs) {
+    if (details.url == tabs[tab].url) {
+      console.log("(cert) right tab", tabs[tab].id);
+      try {
+        let securityInfo = await browser.webRequest.getSecurityInfo(
+          details.requestId,
+          { certificateChain: true }
+        );
+        console.log("(cert) state is complete", securityInfo);
+        console.log("(cert) certificates", securityInfo.certificates);
+      } catch (error) {
+        console.error(error);
+      }
+    }
+  }
+}
+
+// Listen for onHeaderReceived for the target page.
+// Set "blocking" and "responseHeaders".
+browser.webRequest.onHeadersReceived.addListener(
+  certCheck,
+  { urls: ["<all_urls>"] },
+  ["blocking", "responseHeaders"]
+);

bookmarks.js

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

cert.js

@@ -0,0 +1,52 @@
+function blankContent(id) {
+  let infoTitle = document.getElementById(id);
+  if (infoTitle === null) {
+    console.log('content error', id);
+    return;
+  }
+  infoTitle.textContent = '';
+}
+
+function contentUpdateById(id, message) {
+  let infoTitle = document.getElementById(id);
+  let messageContent = chrome.i18n.getMessage(message);
+  if (infoTitle === null) {
+    console.log('content error', id, messageContent);
+    return;
+  }
+  infoTitle.textContent = messageContent;
+}
+
+contentUpdateById('TypeLabel', 'siteLabel');
+
+contentUpdateById('CertLabel', 'certLabel');
+
+function tabCheck(tabInfo) {
+  // Information Section
+  console.log('(cert) checking tab');
+  var host = tabInfo[0].url.split('.i2p')[0] + '.i2p';
+  if (host.length < 51) {
+    contentUpdateById('AddressInfo', 'isHostName');
+  } else {
+    if (host.endsWith('b32.i2p')) {
+      contentUpdateById('AddressInfo', 'isBase32');
+    }
+  }
+  if (host.startsWith('https')) {
+    contentUpdateById('AddressCertInfo', 'certPresent');
+    console.log('(cert) initiating request to check server cert');
+    fetch(host).then(response => {
+      console.log('Updating cert information', response);
+    });
+  } else {
+    contentUpdateById("AddressCertInfo", "certAbsent");
+    blankContent("SignedLabel");
+  }
+}
+
+function tabError(error) {
+  console.log(`Error: ${error}`);
+}
+
+const gettingCurrent = browser.tabs.query({ active: true });
+gettingCurrent.then(tabCheck, tabError);

config.js

@@ -0,0 +1,18 @@
+var proxy_scheme = 'HTTP';
+var proxy_host = '127.0.0.1';
+var proxy_port = '4444';
+
+var control_host = '127.0.0.1';
+var control_port = '7657';
+
+var rpc_host = '127.0.0.1';
+var rpc_port = '7657';
+var rpc_path = 'jsonrpc';
+var rpc_pass = 'itoopie';
+
+var bt_rpc_host = '127.0.0.1';
+var bt_rpc_port = '7657';
+var bt_rpc_path = 'transmission/rpc';
+var bt_rpc_pass = 'transmission';
+
+var disable_history = false;

content.js

@@ -1,35 +1,55 @@
-var infoTitle = document.getElementById("text-section-header");
-infoTitle.textContent = chrome.i18n.getMessage("infoTitle");
-/*
-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");
-/*
-document.addEventListener("click", e => {
-  browser.runtime.sendMessage({ url: "http://proxy.i2p" });
+function contentUpdateById(id, message) {
+  let infoTitle = document.getElementById(id);
+  let messageContent = chrome.i18n.getMessage(message);
+  if (infoTitle === null) {
+    console.log('content error', id, messageContent);
+    return;
+  }
+  infoTitle.textContent = messageContent;
+}
+
+// Information Section
+contentUpdateById('text-section-header', 'extensionName');
+contentUpdateById('description', 'extensionDescription');
+contentUpdateById('i2pbrowser-version', 'extensionVersion');
+contentUpdateById('beta', 'extensionStatus');
+contentUpdateById('proxy-check', 'proxyFailedStatus');
+
+// Control Section
+contentUpdateById('controlHeader', 'controlHeader');
+contentUpdateById('controlExplain', 'controlExplain');
+contentUpdateById('clear-browser-data', 'clearData');
+contentUpdateById('clear-desc', 'clearDesc');
+contentUpdateById('enable-web-rtc', 'enableWebRTC');
+contentUpdateById('rtcDesc', 'rtcDesc');
+contentUpdateById('disable-history', 'disableHistory');
+contentUpdateById('histDesc', 'histDesc');
+
+// Application Section
+contentUpdateById('applicationHeader', 'applicationHeader');
+contentUpdateById('applicationExplain', 'applicationExplain');
+contentUpdateById('window-visit-index', 'windowVisitHelppage');
+contentUpdateById('help', 'help');
+contentUpdateById('window-visit-router', 'windowVisitConsole');
+contentUpdateById('routerConsole', 'routerConsole');
+contentUpdateById('window-visit-homepage', 'windowVisitHomepage');
+contentUpdateById('abouthome', 'abouthome');
+contentUpdateById('window-visit-i2ptunnel', 'windowVisitI2ptunnel');
+contentUpdateById('i2ptunnel', 'i2ptunnel');
+contentUpdateById('window-visit-susimail', 'windowVisitSusiMail');
+contentUpdateById('susimail', 'susimail');
+contentUpdateById('window-visit-snark', 'windowVisitSnark');
+contentUpdateById('snark', 'snark');
+
+// Homepage Section
+contentUpdateById('window-visit-webpage', 'windowVisitWebPage');
+contentUpdateById('webpage', 'help');
+contentUpdateById('window-visit-sources', 'windowVisitSources');
+contentUpdateById('sources', 'sources');
+contentUpdateById('window-visit-releases', 'windowVisitReleases');
+contentUpdateById('releases', 'releases');
+
+fetch('http://proxy.i2p').then(myJson => {
+  console.log('FETCH RESULT', myJson);
+  contentUpdateById('proxy-check', 'proxySuccessStatus');
 });
-
-function proxyContent(message) {
-  var proxyData = document.getElementById("proxy-health");
-  proxyData.textContent = message;
-  console.log("Event occurred", message);
-}
-
-browser.runtime.onMessage.addListener(proxyContent);
-*/
-
-/*
-function signalWebRTC(val){
-    console.log("signal", val)
-}
-*/

context.js

@@ -1,26 +1,26 @@
 //var windowIds = []
-var titlepref = chrome.i18n.getMessage("titlePreface");
+var titlepref = chrome.i18n.getMessage('titlePreface');
 
 function onError(error) {
-  console.log(`Error: ${error}`);
+  console.log(`Error : ${error}`);
 }
 
 function eventHandler(event) {
   function onCreated(windowInfo) {
-    console.log(`Created window: ${windowInfo.id}`);
+    console.log(`Created window : ${windowInfo.id}`);
     browser.tabs.create({
       windowId: windowInfo.id,
-      url: "about:blank",
+      url: 'about:blank',
       cookieStoreId: event.target.dataset.identity
     });
   }
-  if (event.target.dataset.action == "create") {
+  if (event.target.dataset.action == 'create') {
     var creating = browser.tabs.create({
       cookieStoreId: event.target.dataset.identity
     });
     creating.then(onCreated, onError);
   }
-  if (event.target.dataset.action == "close-all") {
+  if (event.target.dataset.action == 'close-all') {
     browser.tabs
       .query({
         cookieStoreId: event.target.dataset.identity

debian/changelog

@@ -1,3 +1,72 @@
+i2psetproxy.js (0.73-1) UNRELEASED; urgency=low
+
+  * Update bookmarks format
+  * Deprecate WebRTC State Management
+
+ -- idk <hankhill19580@gmail.com>  Mon, 22 JUN 2020 19:21:23 -0400
+
+i2psetproxy.js (0.71-1) UNRELEASED; urgency=low
+
+  * Fix incomplete bugfix from 0.69
+
+ -- idk <hankhill19580@gmail.com>  Tue, 24 MAR 2020 0:19:59 -0400
+
+i2psetproxy.js (0.71-1) UNRELEASED; urgency=low
+
+  * Fix incomplete bugfix from 0.69
+
+ -- idk <hankhill19580@gmail.com>  Tue, 24 MAR 2020 0:19:59 -0400
+
+i2psetproxy.js (0.69-1) UNRELEASED; urgency=low
+
+  * Add MuWire contextual ID
+  * Fix bug occurring on certain modded I2P installs
+
+ -- idk <hankhill19580@gmail.com>  Tue, 24 MAR 2020 0:12:02 -0400
+
+i2psetproxy.js (0.67-1) UNRELEASED; urgency=low
+
+  * Tweak some default settings that should have gone into 65
+
+ -- idk <hankhill19580@gmail.com>  Tue, 17 MAR 2020 22:58:55 -0400
+
+i2psetproxy.js (0.65-1) UNRELEASED; urgency=low
+
+  * Initial prototype of certs implementation
+  * Use "pinned apptabs" to minimize the number of tabs occupied by an app
+  * Get ready for self-hosted updates but with bittorrent because it's cooler
+
+ -- idk <hankhill19580@gmail.com>  Tue, 17 MAR 2020 22:58:55 -0400
+
+i2psetproxy.js (0.63-1) UNRELEASED; urgency=low
+
+  * other containerizers bugfix
+
+ -- idk <hankhill19580@gmail.com>  Mon, 02 MAR 2020 17:54:26 -0400
+
+i2psetproxy.js (0.61-1) UNRELEASED; urgency=low
+
+  * other containerizers bugfix
+
+ -- idk <hankhill19580@gmail.com>  Mon, 02 MAR 2020 17:46:24 -0400
+
+i2psetproxy.js (0.59-1) UNRELEASED; urgency=low
+
+  * transmission-rpc based torrent controls
+  * bugfixes
+
+ -- idk <hankhill19580@gmail.com>  Tue, 25 FEB 2020 20:52:19 -0400
+
+i2psetproxy.js (0.57-1) UNRELEASED; urgency=low
+
+  * Snowflake compatibility
+  * Lots of small compatibility fixes
+  * More linter errors
+  * Make it multilingual again
+  * Distribute a torrent and a magnet link with the plugin of the plugin
+
+ -- idk <hankhill19580@gmail.com>  Thu, 4 JAN 2020 16:43:58 -0400
+
 i2psetproxy.js (0.55-1) UNRELEASED; urgency=low
 
   * Get rid of Web Browsing context launcher
@@ -5,7 +74,7 @@ i2psetproxy.js (0.55-1) UNRELEASED; urgency=low
   * Tolerate themes
   * Tolerate other containerizers
 
- -- idk <hankhill19580@gmail.com>  Thu, 2 JAN 2019 16:47:33 -0400
+ -- idk <hankhill19580@gmail.com>  Thu, 2 JAN 2020 16:47:33 -0400
 
 i2psetproxy.js (0.53-1) UNRELEASED; urgency=low
 

debian/postinst

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

debian/rules

@@ -3,20 +3,7 @@
 %:
 	dh $@
 
+export PREFIX=debian/i2psetproxy.js/usr
+
 override_dh_auto_install:
-	mkdir -p $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io \
-		$$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol \
-		$$(pwd)/debian/i2psetproxy.js/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-	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/
-	cp ./*.xpi $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./manifest.json $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./LICENSE $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	ln -sf $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io \
-		$$(pwd)/debian/i2psetproxy.js/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+	make install

debian/source/include-binaries

@@ -1,6 +1,3 @@
 i2psetproxy.js.gif
-i2psetproxy.js@eyedeekay.github.io.xpi
-i2ppb@eyedeekay.github.io.xpi
-web-ext-artifacts/i2p_in_private_browsing-0.51-an+fx.xpi
 smartlander.pdf
 browser.pdf

handler.js

@@ -1,28 +1,86 @@
+function routerHost(url) {
+  let hostname = '';
+  let path = '';
+  function pathcheck(str) {
+    if (str != undefined) {
+      let final = str.split('/')[0];
+      if (final === 'i2ptunnelmgr' || final === 'i2ptunnel') {
+        console.log('(urlcheck) Tunnel application path', final);
+        return 'i2ptunnelmgr';
+      } else if (final === 'i2psnark' || final === 'torrents') {
+        console.log('(urlcheck) Torrent application path', final);
+        return 'i2psnark';
+      } else if (final === 'webmail' || final === 'susimail') {
+        console.log('(urlcheck) Mail application path', final);
+        return 'webmail';
+      } else if (final.startsWith('MuWire')) {
+        if (!url.includes('.png')) {
+          console.log('(urlcheck) MuWire application path', final);
+          return 'muwire';
+        }
+      } else if (
+        final === 'home' ||
+        final === 'console' ||
+        final === 'dns' ||
+        final.startsWith('config')
+      ) {
+        console.log('(urlcheck) Console application path', final);
+        return 'routerconsole';
+      }
+    }
+    return true;
+  }
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
+    let prefix = url.substr(0, url.indexOf('://') + 3);
+    path = url.replace(prefix + hostname + '/', '');
+  } else if (identifyProtocolHandler(url)) {
+    let newurl = identifyProtocolHandler(url);
+    return routerHost(newurl);
+  } else {
+    hostname = url.split('/')[0];
+    path = url.replace(hostname + '/', '');
+  }
+  if (hostname === control_host + ':' + control_port) {
+    //console.log("(hostcheck) router console found on configured ports");
+    return pathcheck(path);
+  }
+  if (hostname === 'localhost' + ':' + control_port) {
+    //console.log("(hostcheck) router console found on configured ports");
+    return pathcheck(path);
+  }
+  if (hostname === '127.0.0.1' + ':' + control_port) {
+    return pathcheck(path);
+  }
+
+  return false;
+}
+
 function identifyProtocolHandler(url) {
   //console.log("looking for handler-able requests")
   if (routerHost(url)) {
-    if (url.includes(encodeURIComponent("ext+rc:"))) {
-      return url.replace(encodeURIComponent("ext+rc:"), "");
-    } else if (url.includes("ext+rc:")) {
-      return url.replace("ext+rc:", "");
+    if (url.includes(encodeURIComponent('ext+rc:'))) {
+      return url.replace(encodeURIComponent('ext+rc:'), '');
+    } else if (url.includes('ext+rc:')) {
+      return url.replace('ext+rc:', '');
     }
-  } else if (url.includes("ext+rc:")) {
+  } else if (url.includes('ext+rc:')) {
     return url;
   }
   return false;
 }
 
 function trimHost(url) {
-  let hostname = "";
-  let prefix = "";
-  if (url.indexOf("://") > -1) {
-    prefix = url.substr(0, url.indexOf("://") + 3);
-    hostname = url.split("/")[2];
+  let hostname = '';
+  let prefix = '';
+  if (url.indexOf('://') > -1) {
+    prefix = url.substr(0, url.indexOf('://') + 3);
+    hostname = url.split('/')[2];
   } else {
-    hostname = url.split("/")[0];
+    hostname = url.split('/')[0];
   }
-  let path = url.replace(prefix + hostname, "");
-  console.log("(handler) path", prefix + hostname, path);
+  let path = url.replace(prefix + hostname, '');
+  console.log('(handler) path', prefix + hostname, path);
   return path;
 }
 
@@ -30,7 +88,7 @@ var handlerSetup = function(requestDetails) {
   //console.log("checking protocol handler listener")
   let rwurl = identifyProtocolHandler(requestDetails.url);
   if (rwurl != false) {
-    console.log("(handler) rewrite URL requested", rwurl);
+    console.log('(handler) rewrite URL requested', rwurl);
     requestDetails.redirectUrl = rwurl;
     requestDetails.url = trimHost(rwurl);
     requestDetails.originUrl = trimHost(rwurl);
@@ -40,6 +98,6 @@ var handlerSetup = function(requestDetails) {
 
 browser.webRequest.onBeforeRequest.addListener(
   handlerSetup,
-  { urls: ["<all_urls>"] },
-  ["blocking"]
+  { urls: ['<all_urls>'] },
+  ['blocking']
 );

home.css

@@ -79,8 +79,11 @@ p {
   background: #f8f8ff;
   min-width: 95%
 }
+#header,
 .application-info,
-.extended-info {
+.browser-info,
+.extended-info,
+.search-info {
   min-height: 3rem;
   padding: 1rem;
   margin-top: 1.5rem;
@@ -100,7 +103,6 @@ h1 {
   color: #41465f;
   border: 1px solid #dee2e6;
   border-radius: 2px 2px 0 0;
-  width: 90%;
   padding-left: 5%
 }
 h2,
@@ -111,7 +113,6 @@ h3 {
   font-size: 25px;
   text-transform: uppercase;
   color: #41465f;
-  border: 1px solid #dee2e6;
   border-radius: 2px 2px 0 0;
   width: 90%;
   padding-left: 5%
@@ -167,21 +168,23 @@ li {
   margin: .5rem .5rem .5rem 32%
 }
 #readyness {
-  min-height: 5rem;
-  padding: .5rem;
-  margin: .5rem;
+  padding-top: 1rem;
+  padding-bottom: 1rem;
+  margin: 1rem;
   width: 42%;
   min-width: 42%;
   background: #dee2e6;
   text-align: center!important;
   border: 1px solid #dee2e6;
   border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  display: inline-block
 }
 #onboarding {
   min-height: 5rem;
   padding: .5rem;
   margin: .5rem;
+  margin-top: 4rem;
   width: 42%;
   min-width: 42%;
   font-size: 2rem;
@@ -192,18 +195,16 @@ li {
   box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
 }
 #i2pbrowser-description {
+  padding-top: 1rem;
+  padding-bottom: 1rem;
   width: 50%;
   min-width: 50%;
-  min-height: 5rem;
-  padding: .5rem;
-  display: inline;
+  display: inline-block;
   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;
@@ -211,19 +212,32 @@ li {
   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
 }
+#applicationExplain,
+#controlExplain {
+  min-height: 5rem;
+  padding: .5rem;
+  margin: .5rem;
+  width: 30%;
+  min-width: 30%;
+  background: #dee2e6;
+  text-align: center!important;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  float: left
+}
 #proxyReady {
   min-height: 3rem;
   padding: .5rem;
   margin: .2rem;
   width: 38%;
   min-width: 38%;
-  display: inline;
+  display: inline-block;
   background: #d9d9d6;
   float: right;
   text-align: center!important;
@@ -237,7 +251,7 @@ li {
   margin: .2rem;
   width: 38%;
   min-width: 38%;
-  display: inline;
+  display: inline-block;
   float: right;
   text-align: center!important;
   border: 1px solid #ffc56d;
@@ -251,7 +265,7 @@ li {
   margin: .2rem;
   width: 38%;
   min-width: 38%;
-  display: inline;
+  display: inline-block;
   float: left;
   text-align: center!important;
   border: 1px solid #f7e59a;
@@ -264,9 +278,6 @@ li {
   text-align: left;
   display: none
 }
-#proxy-check {
-  visibility: hidden
-}
 #info-content {
   display: none
 }

home.html

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

home.js

@@ -1,24 +1,25 @@
-document.addEventListener("click", clickEvent => {
-  if (clickEvent.target.id === "onboardingButtonZero") {
-    flipVisibility("onboardingContentZero");
-  } else if (clickEvent.target.id === "onboardingButtonOne") {
-    flipVisibility("onboardingContentOne");
-  } else if (clickEvent.target.id === "onboardingButtonTwo") {
-    flipVisibility("onboardingContentTwo");
-  } else if (clickEvent.target.id === "onboardingButtonThree") {
-    flipVisibility("onboardingContentThree");
-  } else if (clickEvent.target.id === "onboardingButtonFour") {
-    flipVisibility("onboardingContentFour");
-  } else if (clickEvent.target.id === "fliplinks") {
-    flipVisibility("info-content");
+document.addEventListener('click', clickEvent => {
+  if (clickEvent.target.id === 'onboardingButtonZero') {
+    flipVisibility('onboardingContentZero');
+  } else if (clickEvent.target.id === 'onboardingButtonOne') {
+    flipVisibility('onboardingContentOne');
+  } else if (clickEvent.target.id === 'onboardingButtonTwo') {
+    flipVisibility('onboardingContentTwo');
+  } else if (clickEvent.target.id === 'onboardingButtonThree') {
+    flipVisibility('onboardingContentThree');
+  } else if (clickEvent.target.id === 'onboardingButtonFour') {
+    flipVisibility('onboardingContentFour');
+  } else if (clickEvent.target.id === 'fliplinks') {
+    flipVisibility('info-content');
   }
 });
 
 function flipVisibility(div) {
+  console.log('(home) seeking flippable', div);
   let flippable = document.getElementById(div);
-  if (flippable.style.display === "none") {
-    flippable.style.display = "block";
+  if (flippable.style.display !== 'block') {
+    flippable.style.display = 'block';
   } else {
-    flippable.style.display = "none";
+    flippable.style.display = 'none';
   }
 }

host.js

@@ -1,27 +1,32 @@
 function proxyHost(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
+  let hostname = '';
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
   } else {
-    hostname = url.split("/")[0];
+    hostname = url.split('/')[0];
   }
-  if (hostname == "proxy.i2p") {
+  if (hostname == 'proxy.i2p') {
+    return true;
+  }
+  if (
+    hostname == 'c6lilt4cr5x7jifxridpkesf2zgfwqfchtp6laihr4pdqomq25iq.b32.i2p'
+  ) {
     return true;
   }
   return false;
 }
 
 function localHost(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
+  let hostname = '';
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
   } else {
-    hostname = url.split("/")[0];
+    hostname = url.split('/')[0];
   }
-  hostname = hostname.split(":")[0];
-  if (hostname === "127.0.0.1") {
+  hostname = hostname.split(':')[0];
+  if (hostname === '127.0.0.1') {
     return true;
-  } else if (hostname === "localhost") {
+  } else if (hostname === 'localhost') {
     return true;
   }
 
@@ -29,83 +34,93 @@ function localHost(url) {
 }
 
 function extensionHost(url) {
-  var res = url.startsWith(browser.runtime.getURL(""));
-  console.log("Extension URL?", res, url, browser.runtime.getURL(""));
-  return res;
+  if (url.originUrl !== undefined) {
+    var res = url.originUrl.startsWith(browser.runtime.getURL(''));
+    if (res) return res;
+  }
+  if (url.url !== undefined) {
+    var res = url.url.startsWith(browser.runtime.getURL(''));
+    if (res) return res;
+  }
 }
 
 function i2pHostName(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
+  let hostname = '';
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
   } else {
-    hostname = url.split("/")[0];
+    hostname = url.split('/')[0];
   }
   return hostname;
 }
 
 function i2pHost(url) {
   let hostname = i2pHostName(url);
-  return hostname.endsWith(".i2p");
+  return hostname.endsWith('.i2p');
 }
 
 function routerHost(url) {
-  let hostname = "";
-  let path = "";
+  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";
+      let final = str.split('/')[0];
+      if (final === 'i2ptunnelmgr' || final === 'i2ptunnel') {
+        console.log('(urlcheck) Tunnel application path', final);
+        return 'i2ptunnelmgr';
       } else if (
-        final === "home" ||
-        final === "console" ||
-        final.startsWith("config")
+        final === 'i2psnark' ||
+        final === 'torrents' ||
+        final.startsWith('transmission')
       ) {
-        console.log("(urlcheck) application path", final);
-        return "routerconsole";
+        console.log('(urlcheck) Torrent application path', final);
+        return 'i2psnark';
+      } else if (final === 'webmail' || final === 'susimail') {
+        console.log('(urlcheck) Mail application path', final);
+        return 'webmail';
+      } else if (final.startsWith('MuWire')) {
+        if (!url.includes('.png')) {
+            console.log('(urlcheck) MuWire application path', final);
+            return 'muwire';
+        }
+      } else if (
+        final === 'home' ||
+        final === 'console' ||
+        final === 'dns' ||
+        final === 'sitemap' ||
+        final.startsWith('config')
+      ) {
+        console.log('(urlcheck) Console application path', final);
+        return 'routerconsole';
       }
     }
     return true;
   }
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-    let prefix = url.substr(0, url.indexOf("://") + 3);
-    path = url.replace(prefix + hostname + "/", "");
+  if (url.indexOf('://') > -1) {
+    hostname = url.split('/')[2];
+    let prefix = url.substr(0, url.indexOf('://') + 3);
+    path = url.replace(prefix + hostname + '/', '');
   } else if (identifyProtocolHandler(url)) {
     let newurl = identifyProtocolHandler(url);
     return routerHost(newurl);
   } else {
-    hostname = url.split("/")[0];
-    path = url.replace(hostname + "/", "");
+    hostname = url.split('/')[0];
+    path = url.replace(hostname + '/', '');
   }
-  if (hostname === control_host + ":" + control_port) {
-    console.log("(hostcheck) router console found on configured ports");
-    return pathcheck(path);
-  } else if (hostname === "127.0.0.1:7657") {
-    return pathcheck(path);
-  } else if (hostname === "localhost:7657") {
+  if (hostname === control_host + ':' + control_port) {
     return pathcheck(path);
   }
-
-  if (hostname === "127.0.0.1:7657") {
-    return pathcheck(path);
-  } else if (hostname === "localhost:7657") {
+  if (hostname === 'localhost' + ':' + control_port) {
     return pathcheck(path);
   }
-
-  if (hostname === "127.0.0.1:7070") {
-    return pathcheck(path);
-  } else if (hostname === "localhost:7070") {
+  if (hostname === '127.0.0.1' + ':' + control_port) {
+    return pathcheck(path);
+  }
+  if (hostname === 'localhost' + ':' + 7070) {
+    return pathcheck(path);
+  }
+  if (hostname === '127.0.0.1' + ':' + 7070) {
     return pathcheck(path);
   }
-
   return false;
 }

i2pcontrol/README.md

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

i2pcontrol/i2pcontrol.js

@@ -1,47 +1,391 @@
-function send(json) {
-  const Http = new XMLHttpRequest();
-  Http.withCredentials = false;
-  const url = "http://" + "127.0.0.1" + ":" + "7650";
-  Http.open("POST", url);
-  Http.send(json);
-  //console.log(Http);
-  return Http;
+var hello = 'hello i2pcontrol';
+
+function makeid(length) {
+  var result = '';
+  var characters =
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  var charactersLength = characters.length;
+  for (var i = 0; i < length; i++) {
+    result += characters.charAt(Math.floor(Math.random() * charactersLength));
+  }
+  return result;
 }
 
-function authenticate(user, password) {
-  var json = {
-    jsonrpc: "2.0",
-    id: user,
-    method: "Authenticate",
-    params: {
-      API: 1,
-      Password: password
-    }
-  };
-  return send(json);
-}
-
-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 = {
-      jsonrpc: "2.0",
-      id: username,
-      method: "Echo",
-      params: {
-        Token: resp.Token,
-        Echo: string
-      }
+function send(
+  message,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc"
+) {
+  async function postData(url = "", data = {}) {
+    // Default options are marked with *
+    let requestBody = JSON.stringify(data);
+    //console.log("(i2pcontrol) sending request", requestBody);
+    let opts = {
+      method: 'POST', // *GET, POST, PUT, DELETE, etc.
+      mode: 'cors', // no-cors, *cors, same-origin
+      cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
+      credentials: 'same-origin', // include, *same-origin, omit
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      redirect: 'follow', // manual, *follow, error
+      referrerPolicy: 'no-referrer', // no-referrer, *client
+      body: requestBody // body data type must match "Content-Type" header
     };
-    var controlMessage = document.getElementById(section);
-    console.log("(i2pcontrol) reply", xhr.responseText);
-    infoMessage.textContent = xhr.responseText;
-  };
+    const response = await fetch(url, opts);
+    return await response.json(); // parses JSON response into native JavaScript objects
+  }
+
+  //console.log("http://" + control_host + ":" + control_port + "/" + control_path)
+  return postData(
+    'http://' + control_host + ':' + control_port + '/' + control_path + '/',
+    message
+  );
 }
 
-echo("test", "test");
+async function authenticate(
+  password = "itoopie",
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc"
+) {
+  var json = new Object();
+  json['id'] = makeid(6);
+  json['jsonrpc'] = '2.0';
+  json['method'] = 'Authenticate';
+  json['params'] = new Object();
+  json['params']['API'] = 1;
+  json['params']['Password'] = password;
+  return send(json, control_host, control_port, control_path);
+}
+
+async function GetToken(
+  password = "itoopie",
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc"
+) {
+  function gettoken(authtoken) {
+    return authtoken.result.Token;
+  }
+  let me = authenticate(password, control_host, control_port, control_path);
+  return await me.then(gettoken);
+}
+
+async function Echo(
+  message,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function echo(token) {
+    console.log('(i2pcontrol) testing I2PControl connection');
+    var json = new Object();
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'Echo';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params']['Echo'] = message;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(echo);
+  return done;
+}
+
+function UpdateEchoElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc"
+) {
+  function updateelement(update) {
+    //console.log("(i2pcontrol)", update);
+    if (document.getElementById(ID) !== null)
+      document.getElementById(ID).innerText = update;
+  }
+  let net = Echo(Query, control_host, control_port, control_path, password);
+  net.then(updateleement);
+}
+
+async function GetRate(
+  Query,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function getrate(token) {
+    var json = new Object();
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'I2PControl';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params']['Stat'] = Query;
+    json['params']['Period'] = 2000;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(getrate);
+  return done;
+}
+
+function UpdateGetRateElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc"
+) {
+  function updateelement(update) {
+    //console.log("(i2pcontrol)", update);
+    if (document.getElementById(ID) !== null)
+      document.getElementById(ID).innerText = update;
+  }
+  let net = GetRate(Query, control_host, control_port, control_path, password);
+  net.then(updateleement);
+}
+
+async function I2PControl(
+  Query,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function i2pcontrol(token) {
+    var json = new Object();
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'I2PControl';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params'][Query] = null;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(i2pcontrol);
+  return done;
+}
+
+function UpdateI2PControlElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc"
+) {
+  function updateelement(update) {
+    //console.log("(i2pcontrol)", update);
+    if (document.getElementById(ID) !== null)
+      document.getElementById(ID).innerText = update;
+  }
+  let net = I2PControl(
+    Query,
+    control_host,
+    control_port,
+    control_path,
+    password
+  );
+  net.then(updateleement);
+}
+
+async function RouterInfo(
+  Query,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function routerinfo(token) {
+    var json = new Object();
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'RouterInfo';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params'][Query] = null;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(routerinfo);
+  return done;
+}
+
+function UpdateRouterInfoElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function updateelement(update) {
+    /*console.log(
+      "(i2pcontrol) element",
+      update.result[Query],
+      ID,
+      document.getElementById(ID)
+    );*/
+    if (document.getElementById(ID) !== null)
+      document.getElementById(ID).innerText = update.result[Query];
+  }
+
+  let net = RouterInfo(
+    Query,
+    control_host,
+    control_port,
+    control_path,
+    password
+  );
+  net.then(updateelement);
+}
+
+async function RouterManager(
+  Query,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function routermanager(token) {
+    var json = new Object();
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'RouterManager';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params'][Query] = null;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(routermanager);
+  return done;
+}
+
+function UpdateRouterManagerElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function updateelement(update) {
+    //console.log("(i2pcontrol)", update);
+    if (document.getElementById(ID) !== null)
+      document.getElementById(ID).innerText = update;
+  }
+  let net = RouterManager(
+    Query,
+    control_host,
+    control_port,
+    control_path,
+    password
+  );
+  net.then(updateleement);
+}
+
+async function NetworkSetting(
+  Query,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function networksetting(token) {
+    var json = new Object();
+    json['id'] = makeid(6);
+    json['jsonrpc'] = '2.0';
+    json['method'] = 'NetworkSetting';
+    json['params'] = new Object();
+    json['params']['Token'] = token;
+    json['params'][Query] = null;
+    return send(json, control_host, control_port, control_path);
+  }
+  let token = GetToken(password, control_host, control_port, control_path);
+  let done = await token.then(networksetting);
+  return done;
+}
+
+function UpdateNetworkSettingElementByID(
+  Query,
+  ID,
+  control_host = "127.0.0.1",
+  control_port = "7657",
+  control_path = "jsonrpc",
+  password = "itoopie"
+) {
+  function updateelement(update) {
+    //console.log("(i2pcontrol)", update);
+    document.getElementById(ID).innerText = update;
+  }
+  let net = NetworkSetting(
+    Query,
+    control_host,
+    control_port,
+    control_path,
+    password
+  );
+  net.then(updateleement);
+}
+
+function UpdateContents() {
+  UpdateRouterInfoElementByID('i2p.router.status', 'router-status');
+  UpdateRouterInfoElementByID('i2p.router.uptime', 'router-uptime');
+  UpdateRouterInfoElementByID('i2p.router.version', 'router-version');
+  UpdateRouterInfoElementByID(
+    'i2p.router.net.bw.inbound.1s',
+    'router-net-bw-inbound-1s'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.net.bw.inbound.15s',
+    'router-net-bw-inbound-15s'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.net.bw.outbound.1s',
+    'router-net-bw-outbound-1s'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.net.bw.outbound.15s',
+    'router-net-bw-outbound-15s'
+  );
+  UpdateRouterInfoElementByID('i2p.router.net.status', 'router-net-status');
+  UpdateRouterInfoElementByID(
+    'i2p.router.net.tunnels.participating',
+    'router-net-tunnels-participating'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.netdb.activepeers',
+    'router-netdb-activepeers'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.netdb.fastpeers',
+    'router-netdb-fastpeers'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.netdb.highcapacitypeers',
+    'router-netdb-highcapacitypeers'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.netdb.isreseeding',
+    'router-netdb-isreseeding'
+  );
+  UpdateRouterInfoElementByID(
+    'i2p.router.netdb.knownpeers',
+    'router-netdb-knownpeers'
+  );
+}
+
+var done = Echo(hello);
+done.then(Done);
+
+function Done(output) {
+  console.log('(i2pcontrol) I2PControl connection tested,', output);
+  return output;
+}

index.html

@@ -1,189 +1,209 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>I2P in Private Browsing Mode</title>
-  <link rel="stylesheet" type="text/css" href ="home.css" />
+    <title>I2P in Private Browsing Mode</title>
+    <link href="home.css" rel="stylesheet" type="text/css">
+    <link href="sidebar.css" rel="stylesheet" type="text/css">
 </head>
-<h1>i2psetproxy.js</h1>
+<body>
+    <h1>I2P in Private Browsing Mode(Firefox-Only)</h1>
 
-<p>This is an <strong>Experimental</strong> webextension which introduces a set of new "Private
-Browsing" modes to Firefox-based browsers(Supporting webextensions) that makes
-it easier to configure a browser to use I2P securely and adds features for
-making I2P applications easier to use. It does this by isolating I2P-specific
-settings to Contextual Identities within Firefox, then loading them
-automatically when the user requests them. It also adds convenience and
-management features specific to I2P like protocol handlers and native messaging
-systems.</p>
+    <p>This is an webextension which introduces a set of new "Private Browsing" modes to Firefox-based browsers(Supporting webextensions) that makes it easier to configure a browser to use I2P securely and adds features for making I2P applications easier to use. It does this by isolating I2P-specific settings to Contextual Identities within Firefox, then loading them automatically when the user requests them. It also adds convenience and management features, like an embedded I2P console and Bittorrent integration with clients using the transmission-rpc API.</p>
 
-<h2>Installation(Cross-Platform):</h2>
+    <h2>Installation(Cross-Platform):</h2>
 
-<p>For desktop users this addon is available from addons.mozilla.org, where you
-will be able to recive automatic updates:
-https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/.</p>
+    <p>For desktop users this addon is available from addons.mozilla.org, where you will be able to recive automatic updates: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>.</p>
 
-<h2>Debian Installation:</h2>
+    <h2>Debian Installation:</h2>
 
-<p>Should you prefer, it is possible to install this extension system-wide by
-side-loading it into Debian. You can generate your own deb file by running the
-command:</p>
+    <p>Should you prefer, it is possible to install this extension system-wide by side-loading it into Debian. You can generate your own deb file by running the command:</p>
 
-<pre><code>    make deb
+    <pre><code>    make deb
 </code></pre>
+    <p>and then you can install it with:</p>
 
-<p>and then you can install it with:</p>
-
-<pre><code>    sudo apt install ../i2psetproxy.js_*.deb
+    <pre><code>    sudo apt install ../i2psetproxy.js_*.deb
 </code></pre>
+    <h2>Bittorrent Download:</h2>
 
-<h2>Usage:</h2>
+    <p>The self-hosted plugin is available from bittorrent both within the I2P and Clearnet Bittorrent network(With a web seed to support it in case one goes dead).</p>
 
-<ul>
-<li>Basically, it "Just Works." After you install the plugin, browsing to an I2P
-domain will automatically stop the current tab and re-open the I2P site in an
-I2P Browser tab.</li>
-<li>Besides that, four bookmarks are added to the "Bookmarks Toolbar," which
-will take you to visit your Java I2P applications, or the "Simplified I2P
-Landing Page" embedded in the plugin:</li>
-<li><img src="lander.png" alt="Landing page" title="" /></li>
-<li>Also, there's a menu for accessing I2P functionality while you're browsing.
-It lets you control a few settings in a granular way.</li>
-<li><img src="menu.png" alt="Menu" title="" /></li>
-<li>You can re-enable WebRTC but force it to always use the proxy that is
-enforced by the tab.</li>
-<li>You can either force the browser to delete all history for I2P sites
-immediately, or you can close all your I2P Browser tabs at once and delete
-the history for I2P browsing when you're done.</li>
-<li>That's all there is to it! Your browser is configured to safely use and
-administer I2P</li>
-</ul>
+    <ul>
+        <li>
+            <a href="">Magnet Link</a>
+        </li>
 
-<h3>Features</h3>
+        <li>
+            <a href="./i2ppb@eyedeekay.github.io.xpi.torrent">Get the .torrent file</a>
+        </li>
+    </ul>
 
-<ul>
-<li>[done] <strong>Provide</strong> a way to launch into an I2P-Specific contextual identity
-(container). Intercept requests to .i2p domains and automatically route them
-to the I2P container. Isolate the router console from other local
-applications by automatically intercepting requests to the router console to
-another container.</li>
-<li><img src="i2psetproxy.js.png" alt="Visiting i2p-projekt.i2p" title="" /></li>
-<li>[done] <strong>Indicate</strong> the I2P browser is in use visually. Find an
-acceptable way to indicate it on Android.</li>
-<li><img src="susimail.png" alt="Visiting webmail" title="" /></li>
-<li>[done] <strong>Set</strong> the http proxy to use the local I2P proxy automatically.
-Provide specific configuration for other types of I2P proxies(SOCKS,
-isolating HTTP)</li>
-<li>[done] <strong>Disable</strong> risky webRTC features/offer the option to re-enable
-them with the proxy enforced.</li>
-<li>[done] <strong>Change</strong> the color of the browser window to indicate that I2P is in
-use</li>
-<li><img src="i2ptunnel.png" alt="Visiting i2ptunnel" title="" /></li>
-<li>[ready/broken/wip] <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. Currently the plugin checks whether the HTTP Proxy is
-working by fetching an image from "http://proxy.i2p" and displaying a result.
-A work-in-progress binding to i2pcontrol is available in ./i2pcontrol, it is
-inert at this time.</li>
-<li>[Done] <strong>Handle</strong> router console applications under their own origins and
-within their own contextual identity. (1) The router console is automatically
-confined to it's own container tab. (2) Use a custom protocol handler to
-place each i2p application/plugin under it's own origin, shortening router
-console URL's and placing applications under their own origin.</li>
-<li><img src="routerconsole.png" alt="Visiting routerconsole" title="" /></li>
-<li>[wip] <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. Right now instead of talking to snark-rpc, it uses a web-based protocl
-handler that simply auto-fills the torrent into i2psnark.</li>
-<li><img src="i2psnark.png" alt="Visiting i2psnark" title="" /></li>
-<li>[barely started] <strong>Isolate</strong> traffic by contextual identity to it's own HTTP
-Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The
-contextual identities. For now, the contextual identities used to manage
-browsing are "I2P Browsing" and "Web Browsing" where I2P Browsing is capable
-of using an outproxy but in the case of traffic destined for the clearnet
-does not do header rewriting, and Web Browsing falls back to the Proxy
-configured in Firefox. The I2P Browsing will be expanded to
-<ul>
-<li>I2P Amnesiac Browsing: Use for General Browsing, stores no history and
-uses an HTTP Proxy with a very short tunnel-close timeout and no key-reuse.</li>
-<li>I2P Social Networking: Use this for logging into social network accounts,
-forums, and other interactive asynchronous public communication platforms
-where your identity is behaviorally linkable. This has a very long
-tunnel-close timeout and key-reuse until specifically invoked.</li>
-<li>I2P Blogging: Use this for posting content to the web interface of your
-blog or to other similar websites that you create content on.</li>
-</ul></li>
-<li><img src="clearweb.png" alt="Visiting clearweb" title="" /></li>
-</ul>
+    <h2>Usage:</h2>
 
-<h3>Video</h3>
+    <ul>
+        <li>Basically, it "Just Works." After you install the plugin, browsing to an I2P domain will automatically stop the current tab and re-open the I2P site in an I2P Browser tab.</li>
 
-<ul>
-<li><img src="i2psetproxy.js.gif" alt="Video of the plugin in action" title="" /></li>
-</ul>
+        <li>Besides that, four bookmarks are added to the "Bookmarks Toolbar," which will take you to visit your Java I2P applications, or the "Simplified I2P Landing Page" embedded in the plugin:</li>
 
-<h2>Documents</h2>
+        <li><img alt="Landing page" src="lander.png" title="">
+        </li>
 
-<ul>
-<li><strong><a href="browser.pdf">Browser Outline</a></strong>: This document is an outline of each of
-the browser extension's feature panels in presentation form.</li>
-<li><strong><a href="smartlander.pdf">Smart Lander Design</a></strong>: This is the original outline of
-the smart landing page which became the I2P home page within the browser and
-the drop-down control panel.</li>
-</ul>
+        <li>Also, there's a menu for accessing I2P functionality while you're browsing. It lets you control a few settings in a granular way.</li>
 
-<h2>Super Extra Important Background Info:</h2>
+        <li><img alt="Menu" src="menu.png" title="">
+        </li>
 
-<p>This plugin's viability is directly related to the viability of Mozilla and
-Tor's work on hardening Firefox itself and of particular interest are the
-"Uplift" and "Fusion(Firefox Using Onions)" projects.</p>
+        <li>You can re-enable WebRTC but force it to always use the proxy that is enforced by the tab.</li>
 
-<h3>Links about Project Uplift</h3>
+        <li>You can either force the browser to delete all history for I2P sites immediately, or you can close all your I2P Browser tabs at once and delete the history for I2P browsing when you're done.</li>
 
-<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>
+        <li>That's all there is to it! Your browser is configured to safely use and administer I2P.</li>
 
-<p>Project uplift seems to have largely been accomplished?</p>
+        <li>Optionally, you can add I2PSnark-RPC and use Bittorrent-over-I2P via the transmission-rpc interface. To do this, have a look at the torrent guide: <a href="torrent/index.html">Torrent guide</a>
+        </li>
+    </ul>
 
-<h3>Links about Project Fusion</h3>
+    <h3>Features</h3>
 
-<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>
+    <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>
 
-<h2>The Old Version</h2>
+        <li><img alt="Visiting i2p-projekt.i2p" src="i2psetproxy.js.png" title="">
+        </li>
 
-<p>New versions of this extension create an I2P in Private Browsing mode instead.
-Since this is a drastic change to the behavior of the old plugin, a new entry
-for the new plugin has been made at a new location on addons.mozilla.org.</p>
+        <li>[done] <strong>Indicate</strong> the I2P browser is in use visually. Find an acceptable way to indicate it on Android.</li>
 
-<ul>
-<li><p>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></p></li>
-<li><p>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></p></li>
-</ul>
+        <li><img alt="Visiting webmail" src="susimail.png" title="">
+        </li>
 
-<h2>Android usage:</h2>
+        <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>
 
-<p>Open the following link
-<a href="https://github.com/eyedeekay/i2psetproxy.js/releases/">Github Releases Version</a>
-in the browser you want to use for I2P. Firefox will warn you that it is about
-to install an extension and indicate the permissions required. Read them over
-and when you're ready, accept them. That's all it should take, your browser is
-now configured to use I2P.</p>
+        <li>[done] <strong>Disable</strong> risky webRTC features/offer the option to re-enable them with the proxy enforced.</li>
 
-<h3>Android addons.mozilla.org(Temporarily Disabled)</h3>
+        <li>[done] <strong>Change</strong> the color of the browser window to indicate that I2P is in use</li>
 
-<p>If you would prefer to recieve automatic updates from AMO, the correct product
-page for this plugin is
-<a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P In Private Browsing</a>.
-This absolutely requires a working outproxy. If you want to avoid the use of AMO
-for updates, you can download the identical plugin from this repository's
-releases page. The latest AMO Plugin will always be identical to the latest
-github release, except for the version number, which must be incremented for
-submission to AMO.</p>
+        <li><img alt="Visiting i2ptunnel" src="i2ptunnel.png" title="">
+        </li>
+
+        <li>[ready] <strong>Provide</strong> help in a variety of languages.</li>
+
+        <li>[done] <strong>Monitor</strong> the health and readiness of the I2P router it is instructed to use. Currently the plugin checks whether the HTTP Proxy is working by fetching an image from "http://proxy.i2p" and displaying a result. A work-in-progress binding to i2pcontrol is available in ./i2pcontrol, it is inert at this time.</li>
+
+        <li><img alt="Visiting toopie.html" src="toopie.png" title="">
+        </li>
+
+        <li>[Done] <strong>Handle</strong> router console applications under their own origins and within their own contextual identity. (1) The router console is automatically confined to it's own container tab. (2) Use a custom protocol handler to place each i2p application/plugin under it's own origin, shortening router console URL's and placing applications under their own origin.</li>
+
+        <li><img alt="Visiting routerconsole" src="routerconsole.png" title="">
+        </li>
+
+        <li>[Done] <strong>Handle Torrents</strong> by talking to i2psnark-rpc plugin and then adding them directly into the Firefox downloads drop-downs, menus, etc. If I can.</li>
+
+        <li><img alt="Visiting i2psnark" src="i2psnark.png" title="">
+        </li>
+
+        <li><img alt="Monitoring torrents" src="transmissionrpc.png" title="">
+        </li>
+
+        <li>[Started] Indicate the level of authenticity provided by TLS. TLS is optional on I2P for now, but some sites offer it anyway. TLS support is experimental and in the works.</li>
+
+        <li>[barely started] <strong>Isolate</strong> traffic by contextual identity to it's own HTTP Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The contextual identities. For now, the contextual identities used to manage browsing are "I2P Browsing" and "Web Browsing" where I2P Browsing is capable of using an outproxy but in the case of traffic destined for the clearnet does not do header rewriting, and Web Browsing falls back to the Proxy configured in Firefox. The I2P Browsing will be expanded to
+            <ul>
+                <li>I2P Amnesiac Browsing: Use for General Browsing, stores no history and uses an HTTP Proxy with a very short tunnel-close timeout and no key-reuse.</li>
+
+                <li>I2P Social Networking: Use this for logging into social network accounts, forums, and other interactive asynchronous public communication platforms where your identity is behaviorally linkable. This has a very long tunnel-close timeout and key-reuse until specifically invoked.</li>
+
+                <li>I2P Blogging: Use this for posting content to the web interface of your blog or to other similar websites that you create content on.</li>
+            </ul>
+        </li>
+
+        <li><img alt="Visiting clearweb" src="clearweb.png" title="">
+        </li>
+    </ul>
+
+    <h3>Video</h3>
+
+    <ul>
+        <li><img alt="Video of the plugin in action" src="i2psetproxy.js.gif" title="">
+        </li>
+    </ul>
+
+    <h2>Documents</h2>
+
+    <ul>
+        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Browser.Design.Documentation.pdf">Browser Outline</a></strong>: This document is an outline of each of the browser extension's feature panels in presentation form.</li>
+
+        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Landing.Page.Documentation.pdf">Smart Lander Design</a></strong>: This is the original outline of the smart landing page which became the I2P home page within the browser and the drop-down control panel.</li>
+
+        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/wiki/Other-Extensions">Other extensions</a></strong>: and how they work with this one.</li>
+    </ul>
+
+    <h2>Super Extra Important Background Info:</h2>
+
+    <p>This plugin's viability is directly related to the viability of Mozilla and Tor's work on hardening Firefox itself and of particular interest are the "Uplift" and "Fusion(Firefox Using Onions)" projects.</p>
+
+    <h3>Links about Project Uplift</h3>
+
+    <ul>
+        <li>
+            <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> is a project which brings important features of the Tor Browser to the mainstream of Firefox users by including patches from Tor Browser Bundle into Firefox where it is appropriate.
+        </li>
+
+        <li>
+            <a href="https://wiki.mozilla.org/Security/FirstPartyIsolation">First Party Isolation</a> is a feature in Firefox and other browsers which keeps information from leaking across first-party domains.
+        </li>
+
+        <li>
+            <a href="https://wiki.mozilla.org/Security/Fingerprinting">Fingerprinting</a> is a technique where a tracker attempts to extract unique information about a user from a side-channel in order to create an identifier that can be used to correlate the user across many sites.
+        </li>
+
+        <li>
+            <a href="https://wiki.mozilla.org/Security/Fennec%2BTor_Project">Fennec</a> is Firefox for Android and this link has some analysis of the privacy consequences of the Android platform.
+        </li>
+
+        <li>
+            <a href="https://wiki.mozilla.org/Security/Tor_Uplift/Tracking">Tracking</a> in Firefox is surveyed here.
+        </li>
+    </ul>
+
+    <p>Project uplift seems to have largely been accomplished?</p>
+
+    <h3>Links about Project Fusion</h3>
+
+    <ul>
+        <li>
+            <a href="https://wiki.mozilla.org/Security/Fusion">Project Fusion</a> or Firefox using Onions is a joint Mozilla/Tor effort to create an enhanced Private Browsing mode for Firefox which uses Tor.
+        </li>
+
+        <li>
+            <a href="https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject">Notes</a> from a meeting about Fusion.
+        </li>
+
+        <li>
+            <a href="https://blog.torproject.org/tor-heart-firefox">Tor at the Heart: Firefox</a> is a blog about Tor and the relationship they have to Firefox re: TBB, Fusion.
+        </li>
+    </ul>
+
+    <h2>The Old Version</h2>
+
+    <p>New versions of this extension create an I2P in Private Browsing mode instead. Since this is a drastic change to the behavior of the old plugin, a new entry for the new plugin has been made at a new location on addons.mozilla.org.</p>
+
+    <ul>
+        <li>
+            <p>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></p>
+        </li>
+
+        <li>
+            <p>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></p>
+        </li>
+    </ul>
+
+    <h2>Android usage:</h2>
+
+    <p>Open the following link <a href="https://github.com/eyedeekay/i2psetproxy.js/releases/">Github Releases Version</a> in the browser you want to use for I2P. Firefox will warn you that it is about to install an extension and indicate the permissions required. Read them over and when you're ready, accept them. That's all it should take, your browser is now configured to use I2P.</p>
+
+    <h3>Android addons.mozilla.org(Temporarily Disabled)</h3>
+
+    <p>If you would prefer to recieve automatic updates from AMO, the correct product page for this plugin is <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P In Private Browsing</a>. This absolutely requires a working outproxy. If you want to avoid the use of AMO for updates, you can download the identical plugin from this repository's releases page. The latest AMO Plugin will always be identical to the latest github release, except for the version number, which must be incremented for submission to AMO.</p>
+</body>
 </html>

info.css

@@ -51,4 +51,10 @@ img.readyness {
 }
 #consoleOn {
   min-height: 2rem
+}
+#torrentpanel {
+  display: none
+}
+.torrent-progress {
+  width: 100%
 }

info.js

@@ -2,13 +2,31 @@ function checkPeerConnection() {
   let getting = browser.privacy.network.peerConnectionEnabled.get({});
   getting.then(got => {
     let webrtc = got.value;
-    console.log("checking webrtc", webrtc);
-    document.getElementById("enable-web-rtc").checked = webrtc;
+    console.log('checking webrtc', webrtc);
+    if (document.getElementById('enable-web-rtc') !== null)
+      document.getElementById('enable-web-rtc').checked = webrtc;
   });
 }
 
 checkPeerConnection();
 
+function checkSnowflake() {
+  try {
+    function snowflake(snowflake) {
+      console.log("snowflake plugin found, leaving WebRTC alone", snowflake);
+      EnablePeerConnection();
+    }
+    var snowflakeInfo = browser.management.get(
+      "{b11bea1f-a888-4332-8d8a-cec2be7d24b9}" // string
+    );
+    snowflakeInfo.then(snowflake);
+  } catch {
+    console.log("snowflake not found");
+  }
+}
+
+checkSnowflake();
+
 function checkHistory() {
   let getting = browser.storage.local.get("disable_history");
   getting.then(got => {
@@ -17,7 +35,8 @@ function checkHistory() {
       disable_history = false;
     }
     console.log("checking history", disable_history);
-    document.getElementById("disable-history").checked = disable_history;
+    if (document.getElementById("disable-history") !== null)
+      document.getElementById("disable-history").checked = disable_history;
   });
 }
 
@@ -54,10 +73,33 @@ document.addEventListener("click", clickEvent => {
       };
     }
     refreshIdentity();
+  } else if (clickEvent.target.id === "label-router-restart") {
+    console.log("attempting to initiate graceful restart");
+    RouterManager("RestartGraceful");
+  } else if (clickEvent.target.id === "label-router-shutdown") {
+    console.log("attempting to initiate graceful shutdown");
+    RouterManager("ShutdownGraceful");
+  } else if (clickEvent.target.id === "search-submit") {
+    console.log("attempting to create search tab");
+    goSearch();
+  } else if (clickEvent.target.id === "browser-action") {
+    console.log("showing a browser action");
+    showBrowsing();
+  } else if (clickEvent.target.id === "torrent-action") {
+    console.log("showing a torrent action");
+    showTorrentsMenu();
   } else if (clickEvent.target.id === "window-preface-title") {
+    console.log("attempting to create homepage tab");
+    goHome();
+  } else if (clickEvent.target.id === "window-visit-index") {
+    console.log("attempting to create index tab");
+    goIndex();
   } else if (clickEvent.target.id === "window-visit-homepage") {
     console.log("attempting to create homepage tab");
     goHome();
+  } else if (clickEvent.target.id === "window-visit-toopie") {
+    console.log("attempting to create toopie tab");
+    goToopie();
   } else if (clickEvent.target.id === "window-visit-i2ptunnel") {
     console.log("attempting to create i2ptunnel tab");
     goTunnel();
@@ -77,6 +119,7 @@ document.addEventListener("click", clickEvent => {
     } else {
       browser.runtime.sendMessage({ rtc: "disableWebRTC" });
     }
+    checkPeerConnection();
     return;
   } else if (clickEvent.target.id === "disable-history") {
     if (clickEvent.target.checked) {
@@ -101,6 +144,20 @@ gettingInfo.then(got => {
   }
 });
 
+function showBrowsing() {
+  var x = document.getElementById("browserpanel");
+  x.style.display = "block";
+  var y = document.getElementById("torrentpanel");
+  y.style.display = "none";
+}
+
+function showTorrentsMenu() {
+  var x = document.getElementById("browserpanel");
+  x.style.display = "none";
+  var y = document.getElementById("torrentpanel");
+  y.style.display = "block";
+}
+
 function goHome() {
   function gotProxyInfo(info) {
     let port = info.value.http.split(":")[1];
@@ -110,12 +167,14 @@ function goHome() {
       };
       console.log("visiting homepage");
       let creating = browser.tabs.create(createRhizomeData);
+      creating.then(onTabCreated, onTabError);
     } else {
       let createData = {
         url: "home.html"
       };
       console.log("visiting homepage");
       let creating = browser.tabs.create(createData);
+      creating.then(onTabCreated, onTabError);
     }
     console.log("(bookmarks) adding home page bookmark");
   }
@@ -124,20 +183,62 @@ function goHome() {
   gettingProxyInfo.then(gotProxyInfo);
 }
 
+function goIndex() {
+  function onTabError() {
+    console.log("Help tab created");
+  }
+  let createData = {
+    url: "index.html"
+  };
+  console.log("visiting help");
+  let creating = browser.tabs.create(createData);
+  creating.then(onTabCreated, onTabError);
+}
+
+function goToopie() {
+  function onTabError() {
+    console.log("Toopie tab created");
+  }
+  console.log("visiting toopie");
+  let creating = browser.sidebarAction.open();
+  creating.then(onTabCreated, onTabError);
+}
+
 function onTabCreated() {
   console.log("Tab Created");
 }
 
+function goSearch() {
+  function onTabError() {
+    console.log("Search tab created");
+  }
+  let createData = {
+    url:
+      "http://yacy.idk.i2p/yacysearch.html?" +
+      "query=" +
+      document.getElementById("search-query").value
+  };
+  console.log("visiting legwork");
+  let creating = browser.tabs.create(createData);
+  creating.then(onTabCreated, onTabError);
+}
+
+function routerAddr() {
+  if (!control_host) var control_host = "127.0.0.1";
+  if (!control_port) var control_port = "7657";
+  return control_host + ":" + control_port;
+}
+
 function goTunnel() {
   function onTabError() {
     console.log("I2PTunnel tab created");
   }
   let createData = {
-    url: "http://" + control_host + ":" + control_port + "/i2ptunnel"
+    url: "http://" + routerAddr() + "/i2ptunnel"
   };
   console.log("visiting i2ptunnel");
   let creating = browser.tabs.create(createData);
-  creating(onTabCreated, onTabError);
+  creating.then(onTabCreated, onTabError);
 }
 
 function goMail() {
@@ -145,7 +246,7 @@ function goMail() {
     console.log("Mail tab created");
   }
   let createData = {
-    url: "http://" + control_host + ":" + control_port + "/susimail"
+    url: "http://" + routerAddr() + "/susimail"
   };
   console.log("visiting mail");
   let creating = browser.tabs.create(createData);
@@ -157,11 +258,11 @@ function goSnark() {
     console.log("Snark tab created");
   }
   let createData = {
-    url: "http://" + control_host + ":" + control_port + "/i2psnark"
+    url: "http://" + routerAddr() + "/i2psnark"
   };
   console.log("visiting snark");
   let creating = browser.tabs.create(createData);
-  creating(onTabCreated, onTabError);
+  creating.then(onTabCreated, onTabError);
 }
 
 function onVisited(historyItem) {
@@ -187,3 +288,12 @@ function onVisited(historyItem) {
     deletingUrl.then(onRemoved);
   }
 }
+
+if (UpdateContents !== undefined) UpdateContents();
+
+const minutes = 0.2;
+const interval = minutes * 60 * 1000;
+
+setInterval(function() {
+  if (UpdateContents !== undefined) UpdateContents();
+}, interval);

manifest.json

@@ -7,8 +7,11 @@
   },
   "permissions": [
     "theme",
+    "alarms",
     "browsingData",
     "bookmarks",
+    "contextMenus",
+    "management",
     "notifications",
     "proxy",
     "privacy",
@@ -23,10 +26,10 @@
   ],
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "0.54",
-  "version_name": "0.54",
+  "version": "0.73",
+  "version_name": "0.73",
   "description": "__MSG_extensionDescription__",
-  "homepage_url": "https://github.com/eyedeekay/i2psetproxy.js",
+  "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
   "icons": {
     "48": "icons/toopie.png"
   },
@@ -36,20 +39,44 @@
     "default_title": "__MSG_extensionName__",
     "default_popup": "window.html"
   },
+  "sidebar_action": {
+    "browser_style": true,
+    "default_icon": "icons/logo.png",
+    "default_title": "__MSG_toopieName__",
+    "default_panel": "toopie.html",
+    "open_at_install": false
+  },
+  "page_action": {
+    "browser_style": true,
+    "default_title": "__MSG_toopieTLS__",
+    "default_icon": "icons/toopie.png",
+    "show_matches": [
+      "http://*.i2p/*",
+      "https://*.i2p/*",
+      "http://*.b32.i2p/*",
+      "https://*.b32.i2p/*"
+    ],
+    "default_panel": "security.html",
+    "pinned": true
+  },
   "options_ui": {
     "page": "options/options.html"
   },
   "background": {
+    "persistent": true,
     "scripts": [
+      "config.js",
+      "torrent/common.js",
+      "torrent/background.js",
+      "i2pcontrol/i2pcontrol.js",
+      "host.js",
       "privacy.js",
       "platform.js",
       "background.js",
-      "host.js",
       "handler.js",
       "proxy.js",
       "info.js",
       "home.js",
-      "i2pcontrol/i2pcontrol.js",
       "scrub.js",
       "bookmarks.js"
     ]
@@ -60,11 +87,6 @@
       "name": "RouterConsole",
       "uriTemplate": "http://127.0.0.1:7657/%s"
     },
-    {
-      "protocol": "ext+dati2p",
-      "name": "Dat over I2P",
-      "uriTemplate": "/dat.html#!/%s"
-    },
     {
       "protocol": "magnet",
       "name": "I2PTorrent",

options/options.css

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

options/options.html

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

options/options.js

@@ -1,217 +1,317 @@
 function SetHostText() {
-  var hostid = document.getElementById("hostText");
-  hostid.textContent = chrome.i18n.getMessage("hostText");
+  var hostid = document.getElementById('hostText');
+  hostid.textContent = chrome.i18n.getMessage('hostText');
 }
 
 function SetPortText() {
-  var portid = document.getElementById("portText");
-  portid.textContent = chrome.i18n.getMessage("portText");
+  var portid = document.getElementById('portText');
+  portid.textContent = chrome.i18n.getMessage('portText');
+}
+
+function SetPortHelpText() {
+  var portid = document.getElementById('proxyHelpText');
+  portid.textContent = chrome.i18n.getMessage('proxyHelpText');
 }
 
 function SetControlHostText() {
-  var controlhostid = document.getElementById("controlHostText");
-  controlhostid.textContent = chrome.i18n.getMessage("controlHostText");
+  var controlhostid = document.getElementById('controlHostText');
+  controlhostid.textContent = chrome.i18n.getMessage('controlHostText');
 }
 
 function SetControlPortText() {
-  var controlportid = document.getElementById("controlPortText");
-  controlportid.textContent = chrome.i18n.getMessage("controlPortText");
+  var controlportid = document.getElementById('controlPortText');
+  controlportid.textContent = chrome.i18n.getMessage('controlPortText');
 }
 
 function SetControlHelpText() {
-  var portid = document.getElementById("controlHelpText");
-  portid.textContent = chrome.i18n.getMessage("controlHelpText");
+  var portid = document.getElementById('controlHelpText');
+  portid.textContent = chrome.i18n.getMessage('controlHelpText');
 }
 
 function getScheme() {
-  const proxy_scheme = document.querySelector("#proxy_scheme");
-  console.log("Got i2p proxy scheme:", proxy_scheme.value);
-  if (proxy_scheme == "HTTP") {
-    return "http";
+  const proxy_scheme = document.querySelector('#proxy_scheme');
+  console.log('(options)Got i2p proxy scheme:', proxy_scheme.value);
+  if (proxy_scheme.value == 'HTTP') {
+    return 'http';
   }
-  if (proxy_scheme == "SOCKS") {
-    return "socks";
+  if (proxy_scheme.value == 'SOCKS') {
+    return 'socks';
   }
-  return proxy_scheme.value;
+  if (proxy_scheme.value == 'http') return 'http';
+  if (proxy_scheme.value == 'socks') return 'socks';
+  else return 'http';
 }
 
 function getHost() {
-  proxy_host = document.getElementById("host").value;
-  console.log("Got i2p proxy host:", proxy_host);
+  proxy_host = document.getElementById('host').value;
+  console.log('(options)Got i2p proxy host:', proxy_host);
   if (proxy_host == undefined) {
-    return "127.0.0.1";
+    return '127.0.0.1';
   }
   return proxy_host;
 }
 
 function getPort() {
-  proxy_port = document.getElementById("port").value;
-  console.log("Got i2p proxy port:", proxy_port);
+  proxy_port = document.getElementById('port').value;
+  console.log('(options)Got i2p proxy port:', proxy_port);
   if (proxy_port == undefined) {
-    return "4444";
+    return '4444';
   }
   return proxy_port;
 }
 
 function getControlHost() {
-  control_host = document.getElementById("controlhost").value;
-  console.log("Got i2p control host:", control_host);
+  control_host = document.getElementById('controlhost').value;
+  console.log('(options)Got i2p control host:', control_host);
   if (control_host == undefined) {
-    return "127.0.0.1";
+    return '127.0.0.1';
   }
   return control_host;
 }
 
 function getControlPort() {
-  control_port = document.getElementById("controlport").value;
-  console.log("Got i2p control port:", control_port);
+  control_port = document.getElementById('controlport').value;
+  console.log('(options)Got i2p control port:', control_port);
   if (control_port == undefined) {
-    return "4444";
+    return '4444';
   }
   return control_port;
 }
 
+function getRPCHost() {
+  rpc_host = document.getElementById('rpchost').value;
+  console.log('(options)Got i2pcontrol rpc host:', rpc_host);
+  if (rpc_host == undefined) {
+    return '127.0.0.1';
+  }
+  return rpc_host;
+}
+
+function getRPCPort() {
+  rpc_port = document.getElementById('rpcport').value;
+  console.log('(options)Got i2pcontrol rpc port:', rpc_port);
+  if (rpc_port == undefined) {
+    return '7657';
+  }
+  return rpc_port;
+}
+
+function getRPCPath() {
+  rpc_path = document.getElementById('rpcpath').value;
+  console.log('(options)Got i2pcontrol rpc path:', rpc_path);
+  if (rpc_path == undefined) {
+    return 'jsonrpc';
+  }
+  return rpc_path;
+}
+
+function getRPCPass() {
+  rpc_pass = document.getElementById('rpcpass').value;
+  console.log('(options)Got i2pcontrol rpc password:');
+  if (rpc_pass == undefined) {
+    return 'itoopie';
+  }
+  return rpc_pass;
+}
+
+function getBTRPCHost() {
+  bt_rpc_host = document.getElementById('btrpchost').value;
+  console.log('(options)Got torrent rpc host:', bt_rpc_host);
+  if (bt_rpc_host == undefined) {
+    return '127.0.0.1';
+  }
+  return bt_rpc_host;
+}
+
+function getBTRPCPort() {
+  bt_rpc_port = document.getElementById('btrpcport').value;
+  console.log('(options)Got torrent rpc port:', bt_rpc_port);
+  if (bt_rpc_port == undefined) {
+    return '7657';
+  }
+  return bt_rpc_port;
+}
+
+function getBTRPCPath() {
+  bt_rpc_path = document.getElementById('btrpcpath').value;
+  console.log('(options)Got torrent rpc path:', bt_rpc_path);
+  if (bt_rpc_path == undefined) {
+    return 'transmission/rpc';
+  }
+  return bt_rpc_path;
+}
+
+function getBTRPCPass() {
+  bt_rpc_pass = document.getElementById('btrpcpass').value;
+  console.log('(options)Got torrent rpc password:');
+  if (bt_rpc_pass == undefined) {
+    return 'itoopie';
+  }
+  return bt_rpc_pass;
+}
+
 function checkStoredSettings(storedSettings) {
   function gotProxyInfo(info) {
     let defaultSettings = {};
-    let host = info.value.http.split(":")[0];
-    let port = info.value.http.split(":")[1];
-    console.log("proxy", "'" + host + "'", ":", port);
-    if (!storedSettings.proxy_scheme) {
-      defaultSettings["proxy_scheme"] = "http";
+    let host = info.value.http.split(':')[0];
+    let port = info.value.http.split(':')[1];
+    if (port != 7644) {
+      port = undefined;
     }
-    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('(options)proxy', "'" + host + "'", ':', port);
+    if (!storedSettings['proxy_scheme'])
+      defaultSettings['proxy_scheme'] = 'http';
+    else defaultSettings['proxy_scheme'] = storedSettings['proxy_scheme'];
+    if (!storedSettings['proxy_host']) {
+      if (host == '') defaultSettings['proxy_host'] = '127.0.0.1';
+      else defaultSettings['proxy_host'] = host;
+    } else defaultSettings['proxy_host'] = storedSettings['proxy_host'];
+
+    if (!storedSettings['proxy_port']) {
+      if (port == undefined) defaultSettings['proxy_port'] = 4444;
+      else if (port == 7644) defaultSettings['proxy_port'] = port;
+      else defaultSettings['proxy_port'] = 4444;
+    } else defaultSettings['proxy_port'] = storedSettings.proxy_port;
+
+    if (!storedSettings['control_host']) {
+      if (host == '') defaultSettings['control_host'] = '127.0.0.1';
+      else defaultSettings['control_host'] = host;
+    } else defaultSettings['control_host'] = storedSettings.control_host;
+
+    if (!storedSettings['control_port']) {
+      defaultSettings['control_port'] = 7657;
+    } else defaultSettings['control_port'] = storedSettings.control_port;
+
+    if (!storedSettings['rpc_host']) {
+      if (host == '') defaultSettings['rpc_host'] = '127.0.0.1';
+      else defaultSettings['rpc_host'] = host;
+    } else defaultSettings['rpc_host'] = storedSettings.rpc_host;
+
+    if (!storedSettings['rpc_port']) {
+      defaultSettings['rpc_port'] = 7657;
+    } else defaultSettings['rpc_port'] = storedSettings.rpc_port;
+
+    if (!storedSettings['rpc_path']) {
+      defaultSettings['rpc_path'] = 'jsonrpc';
+    } else defaultSettings['rpc_path'] = storedSettings.rpc_path;
+
+    if (!storedSettings['rpc_pass']) {
+      defaultSettings['rpc_pass'] = 'itoopie';
+    } else defaultSettings['rpc_pass'] = storedSettings.rpc_pass;
+
+    if (!storedSettings['bt_rpc_host']) {
+      if (host == '') defaultSettings['bt_rpc_host'] = '127.0.0.1';
+      else defaultSettings['bt_rpc_host'] = host;
+    } else defaultSettings['bt_rpc_host'] = storedSettings.bt_rpc_host;
+
+    if (!storedSettings['bt_rpc_port']) {
+      defaultSettings['bt_rpc_port'] = 7657;
+    } else defaultSettings['bt_rpc_port'] = storedSettings.bt_rpc_port;
+
+    if (!storedSettings['bt_rpc_path']) {
+      defaultSettings['bt_rpc_path'] = 'transmission/';
+    } else defaultSettings['bt_rpc_path'] = storedSettings.bt_rpc_path;
+
+    if (!storedSettings['bt_rpc_pass']) {
+      defaultSettings['bt_rpc_pass'] = 'transmission';
+    } else defaultSettings['bt_rpc_pass'] = storedSettings.bt_rpc_pass;
+
+    console.log('(options)(browserinfo) NATIVE PROXYSETTINGS', info.value);
+    defaultSettings['base_url'] =
+      'http://' +
+      defaultSettings['bt_rpc_host'] +
+      ':' +
+      defaultSettings['bt_rpc_port'] +
+      '/' +
+      defaultSettings['bt_rpc_path'];
     console.log(
-      defaultSettings["proxy_host"],
-      defaultSettings["proxy_port"],
-      defaultSettings["control_host"],
-      defaultSettings["control_port"]
+      '(options)',
+      defaultSettings['proxy_scheme'],
+      defaultSettings['proxy_host'],
+      defaultSettings['proxy_port'],
+      defaultSettings['control_host'],
+      defaultSettings['control_port'],
+      defaultSettings['base_url']
     );
+
     chrome.storage.local.set(defaultSettings);
+    return defaultSettings;
   }
   var gettingInfo = browser.proxy.settings.get({});
-  gettingInfo.then(gotProxyInfo);
+  return gettingInfo.then(gotProxyInfo);
 }
 
 function checkAndroidStoredSettings(storedSettings) {
   let defaultSettings = {};
-  let host = "";
-  let port = "";
-  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;
-    }
-  }
+  let host = '';
+  let port = '';
+  if (!storedSettings['proxy_scheme']) defaultSettings['proxy_scheme'] = 'http';
+  else defaultSettings['proxy_scheme'] = storedSettings['proxy_scheme'];
+  if (!storedSettings['proxy_host']) {
+    if (host == '') defaultSettings['proxy_host'] = '127.0.0.1';
+    else defaultSettings['proxy_host'] = host;
+  } else defaultSettings['proxy_host'] = storedSettings['proxy_host'];
+
+  if (!storedSettings['proxy_port']) {
+    if (port == undefined) defaultSettings['proxy_port'] = 4444;
+    else if (port == 7644) defaultSettings['proxy_port'] = port;
+    else defaultSettings['proxy_port'] = 4444;
+  } else defaultSettings['proxy_port'] = storedSettings.proxy_port;
+
+  if (!storedSettings['control_host']) {
+    if (host == '') defaultSettings['control_host'] = '127.0.0.1';
+    else defaultSettings['control_host'] = host;
+  } else defaultSettings['control_host'] = storedSettings.control_host;
+
+  if (!storedSettings['control_port']) {
+    defaultSettings['control_port'] = 7657;
+  } else defaultSettings['control_port'] = storedSettings.control_port;
+
+  if (!storedSettings['rpc_host']) {
+    if (host == '') defaultSettings['rpc_host'] = '127.0.0.1';
+    else defaultSettings['rpc_host'] = host;
+  } else defaultSettings['rpc_host'] = storedSettings.rpc_host;
+
+  if (!storedSettings['rpc_port']) {
+    defaultSettings['rpc_port'] = 7657;
+  } else defaultSettings['rpc_port'] = storedSettings.rpc_port;
+
+  if (!storedSettings['rpc_path']) {
+    defaultSettings['rpc_path'] = 'jsonrpc';
+  } else defaultSettings['rpc_path'] = storedSettings.rpc_path;
+
+  if (!storedSettings['rpc_pass']) {
+    defaultSettings['rpc_pass'] = 'itoopie';
+  } else defaultSettings['rpc_pass'] = storedSettings.rpc_pass;
+
+  if (!storedSettings['bt_rpc_host']) {
+    if (host == '') defaultSettings['bt_rpc_host'] = '127.0.0.1';
+    else defaultSettings['bt_rpc_host'] = host;
+  } else defaultSettings['bt_rpc_host'] = storedSettings.bt_rpc_host;
+
+  if (!storedSettings['bt_rpc_port']) {
+    defaultSettings['bt_rpc_port'] = 7657;
+  } else defaultSettings['bt_rpc_port'] = storedSettings.bt_rpc_port;
+
+  if (!storedSettings['bt_rpc_path']) {
+    defaultSettings['bt_rpc_path'] = 'transmission/rpc';
+  } else defaultSettings['bt_rpc_path'] = storedSettings.bt_rpc_path;
+
+  if (!storedSettings['bt_rpc_pass']) {
+    defaultSettings['bt_rpc_pass'] = 'transmission';
+  } else defaultSettings['bt_rpc_pass'] = storedSettings.bt_rpc_pass;
+
+  console.log('(options)(browserinfo) NATIVE PROXYSETTINGS', info.value);
   console.log(
-    defaultSettings["proxy_host"],
-    defaultSettings["proxy_port"],
-    defaultSettings["control_host"],
-    defaultSettings["control_port"]
+    '(options)',
+    defaultSettings['proxy_scheme'],
+    defaultSettings['proxy_host'],
+    defaultSettings['proxy_port'],
+    defaultSettings['control_host'],
+    defaultSettings['control_port']
   );
   chrome.storage.local.set(defaultSettings);
+  return defaultSettings;
 }
 
 function onError(e) {
@@ -219,48 +319,88 @@ function onError(e) {
 }
 
 function storeSettings() {
-  let proxy_scheme = getScheme();
-  let proxy_host = getHost();
-  let proxy_port = getPort();
-  let control_host = getControlHost();
-  let control_port = getControlPort();
-  chrome.storage.local.set({
-    proxy_scheme,
-    proxy_host,
-    proxy_port,
-    control_host,
-    control_port
-  });
-  console.log("storing proxy scheme:", proxy_scheme);
-  console.log("storing proxy host:", proxy_host);
-  console.log("storing proxy port:", proxy_port);
-  console.log("storing control host:", control_host);
-  console.log("storing control port:", control_port);
+  let storableSettings = {};
+  storableSettings['proxy_scheme'] = getScheme();
+  storableSettings['proxy_host'] = getHost();
+  storableSettings['proxy_port'] = getPort();
+  storableSettings['control_host'] = getControlHost();
+  storableSettings['control_port'] = getControlPort();
+  storableSettings['rpc_host'] = getRPCHost();
+  storableSettings['rpc_port'] = getRPCPort();
+  storableSettings['rpc_path'] = getRPCPath();
+  storableSettings['rpc_pass'] = getRPCPass();
+  storableSettings['bt_rpc_host'] = getBTRPCHost();
+  storableSettings['bt_rpc_port'] = getBTRPCPort();
+  storableSettings['bt_rpc_path'] = getBTRPCPath();
+  storableSettings['bt_rpc_pass'] = getBTRPCPass();
+  storableSettings['base_url'] =
+    'http://' + bt_rpc_host + ':' + bt_rpc_port + '/' + bt_rpc_path;
+  console.log('storing', storableSettings);
+  chrome.storage.local.set(storableSettings);
 }
 
 function updateUI(restoredSettings) {
-  const selectList = document.querySelector("#proxy_scheme");
-  selectList.value = restoredSettings.proxy_scheme;
-  console.log("showing proxy scheme:", selectList.value);
+  const selectList = document.querySelector('#proxy_scheme');
+  if (selectList == undefined) selectList.value = restoredSettings.proxy_scheme;
+  //console.log("(options)showing proxy scheme:", selectList.value);
 
-  const hostitem = document.getElementById("host");
-  hostitem.value = restoredSettings.proxy_host;
-  console.log("showing proxy host:", hostitem.value);
+  const hostitem = document.getElementById('host');
+  if (hostitem == undefined) hostitem.value = restoredSettings.proxy_host;
+  //console.log("(options)showing proxy host:", hostitem.value);
 
-  const portitem = document.getElementById("port");
-  portitem.value = restoredSettings.proxy_port;
-  console.log("showing proxy port:", portitem.value);
+  const portitem = document.getElementById('port');
+  if (portitem == undefined) portitem.value = restoredSettings.proxy_port;
+  //console.log("(options)showing proxy port:", portitem.value);
 
-  const controlhostitem = document.getElementById("controlhost");
-  controlhostitem.value = restoredSettings.control_host;
-  console.log("showing control host:", controlhostitem.value);
+  const controlhostitem = document.getElementById('controlhost');
+  if (controlhostitem == undefined)
+    controlhostitem.value = restoredSettings.control_host;
+  //console.log("(options)showing control host:", controlhostitem.value);
 
-  const controlportitem = document.getElementById("controlport");
-  controlportitem.value = restoredSettings.control_port;
-  console.log("showing control port:", controlportitem.value);
+  const controlportitem = document.getElementById('controlport');
+  if (controlportitem == undefined)
+    controlportitem.value = restoredSettings.control_port;
+  //console.log("(options)showing control port:", controlportitem.value);
+
+  const rpchostitem = document.getElementById('rpchost');
+  if (rpchostitem == undefined) rpchostitem.value = restoredSettings.rpc_host;
+  //console.log("(options)showing rpc host:", rpchostitem.value);
+
+  const rpcportitem = document.getElementById('rpcport');
+  if (rpcportitem == undefined) rpcportitem.value = restoredSettings.rpc_port;
+  //console.log("(options)showing rpc port:", rpcportitem.value);
+
+  const rpcpathitem = document.getElementById('rpcpath');
+  if (rpcpathitem == undefined) rpcpathitem.value = restoredSettings.rpc_path;
+  //console.log("(options)showing rpc path:", rpcpathitem.value);
+
+  const rpcpassitem = document.getElementById('rpcpass');
+  if (rpcpassitem == undefined) rpcpassitem.value = restoredSettings.rpc_pass;
+  //console.log("(options)showing rpc pass:");
+
+  const btrpchostitem = document.getElementById('btrpchost');
+  if (btrpchostitem == undefined)
+    btrpchostitem.value = restoredSettings.rpc_host;
+  //console.log("(options)showing bt rpc host:", btrpchostitem.value);
+
+  const btrpcportitem = document.getElementById('btrpcport');
+  if (btrpcportitem == undefined)
+    btrpcportitem.value = restoredSettings.rpc_port;
+  //console.log("(options)showing rbt pc port:", rpcportitem.value);
+
+  const btrpcpathitem = document.getElementById('btrpcpath');
+  if (btrpcpathitem == undefined)
+    btrpcpathitem.value = restoredSettings.rpc_path;
+  //console.log("(options)showing bt rpc path:", btrpcpathitem.value);
+
+  const btrpcpassitem = document.getElementById('btrpcpass');
+  if (btrpcpassitem == undefined)
+    btrpcpassitem.value = restoredSettings.rpc_pass;
+  //console.log("(options)showing bt rpc pass:");
 
   SetHostText();
   SetPortText();
+  SetPortHelpText();
   SetControlHostText();
   SetControlPortText();
   SetControlHelpText();
@@ -272,10 +412,10 @@ function onError(e) {
 
 var gettingInfo = browser.runtime.getPlatformInfo();
 gettingInfo.then(got => {
-  if (got.os != "android") {
+  if (got.os != 'android') {
     chrome.storage.local.get(function(got) {
-      checkStoredSettings(got);
-      updateUI(got);
+      let settings = checkStoredSettings(got);
+      settings.then(updateUI);
     });
   } else {
     chrome.storage.local.get(function(got) {
@@ -285,7 +425,5 @@ gettingInfo.then(got => {
   }
 });
 
-const saveButton = document.querySelector("#save-button");
-saveButton.addEventListener("click", storeSettings);
-
-//EXPERIMENTAL: Open in I2P Tab
+const saveButton = document.querySelector('#save-button');
+saveButton.addEventListener('click', storeSettings);

platform.js

@@ -2,19 +2,19 @@ var android = false;
 
 var gettingInfo = browser.runtime.getPlatformInfo();
 gettingInfo.then(got => {
-  if (got.os == "android") {
-    console.log("Running in Android detected");
+  if (got.os == 'android') {
+    console.log('Running in Android detected');
     android = true;
     return true;
   } else {
-    console.log("Running in Desktop detected");
+    console.log('Running in Desktop detected');
     android = false;
     return false;
   }
 });
 
 function isDroid() {
-  console.log("android?", android);
+  console.log('android?', android);
   if (android == undefined) {
     return false;
   }

privacy.js

@@ -1,10 +1,10 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
+var titlepref = chrome.i18n.getMessage('titlePreface');
 
 function onSet(result) {
   if (result) {
-    console.log("->: Value was updated");
+    console.log('->: Value was updated');
   } else {
-    console.log("-X: Value was not updated");
+    console.log('-X: Value was not updated');
   }
 }
 
@@ -14,7 +14,7 @@ function disableHyperlinkAuditing() {
   var setting = browser.privacy.websites.hyperlinkAuditingEnabled.set({
     value: false
   });
-  console.log("Disabling hyperlink auditing/val=", {
+  console.log('Disabling hyperlink auditing/val=', {
     value: false
   });
   setting.then(onSet);
@@ -25,7 +25,7 @@ function enableFirstPartyIsolation() {
   var setting = browser.privacy.websites.firstPartyIsolate.set({
     value: true
   });
-  console.log("Enabling first party isolation/val=", {
+  console.log('Enabling first party isolation/val=', {
     value: true
   });
   setting.then(onSet);
@@ -39,13 +39,13 @@ function disableEvilCookies() {
   getting.then(got => {
     var setting = browser.privacy.websites.cookieConfig.set({
       value: {
-        behavior: "reject_third_party",
+        behavior: 'reject_third_party',
         nonPersistentCookies: got.value.nonPersistentCookies
       }
     });
-    console.log("Setting cookie behavior/val=", {
+    console.log('Setting cookie behavior/val=', {
       value: {
-        behavior: "reject_third_party",
+        behavior: 'reject_third_party',
         nonPersistentCookies: got.value.nonPersistentCookies
       }
     });
@@ -130,35 +130,37 @@ function setAllPrivacy() {
 setAllPrivacy();
 
 function ResetPeerConnection() {
-  var webrtc = false;
-  var rtc = browser.privacy.network.peerConnectionEnabled.set({
-    value: webrtc
-  });
-  rtc.then(AssurePeerConnection);
+  function reset(snowflake) {
+    var webrtc = true;
+    console.log("No snowflake plugin found, pre-disabled WebRTC");
+    var rtc = browser.privacy.network.peerConnectionEnabled.set({
+      value: webrtc
+    });
+    rtc.then(AssurePeerConnection);
+  }
+  function snowflake(snowflake) {
+    console.log("snowflake plugin found, leaving WebRTC alone", snowflake);
+    EnablePeerConnection();
+  }
+  var snowflakeInfo = browser.management.get(
+    "{b11bea1f-a888-4332-8d8a-cec2be7d24b9}" // string
+  );
+  snowflakeInfo.then(snowflake, reset);
 }
 
 function EnablePeerConnection() {
-  var webrtc = false;
+  var webrtc = true;
   var rtc = browser.privacy.network.peerConnectionEnabled.set({
     value: webrtc
   });
-  rtc.then(SetupPeerConnection);
-  console.log("Enabled WebRTC");
-}
-
-function SetupPeerConnection() {
-  var webrtc = true;
-  console.log("Pre-disabled WebRTC");
-  let rtc = browser.privacy.network.peerConnectionEnabled.set({
-    value: webrtc
-  });
   rtc.then(AssurePeerConnection);
+  console.log("Enabled WebRTC");
 }
 
 function AssurePeerConnection() {
   function assure(webrtc) {
     browser.privacy.network.peerConnectionEnabled.set({
-      value: webrtc.value
+      value: true
     });
     browser.privacy.network.networkPredictionEnabled.set({
       value: false
@@ -167,7 +169,7 @@ function AssurePeerConnection() {
       value: "proxy_only"
     });
   }
-  rtc = browser.privacy.network.peerConnectionEnabled.get({});
+  let rtc = browser.privacy.network.peerConnectionEnabled.get({});
   rtc.then(assure);
 }
 
@@ -340,7 +342,7 @@ function i2pHost(url) {
 }
 
 function onContextGotLog(contexts) {
-  if (contexts !== null) {
+  if (contexts != null) {
     for (let context of contexts) {
       console.log(context);
     }

proxy.js

@@ -1,18 +1,18 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var webpref = chrome.i18n.getMessage("webPreface");
-var routerpref = chrome.i18n.getMessage("routerPreface");
-var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
+var titlepref = chrome.i18n.getMessage('titlePreface');
+var webpref = chrome.i18n.getMessage('webPreface');
+var routerpref = chrome.i18n.getMessage('routerPreface');
+var routerprefpriv = chrome.i18n.getMessage('routerPrefacePrivate');
 
 browser.privacy.network.peerConnectionEnabled.set({
   value: false
 });
-console.log("Preliminarily disabled WebRTC.");
+console.log('Preliminarily disabled WebRTC.');
 
 chrome.privacy.network.networkPredictionEnabled.set({
   value: false
 });
 chrome.privacy.network.webRTCIPHandlingPolicy.set({
-  value: "disable_non_proxied_udp"
+  value: 'proxy_only'
 });
 
 function shouldProxyRequest(requestInfo) {
@@ -20,14 +20,13 @@ function shouldProxyRequest(requestInfo) {
 }
 
 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 == "firefox-default" || context == "firefox-private") {
+      if (context == 'firefox-default' || context == 'firefox-private') {
         proxy = null;
         return proxy;
       }
@@ -38,18 +37,18 @@ var handleContextProxyRequest = async function(requestDetails) {
             host: getHost(),
             port: getPort()
           };
-          console.log("(proxy)", context.name);
+          /*console.log("(proxy)", context.name);
           console.log("Using", proxy.type);
-          console.log("proxy ", proxy.host + ":" + proxy.port);
+          console.log("proxy ", proxy.host + ":" + proxy.port);*/
           return proxy;
         } else if (context.name == routerpref) {
           if (routerHost(requestDetails.url)) {
             return proxy;
           } else if (!routerHost(requestDetails.url)) {
             proxy = {
-              type: "http",
-              host: "localhost",
-              port: "65535"
+              type: 'http',
+              host: 'localhost',
+              port: '65535'
             };
           }
           proxy = {
@@ -57,30 +56,30 @@ var handleContextProxyRequest = async function(requestDetails) {
             host: getHost(),
             port: getPort()
           };
-          console.log("(proxy)", context.name);
+          /*console.log("(proxy)", context.name);
           console.log("Using", proxy.type);
-          console.log("proxy ", proxy.host + ":" + proxy.port);
+          console.log("proxy ", proxy.host + ":" + proxy.port);*/
           return proxy;
         } else if (context.name == webpref) {
           if (localHost(requestDetails.url)) {
             if (!routerHost(requestDetails.url)) {
               proxy = {
-                type: "http",
-                host: "localhost",
-                port: "65535"
+                type: 'http',
+                host: 'localhost',
+                port: '65535'
               };
             }
           }
-          console.log("(proxy)", context.name);
-          console.log("Using", proxy.type);
-          console.log("proxy ", proxy.host + ":" + proxy.port);
+          console.log('(proxy)', context.name);
+          console.log('Using', proxy.type);
+          console.log('proxy ', proxy.host + ':' + proxy.port);
           return proxy;
         }
       }
       if (!routerHost(requestDetails.url)) {
         if (localHost(requestDetails.url)) {
           console.log(
-            "(proxy) non-routerconsole localhost url, will not interfere",
+            '(proxy) non-routerconsole localhost url, will not interfere',
             requestDetails.url
           );
           /*proxy = {
@@ -100,26 +99,50 @@ var handleContextProxyRequest = async function(requestDetails) {
     };
     var contextGet = async function(tabInfo) {
       try {
-        console.log("(proxy)Tab info from Function", tabInfo);
+        console.log('(proxy)Tab info from Function', tabInfo);
         context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
         return context;
       } catch (error) {
         console.error(error);
-        //return; //"firefox-default";
+        return 'firefox-default';
       }
     };
     var tabGet = async function(tabId) {
       try {
-        console.log("(proxy)Tab ID from Request", tabId);
+        //console.log("(proxy)Tab ID from Request", tabId);
         let tabInfo = await browser.tabs.get(tabId);
         return tabInfo;
       } catch (error) {
-        console.log("(proxy)Tab error", error);
+        console.log('(proxy)Tab error', error);
       }
     };
-
+    if (proxyHost(requestDetails.url)) {
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort()
+      };
+      return proxy;
+    }
+    if (requestDetails.originUrl == browser.runtime.getURL('security.html')) {
+      console.log(
+        '(proxy) extension security URL',
+        browser.runtime.getURL('security.html')
+      );
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort()
+      };
+      return proxy;
+    }
+    if (
+      requestDetails.cookieStoreId == 'firefox-default' ||
+      requestDetails.cookieStoreId == 'firefox-private'
+    ) {
+      return browser.proxy.settings.get({});
+    }
     if (requestDetails.tabId > 0) {
-      console.log("manifest", requestDetails);
       if (proxyHost(requestDetails.url)) {
         proxy = {
           type: getScheme(),
@@ -127,19 +150,20 @@ var handleContextProxyRequest = async function(requestDetails) {
           port: getPort()
         };
         return proxy;
+      } else if (extensionHost(requestDetails.url)) {
+        return;
       } else if (i2pHost(requestDetails.url)) {
-        console.log("(Proxy)I2P URL detected, ");
         var tab = tabGet(requestDetails.tabId);
         requestDetails.tabId = tab;
         var context = tab.then(contextGet);
         var proxy = await context.then(handleProxyRequest);
-        console.log("(proxy)Returning I2P Proxy", proxy);
+        console.log('(proxy)Returning I2P Proxy', proxy);
         return proxy;
       } else {
         var tab = tabGet(requestDetails.tabId);
         var context = tab.then(contextGet);
         var proxy = await context.then(handleProxyRequest);
-        console.log("(proxy)Returning I2P Proxy", proxy);
+        //console.log("(proxy)Returning I2P Proxy", proxy);
         return proxy;
       }
       /*proxy = {};
@@ -147,77 +171,62 @@ var handleContextProxyRequest = async function(requestDetails) {
       return proxy;*/
     }
   } catch (error) {
-    console.log("(proxy)Not using I2P Proxy.", error);
+    console.log('(proxy)Not using I2P Proxy.', error);
   }
-};
-
-var proxy_scheme = "HTTP";
-var proxy_host = "127.0.0.1";
-var proxy_port = "4444";
-var control_host = "127.0.0.1";
-var control_port = "4444";
-var disable_history = false;
+}
 
 function SetupSettings() {
-  console.log("Initialising Settings");
+  console.log('Initialising Settings');
   function onSetupError() {
-    console.log("Settings initialization error");
+    console.log('Settings initialization error');
   }
   //
   function checkSchemeStoredSettings(storedSettings) {
-    if (storedSettings.proxy_scheme === undefined) {
-      proxy_scheme = "http";
-      storedSettings.proxy_scheme = proxy_scheme;
-    } else {
-      proxy_scheme = storedSettings.proxy_scheme;
-    }
-    console.log("Initialising Proxy Scheme", storedSettings.proxy_scheme);
+    if (storedSettings.proxy_scheme == undefined)
+      storedSettings.proxy_scheme = 'http';
+    else proxy_scheme = storedSettings.proxy_scheme;
+
+    console.log('Initialising Proxy Scheme', storedSettings.proxy_scheme);
     setupProxy();
   }
-  var gettingSchemeStoredSettings = browser.storage.local.get("proxy_scheme");
+  var gettingSchemeStoredSettings = browser.storage.local.get('proxy_scheme');
   gettingSchemeStoredSettings.then(checkSchemeStoredSettings, onSetupError);
 
   //
   function checkHostStoredSettings(storedSettings) {
-    if (storedSettings.proxy_host != undefined) {
-      proxy_host = storedSettings.proxy_host;
-    } else {
-      proxy_host = "127.0.0.1";
-      storedSettings.proxy_host = proxy_host;
-    }
-    console.log("Initialising Host", storedSettings.proxy_host);
+    if (storedSettings.proxy_host == undefined)
+      storedSettings.proxy_host = '127.0.0.1';
+    else proxy_host = storedSettings.proxy_host;
+
+    console.log('Initialising Host', storedSettings.proxy_host);
     setupProxy();
   }
-  var gettingHostStoredSettings = browser.storage.local.get("proxy_host");
+  var gettingHostStoredSettings = browser.storage.local.get('proxy_host');
   gettingHostStoredSettings.then(checkHostStoredSettings, onSetupError);
 
   //
   function checkPortStoredSettings(storedSettings) {
-    if (storedSettings.proxy_port != undefined) {
-      proxy_port = storedSettings.proxy_port;
-    } else {
-      proxy_port = "4444";
-      storedSettings.proxy_port = proxy_port;
-    }
-    console.log("Initialising Port", storedSettings.proxy_port);
+    if (storedSettings.proxy_port == undefined)
+      storedSettings.proxy_port = '4444';
+    else proxy_port = storedSettings.proxy_port;
+
+    console.log('Initialising Port', storedSettings.proxy_port);
     setupProxy();
   }
-  var gettingPortStoredSettings = browser.storage.local.get("proxy_port");
+  var gettingPortStoredSettings = browser.storage.local.get('proxy_port');
   gettingPortStoredSettings.then(checkPortStoredSettings, onSetupError);
 
   //
   function checkControlHostStoredSettings(storedSettings) {
-    if (storedSettings.control_host != undefined) {
-      control_host = storedSettings.control_host;
-    } else {
-      control_host = "127.0.0.1";
-      storedSettings.control_host = control_host;
-    }
-    console.log("Initialising Control Host", storedSettings.control_host);
+    if (storedSettings.control_host == undefined)
+      storedSettings.control_host = '127.0.0.1';
+    else control_host = storedSettings.control_host;
+
+    console.log('Initialising Control Host', storedSettings.control_host);
     setupProxy();
   }
   var gettingControlHostStoredSettings = browser.storage.local.get(
-    "control_host"
+    'control_host'
   );
   gettingControlHostStoredSettings.then(
     checkControlHostStoredSettings,
@@ -226,17 +235,15 @@ function SetupSettings() {
 
   //
   function checkControlPortStoredSettings(storedSettings) {
-    if (storedSettings.control_port != undefined) {
-      let control_port = storedSettings.control_port;
-    } else {
-      let new_control_port = "7657";
-      storedSettings.control_port = new_control_port;
-    }
-    console.log("Initialising Control Port", storedSettings.control_port);
+    if (storedSettings.control_port == undefined)
+      storedSettings.control_port = '7657';
+    else control_port = storedSettings.control_port;
+
+    console.log('Initialising Control Port', storedSettings.control_port);
     setupProxy();
   }
   var gettingControlPortStoredSettings = browser.storage.local.get(
-    "control_port"
+    'control_port'
   );
   gettingControlPortStoredSettings.then(
     checkControlPortStoredSettings,
@@ -245,44 +252,33 @@ function SetupSettings() {
 
   //
   function checkHistoryStoredSettings(storedSettings) {
-    if (storedSettings.disable_history != undefined) {
-      disable_history = storedSettings.disable_history;
-    } else {
-      disable_history = false;
-      storedSettings.disable_history = disable_history;
-    }
+    if (storedSettings.disable_history == undefined)
+      storedSettings.disable_history = false;
+    else disable_history = storedSettings.disable_history;
+
     console.log(
-      "Initialising Disabled History",
+      'Initialising Disabled History',
       storedSettings.disable_history
     );
     setupProxy();
   }
   var gettingHistoryStoredSettings = browser.storage.local.get(
-    "disable_history"
+    'disable_history'
   );
   gettingHistoryStoredSettings.then(checkHistoryStoredSettings, onSetupError);
 }
 
 function getScheme() {
-  if (proxy_scheme == undefined) {
-    proxy_scheme = "http";
-  }
-  if (proxy_scheme == "HTTP") {
-    proxy_scheme = "http";
-  }
-  if (proxy_scheme == "SOCKS") {
-    proxy_scheme = "socks";
-  }
-  if (proxy_scheme != "http" && proxy_scheme != "socks") {
-    proxy_scheme = "http";
-  }
-  //console.log("Got i2p proxy scheme:", proxy_scheme);
-  return proxy_scheme;
+  if (proxy_scheme == 'HTTP') return 'http';
+  if (proxy_scheme == 'SOCKS') return 'socks';
+  if (proxy_scheme == 'http') return 'http';
+  if (proxy_scheme == 'socks') return 'socks';
+  else return 'http';
 }
 
 function getHost() {
   if (proxy_host == undefined) {
-    proxy_host = "127.0.0.1";
+    proxy_host = '127.0.0.1';
   }
   return proxy_host;
 }
@@ -290,68 +286,53 @@ function getHost() {
 function getPort() {
   if (proxy_port == undefined) {
     var scheme = getScheme();
-    if (scheme == "socks") {
-      proxy_port = "4446";
-    } else {
-      proxy_port = "4444";
-    }
+    if (scheme == 'socks') proxy_port = '4446';
+    else proxy_port = '4444';
   }
   return proxy_port;
 }
 
-function getControlHost() {
-  if (control_host == undefined) {
-    return "127.0.0.1";
-  }
-  return control_host;
-}
-
-function getControlPort() {
-  if (control_port == undefined) {
-    return "7657";
-  }
-  return control_port;
-}
-
 function setupProxy() {
-  /**/
-  console.log("Setting up Firefox WebExtension proxy");
+  console.log('Setting up Firefox WebExtension proxy');
   browser.proxy.onRequest.addListener(handleContextProxyRequest, {
-    urls: ["<all_urls>"]
+    urls: ['<all_urls>']
   });
-  console.log("i2p settings created for WebExtension Proxy");
-  /**/
+  console.log('i2p settings created for WebExtension Proxy');
 }
 
 function update() {
-  console.log("restoring proxy scheme:", proxy_scheme);
-  console.log("restoring proxy host:", proxy_host);
-  console.log("restoring proxy port:", proxy_port);
-  console.log("restoring control host:", control_host);
-  console.log("restoring control port:", control_port);
+  console.log('restoring proxy scheme:', proxy_scheme);
+  console.log('restoring proxy host:', proxy_host);
+  console.log('restoring proxy port:', proxy_port);
+  console.log('restoring control host:', control_host);
+  console.log('restoring control port:', control_port);
 }
 
 function updateFromStorage() {
-  console.log("updating settings from storage");
+  console.log('updating settings from storage');
+  chrome.storage.local.get(function() {
+    SetupSettings();
+    update();
+    setupProxy();
+  });
   var gettingInfo = browser.runtime.getPlatformInfo();
   gettingInfo.then(got => {
-    if (got.os != "android") {
+    if (got.os != 'android') {
       browser.windows.getAll().then(wins => wins.forEach(themeWindow));
-      chrome.storage.local.get(function() {
-        SetupSettings();
-        update();
-        setupProxy();
-      });
-    } else {
-      chrome.storage.local.get(function() {
-        SetupSettings();
-        update();
-        setupProxy();
-      });
     }
   });
 }
 
+updateFromStorage();
 browser.storage.onChanged.addListener(updateFromStorage);
 SetupSettings();
 setupProxy();
+
+var gettingListenerInfo = browser.runtime.getPlatformInfo();
+gettingListenerInfo.then(got => {
+  browser.windows.onCreated.addListener(() => {
+    chrome.storage.local.get(function() {
+      setupProxy();
+    });
+  });
+});

releases.atom

@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/" xml:lang="en-US">
+  <id>tag:github.com,2008:https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases</id>
+  <link type="text/html" rel="alternate" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases"/>
+  <link type="application/atom+xml" rel="self" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases.atom"/>
+  <title>Release notes from I2P-in-Private-Browsing-Mode-Firefox</title>
+  <updated>2020-03-24T04:22:27Z</updated>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.71</id>
+    <updated>2020-03-24T23:01:20Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.71"/>
+    <title>0.71</title>
+    <enclosure url="magnet:?xt=urn:btih:337ece11e8d9318c0e11d9320e3426fe9ff15556" type="application/x-bittorrent" />
+    <content type="html">&lt;h1&gt;I2P in Private Browsing Mode&lt;/h1&gt;
+&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.71-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Fix incomplete bugfix from 0.69&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Tue, 24 MAR 2020 0:19:59 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.69-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.69</id>
+    <updated>2020-03-24T04:19:44Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.69"/>
+    <title>0.69</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.69-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Add MuWire contextual ID&lt;/li&gt;
+&lt;li&gt;Fix bug occurring on certain modded I2P installs&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Tue, 24 MAR 2020 0:12:02 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.67-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.67</id>
+    <updated>2020-03-18T04:27:30Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.67"/>
+    <title>0.67</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.67-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Tweak some default settings that should have gone into 65&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Tue, 17 MAR 2020 22:58:55 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.65-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.65</id>
+    <updated>2020-03-18T03:01:20Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.65"/>
+    <title>0.65</title>
+    <content type="html">&lt;p&gt;Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.65-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Initial prototype of certs implementation&lt;/li&gt;
+&lt;li&gt;Use &quot;pinned apptabs&quot; to minimize the number of tabs occupied by an app&lt;/li&gt;
+&lt;li&gt;Get ready for self-hosted updates but with bittorrent because it&#39;s cooler&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Tue, 17 MAR 2020 22:58:55 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.63-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.63</id>
+    <updated>2020-03-02T23:01:58Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.63"/>
+    <title>0.63</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.63-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;other containerizers bugfix&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Mon, 02 MAR 2020 17:54:26 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.61-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.61</id>
+    <updated>2020-03-02T22:48:06Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.61"/>
+    <title>0.61</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.61-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;other containerizers bugfix&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Mon, 02 MAR 2020 17:46:24 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.59-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.59</id>
+    <updated>2020-02-26T03:10:23Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.59"/>
+    <title>0.59</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.59-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;transmission-rpc based torrent controls&lt;/li&gt;
+&lt;li&gt;bugfixes&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Tue, 25 FEB 2020 20:52:19 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.57-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.57</id>
+    <updated>2020-01-06T17:16:33Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.57"/>
+    <title>0.57</title>
+    <content type="html">&lt;h1&gt;I2P in Private Browsing Mode&lt;/h1&gt;
+&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.57-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Snowflake compatibility&lt;/li&gt;
+&lt;li&gt;Lots of small compatibility fixes&lt;/li&gt;
+&lt;li&gt;More linter errors&lt;/li&gt;
+&lt;li&gt;Make it multilingual again&lt;/li&gt;
+&lt;li&gt;Distribute a torrent and a magnet link with the plugin of the plugin&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Thu, 4 JAN 2019 16:43:58 -0400&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/docs</id>
+    <updated>2020-01-03T18:01:49Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/docs"/>
+    <title>Documentation</title>
+    <content type="html">&lt;p&gt;PDF&#39;s and text about the extension&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.55</id>
+    <updated>2020-01-06T17:17:01Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.55"/>
+    <title>0.55</title>
+    <content type="html">&lt;h1&gt;I2P in Private Browsing Mode&lt;/h1&gt;
+&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.55-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Get rid of Web Browsing context launcher&lt;/li&gt;
+&lt;li&gt;Fix linter errors&lt;/li&gt;
+&lt;li&gt;Tolerate themes&lt;/li&gt;
+&lt;li&gt;Tolerate other containerizers&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Thu, 2 JAN 2019 16:47:33 -0400&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+</feed>

scrub.js

@@ -1,27 +1,28 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var webpref = chrome.i18n.getMessage("webPreface");
-var routerpref = chrome.i18n.getMessage("routerPreface");
-var mailpref = chrome.i18n.getMessage("mailPreface");
-var torrentpref = chrome.i18n.getMessage("torrentPreface");
-var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
-var localpref = chrome.i18n.getMessage("localPreface");
+var titlepref = chrome.i18n.getMessage('titlePreface');
+var webpref = chrome.i18n.getMessage('webPreface');
+var routerpref = chrome.i18n.getMessage('routerPreface');
+var mailpref = chrome.i18n.getMessage('mailPreface');
+var torrentpref = chrome.i18n.getMessage('torrentPreface');
+var tunnelpref = chrome.i18n.getMessage('i2ptunnelPreface');
+var localpref = chrome.i18n.getMessage('localPreface');
+var extensionpref = chrome.i18n.getMessage('extensionPreface');
+var muwirepref = chrome.i18n.getMessage('muwirePreface');
 
 var contextScrub = async function(requestDetails) {
   function onHeaderError() {
-    console.log("Header scrub error");
+    console.log('Header scrub error');
   }
-  console.log("(scrub)Scrubbing info from contextualized request");
+  //console.log("(scrub)Scrubbing info from contextualized request");
   try {
     var headerScrub = function(context) {
-      var ua = "MYOB/6.66 (AN/ON)";
+      var ua = 'MYOB/6.66 (AN/ON)';
       if (!context) {
-        console.log("Context not found", context);
       } else if (context.name == titlepref) {
         if (i2pHost(requestDetails.url)) {
           for (var header of requestDetails.requestHeaders) {
-            if (header.name.toLowerCase() === "user-agent") {
+            if (header.name.toLowerCase() === 'user-agent') {
               header.value = ua;
-              console.log("(scrub)User-Agent header modified", header.value);
+              console.log('(scrub)User-Agent header modified', header.value);
             }
           }
         }
@@ -31,9 +32,9 @@ var contextScrub = async function(requestDetails) {
       } else if (context.name == routerpref) {
         if (i2pHost(requestDetails.url)) {
           for (var header of requestDetails.requestHeaders) {
-            if (header.name.toLowerCase() === "user-agent") {
+            if (header.name.toLowerCase() === 'user-agent') {
               header.value = ua;
-              console.log("(scrub)User-Agent header modified", header.value);
+              console.log('(scrub)User-Agent header modified', header.value);
             }
           }
         }
@@ -44,7 +45,7 @@ var contextScrub = async function(requestDetails) {
     };
     var contextGet = async function(tabInfo) {
       try {
-        console.log("(scrub)Tab info from Function", tabInfo);
+        //console.log("(scrub)Tab info from Function", tabInfo);
         let context = await browser.contextualIdentities.get(
           tabInfo.cookieStoreId
         );
@@ -55,7 +56,7 @@ var contextScrub = async function(requestDetails) {
     };
     var tabGet = async function(tabId) {
       try {
-        console.log("(scrub)Tab ID from Request", tabId);
+        //console.log("(scrub)Tab ID from Request", tabId);
         let tabInfo = await browser.tabs.get(tabId);
         return tabInfo;
       } catch (error) {
@@ -67,31 +68,79 @@ var contextScrub = async function(requestDetails) {
       var context = {};
       var req = {};
       if (i2pHost(requestDetails.url)) {
-        console.log("(scrub)I2P URL detected, ");
+        //console.log("(scrub)I2P URL detected, ");
         tab = tabGet(requestDetails.tabId);
         context = tab.then(contextGet, onHeaderError);
         req = await context.then(headerScrub, onHeaderError);
-        console.log("(scrub)Scrubbing I2P Request", req);
+        //console.log("(scrub)Scrubbing I2P Request", req);
         return req;
       } else if (routerHost(requestDetails.url)) {
         tab = tabGet(requestDetails.tabId);
         context = tab.then(contextGet, onHeaderError);
         req = await context.then(headerScrub, onHeaderError);
-        console.log("(scrub)Scrubbing non-I2P Request", req);
+        //console.log("(scrub)Scrubbing non-I2P Request", req);
         return req;
       }
       return req;
     }
   } catch (error) {
-    console.log("(scrub)Not scrubbing non-I2P request.", error);
+    console.log('(scrub)Not scrubbing non-I2P request.', error);
   }
-};
+}
 
-var contextSetup = async function(requestDetails) {
-  function onContextError() {
-    console.log("Context launcher error");
+var notMyContextNotMyProblem = async function() {
+  var contexts = await browser.contextualIdentities.query({});
+  var context1 = await browser.contextualIdentities.query({
+    name: titlepref
+  });
+  var context2 = await browser.contextualIdentities.query({
+    name: routerpref
+  });
+  var context3 = await browser.contextualIdentities.query({
+    name: mailpref
+  });
+  var context4 = await browser.contextualIdentities.query({
+    name: torrentpref
+  });
+  var context5 = await browser.contextualIdentities.query({
+    name: tunnelpref
+  });
+  var context6 = await browser.contextualIdentities.query({
+    name: localpref
+  });
+  var context7 = await browser.contextualIdentities.query({
+    name: muwirepref
+  });
+  var othercontexts = [];
+  console.log('Contexts:', contexts);
+  for (context in contexts) {
+    if (
+      contexts[context].cookieStoreId == context1[0].cookieStoreId ||
+      contexts[context].cookieStoreId == context2[0].cookieStoreId ||
+      contexts[context].cookieStoreId == context3[0].cookieStoreId ||
+      contexts[context].cookieStoreId == context4[0].cookieStoreId ||
+      contexts[context].cookieStoreId == context5[0].cookieStoreId ||
+      contexts[context].cookieStoreId == context6[0].cookieStoreId ||
+      contexts[context].cookieStoreId == context7[0].cookieStoreId
+    ) {
+      console.log(
+        'Context found',
+        contexts[context].cookieStoreId,
+        'is my responsibility'
+      );
+    } else {
+      //console.log("Context found", contexts[context].cookieStoreId, "is not my responsibility")
+      othercontexts.push(contexts[context]);
+    }
   }
-  console.log("(isolate)Forcing I2P requests into context");
+  return othercontexts;
+}
+
+var contextSetup = function(requestDetails) {
+  function onContextError() {
+    console.log('Context launcher error');
+  }
+  //console.log("(isolate)Forcing I2P requests into context");
   try {
     var i2pTabFind = async function(tabId) {
       try {
@@ -99,17 +148,20 @@ var contextSetup = async function(requestDetails) {
           name: titlepref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log("(isolate) I2P context", context[0].cookieStoreId);
-          console.log("tab context", tabId.cookieStoreId);
           function Create() {
             function onCreated(tab) {
               function closeOldTab() {
                 if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
+                  console.log('(isolate) Closing un-isolated tab', tabId.id);
+                  console.log('in favor of', tab.id);
+                  console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
                 }
+                browser.pageAction.setPopup({
+                  tabId: tabId.id,
+                  popup: 'security.html'
+                });
+                browser.pageAction.show(tabId.id);
               }
               closeOldTab(tab);
             }
@@ -125,7 +177,7 @@ var contextSetup = async function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var routerTabFind = async function(tabId) {
@@ -134,22 +186,28 @@ var contextSetup = async function(requestDetails) {
           name: routerpref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log("(isolate) I2P context", context[0].cookieStoreId);
-          console.log("tab context", tabId.cookieStoreId);
           function Create() {
             function onCreated(tab) {
-              function closeOldTab() {
+              function closeOldTab(tabs) {
                 if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
+                  console.log('(isolate) Closing un-isolated tab', tabId.id);
+                  console.log('in favor of', tab.id);
+                  console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
                 }
+                for (index = 0; index < tabs.length; index++) {
+                  if (index != tabs.length - 1)
+                    browser.tabs.remove(tabs[index].id);
+                }
               }
-              closeOldTab(tab);
+              var pins = browser.tabs.query({
+                cookieStoreId: context[0].cookieStoreId
+              });
+              pins.then(closeOldTab, onError);
             }
             var created = browser.tabs.create({
               active: true,
+              pinned: true,
               cookieStoreId: context[0].cookieStoreId,
               url: requestDetails.url
             });
@@ -160,7 +218,7 @@ var contextSetup = async function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var i2ptunnelTabFind = async function(tabId) {
@@ -169,22 +227,28 @@ var contextSetup = async function(requestDetails) {
           name: tunnelpref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log("(isolate) I2P context", context[0].cookieStoreId);
-          console.log("tab context", tabId.cookieStoreId);
           function Create() {
             function onCreated(tab) {
-              function closeOldTab() {
+              function closeOldTab(tabs) {
                 if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
+                  console.log('(isolate) Closing un-isolated tab', tabId.id);
+                  console.log('in favor of', tab.id);
+                  console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
                 }
+                for (index = 0; index < tabs.length; index++) {
+                  if (index != tabs.length - 1)
+                    browser.tabs.remove(tabs[index].id);
+                }
               }
-              closeOldTab(tab);
+              var pins = browser.tabs.query({
+                cookieStoreId: context[0].cookieStoreId
+              });
+              pins.then(closeOldTab, onError);
             }
             var created = browser.tabs.create({
               active: true,
+              pinned: true,
               cookieStoreId: context[0].cookieStoreId,
               url: requestDetails.url
             });
@@ -195,7 +259,7 @@ var contextSetup = async function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var snarkTabFind = async function(tabId) {
@@ -204,22 +268,28 @@ var contextSetup = async function(requestDetails) {
           name: torrentpref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log("(isolate) I2P context", context[0].cookieStoreId);
-          console.log("tab context", tabId.cookieStoreId);
           function Create() {
             function onCreated(tab) {
-              function closeOldTab() {
+              function closeOldTab(tabs) {
                 if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
+                  console.log('(isolate) Closing un-isolated tab', tabId.id);
+                  console.log('in favor of', tab.id);
+                  console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
                 }
+                for (index = 0; index < tabs.length; index++) {
+                  if (index != tabs.length - 1)
+                    browser.tabs.remove(tabs[index].id);
+                }
               }
-              closeOldTab(tab);
+              var pins = browser.tabs.query({
+                cookieStoreId: context[0].cookieStoreId
+              });
+              pins.then(closeOldTab, onError);
             }
             var created = browser.tabs.create({
               active: true,
+              pinned: true,
               cookieStoreId: context[0].cookieStoreId,
               url: requestDetails.url
             });
@@ -230,7 +300,48 @@ var contextSetup = async function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
+      }
+    };
+    var muwireTabFind = async function(tabId) {
+      try {
+        var context = await browser.contextualIdentities.query({
+          name: muwirepref
+        });
+        if (tabId.cookieStoreId != context[0].cookieStoreId) {
+          function Create() {
+            function onCreated(tab) {
+              function closeOldTab(tabs) {
+                if (tabId.id != tab.id) {
+                  console.log('(isolate) Closing un-isolated tab', tabId.id);
+                  console.log('in favor of', tab.id);
+                  console.log('with context', tab.cookieStoreId);
+                  browser.tabs.remove(tabId.id);
+                }
+                for (index = 0; index < tabs.length; index++) {
+                  if (index != tabs.length - 1)
+                    browser.tabs.remove(tabs[index].id);
+                }
+              }
+              var pins = browser.tabs.query({
+                cookieStoreId: context[0].cookieStoreId
+              });
+              pins.then(closeOldTab, onError);
+            }
+            var created = browser.tabs.create({
+              active: true,
+              pinned: true,
+              cookieStoreId: context[0].cookieStoreId,
+              url: requestDetails.url
+            });
+            created.then(onCreated, onContextError);
+          }
+          var gettab = browser.tabs.get(tabId.id);
+          gettab.then(Create, onContextError);
+          return tabId;
+        }
+      } catch (error) {
+        console.log('(isolate)Context Error', error);
       }
     };
     var mailTabFind = async function(tabId) {
@@ -239,22 +350,28 @@ var contextSetup = async function(requestDetails) {
           name: mailpref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log("(isolate) I2P context", context[0].cookieStoreId);
-          console.log("tab context", tabId.cookieStoreId);
           function Create() {
             function onCreated(tab) {
-              function closeOldTab() {
+              function closeOldTab(tabs) {
                 if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
+                  console.log('(isolate) Closing un-isolated tab', tabId.id);
+                  console.log('in favor of', tab.id);
+                  console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
                 }
+                for (index = 0; index < tabs.length; index++) {
+                  if (index != tabs.length - 1)
+                    browser.tabs.remove(tabs[index].id);
+                }
               }
-              closeOldTab(tab);
+              var pins = browser.tabs.query({
+                cookieStoreId: context[0].cookieStoreId
+              });
+              pins.then(closeOldTab, onError);
             }
             var created = browser.tabs.create({
               active: true,
+              pinned: true,
               cookieStoreId: context[0].cookieStoreId,
               url: requestDetails.url
             });
@@ -265,7 +382,7 @@ var contextSetup = async function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var localTabFind = async function(tabId) {
@@ -274,15 +391,13 @@ var contextSetup = async function(requestDetails) {
           name: localpref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log("(isolate) I2P context", context[0].cookieStoreId);
-          console.log("tab context", tabId.cookieStoreId);
           function Create() {
             function onCreated(tab) {
               function closeOldTab() {
                 if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
+                  console.log('(isolate) Closing un-isolated tab', tabId.id);
+                  console.log('in favor of', tab.id);
+                  console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
                 }
               }
@@ -300,77 +415,107 @@ var contextSetup = async function(requestDetails) {
           return tabId;
         }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
-    var anyTabFind = async function(tabId) {
+    var normalTabFind = async function(tabId) {
+      if (tabId == undefined) {
+        return;
+      }
       try {
-        var context = await browser.contextualIdentities.query({
-          name: webpref
+        var anoncontext = await browser.contextualIdentities.query({
+          name: titlepref
         });
-        console.log("(ISOLATE)", tabId.cookieStoreId);
-        if (
-          tabId.cookieStoreId == "firefox-default" ||
-          tabId.cookieStoreId == "firefox-private"
-        ) {
-          if (tabId.cookieStoreId != context[0].cookieStoreId) {
-            console.log("(isolate) I2P context", context[0].cookieStoreId);
-            console.log("tab context", tabId.cookieStoreId);
-            function Create() {
-              function onCreated(tab) {
-                function closeOldTab() {
-                  if (tabId.id != tab.id) {
-                    console.log("(isolate) Closing un-isolated tab", tabId.id);
-                    console.log("in favor of", tab.id);
-                    console.log("with context", tab.cookieStoreId);
-                    browser.tabs.remove(tabId.id);
-                  }
-                }
-                closeOldTab(tab);
-              }
-              var created = browser.tabs.create({
-                active: true,
-                cookieStoreId: context[0].cookieStoreId,
-                url: requestDetails.url
-              });
-              created.then(onCreated, onContextError);
-            }
-            var gettab = browser.tabs.get(tabId.id);
-            gettab.then(Create, onContextError);
-            return tabId;
+        var localcontext = await browser.contextualIdentities.query({
+          name: localpref
+        });
+        var othercontexts = await notMyContextNotMyProblem();
+        var nmp = false;
+        for (context in othercontexts) {
+          if (tabId.cookieStoreId == othercontexts[context].cookieStoreId) {
+            console.log('Not my problem');
+            nmp = true;
           }
         }
+        if (
+          tabId.cookieStoreId == 'firefox-default' ||
+          tabId.cookieStoreId == 'firefox-private' ||
+          tabId.cookieStoreId == anoncontext[0].cookieStoreId ||
+          tabId.cookieStoreId == localcontext[0].cookieStoreId ||
+          nmp
+        ) {
+          console.log(
+            '(ISOLATE)',
+            tabId.cookieStoreId,
+            'not',
+            anoncontext[0].cookieStoreId,
+            localcontext[0].cookieStoreId
+          );
+          return;
+        } else {
+          function Create() {
+            function onCreated(tab) {
+              function closeOldTab() {
+                if (
+                  tabId.id != tab.id &&
+                  tabId.cookieStoreId != tab.cookieStoreId
+                ) {
+                  console.log(
+                    '(isolate) Closing isolated tab',
+                    tabId.id,
+                    'with context',
+                    tabId.cookieStoreId
+                  );
+                  console.log(
+                    '(isolate) in favor of',
+                    tab.id,
+                    'with context',
+                    tab.cookieStoreId
+                  );
+                  browser.tabs.remove(tabId.id);
+                }
+              }
+              closeOldTab(tab);
+            }
+            var created = browser.tabs.create({
+              active: true,
+              cookieStoreId: 'firefox-default',
+              url: requestDetails.url
+            });
+            created.then(onCreated, onContextError);
+          }
+          var gettab = browser.tabs.get(tabId.id);
+          gettab.then(Create, onContextError);
+          return tabId;
+        }
       } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.log('(isolate)Context Error', error);
       }
     };
     var tabGet = async function(tabId) {
       try {
-        console.log("(isolate)Tab ID from Request", tabId);
+        //console.log("(isolate)Tab ID from Request", tabId);
         let tabInfo = await browser.tabs.get(tabId);
         return tabInfo;
       } catch (error) {
-        console.log("(isolate)Tab error", error);
+        console.log('(isolate)Tab error', error);
       }
     };
     if (requestDetails == undefined) {
       return requestDetails;
     }
+    if (proxyHost(requestDetails.url)) {
+      setcookie = browser.cookies.set({
+        firstPartyDomain: i2pHostName(requestDetails.url),
+        url: requestDetails.url,
+        secure: true
+      });
+      setcookie.then(onContextGotLog, onContextError);
+      return requestDetails;
+    }
+
     if (requestDetails.tabId > 0) {
-      if (proxyHost(requestDetails.url)) {
-        setcookie = browser.cookies.set({
-          firstPartyDomain: i2pHostName(requestDetails.url),
-          url: requestDetails.url,
-          secure: true
-        });
-        setcookie.then(onContextGotLog, onContextError);
-        return requestDetails;
-      }
-      console.log("(isolate)Request Details", requestDetails);
       var tab = tabGet(requestDetails.tabId);
-      if (extensionHost(requestDetails.url)) {
-        return requestDetails;
-      }
       if (i2pHost(requestDetails.url)) {
         var setcookie = browser.cookies.set({
           firstPartyDomain: i2pHostName(requestDetails.url),
@@ -381,45 +526,51 @@ var contextSetup = async function(requestDetails) {
         var i2ptab = tab.then(i2pTabFind, onContextError);
         return requestDetails;
       }
+      if (extensionHost(requestDetails)) {
+        return requestDetails;
+      }
       let localhost = localHost(requestDetails.url);
       let routerhost = routerHost(requestDetails.url);
-      if (!routerhost) {
-        if (localhost) {
-          var localtab = tab.then(localTabFind, onContextError);
-          return requestDetails;
-        }
-      }
       if (routerhost) {
-        if (routerhost === "i2ptunnelmgr") {
+        if (routerhost === 'i2ptunnelmgr') {
           var tunneltab = tab.then(i2ptunnelTabFind, onContextError);
           return requestDetails;
-        } else if (routerhost === "i2psnark") {
+        } else if (routerhost === 'i2psnark') {
           var snarktab = tab.then(snarkTabFind, onContextError);
           return requestDetails;
-        } else if (routerhost === "webmail") {
+        } else if (routerhost === 'webmail') {
           var mailtab = tab.then(mailTabFind, onContextError);
           return requestDetails;
-        } else if (routerhost === "routerconsole") {
+        } else if (routerhost === 'muwire') {
+          var routertab = tab.then(muwireTabFind, onContextError);
+          return requestDetails;
+        } else if (routerhost === 'routerconsole') {
           var routertab = tab.then(routerTabFind, onContextError);
           return requestDetails;
         }
       } else {
+        if (localhost) {
+          var localtab = tab.then(localTabFind, onContextError);
+          return requestDetails;
+        }
+        var normalTab = tab.then(normalTabFind, onContextError);
         return requestDetails;
+        //return requestDetails;
       }
     }
   } catch (error) {
-    console.log("(isolate)Not an I2P request, blackholing", error);
+    console.log('(isolate)Not an I2P request, blackholing', error);
   }
 };
 
 browser.webRequest.onBeforeRequest.addListener(
   contextSetup,
-  { urls: ["<all_urls>"] },
-  ["blocking"]
+  { urls: ['<all_urls>'] },
+  ['blocking']
 );
 
 browser.webRequest.onBeforeSendHeaders.addListener(
   contextScrub,
-  { urls: ["<all_urls>"] },
-  ["blocking", "requestHeaders"]
+  { urls: ['<all_urls>'] },
+  ['blocking', 'requestHeaders']
 );

search.css

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

security.html

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

sidebar.css

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

toopie.html

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

torrent/README.md

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

torrent/UNLICENSE

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

torrent/background.js

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

torrent/common.js

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

torrent/index.html

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

torrent/popup.js

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

window.html

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