From cb5585a0c8ed7c1cb432986f304fa7f64b2674f5 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 3 Mar 2026 09:08:28 -0800 Subject: request tuning --- src/lib/socket.ts | 1 - src/routes/(app)/+layout.server.ts | 28 +++------------------- src/routes/(app)/+layout.svelte | 10 ++------ src/routes/(app)/[username]/(profile)/+page.svelte | 7 +----- src/routes/(app)/admin/+layout.server.ts | 15 +++--------- src/routes/(static)/+layout.server.ts | 19 ++------------- 6 files changed, 11 insertions(+), 69 deletions(-) (limited to 'src') diff --git a/src/lib/socket.ts b/src/lib/socket.ts index b2d070fe..2262f388 100644 --- a/src/lib/socket.ts +++ b/src/lib/socket.ts @@ -41,7 +41,6 @@ export const messages = (data) => ({ async payment() { const { amount, confirmed, iid, aid, type } = data; - invalidate("app:user"); invalidate("app:invoice"); invalidate("app:payments"); paymentSignal.update((n) => n + 1); diff --git a/src/routes/(app)/+layout.server.ts b/src/routes/(app)/+layout.server.ts index 11114ebd..494cc91e 100644 --- a/src/routes/(app)/+layout.server.ts +++ b/src/routes/(app)/+layout.server.ts @@ -1,34 +1,12 @@ -import { auth, get, isInvalidTokenError, sleep } from "$lib/utils"; +import { get } from "$lib/utils"; import { error, redirect } from "@sveltejs/kit"; -export async function load({ cookies, request, url, params }) { +export async function load({ cookies, request, url, params, parent }) { const { pathname } = url; const { id, username } = params; const token = cookies.get("token"); - let user; - if (token) { - try { - user = await get("/me", auth(cookies)); - } catch (e) { - const { message } = e as Error; - if (message.startsWith("Rate")) { - await sleep(3000); - try { - user = await get("/me", auth(cookies)); - } catch (retryError) { - if (isInvalidTokenError(retryError) && pathname !== "/logout") { - redirect(307, "/logout"); - } - throw retryError; - } - } else if (isInvalidTokenError(e) && pathname !== "/logout") { - redirect(307, "/logout"); - } else { - throw e; - } - } - } + const { user } = await parent(); let subject; diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 748dfdba..f6c496c4 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -28,7 +28,7 @@ import Password from "$comp/Password.svelte"; import { s, f, toFiat, success, getCookie, warning, post } from "$lib/utils"; import { t, locale, loading } from "$lib/translations"; - import { goto, invalidate, afterNavigate, preloadData } from "$app/navigation"; + import { goto, invalidate, afterNavigate } from "$app/navigation"; let { data, children } = $props(); @@ -50,13 +50,7 @@ afterNavigate(() => { document.cookie = `pathname=${$page.url.pathname}; path=/; max-age=86400`; - if (user) { - preloadData(`/${user.username}`); - preloadData(`/${user.username}/receive`); - preloadData("/payments"); - preloadData("/send"); - if ($arkkey) arkSync("afterNavigate"); - } + if (user && $arkkey) arkSync("afterNavigate"); }); let arkSyncing = false; diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte index 69fdfed6..db569442 100644 --- a/src/routes/(app)/[username]/(profile)/+page.svelte +++ b/src/routes/(app)/[username]/(profile)/+page.svelte @@ -9,17 +9,12 @@ import Spinner from "$comp/Spinner.svelte"; import { t } from "$lib/translations"; import { installPrompt, password, cachedAccounts, cachedRates } from "$lib/store"; - import { afterNavigate, goto, invalidate, preloadData } from "$app/navigation"; + import { goto, invalidate } from "$app/navigation"; import { page } from "$app/stores"; import { versions, post, fail, getCookie } from "$lib/utils"; let { data } = $props(); - afterNavigate(() => { - if (user) preloadData(`/${user.username}/receive`); - preloadData("/send"); - }); - let { accounts, subject, rates, user } = $derived(data as any); let { locked } = $derived(user); let hasArk = $derived(accounts.some((a: any) => a.type === "ark")); diff --git a/src/routes/(app)/admin/+layout.server.ts b/src/routes/(app)/admin/+layout.server.ts index 01f328a0..3dd3277f 100644 --- a/src/routes/(app)/admin/+layout.server.ts +++ b/src/routes/(app)/admin/+layout.server.ts @@ -1,17 +1,8 @@ -import { auth, get, isInvalidTokenError } from "$lib/utils"; import { redirect } from "@sveltejs/kit"; -export async function load({ cookies }) { - const token = cookies.get("token"); - if (!token) redirect(307, "/login"); - let user; - try { - user = await get("/me", auth(cookies)); - } catch (e) { - if (isInvalidTokenError(e)) redirect(307, "/logout"); - throw e; - } +export async function load({ cookies, parent }) { + if (!cookies.get("token")) redirect(307, "/login"); + const { user } = await parent(); if (!user) redirect(307, "/login"); - return { user }; } diff --git a/src/routes/(static)/+layout.server.ts b/src/routes/(static)/+layout.server.ts index bd8ce5a8..a6c5a722 100644 --- a/src/routes/(static)/+layout.server.ts +++ b/src/routes/(static)/+layout.server.ts @@ -1,19 +1,4 @@ -import { auth, get, isInvalidTokenError } from "$lib/utils"; -import { redirect } from "@sveltejs/kit"; - -export async function load({ cookies }) { - const token = cookies.get("token"); - - let user; - if (token) { - try { - user = await get("/me", auth(cookies)); - } catch (e) { - if (isInvalidTokenError(e)) { - redirect(307, "/logout"); - } - } - } - +export async function load({ parent }) { + const { user } = await parent(); return { user }; } -- cgit v1.2.3