diff --git a/README.md b/README.md index 92498ea3..9fb41788 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ Instagram => [Bibliogram](https://sr.ht/~cadence/bibliogram/)\ TikTok => [ProxiTok](https://github.com/pablouser1/ProxiTok)\ Reddit => [Libreddit](https://github.com/spikecodes/libreddit#instances), [Teddit](https://codeberg.org/teddit/teddit#instances), [Old Reddit](https://old.reddit.com)\ Imgur => [Rimgo](https://codeberg.org/video-prize-ranch/rimgo)\ -Speedtest => [Librespeed](https://github.com/librespeed/)\ Spotify => [Soju](https://github.com/coffeebank/soju)\ Wikipedia => [Wikiless](https://codeberg.org/orenom/wikiless)\ Medium => [Scribe](https://sr.ht/~edwardloveall/scribe/)\ diff --git a/pug/options/speedtest/speedtest.pug b/pug/options/speedtest/speedtest.pug deleted file mode 100644 index c9b36fad..00000000 --- a/pug/options/speedtest/speedtest.pug +++ /dev/null @@ -1,33 +0,0 @@ -doctype html -html(lang="en") - include ../../widgets/head.pug - title General -script(type="module" src="../../../assets/javascripts/localise.js") -body.option(dir="auto") - include ../../widgets/links.pug - +links('speedtest') - - section.option-block - .some-block.option-block - h4(data-localise="__MSG_enable__") Enable - input#disable-speedtest(type="checkbox") - - .some-block.option-block - h4(data-localise="__MSG_protocol__") Protocol - select#protocol - option(value="normal" data-localise="__MSG_normal__") Normal - option(value="tor" data-localise="__MSG_tor__") Tor - - #librespeed - hr - .normal - include ../../widgets/instances.pug - +instances('https://librespeed.com') - include ../../widgets/latency.pug - +latency() - .tor - include ../../widgets/instances.pug - +instances('https://librespeed.onion') - - script(type="module" src="../init.js") - script(type="module" src="./speedtest.js") \ No newline at end of file diff --git a/pug/widgets/links.pug b/pug/widgets/links.pug index 025d99f5..89eab335 100644 --- a/pug/widgets/links.pug +++ b/pug/widgets/links.pug @@ -36,10 +36,6 @@ mixin links(service) img(src="../../../assets/images/imgur-icon.png") a(href="../imgur/imgur.html" data-localise="__MSG_imgur__" class=service == "imgur" ? "selected" : "") Imgur - .title - img(src="../../../assets/images/librespeed-icon.svg") - a(href="../speedtest/speedtest.html" data-localise="__MSG_speedtest__" class=service == "speedtest" ? "selected" : "") Speedtest - .title img(src="../../../assets/images/spotify-icon.png") a(href="../spotify/spotify.html" data-localise="__MSG_spotify__" class=service == "spotify" ? "selected" : "") Spotify diff --git a/src/assets/images/librespeed-icon.svg b/src/assets/images/librespeed-icon.svg deleted file mode 100644 index 8691d7a3..00000000 --- a/src/assets/images/librespeed-icon.svg +++ /dev/null @@ -1,497 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/javascripts/helpers/speedtest.js b/src/assets/javascripts/helpers/speedtest.js deleted file mode 100644 index 00f0a138..00000000 --- a/src/assets/javascripts/helpers/speedtest.js +++ /dev/null @@ -1,113 +0,0 @@ -window.browser = window.browser || window.chrome; - -import commonHelper from './common.js' - -const targets = [ - /^https?:\/{2}(www\.|)speedtest\.net\/$/ -]; - -let redirects = { - "librespeed": { - "normal": [ - "https://librespeed.org" - ], - "tor": [] - } -} - -const getRedirects = () => redirects; -function setRedirects(val) { - redirects.librespeed = val; - browser.storage.local.set({ speedtestRedirects: redirects }) - console.log("speedtestRedirects: ", val) - for (const item of librespeedNormalRedirectsChecks) - if (!redirects.librespeed.normal.includes(item)) { - var index = librespeedNormalRedirectsChecks.indexOf(item); - if (index !== -1) librespeedNormalRedirectsChecks.splice(index, 1); - } - browser.storage.local.set({ librespeedNormalRedirectsChecks }) - - for (const item of librespeedTorRedirectsChecks) - if (!redirects.librespeed.normal.includes(item)) { - var index = librespeedTorRedirectsChecks.indexOf(item); - if (index !== -1) librespeedTorRedirectsChecks.splice(index, 1); - } - browser.storage.local.set({ librespeedTorRedirectsChecks }) -} - -let librespeedNormalRedirectsChecks; -let librespeedTorRedirectsChecks; -let librespeedNormalCustomRedirects = []; -let librespeedTorCustomRedirects = []; - -let disable; // disableSpeedtest -let protocol; // speedtestProtocol - -function redirect(url, type, initiator) { - if (disable) return null; - if (initiator && ([...redirects.librespeed.normal, ...librespeedNormalCustomRedirects].includes(initiator.origin) || targets.includes(initiator.host))) return null; - if (!targets.some(rx => rx.test(url.href))) return null; - console.log("Librespeed!!"); - - if (type != "main_frame" && type != "sub_frame") return null; - - let instancesList; - if (protocol == 'normal') instancesList = [...librespeedNormalRedirectsChecks, ...librespeedNormalCustomRedirects]; - if (protocol == 'tor') instancesList = [...librespeedTorRedirectsChecks, ...librespeedTorCustomRedirects]; - if (instancesList.length === 0) return null; - let randomInstance = commonHelper.getRandomInstance(instancesList); - - return `${randomInstance}`; -} - -async function initDefaults() { - await browser.storage.local.set({ - disableSpeedtest: true, - - speedtestRedirects: redirects, - - librespeedNormalRedirectsChecks: [...redirects.librespeed.normal], - librespeedNormalCustomRedirects: [], - - librespeedTorRedirectsChecks: [...redirects.librespeed.tor], - librespeedTorCustomRedirects: [], - - speedtestProtocol: "normal", - }) -} - -async function init() { - browser.storage.local.get( - [ - "disableSpeedtest", - "speedtestRedirects", - - "librespeedNormalRedirectsChecks", - "librespeedNormalCustomRedirects", - - "librespeedTorRedirectsChecks", - "librespeedTorCustomRedirects", - - "speedtestProtocol" - ], - r => { - disable = r.disableSpeedtest; - protocol = r.speedtestProtocol; - - librespeedNormalRedirectsChecks = r.librespeedNormalRedirectsChecks; - librespeedNormalCustomRedirects = r.librespeedNormalCustomRedirects; - - librespeedTorRedirectsChecks = r.librespeedTorRedirectsChecks; - librespeedTorCustomRedirects = r.librespeedTorCustomRedirects; - } - ) -} - -export default { - getRedirects, - setRedirects, - - redirect, - initDefaults, - init, -}; diff --git a/src/pages/background/background.js b/src/pages/background/background.js index 65be27ae..b54da6c7 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -11,7 +11,6 @@ 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 speedtestHelper from "../../assets/javascripts/helpers/speedtest.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"; @@ -37,7 +36,6 @@ browser.runtime.onInstalled.addListener(async details => { wikipediaHelper.initDefaults(); imgurHelper.initDefaults(); tiktokHelper.initDefaults(); - speedtestHelper.initDefaults(); sendTargetsHelper.initDefaults(); peertubeHelper.initDefaults(); lbryHelper.initDefaults(); @@ -59,7 +57,6 @@ async function wholeInit() { await wikipediaHelper.init(); await imgurHelper.init(); await tiktokHelper.init(); - await speedtestHelper.init(); await sendTargetsHelper.init(); await peertubeHelper.init(); await lbryHelper.init(); @@ -111,8 +108,6 @@ browser.webRequest.onBeforeRequest.addListener( if (!newUrl) newUrl = tiktokHelper.redirect(url, details.type, initiator); - if (!newUrl) newUrl = speedtestHelper.redirect(url, details.type, initiator); - if (!newUrl) newUrl = sendTargetsHelper.redirect(url, details.type, initiator); if (!newUrl) newUrl = peertubeHelper.redirect(url, details.type, initiator); diff --git a/src/pages/background/incognito.js b/src/pages/background/incognito.js index 18096390..035700d5 100644 --- a/src/pages/background/incognito.js +++ b/src/pages/background/incognito.js @@ -11,7 +11,6 @@ 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 speedtestHelper from "../../assets/javascripts/helpers/speedtest.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"; @@ -34,7 +33,6 @@ async function wholeInit() { await wikipediaHelper.init(); await imgurHelper.init(); await tiktokHelper.init(); - await speedtestHelper.init(); await sendTargetsHelper.init(); await peertubeHelper.init(); await lbryHelper.init(); diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index 615ccee3..7f21046e 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -22,7 +22,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index 2f959996..2546b041 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index 9ff2651c..a0340fce 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/lbry/lbry.html b/src/pages/options/lbry/lbry.html index 4b6033aa..edbc22be 100644 --- a/src/pages/options/lbry/lbry.html +++ b/src/pages/options/lbry/lbry.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html index fe18892a..3649a34a 100644 --- a/src/pages/options/maps/maps.html +++ b/src/pages/options/maps/maps.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index e7c0a336..5d14fcb1 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/peertube/peertube.html b/src/pages/options/peertube/peertube.html index 1a4bfa66..8f43e9be 100644 --- a/src/pages/options/peertube/peertube.html +++ b/src/pages/options/peertube/peertube.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html index 9ccc130d..9e967cac 100644 --- a/src/pages/options/reddit/reddit.html +++ b/src/pages/options/reddit/reddit.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index 3c0d9d89..7f113875 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/sendTargets/sendTargets.html b/src/pages/options/sendTargets/sendTargets.html index b63c8233..afe3b98f 100644 --- a/src/pages/options/sendTargets/sendTargets.html +++ b/src/pages/options/sendTargets/sendTargets.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/speedtest/speedtest.html b/src/pages/options/speedtest/speedtest.html deleted file mode 100644 index 369d226a..00000000 --- a/src/pages/options/speedtest/speedtest.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - General - - - - -
-
- - - General -
-
YouTube
-
YT Music
-
Twitter
-
Instagram
-
TikTok
-
Reddit
-
Imgur
-
Speedtest
-
Spotify
-
Wikipedia
-
- - - - - Medium -
-
Peertube
-
LBRY/Odysee
-
- - - Search -
-
- - - Translate -
-
- - - Maps -
-
- - - Send Files -
-
-
-
-

Enable

- -
-
-

Protocol

- -
-
-
-
-
-

Default Instances

-
-
-
-
-

Custom Instances

-
-
-
- - -
-
-
- - -
-
-
-

Default Instances

-
-
-
-
-

Custom Instances

-
-
-
- - -
-
-
-
-
-
- - - \ No newline at end of file diff --git a/src/pages/options/speedtest/speedtest.js b/src/pages/options/speedtest/speedtest.js deleted file mode 100644 index 986f75c7..00000000 --- a/src/pages/options/speedtest/speedtest.js +++ /dev/null @@ -1,61 +0,0 @@ -import speedtestHelper from "../../../assets/javascripts/helpers/speedtest.js"; -import commonHelper from "../../../assets/javascripts/helpers/common.js"; - -let disableSpeedtestElement = document.getElementById("disable-speedtest"); -let protocolElement = document.getElementById("protocol") - -browser.storage.local.get( - [ - "disableSpeedtest", - "speedtestProtocol", - ], - r => { - disableSpeedtestElement.checked = !r.disableSpeedtest; - - protocolElement.value = r.speedtestProtocol; - changeProtocolSettings(r.speedtestProtocol); - } -) - -document.addEventListener("change", async () => { - await browser.storage.local.set({ - disableSpeedtest: !disableSpeedtestElement.checked, - speedtestProtocol: protocolElement.value, - }) - changeProtocolSettings(protocolElement.value); -}) - -function changeProtocolSettings(protocol) { - let normalDiv = document.getElementsByClassName("normal")[0]; - let torDiv = document.getElementsByClassName("tor")[0]; - if (protocol == 'normal') { - normalDiv.style.display = 'block'; - torDiv.style.display = 'none'; - } - else if (protocol == 'tor') { - normalDiv.style.display = 'none'; - torDiv.style.display = 'block'; - } -} - -commonHelper.processDefaultCustomInstances('speedtest', 'librespeed', 'normal', document); -commonHelper.processDefaultCustomInstances('speedtest', 'librespeed', 'tor', document); - -let latencyElement = document.getElementById("latency"); -let latencyLabel = document.getElementById("latency-label"); -latencyElement.addEventListener("click", - async () => { - let reloadWindow = () => location.reload(); - latencyElement.addEventListener("click", reloadWindow); - await speedtestHelper.init(); - let redirects = speedtestHelper.getRedirects(); - const oldHtml = latencyLabel.innerHTML; - latencyLabel.innerHTML = '...'; - commonHelper.testLatency(latencyLabel, redirects.librespeed.normal).then(r => { - browser.storage.local.set({ librespeedLatency: r }); - latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances('speedtest', 'librespeed', 'normal', document); - latencyElement.removeEventListener("click", reloadWindow) - }); - } -); \ No newline at end of file diff --git a/src/pages/options/spotify/spotify.html b/src/pages/options/spotify/spotify.html index 03a1ca9e..643715df 100644 --- a/src/pages/options/spotify/spotify.html +++ b/src/pages/options/spotify/spotify.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index e422eef7..b12ee060 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html index f80854f1..fd0e857d 100644 --- a/src/pages/options/translate/translate.html +++ b/src/pages/options/translate/translate.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html index d553d72c..e84028e7 100644 --- a/src/pages/options/twitter/twitter.html +++ b/src/pages/options/twitter/twitter.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html index 4d0f08cb..42eb0bb4 100644 --- a/src/pages/options/wikipedia/wikipedia.html +++ b/src/pages/options/wikipedia/wikipedia.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index aa257726..d5414c08 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/youtubeMusic/youtubeMusic.html b/src/pages/options/youtubeMusic/youtubeMusic.html index 5a93bffc..77e6482c 100644 --- a/src/pages/options/youtubeMusic/youtubeMusic.html +++ b/src/pages/options/youtubeMusic/youtubeMusic.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Speedtest
Spotify
Wikipedia