Cookies_Github_mirror/AquaDX
4
0
Fork 1
mirror of https://github.com/MewoLab/AquaDX.git synced 2026-02-07 01:27:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 🎨 finalize server url mode

Browse Source
This commit is contained in:
Raymond
2025-01-04 22:04:09 -05:00
parent f6efd392b9
commit 8b9236ae43
6 changed files with 172 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
AquaNet/src/components/settings/ChuniSettings.svelte
View File

@@ -120,15 +120,14 @@
}
let USERBOX_URL_STATE = useLocalStorage("userboxURL", USERBOX_DEFAULT_URL);
function userboxHandleInput(e: KeyboardEvent) {
if (e.key != "Enter")
return;
let baseURL = (e.target as HTMLInputElement).value;
function userboxHandleInput(baseURL: string, isSetByServer: boolean = false) {
if (baseURL != "")
try {
// validate url
new URL(baseURL);
new URL(baseURL, location.href);
} catch(err) {
if (isSetByServer)
return;
return error = t("userbox.new.error.invalidUrl")
}
USERBOX_URL_STATE.value = baseURL;
@@ -137,17 +136,17 @@
location.reload();
}
if (USERBOX_DEFAULT_URL)
USERBOX_URL_STATE.value = USERBOX_DEFAULT_URL;
if (USERBOX_DEFAULT_URL && !USERBOX_URL_STATE.value)
userboxHandleInput(USERBOX_DEFAULT_URL, true);
indexedDB.databases().then(async (dbi) => {
let databaseExists = dbi.some(db => db.name == "userboxChusanDDS");
if (databaseExists) {
if (databaseExists)
await initializeDb();
if (databaseExists || USERBOX_URL_STATE.value) {
DDSreader = new DDS(ddsDB);
USERBOX_INSTALLED = databaseExists;
} else if (USERBOX_URL_STATE.value)
USERBOX_INSTALLED = true;
USERBOX_INSTALLED = databaseExists || USERBOX_URL_STATE.value != "";
}
})
</script>
@@ -251,7 +250,7 @@
</label>
</div>
{/if}
{#if USERBOX_SUPPORT}
{#if USERBOX_SUPPORT && !USERBOX_DEFAULT_URL}
<p>
<button on:click={() => USERBOX_SETUP_RUN = !USERBOX_SETUP_RUN}>{t(!USERBOX_INSTALLED ? `userbox.new.activate_first` : `userbox.new.activate_update`)}</button>
</p>
@@ -282,7 +281,7 @@
<span>{USERBOX_SETUP_MODE ? t('userbox.new.url_warning') : USERBOX_SETUP_TEXT}</span>
<div class="actions">
{#if USERBOX_SETUP_MODE}
<input type="text" on:keyup={userboxHandleInput} class="add-margin" placeholder="Base URL">
<input type="text" on:keyup={e => {if (e.key == "Enter") userboxHandleInput((e.target as HTMLInputElement).value)}} class="add-margin" placeholder="Base URL">
{:else}
<p class="notice add-margin">
{t('userbox.new.setup.notice')}

2
AquaNet/src/libs/config.ts
View File

@@ -16,7 +16,7 @@ export const FADE_OUT = { duration: 200 }
export const FADE_IN = { delay: 400 }
export const DEFAULT_PFP = '/assets/imgs/no_profile.png'
// USERBOX_ASSETS
// Documentation for Userbox mode can be found in `docs/aquabox-url-mode.md`
// Please note that if this is set, it must be manually unset by users in Chuni Settings -> Update Userbox -> Switch to URL mode -> (empty value) -> Enter key
export const USERBOX_DEFAULT_URL = ""

2
AquaNet/src/libs/userbox/ddsCache.ts
View File

@@ -49,7 +49,7 @@ export default class DDSCache {
return new Promise(async (resolve, reject) => {
if (this.userboxURL.value) {
let targetPath = path.replaceAll(":", "/");
let response = await fetch(`${this.userboxURL.value}/${targetPath}.dds`).then(b => b.blob()).catch(reject);
let response = await fetch(`${this.userboxURL.value}/${targetPath}.chu`).then(b => b.blob()).catch(reject);
if (response)
return resolve(response);
};