idk/I2P_in_Private_Browsing_Mode_for_Firefox
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

remove tabfind. Never create a window, ever.

Browse Source
This commit is contained in:
idk
2019-11-24 23:29:06 -05:00
parent 94f0124f0f
commit acd7adc9c1
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
proxy.js
View File

@@ -125,14 +125,6 @@ var handleContextProxyRequest = async function(requestDetails) {
console.log("(proxy)Context Error", error);
}
};
var tabFind = async function(tabId) {
try {
return tabId;
} catch (error) {
let tabInfo = await browser.tabs.getCurrent();
return tabInfo;
}
};
var tabGet = async function(tabId) {
try {
console.log("(proxy)Tab ID from Request", tabId);
@@ -155,9 +147,8 @@ var handleContextProxyRequest = async function(requestDetails) {
} else if (i2pHost(requestDetails.url)) {
console.log("(Proxy)I2P URL detected, ");
var tab = tabGet(requestDetails.tabId);
var mtab = tab.then(tabFind);
requestDetails.tabId = mtab;
var context = mtab.then(contextGet);
requestDetails.tabId = tab;
var context = tab.then(contextGet);
var proxy = await context.then(handleProxyRequest);
console.log("(proxy)Returning I2P Proxy", proxy);
return proxy;

15
scrub.js
View File

@@ -55,19 +55,13 @@ var contextScrub = async function(requestDetails) {
console.log("(scrub)Context Error", error);
}
};
var tabFind = async function(tabId) {
try {
return tabId;
} catch (error) {
console.log("(scrub)Context Error", error);
}
};
var tabGet = async function(tabId) {
try {
console.log("(scrub)Tab ID from Request", tabId);
let tabInfo = await browser.tabs.get(tabId);
return tabInfo;
} catch (error) {
console.log("(scrub)Context Error", error);
let tabInfo = await browser.tabs.getCurrent();
return tabInfo;
}
@@ -79,8 +73,7 @@ var contextScrub = async function(requestDetails) {
if (i2pHost(requestDetails.url)) {
console.log("(Proxy)I2P URL detected, ");
tab = tabGet(requestDetails.tabId);
var mtab = tab.then(tabFind, onError);
context = mtab.then(contextGet, onError);
context = tab.then(contextGet, onError);
req = await context.then(headerScrub, onError);
console.log("(scrub)Scrubbing I2P Request", req);
return req;
@@ -101,7 +94,7 @@ var contextScrub = async function(requestDetails) {
var contextSetup = async function(requestDetails) {
console.log("(isolate)Forcing I2P requests into context");
try {
var tabFind = async function(tabId) {
var i2pTabFind = async function(tabId) {
try {
var context = await browser.contextualIdentities.query({
name: titlepref
@@ -328,7 +321,7 @@ var contextSetup = async function(requestDetails) {
});
setcookie.then(onContextGotLog, onError);
var tab = tabGet(requestDetails.tabId);
var mtab = tab.then(tabFind, onError);
var mtab = tab.then(i2pTabFind, onError);
return requestDetails;
}
let routerhost = routerHost(requestDetails.url);