Skip to content

修订 favicon 超时信息 #540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CodFrm merged 1 commit into from
Jul 14, 2025
Merged

修订 favicon 超时信息 #540

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions src/pkg/utils/favicon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,28 +124,35 @@ function parseFaviconsNew(html: string, callback: (href: string) => void) {
return;
}

// AbortSignal.timeout 是较新的功能。如果不支持 AbortSignal.timeout，则返回传统以定时器操作 AbortController
const timeoutAbortSignal =
typeof AbortSignal?.timeout === "function"
? (milis: number) => {
return AbortSignal.timeout(milis);
}
: (milis: number) => {
let controller: AbortController | null = new AbortController();
const signal = controller.signal;
setTimeout(() => {
controller!.abort(); // 中断请求
controller = null;
}, milis);
return signal;
};

/**
* 从域名获取favicon
*/
async function getFaviconFromDomain(domain: string): Promise<string[]> {
const url = `https://${domain}`;
const icons: string[] = [];

// 创建 AbortController 实例
const controller = new AbortController();
const signal = controller.signal;

// 设置超时时间（例如 5 秒）
const timeout = 5000; // 单位：毫秒

// 设置超时计时器
const timeoutId = setTimeout(() => {
controller.abort(); // 中断请求
}, timeout);
try {
// 获取页面HTML

const response = await fetch(url, { signal });
const response = await fetch(url, { signal: timeoutAbortSignal(timeout) });
const html = await response.text();

parseFaviconsNew(html, (href) => icons.push(resolveUrl(href, url)));
Expand All @@ -154,7 +161,7 @@ async function getFaviconFromDomain(domain: string): Promise<string[]> {
if (icons.length === 0) {
const faviconUrl = `${url}/favicon.ico`;
try {
const faviconResponse = await fetch(faviconUrl, { method: "HEAD", signal });
const faviconResponse = await fetch(faviconUrl, { method: "HEAD", signal: timeoutAbortSignal(timeout) });
if (faviconResponse.ok) {
icons.push(faviconUrl);
}
Expand All @@ -164,11 +171,15 @@ async function getFaviconFromDomain(domain: string): Promise<string[]> {
}

return icons;
} catch (error) {
console.error(`Error fetching favicon for ${domain}:`, error);
} catch (error: any) {
if (error.name === "AbortError") {
// 超时
console.warn(`Timeout while fetching favicon:`, url);
} else {
// 其他错误
console.error(`Error fetching favicon for ${domain}:`, error);
}
return [];
} finally {
clearTimeout(timeoutId); // 清除超时计时器
}
}

Expand Down