diff --git a/index.js b/index.js index 5f2fcac..d414714 100644 --- a/index.js +++ b/index.js @@ -14,7 +14,7 @@ import dotenv from "dotenv"; import cookieParser from "cookie-parser"; import wisp from "wisp-server-node"; import fs from "node:fs"; -import fetch from 'node-fetch'; +import fetch from "node-fetch"; dotenv.config(); const LICENSE_SERVER_URL = "https://license.mercurywork.shop/validate?license="; @@ -137,8 +137,8 @@ app.use("/custom-favicon", async (req, res) => { const response = await fetch(url).then((apiRes) => apiRes.buffer()); res.send(response); } catch (err) { - console.log(err) - res.send("Error") + console.log(err); + res.send("Error"); } }); app.use("/", express.static("dist/client/")); diff --git a/public/bare_transport.js b/public/bare_transport.js index 888d4b3..62e4561 100644 --- a/public/bare_transport.js +++ b/public/bare_transport.js @@ -4,8 +4,7 @@ ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) - : ((global = - typeof globalThis !== "undefined" ? globalThis : global || self), + : ((global = typeof globalThis !== "undefined" ? globalThis : global || self), factory((global.BareMod = {}))); })(this, function (exports) { "use strict"; @@ -17,12 +16,12 @@ const WebSocket = globalThis.WebSocket; const WebSocketFields = { prototype: { - send: WebSocket.prototype.send + send: WebSocket.prototype.send, }, CLOSED: WebSocket.CLOSED, CLOSING: WebSocket.CLOSING, CONNECTING: WebSocket.CONNECTING, - OPEN: WebSocket.OPEN + OPEN: WebSocket.OPEN, }; class BareError extends Error { @@ -441,7 +440,7 @@ throw new BareError(400, { code: "INVALID_BARE_HEADER", id: `request.headers.${header}`, - message: `Value didn't begin with semi-colon.` + message: `Value didn't begin with semi-colon.`, }); } const id = parseInt(header.slice(prefix.length + 1)); @@ -473,16 +472,7 @@ async init() { this.ready = true; } - connect( - url, - origin, - protocols, - requestHeaders, - onopen, - onmessage, - onclose, - onerror - ) { + connect(url, origin, protocols, requestHeaders, onopen, onmessage, onclose, onerror) { const ws = new WebSocket(this.ws); const cleanup = () => { ws.removeEventListener("close", closeListener); @@ -495,13 +485,10 @@ cleanup(); // ws.binaryType is irrelevant when sending text if (typeof event.data !== "string") - throw new TypeError( - "the first websocket message was not a text frame" - ); + throw new TypeError("the first websocket message was not a text frame"); const message = JSON.parse(event.data); // finally - if (message.type !== "open") - throw new TypeError("message was not of open type"); + if (message.type !== "open") throw new TypeError("message was not of open type"); // onMeta({ // protocol: message.protocol, // setCookies: message.setCookies, @@ -526,7 +513,7 @@ remote: url.toString(), protocols, headers: requestHeaders, - forwardHeaders: [] + forwardHeaders: [], }) ); // ); @@ -540,16 +527,13 @@ const options = { credentials: "omit", method: method, - signal + signal, }; if (body !== undefined) { options.body = body; } options.headers = this.createBareHeaders(remote, headers); - const response = await fetch( - this.http + "?cache=" + md5(remote.toString()), - options - ); + const response = await fetch(this.http + "?cache=" + md5(remote.toString()), options); const readResponse = await this.readBareResponse(response); // const result: Response & Partial = new Response( // statusEmpty.includes(readResponse.status!) ? undefined : response.body, @@ -566,7 +550,7 @@ body: response.body, headers: readResponse.headers, status: readResponse.status, - statusText: readResponse.statusText + statusText: readResponse.statusText, }; } async readBareResponse(response) { @@ -583,13 +567,7 @@ if (xBareHeaders !== null) result.headers = JSON.parse(xBareHeaders); return result; } - createBareHeaders( - remote, - bareHeaders, - forwardHeaders = [], - passHeaders = [], - passStatus = [] - ) { + createBareHeaders(remote, bareHeaders, forwardHeaders = [], passHeaders = [], passStatus = []) { const headers = new Headers(); headers.set("x-bare-url", remote.toString()); headers.set("x-bare-headers", JSON.stringify(bareHeaders)); @@ -608,4 +586,4 @@ } exports.BareClient = ClientV3; -}); \ No newline at end of file +}); diff --git a/public/sw.js b/public/sw.js index e0285d3..b132ade 100644 --- a/public/sw.js +++ b/public/sw.js @@ -1,6 +1,6 @@ importScripts("/libcurl/index.js"); importScripts("/epoxy/index.js"); -importScripts("/bare_transport.js") +importScripts("/bare_transport.js"); importScripts("/uv/uv.bundle.js"); importScripts("/uv.config.js"); importScripts(__uv$config.sw); diff --git a/src/components/ProxyRegistrar.astro b/src/components/ProxyRegistrar.astro index 4596cd2..4d11d0b 100644 --- a/src/components/ProxyRegistrar.astro +++ b/src/components/ProxyRegistrar.astro @@ -1,10 +1,10 @@ - - - - - + + + + + diff --git a/src/components/SettingsContent/CloakingTab.astro b/src/components/SettingsContent/CloakingTab.astro index 035fa32..a8bf279 100644 --- a/src/components/SettingsContent/CloakingTab.astro +++ b/src/components/SettingsContent/CloakingTab.astro @@ -1,5 +1,7 @@ --- -import Input from "../Input.astro"; +import Input from "@components/UI/Input.astro"; +import { i18n } from "@i18n/utils"; +const t = i18n.inferLangUseTranslations(Astro.url); const presetCloaks = [ { @@ -8,8 +10,7 @@ const presetCloaks = [ }, { cloakTitle: "Google", - favicon: - "/icons/google.png", + favicon: "/icons/google.png", }, { cloakTitle: "Canvas", @@ -21,8 +22,7 @@ const presetCloaks = [ }, { cloakTitle: "Classlink", - favicon: - "/icons/classlink.png", + favicon: "/icons/classlink.png", }, { cloakTitle: "Google Drive", @@ -58,7 +58,7 @@ const presetCloaks = [
- +
diff --git a/src/components/SettingsContent/CreditsTab.astro b/src/components/SettingsContent/CreditsTab.astro index fd349ad..3f0da2f 100644 --- a/src/components/SettingsContent/CreditsTab.astro +++ b/src/components/SettingsContent/CreditsTab.astro @@ -1,7 +1,6 @@ --- -import { getLangFromUrl, useTranslations } from "../../i18n/utils"; -const lang = getLangFromUrl(Astro.url); -const t = useTranslations(lang); +import { i18n } from "@i18n/utils"; +const t = i18n.inferLangUseTranslations(Astro.url); ---
diff --git a/src/components/SettingsContent/CustomizationTab.astro b/src/components/SettingsContent/CustomizationTab.astro index ad30a91..f62f586 100644 --- a/src/components/SettingsContent/CustomizationTab.astro +++ b/src/components/SettingsContent/CustomizationTab.astro @@ -1,9 +1,8 @@ --- -import Dropdown from "../Dropdown.astro"; +import Dropdown from "@components/UI/Dropdown.astro"; -import { getLangFromUrl, useTranslations } from "../../i18n/utils"; -const lang = getLangFromUrl(Astro.url); -const t = useTranslations(lang); +import { i18n } from "@i18n/utils"; +const t = i18n.inferLangUseTranslations(Astro.url); const themeList = [ { name: t("settings.customization.theme.Alu"), value: "alu" }, diff --git a/src/components/SettingsContent/ProxyTab.astro b/src/components/SettingsContent/ProxyTab.astro index 97e8d6e..4b5d1d1 100644 --- a/src/components/SettingsContent/ProxyTab.astro +++ b/src/components/SettingsContent/ProxyTab.astro @@ -1,10 +1,9 @@ --- -import Input from "../Input.astro"; -import Dropdown from "../Dropdown.astro"; +import Input from "@components/UI/Input.astro"; +import Dropdown from "@components/UI/Dropdown.astro"; -import { getLangFromUrl, useTranslations } from "../../i18n/utils"; -const lang = getLangFromUrl(Astro.url); -const t = useTranslations(lang); +import { i18n } from "@i18n/utils"; +const t = i18n.inferLangUseTranslations(Astro.url); const proxyList = [ { name: t("settings.proxy.auto"), value: "auto" }, diff --git a/src/components/SettingsTablist.astro b/src/components/SettingsTablist.astro index aa5f07f..9597b12 100644 --- a/src/components/SettingsTablist.astro +++ b/src/components/SettingsTablist.astro @@ -1,12 +1,12 @@ --- import ProxyTab from "./SettingsContent/ProxyTab.astro"; import CustomizationTab from "./SettingsContent/CustomizationTab.astro"; - -import { getLangFromUrl, useTranslations } from "../i18n/utils"; import CloakingTab from "./SettingsContent/CloakingTab.astro"; import CreditsTab from "./SettingsContent/CreditsTab.astro"; -const lang = getLangFromUrl(Astro.url); -const t = useTranslations(lang); + +import { i18n } from "@i18n/utils"; +const lang = i18n.getLangFromUrl(Astro.url); +const t = i18n.useTranslations(lang); ---
diff --git a/src/components/Switch.astro b/src/components/Switch.astro deleted file mode 100644 index c55c047..0000000 --- a/src/components/Switch.astro +++ /dev/null @@ -1,192 +0,0 @@ ---- -const { inputID } = Astro.props; ---- - - - - diff --git a/src/components/Dropdown.astro b/src/components/UI/Dropdown.astro similarity index 100% rename from src/components/Dropdown.astro rename to src/components/UI/Dropdown.astro diff --git a/src/components/Footer.astro b/src/components/UI/Footer.astro similarity index 87% rename from src/components/Footer.astro rename to src/components/UI/Footer.astro index 3371c37..50bb566 100644 --- a/src/components/Footer.astro +++ b/src/components/UI/Footer.astro @@ -1,9 +1,8 @@ --- -import { getLangFromUrl, useTranslations } from "../i18n/utils"; +import { i18n } from "@i18n/utils"; import Link from "./Link.astro"; -import WaveSVG from "./WaveSVG.astro"; -const lang = getLangFromUrl(Astro.url); -const t = useTranslations(lang); +import WaveSVG from "../WaveSVG.astro"; +const t = i18n.inferLangUseTranslations(Astro.url); ---
diff --git a/src/components/Header.astro b/src/components/UI/Header.astro similarity index 90% rename from src/components/Header.astro rename to src/components/UI/Header.astro index a9556aa..69c6227 100644 --- a/src/components/Header.astro +++ b/src/components/UI/Header.astro @@ -1,7 +1,7 @@ --- -import { getLangFromUrl, useTranslations } from "../i18n/utils"; -const lang = getLangFromUrl(Astro.url); -const t = useTranslations(lang); +import { i18n } from "@i18n/utils"; +const lang = i18n.getLangFromUrl(Astro.url); +const t = i18n.useTranslations(lang); ---
diff --git a/src/components/Input.astro b/src/components/UI/Input.astro similarity index 100% rename from src/components/Input.astro rename to src/components/UI/Input.astro diff --git a/src/components/Link.astro b/src/components/UI/Link.astro similarity index 100% rename from src/components/Link.astro rename to src/components/UI/Link.astro diff --git a/src/components/ts/TransportManager.ts b/src/components/ts/TransportManager.ts index 3fc7733..67a3701 100644 --- a/src/components/ts/TransportManager.ts +++ b/src/components/ts/TransportManager.ts @@ -12,10 +12,12 @@ declare global { } } -type transportConfig = { - wisp: string; - wasm?: string; -} | string; +type transportConfig = + | { + wisp: string; + wasm?: string; + } + | string; export const wispURLDefault = (location.protocol === "https:" ? "wss://" : "ws://") + location.host + "/wisp/"; @@ -40,12 +42,11 @@ export default class TransportManager { updateTransport() { try { this.setTransport(JSON.parse(localStorage.getItem("alu__selectedTransport")!).value); - console.log(this.transport) + console.log(this.transport); } catch { - console.log("Failed to update transport! Falling back to old transport.") + console.log("Failed to update transport! Falling back to old transport."); this.setTransport(this.transport); } - } getTransport() { @@ -82,5 +83,4 @@ export async function initTransport() { resolve(null); }); }); - } diff --git a/src/i18n/en.json b/src/i18n/en.json index bb3148c..3e5e2ba 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -54,6 +54,7 @@ "settings.cloaking": "Cloaking", "settings.cloaking.subtext": "Change how your tab looks...", + "settings.cloaking.updateCloak": "Update Cloak", "settings.credits": "Credits", "settings.credits.mochaandmacchiatothemes": "Mocha & Macchiato Themes", diff --git a/src/i18n/jp.json b/src/i18n/jp.json index c018b32..699a849 100644 --- a/src/i18n/jp.json +++ b/src/i18n/jp.json @@ -54,6 +54,7 @@ "settings.cloaking": "クローキング", "settings.cloaking.subtext": "タブの外観を変更します...", + "settings.cloaking.updateCloak": "クロークを更新", "settings.credits": "クレジット", "settings.credits.mochaandmacchiatothemes": "モカとマキアートテーマ", diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts index 5746416..1bc67e7 100644 --- a/src/i18n/utils.ts +++ b/src/i18n/utils.ts @@ -2,16 +2,23 @@ import { ui, defaultLang } from "./ui"; export const STATIC_PATHS = [{ params: { lang: "en" } }, { params: { lang: "jp" } }]; -export function getLangFromUrl(url: URL) { +function getLangFromUrl(url: URL) { // comma lol const [, lang] = url.pathname.split("/"); if (lang in ui) return lang as keyof typeof ui; return defaultLang; } -export function useTranslations(lang: keyof typeof ui) { +function inferLangUseTranslations(url: URL) { + const lang = getLangFromUrl(url); + return useTranslations(lang); +} + +function useTranslations(lang: keyof typeof ui) { return function t(translationKey: keyof (typeof ui)[typeof defaultLang]) { if (ui[lang][translationKey]) return ui[lang][translationKey]; else return ui[defaultLang][translationKey]; }; } + +export const i18n = { getLangFromUrl, useTranslations, inferLangUseTranslations }; diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 8418508..a2060a2 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -1,11 +1,11 @@ --- import { ViewTransitions } from "astro:transitions"; -import Header from "../components/Header.astro"; -import Footer from "../components/Footer.astro"; -import ThemeLoader from "../components/ThemeLoader.astro"; -import CloakLoader from "../components/CloakLoader.astro"; -import WelcomeLogging from "../components/WelcomeLogging.astro"; -import UVRegistrar from "../components/ProxyRegistrar.astro"; +import Header from "@components/UI/Header.astro"; +import Footer from "@components/UI/Footer.astro"; +import ThemeLoader from "@components/ThemeLoader.astro"; +import CloakLoader from "@components/CloakLoader.astro"; +import WelcomeLogging from "@components/WelcomeLogging.astro"; +import ProxyRegistrar from "@components/ProxyRegistrar.astro"; type Preload = { href: string; @@ -69,7 +69,7 @@ const { title, optionalPreloads } = Astro.props;
- +