aboutsummaryrefslogtreecommitdiffstats
path: root/src/pages/background
diff options
context:
space:
mode:
authorManeraKai <manerakai@protonmail.com>2022-05-21 16:38:28 +0300
committerManeraKai <manerakai@protonmail.com>2022-05-21 16:38:28 +0300
commit68f9fbb3f7862dd9f854a11bc74525985ddbb9c9 (patch)
treede474998634ef4fd0ed26859ba88653bbd162a90 /src/pages/background
parentHiding popup buttons when not available (diff)
downloadlibredirect-68f9fbb3f7862dd9f854a11bc74525985ddbb9c9.zip
Fixed buttons in the general tab
Diffstat (limited to 'src/pages/background')
-rw-r--r--src/pages/background/background.js35
-rw-r--r--src/pages/background/incognito.html30
-rw-r--r--src/pages/background/incognito.js29
3 files changed, 62 insertions, 32 deletions
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index d8f0bb3f..9eedc308 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -1,6 +1,8 @@
"use strict";
import generalHelper from "../../assets/javascripts/helpers/general.js";
+import utils from "../../assets/javascripts/helpers/utils.js";
+
import youtubeHelper from "../../assets/javascripts/helpers/youtube/youtube.js";
import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js";
import twitterHelper from "../../assets/javascripts/helpers/twitter.js";
@@ -16,7 +18,7 @@ import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js";
import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js";
import peertubeHelper from "../../assets/javascripts/helpers/peertube.js";
import lbryHelper from "../../assets/javascripts/helpers/lbry.js";
-import utils from "../../assets/javascripts/helpers/utils.js";
+
window.browser = window.browser || window.chrome;
@@ -35,6 +37,7 @@ browser.runtime.onInstalled.addListener(
if (details.reason == 'install') {
fetch('/instances/blocklist.json').then(response => response.text()).then(async data => {
await browser.storage.local.set({ cloudflareList: JSON.parse(data) })
+ generalHelper.initDefaults();
youtubeHelper.initDefaults();
youtubeMusicHelper.initDefaults();
twitterHelper.initDefaults();
@@ -56,10 +59,6 @@ browser.runtime.onInstalled.addListener(
)
async function wholeInit() {
- await mapsHelper.init();
- await sendTargetsHelper.init();
- await peertubeHelper.init();
- await generalHelper.init();
}
let incognitoInit = false;
@@ -104,10 +103,10 @@ browser.webRequest.onBeforeRequest.addListener(
if (
details.frameAncestors && details.frameAncestors.length > 0 &&
- generalHelper.isException(new URL(details.frameAncestors[0].url))
+ await generalHelper.isException(new URL(details.frameAncestors[0].url))
) newUrl = null;
- if (generalHelper.isException(url)) newUrl = 'BYPASSTAB';
+ if (await generalHelper.isException(url)) newUrl = 'BYPASSTAB';
if (BYPASSTABs.includes(details.tabId)) newUrl = null;
@@ -117,7 +116,7 @@ browser.webRequest.onBeforeRequest.addListener(
return { cancel: true };
}
else if (newUrl === 'BYPASSTAB') {
- console.log(`Bybassed ${details.tabId} ${url}`);
+ console.log(`Bypassed ${details.tabId} ${url}`);
if (!BYPASSTABs.includes(details.tabId)) BYPASSTABs.push(details.tabId);
return null;
}
@@ -180,9 +179,21 @@ async function redirectOfflineInstance(url, tabId) {
}
}
let counter = 0;
+
+function isAutoRedirect() {
+ return new Promise(resolve => {
+ browser.storage.local.get('autoRedirect',
+ r => {
+ if (r.autoRedirect == true) resolve(true)
+ else resolve(false)
+ }
+ )
+ })
+}
+
browser.webRequest.onResponseStarted.addListener(
- details => {
- if (!generalHelper.getAutoRedirect()) return null;
+ async details => {
+ if (!await isAutoRedirect()) return null;
if (details.type == 'main_frame' && (details.statusCode == 502 || details.statusCode == 503 || details.statusCode == 504)) {
// if (details.type == 'main_frame' && details.statusCode >= 200) {
@@ -195,8 +206,8 @@ browser.webRequest.onResponseStarted.addListener(
)
browser.webRequest.onErrorOccurred.addListener(
- details => {
- if (!generalHelper.getAutoRedirect()) return;
+ async details => {
+ if (!await isAutoRedirect()) return;
if (details.type == 'main_frame') {
const url = new URL(details.url);
redirectOfflineInstance(url, details.tabId);
diff --git a/src/pages/background/incognito.html b/src/pages/background/incognito.html
index 57d0bfdb..a618cdb6 100644
--- a/src/pages/background/incognito.html
+++ b/src/pages/background/incognito.html
@@ -3,7 +3,35 @@
<head>
<meta charset="utf-8" />
- <script type="module" src="incognito.js"></script>
+ <meta charset="UTF-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <title data-localise="__MSG_instanceIsOff__">Initializing Cookies</title>
+ <link href="../stylesheets/styles.css" rel="stylesheet" />
+ <style>
+ body {
+ margin: 0;
+ padding: 0;
+ height: 100vh;
+ width: 100vw;
+ flex-wrap: wrap;
+ justify-content: center;
+ align-items: center;
+ font-size: 30px;
+ display: flex;
+ }
+
+ div {
+ text-align: center;
+ }
+ </style>
</head>
+<body>
+ <div>
+ <p>Initializing Cookies</p>
+ </div>
+ <script type="module" src="incognito.js"></script>
+</body>
+
</html> \ No newline at end of file
diff --git a/src/pages/background/incognito.js b/src/pages/background/incognito.js
index 16eccf74..600591d3 100644
--- a/src/pages/background/incognito.js
+++ b/src/pages/background/incognito.js
@@ -1,30 +1,21 @@
-"use strict";
-
import youtubeHelper from "../../assets/javascripts/helpers/youtube/youtube.js";
import twitterHelper from "../../assets/javascripts/helpers/twitter.js";
-import instagramHelper from "../../assets/javascripts/helpers/instagram.js";
import redditHelper from "../../assets/javascripts/helpers/reddit.js";
import searchHelper from "../../assets/javascripts/helpers/search.js";
import translateHelper from "../../assets/javascripts/helpers/translate/translate.js";
-import mapsHelper from "../../assets/javascripts/helpers/maps.js";
import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js";
-import mediumHelper from "../../assets/javascripts/helpers/medium.js";
-import imgurHelper from "../../assets/javascripts/helpers/imgur.js";
import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js";
-import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js";
-import peertubeHelper from "../../assets/javascripts/helpers/peertube.js";
-import lbryHelper from "../../assets/javascripts/helpers/lbry.js";
-import generalHelper from "../../assets/javascripts/helpers/general.js";
-import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js";
window.browser = window.browser || window.chrome;
-async function wholeInit() {
- await youtubeMusicHelper.init();
- await mapsHelper.init();
- await sendTargetsHelper.init();
- await peertubeHelper.init();
- await generalHelper.init();
-}
-await wholeInit();
+await youtubeHelper.setInvidiousCookies();
+await translateHelper.setSimplyTranslateCookies();
+await twitterHelper.setNitterCookies();
+await wikipediaHelper.setWikilessCookies();
+await searchHelper.setSearxCookies();
+await searchHelper.setSearxngCookies();
+await redditHelper.setLibredditCookies();
+await redditHelper.setTedditCookies();
+await tiktokHelper.setProxiTokCookies();
+
window.close() \ No newline at end of file
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-22 09:54:41 +0000