{t("正在加载…")}
; return ({t("正在读取设置…")}
} {mode === "settings" && } diff --git a/src/GameLibrary.Tauri/src/lib/api.ts b/src/GameLibrary.Tauri/src/lib/api.ts index a321d39..7c9cf4d 100644 --- a/src/GameLibrary.Tauri/src/lib/api.ts +++ b/src/GameLibrary.Tauri/src/lib/api.ts @@ -165,11 +165,11 @@ function validateGame(value: unknown) { } } -export function assetDataUrl(assetId: string) { +export function assetDataUrl(assetId: string, signal?: AbortSignal) { return assetCache.load(assetId, async () => { const result = await operation<{ mimeType: string; dataBase64: string }>("assets.get", { assetId }); return `data:${result.data.mimeType};base64,${result.data.dataBase64}`; - }); + }, signal); } /** diff --git a/src/GameLibrary.Tauri/src/lib/assetCache.test.ts b/src/GameLibrary.Tauri/src/lib/assetCache.test.ts index b4aa48f..7b8ed5b 100644 --- a/src/GameLibrary.Tauri/src/lib/assetCache.test.ts +++ b/src/GameLibrary.Tauri/src/lib/assetCache.test.ts @@ -2,6 +2,57 @@ import { describe, expect, it, vi } from "vitest"; import { DataUrlCache } from "./assetCache"; describe("data URL cache", () => { + it("bounds fetches and skips a queued cover after its last consumer leaves", async () => { + const cache = new DataUrlCache(1024, 1); + let finish!: (value: string) => void; + const active = cache.load("active", () => new Promise(resolve => { finish = resolve; })); + const signal = new AbortController(); + const skipped = vi.fn(async () => "old cover"); + const queued = cache.load("offscreen", skipped, signal.signal); + const rejected = expect(queued).rejects.toMatchObject({ name: "AbortError" }); + const nextFetch = vi.fn(async () => "visible cover"); + const next = cache.load("visible", nextFetch); + expect(nextFetch).not.toHaveBeenCalled(); + signal.abort(); + await rejected; + finish("first"); + await active; + await expect(next).resolves.toBe("visible cover"); + expect(skipped).not.toHaveBeenCalled(); + expect(nextFetch).toHaveBeenCalledOnce(); + }); + + it("does not cancel another consumer of the same queued asset", async () => { + const cache = new DataUrlCache(1024, 1); + let finish!: (value: string) => void; + const active = cache.load("active", () => new Promise(resolve => { finish = resolve; })); + const signal = new AbortController(); + const fetch = vi.fn(async () => "shared"); + const a = cache.load("same", fetch, signal.signal); + const b = cache.load("same", fetch); + const rejected = expect(a).rejects.toMatchObject({ name: "AbortError" }); + signal.abort(); await rejected; + finish("first"); await active; + await expect(b).resolves.toBe("shared"); + expect(fetch).toHaveBeenCalledOnce(); + }); + + it("invalidates queued work while preserving the original error of running work", async () => { + const cache = new DataUrlCache(1024, 1); + let fail!: (reason: Error) => void; + const active = cache.load("active", () => new Promise((_resolve, reject) => { fail = reject; })); + const oldFetch = vi.fn(async () => "old"); + const old = cache.load("queued", oldFetch); + const activeError = expect(active).rejects.toThrow("库已切换"); + const queuedError = expect(old).rejects.toThrow("封面已变化"); + cache.clear(); + const fresh = cache.load("queued", async () => "new"); + fail(new Error("库已切换")); + await activeError; await queuedError; + await expect(fresh).resolves.toBe("new"); + expect(oldFetch).not.toHaveBeenCalled(); + }); + it("uses string bytes and evicts the least recently read value", async () => { const cache = new DataUrlCache(24); await cache.load("a", async () => "12345"); diff --git a/src/GameLibrary.Tauri/src/lib/assetCache.ts b/src/GameLibrary.Tauri/src/lib/assetCache.ts index 0662b27..1f28d29 100644 --- a/src/GameLibrary.Tauri/src/lib/assetCache.ts +++ b/src/GameLibrary.Tauri/src/lib/assetCache.ts @@ -1,55 +1,127 @@ import { t } from "./i18n"; -/** Conservative UTF-16 string storage estimate; cached data URLs retain the public API. */ + +interface Consumer { + resolve: (value: string) => void; + reject: (reason: unknown) => void; + signal?: AbortSignal; + abort: () => void; +} +interface FetchEntry { + key: string; + generation: number; + fetch: () => Promise