重试机制

This commit is contained in:
mtvpls
2026-05-19 20:26:17 +08:00
parent 6a0fb07e1d
commit da1be9a07c
2 changed files with 46 additions and 21 deletions
+22 -8
View File
@@ -327,6 +327,24 @@ function findTocLabelByHref(items: TocItem[], currentHref: string): string {
return '';
}
async function fetchJsonWithRetry<T>(url: string, init?: RequestInit, retries = 2): Promise<T> {
let lastError: unknown;
for (let attempt = 0; attempt <= retries; attempt += 1) {
try {
const res = await fetch(url, init);
const json = await res.json();
if (!res.ok) throw new Error(json.error || `请求失败: ${res.status}`);
return json as T;
} catch (error) {
lastError = error;
if (attempt < retries) {
await new Promise((resolve) => setTimeout(resolve, 300 * (attempt + 1)));
}
}
}
throw lastError instanceof Error ? lastError : new Error('请求失败');
}
async function downloadBookWithProgress(
manifest: Pick<BookReadManifest, 'book' | 'format' | 'acquisitionHref'>,
onProgress: (received: number, total: number | null) => void
@@ -492,10 +510,8 @@ function ChapterReader({ manifest }: { manifest: BookReadManifest }) {
setLoading(true);
setError('');
const url = manifest.chaptersUrl || `/api/books/read/chapters?sourceId=${encodeURIComponent(manifest.book.sourceId)}&bookId=${encodeURIComponent(manifest.book.id)}`;
fetch(url, { cache: 'no-store' })
.then(async (res) => {
const json = await res.json();
if (!res.ok) throw new Error(json.error || '获取目录失败');
fetchJsonWithRetry<{ chapters?: BookChapter[] }>(url, { cache: 'no-store' })
.then((json) => {
if (cancelled) return;
const list = (json.chapters || []) as BookChapter[];
setChapters(list);
@@ -520,10 +536,8 @@ function ChapterReader({ manifest }: { manifest: BookReadManifest }) {
scrollRef.current?.scrollTo({ top: 0, behavior: 'auto' });
const params = new URLSearchParams({ sourceId: manifest.book.sourceId, href: item.href });
if (manifest.acquisitionHref) params.set('tocHref', manifest.acquisitionHref);
fetch(`/api/books/read/chapter?${params.toString()}`, { cache: 'no-store' })
.then(async (res) => {
const json = await res.json();
if (!res.ok) throw new Error(json.error || '获取章节失败');
fetchJsonWithRetry<BookChapterContent>(`/api/books/read/chapter?${params.toString()}`, { cache: 'no-store' })
.then((json) => {
setChapter({ ...(json as BookChapterContent), title: (json as BookChapterContent).title || item.title });
const progressPercent = chapters.length > 0 ? Math.round(((currentIndex + 1) / chapters.length) * 100) : 0;
const record: BookReadRecord = {
+24 -13
View File
@@ -373,6 +373,10 @@ function normalizeConfiguredLegadoSource(item: any, index: number): BookSource |
return null;
}
function wait(ms: number) {
return new Promise((resolve) => setTimeout(resolve, ms));
}
async function fetchText(source: BookSource, url: string): Promise<string> {
const safe = await validateProxyUrlServerSide(url);
if (!safe) throw new Error('书源地址未通过安全校验');
@@ -381,20 +385,27 @@ async function fetchText(source: BookSource, url: string): Promise<string> {
const { cacheTTL } = await resolveLegadoConfig();
if (cached && cached.expiresAt > Date.now()) return cached.data;
const controller = new AbortController();
const timeout = setTimeout(() => controller.abort(), DEFAULT_TIMEOUT_MS);
try {
const response = await fetch(url, { headers: buildHeaders(source), signal: controller.signal, cache: 'no-store' });
if (!response.ok) throw new Error(`请求失败: ${response.status}`);
const contentLength = Number(response.headers.get('content-length') || '0');
if (contentLength > MAX_TEXT_BYTES) throw new Error('响应内容过大');
const text = await response.text();
if (text.length > MAX_TEXT_BYTES) throw new Error('响应内容过大');
textCache.set(cacheKey, { data: text, expiresAt: Date.now() + cacheTTL });
return text;
} finally {
clearTimeout(timeout);
let lastError: unknown;
for (let attempt = 0; attempt < 3; attempt += 1) {
const controller = new AbortController();
const timeout = setTimeout(() => controller.abort(), DEFAULT_TIMEOUT_MS);
try {
const response = await fetch(url, { headers: buildHeaders(source), signal: controller.signal, cache: 'no-store' });
if (!response.ok) throw new Error(`请求失败: ${response.status}`);
const contentLength = Number(response.headers.get('content-length') || '0');
if (contentLength > MAX_TEXT_BYTES) throw new Error('响应内容过大');
const text = await response.text();
if (text.length > MAX_TEXT_BYTES) throw new Error('响应内容过大');
textCache.set(cacheKey, { data: text, expiresAt: Date.now() + cacheTTL });
return text;
} catch (error) {
lastError = error;
if (attempt < 2) await wait(300 * (attempt + 1));
} finally {
clearTimeout(timeout);
}
}
throw lastError instanceof Error ? lastError : new Error('请求失败');
}
async function getSourceById(sourceId: string): Promise<BookSource> {