iarv/Remote-Terminal-for-MeshCore
1
0
Fork 1
mirror of https://github.com/jkingsman/Remote-Terminal-for-MeshCore.git synced 2026-03-28 17:43:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix prefetch type glitch

Browse Source
This commit is contained in:
Jack Kingsman
2026-02-27 18:48:39 -08:00
parent dcd473de6c
commit fc27361e37
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/src/prefetch.ts
View File

@@ -8,21 +8,21 @@
import type { AppSettings, Channel, Contact, RadioConfig, UnreadCounts } from './types';
interface PrefetchMap {
config?: Promise<RadioConfig>;
settings?: Promise<AppSettings>;
channels?: Promise<Channel[]>;
contacts?: Promise<Contact[]>;
unreads?: Promise<UnreadCounts>;
undecryptedCount?: Promise<{ count: number }>;
config: Promise<RadioConfig>;
settings: Promise<AppSettings>;
channels: Promise<Channel[]>;
contacts: Promise<Contact[]>;
unreads: Promise<UnreadCounts>;
undecryptedCount: Promise<{ count: number }>;
}
const store: PrefetchMap = (window as unknown as { __prefetch?: PrefetchMap }).__prefetch ?? {};
const store: Partial<PrefetchMap> =
(window as unknown as { __prefetch?: Partial<PrefetchMap> }).__prefetch ?? {};
type PrefetchResolved<K extends keyof PrefetchMap> =
PrefetchMap[K] extends Promise<infer T> ? T : never;
type PrefetchResolved<K extends keyof PrefetchMap> = Awaited<PrefetchMap[K]>;
/** Take a prefetched promise (consumed once, then gone). */
export function takePrefetch<K extends keyof PrefetchMap>(key: K): PrefetchMap[K] {
export function takePrefetch<K extends keyof PrefetchMap>(key: K): PrefetchMap[K] | undefined {
const p = store[key];
delete store[key];
return p;
@@ -42,7 +42,7 @@ export async function takePrefetchOrFetch<K extends keyof PrefetchMap>(
}
try {
return await prefetched;
return (await prefetched) as PrefetchResolved<K>;
} catch (err) {
console.warn(`Prefetch for "${String(key)}" failed, falling back to live fetch.`, err);
return fallback();