From e79b6c7d22d2112ebf590d89ff8aaf20f1dbe5fe Mon Sep 17 00:00:00 2001 From: idk Date: Sat, 4 Jan 2020 02:35:31 -0500 Subject: [PATCH 1/3] add images to deb, plugin builds so that the homepage is also embedded in the plugin. --- Makefile | 1 + debian/rules | 1 + home.css | 2 +- manifest.json | 4 ++-- scrub.js | 6 +++--- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5530482..4f76686 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ install: uninstall 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 ./*.png $(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 \ diff --git a/debian/rules b/debian/rules index 12647cd..123285b 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,7 @@ override_dh_auto_install: 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 ./*.png $$(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 \ diff --git a/home.css b/home.css index d279a5c..9fdf1f3 100644 --- a/home.css +++ b/home.css @@ -203,8 +203,8 @@ li { border-radius: 2px; box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc } -#controlExplain, #applicationExplain, +#controlExplain, #linksExplain { min-height: 5rem; padding: .5rem; diff --git a/manifest.json b/manifest.json index 4558c71..9bd5a77 100644 --- a/manifest.json +++ b/manifest.json @@ -23,8 +23,8 @@ ], "manifest_version": 2, "name": "__MSG_extensionName__", - "version": "0.54", - "version_name": "0.54", + "version": "0.55", + "version_name": "0.55", "description": "__MSG_extensionDescription__", "homepage_url": "https://github.com/eyedeekay/i2psetproxy.js", "icons": { diff --git a/scrub.js b/scrub.js index 1cc4f69..8945a94 100644 --- a/scrub.js +++ b/scrub.js @@ -356,6 +356,9 @@ var contextSetup = async function(requestDetails) { if (requestDetails == undefined) { return requestDetails; } + if (extensionHost(requestDetails.url)) { + return requestDetails; + } if (requestDetails.tabId > 0) { if (proxyHost(requestDetails.url)) { setcookie = browser.cookies.set({ @@ -368,9 +371,6 @@ var contextSetup = async function(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), From 7946b7592fb2cc79eba9675eebd0c82faf572a60 Mon Sep 17 00:00:00 2001 From: idk Date: Sat, 4 Jan 2020 02:41:44 -0500 Subject: [PATCH 2/3] try something --- Makefile | 2 ++ README.md | 8 ++++++++ debian/rules | 1 + index.html | 11 ++++++++++- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4f76686..c847620 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ install: uninstall cp ./*.md $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/ cp ./*.xpi $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/ cp ./*.png $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/ + cp ./*.torrent $(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 \ @@ -206,6 +207,7 @@ torrent: -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 + ln -sf "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "./i2ppb@eyedeekay.github.io.xpi.torrent" 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" diff --git a/README.md b/README.md index f744a65..ab8cebc 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,14 @@ and then you can install it with: sudo apt install ../i2psetproxy.js_*.deb +Bittorrent Download: +-------------------- + +The self-hosted plugin is available from I2P both within the I2P and Clearnet +Bittorrent network. + + * [Get the .torrent file](./i2ppb@eyedeekay.github.io.xpi.torrent) + Usage: ------ diff --git a/debian/rules b/debian/rules index 123285b..0a3a9ec 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,7 @@ override_dh_auto_install: 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 ./*.torrent $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/ cp ./*.png $$(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/ diff --git a/index.html b/index.html index 12f9857..3fccb7b 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ I2P in Private Browsing Mode -

i2psetproxy.js

+

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 @@ -35,6 +35,15 @@ command:

    sudo apt install ../i2psetproxy.js_*.deb
+

Bittorrent Download:

+ +

The self-hosted plugin is available from I2P both within the I2P and Clearnet +Bittorrent network.

+ + +

Usage: