aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/assets/javascripts/services.js4
-rw-r--r--src/pages/background/background.js24
-rw-r--r--src/pages/messages_src/App.svelte61
-rw-r--r--src/pages/popup_src/Buttons.svelte113
-rw-r--r--src/pages/popup_src/components/Row.svelte23
5 files changed, 115 insertions, 110 deletions
diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index 1c84eff0..a0ba0111 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -669,7 +669,9 @@ function computeService(url) {
export function computeFrontend(url) {
for (const service in config.services) {
for (const frontend in config.services[service].frontends) {
- if (all(service, frontend, options, config).findIndex(instance => url.href.startsWith(instance)) >= 0) {
+ const instances = all(service, frontend, options, config)
+ const i = instances.findIndex(instance => url.href.startsWith(instance))
+ if (i >= 0) {
return { service, frontend }
}
}
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 029686a3..4b46ea89 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -117,30 +117,6 @@ browser.webRequest.onBeforeRequest.addListener(
["blocking"]
)
-// browser.webRequest.onHeadersReceived.addListener(
-// details => {
-// if (details.statusCode >= 501 || details.statusCode == 429 || details.statusCode == 403) {
-// const url = new URL(details.url)
-// const r = servicesHelper.computeFrontend(url)
-// if (!r) return
-// const { service, frontend } = r
-// const params = new URLSearchParams({
-// message: "server_error",
-// code: details.statusCode,
-// url: url.href,
-// frontend: frontend,
-// service: service,
-// })
-// setTimeout(() => {
-// browser.tabs.update({
-// url: browser.runtime.getURL(`/pages/messages/index.html?${params.toString()}`),
-// })
-// }, 2000)
-// }
-// },
-// { urls: ["<all_urls>"] }
-// )
-
browser.tabs.onRemoved.addListener(tabId => {
if (tabIdRedirects[tabId] != undefined) {
delete tabIdRedirects[tabId]
diff --git a/src/pages/messages_src/App.svelte b/src/pages/messages_src/App.svelte
index 1c5170dd..9f464ac7 100644
--- a/src/pages/messages_src/App.svelte
+++ b/src/pages/messages_src/App.svelte
@@ -80,39 +80,6 @@
const newUrl = await servicesHelper.redirectAsync(oldUrl, "main_frame", null, null, false, true)
browser.tabs.update({ url: newUrl })
}
-
- async function switchInstance() {
- const newUrl = await servicesHelper.switchInstance(oldUrl)
- browser.tabs.update({ url: newUrl })
- }
-
- async function removeInstance() {
- const service = await servicesHelper.computeService(oldUrl)
- const frontend = params.get("frontend")
- const i = _options[frontend].findIndex(instance => oldUrl.href.startsWith(instance))
- _options[frontend].splice(i, 1)
- options.set(_options)
- const newUrl = await servicesHelper.switchInstance(oldUrl, service)
- browser.tabs.update({ url: newUrl })
- }
-
- async function removeAndAutoPickInstance() {
- const service = await servicesHelper.computeService(oldUrl)
-
- const frontend = params.get("frontend")
- const i = _options[frontend].findIndex(instance => oldUrl.href.startsWith(instance))
- _options[frontend].splice(i, 1)
- options.set(_options)
- await autoPick()
- const newUrl = await servicesHelper.switchInstance(oldUrl, service)
- browser.tabs.update({ url: newUrl })
- }
-
- async function addAutoPickInstance() {
- await autoPick()
- const newUrl = await servicesHelper.switchInstance(oldUrl)
- browser.tabs.update({ url: newUrl })
- }
</script>
{#if _options && _config}
@@ -124,34 +91,6 @@
{browser.i18n.getMessage("enable") || "Enable"}
</Button>
</div>
- {:else if params.get("message") == "server_error"}
- <!-- https://httpstat.us/403 for testing -->
- <div>
- <h1>Your selected instance gave out an error: {params.get("code")}</h1>
- {#if _options[params.get("frontend")].length > 1}
- <Button on:click={switchInstance}>
- <SwitchInstanceIcon class="margin margin_{document.body.dir}" />
- {browser.i18n.getMessage("switchInstance") || "Switch Instance"}
- </Button>
- <Button on:click={removeInstance}>
- <SwitchInstanceIcon class="margin margin_{document.body.dir}" />
- {browser.i18n.getMessage("removeInstance") || "Remove Instance"}
- +
- {browser.i18n.getMessage("switchInstance") || "Switch Instance"}
- </Button>
- {:else}
- <Button on:click={addAutoPickInstance} disabled={autoPicking}>
- <AutoPickIcon class="margin margin_{document.body.dir}" />
- {browser.i18n.getMessage("autoPickInstance") || "Auto Pick Instance"}
- </Button>
- <Button on:click={removeAndAutoPickInstance} disabled={autoPicking}>
- <AutoPickIcon class="margin margin_{document.body.dir}" />
- {browser.i18n.getMessage("removeInstance") || "Remove Instance"}
- +
- {browser.i18n.getMessage("autoPickInstance") || "Auto Pick Instance"}
- </Button>
- {/if}
- </div>
{:else if params.get("message") == "no_instance"}
<div>
<h1>You have no instance selected for this frontend</h1>
diff --git a/src/pages/popup_src/Buttons.svelte b/src/pages/popup_src/Buttons.svelte
index ab5682dc..d2fc5433 100644
--- a/src/pages/popup_src/Buttons.svelte
+++ b/src/pages/popup_src/Buttons.svelte
@@ -10,11 +10,14 @@
import SettingsIcon from "../icons/SettingsIcon.svelte"
import { options, config } from "./stores"
import { onDestroy } from "svelte"
- import servicesHelper from "../../assets/javascripts/services"
+ import servicesHelper, { computeFrontend } from "../../assets/javascripts/services"
import Switch from "./components/Switch.svelte"
+ import AutoPickIcon from "../icons/AutoPickIcon.svelte"
+ import utils from "../../assets/javascripts/utils"
let _options
let _config
+ let autoPicking = false
const unsubscribeOptions = options.subscribe(val => (_options = val))
const unsubscribeConfig = config.subscribe(val => (_config = val))
@@ -28,6 +31,8 @@
let redirectToOriginal
let redirect
let currentService
+ let frontend
+ let service
browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
if (tabs[0].url) {
url = new URL(tabs[0].url)
@@ -35,8 +40,51 @@
servicesHelper.reverse(url).then(r => (redirectToOriginal = r))
servicesHelper.redirectAsync(url, "main_frame", null, null, false, true).then(r => (redirect = r))
servicesHelper.computeService(url).then(r => (currentService = r))
+ const computed = servicesHelper.computeFrontend(url)
+ if (computed) {
+ ;({ service, frontend } = computed)
+ }
}
})
+
+ async function removeInstance() {
+ const i = _options[frontend].findIndex(instance => url.href.startsWith(instance))
+ _options[frontend].splice(i, 1)
+ options.set(_options)
+ const newUrl = await servicesHelper.switchInstance(url, service)
+ browser.tabs.update({ url: newUrl })
+ }
+
+ async function autoPick() {
+ autoPicking = true
+ const redirects = await utils.getList(_options)
+ const instances = utils.randomInstances(redirects[frontend]["clearnet"], 5)
+ const pings = await Promise.all([
+ ...instances.map(async instance => {
+ return [instance, await utils.ping(instance)]
+ }),
+ ])
+ pings.sort((a, b) => a[1] - b[1])
+ _options[frontend].push(pings[0][0])
+ options.set(_options)
+ autoPicking = false
+ }
+
+ async function addAutoPickInstance() {
+ await autoPick()
+ const newUrl = await servicesHelper.switchInstance(url)
+ browser.tabs.update({ url: newUrl })
+ }
+
+ async function removeAndAutoPickInstance() {
+ const i = _options[frontend].findIndex(instance => url.href.startsWith(instance))
+ _options[frontend].splice(i, 1)
+ options.set(_options)
+ await autoPick()
+ const newUrl = await servicesHelper.switchInstance(url, service)
+ browser.tabs.update({ url: newUrl })
+ }
+ $: console.log("autoPicking", autoPicking)
</script>
<div class={document.body.dir}>
@@ -56,17 +104,44 @@
</Row>
{/if}
- {#if switchInstance}
- <Row
- class="interactive"
- on:click={async () =>
- browser.tabs.update({ url: switchInstance }, () => {
- window.close()
- })}
- >
- <Label>{browser.i18n.getMessage("switchInstance") || "Switch Instance"}</Label>
- <SwitchInstanceIcon />
- </Row>
+ {#if service && frontend}
+ {#if _options[frontend].length > 1}
+ {#if switchInstance}
+ <Row
+ class="interactive"
+ on:click={async () =>
+ browser.tabs.update({ url: switchInstance }, () => {
+ window.close()
+ })}
+ >
+ <Label>{browser.i18n.getMessage("switchInstance") || "Switch Instance"}</Label>
+ <SwitchInstanceIcon />
+ </Row>
+ {/if}
+ <Row class="interactive" on:click={removeInstance}>
+ <Label>
+ {browser.i18n.getMessage("remove") || "Remove"}
+ +
+ {browser.i18n.getMessage("switchInstance") || "Switch Instance"}
+ </Label>
+ <SwitchInstanceIcon />
+ </Row>
+ {:else}
+ <Row class={"interactive " + (autoPicking ? "disabled" : "")} on:click={removeAndAutoPickInstance}>
+ <Label>
+ {browser.i18n.getMessage("remove") || "Remove"}
+ +
+ {browser.i18n.getMessage("autoPickInstance") || "Auto Pick Instance"}
+ </Label>
+ <AutoPickIcon />
+ </Row>
+ <Row class={"interactive " + (autoPicking ? "disabled" : "")} on:click={addAutoPickInstance}>
+ <Label>
+ {browser.i18n.getMessage("autoPickInstance") || "Auto Pick Instance"}
+ </Label>
+ <AutoPickIcon />
+ </Row>
+ {/if}
{/if}
{#if redirectToOriginal}
@@ -130,6 +205,20 @@
transform: translateY(1px);
}
+ :global(.disabled) {
+ cursor: not-allowed;
+ opacity: 0.5;
+ }
+
+ :global(.disabled:hover) {
+ color: var(--text);
+ cursor: not-allowed;
+ }
+
+ :global(.disabled:active) {
+ transform: none;
+ }
+
:global(img, svg) {
margin-right: 5px;
margin-left: 0;
diff --git a/src/pages/popup_src/components/Row.svelte b/src/pages/popup_src/components/Row.svelte
index a4d78f07..064942da 100644
--- a/src/pages/popup_src/components/Row.svelte
+++ b/src/pages/popup_src/components/Row.svelte
@@ -1,13 +1,12 @@
<div {...$$props} on:click>
- <slot></slot>
- </div>
-
- <style>
- div {
- justify-content: space-between;
- display: flex;
- align-items: center;
- margin: 10px 0;
- }
- </style>
- \ No newline at end of file
+ <slot></slot>
+</div>
+
+<style>
+ div {
+ justify-content: space-between;
+ display: flex;
+ align-items: center;
+ margin: 10px 0;
+ }
+</style>
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-05 04:50:01 +0000