From 9d766b0025564abd7f143be7329a7067e6881c16 Mon Sep 17 00:00:00 2001
From: hehh <lingtinzhe@icloud.com>
Date: Tue, 25 Nov 2025 00:49:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(about):=20=E4=B8=BAfetch=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B6=85=E6=97=B6=E6=8E=A7=E5=88=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增fetchWithTimeout方法支持请求超时控制
- 为GitHub用户数据请求添加5秒超时限制
- 为GitHub仓库数据请求添加5秒超时限制
- 为RSS数据请求添加5秒超时限制
- 为本地文章数据请求添加3秒超时限制
- 使用AbortController实现请求中断机制
- 优化请求失败时的错误处理流程
---
 js/about.js | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/js/about.js b/js/about.js
index dc4c7bb..20c0d63 100644
--- a/js/about.js
+++ b/js/about.js
@@ -224,6 +224,21 @@ class DataManager {
         setTimeout(() => this.fetchBlog(), 0);
     }
 
+    // 创建带超时的fetch函数
+    async fetchWithTimeout(url, options = {}) {
+        const { timeout = 5000 } = options;
+        
+        const controller = new AbortController();
+        const id = setTimeout(() => controller.abort(), timeout);
+        
+        const response = await fetch(url, {
+            ...options,
+            signal: controller.signal
+        });
+        clearTimeout(id);
+        return response;
+    }
+
     // 优先缓存 -> API -> 默认值
     async fetchGithub() {
         const user = (window.SiteConfig?.github?.username) || 'listener-He';
@@ -240,14 +255,14 @@ class DataManager {
         }
 
         try {
-            // Parallel Fetch
-            const uRes = await fetch(`https://api.github.com/users/${user}`);
+            // Parallel Fetch with timeout
+            const uRes = await this.fetchWithTimeout(`https://api.github.com/users/${user}`, { timeout: 5000 });
             const userData = uRes.ok ? await uRes.json() : (window.SiteConfig?.defaults?.user);
             let allRepos = [];
             let page = 1;
             const perPage = 100;
             while (page <= 10) { // 最多抓取1000条，直到满足条件或为空
-                const rRes = await fetch(`https://api.github.com/users/${user}/repos?sort=stars&per_page=${perPage}&page=${page}`);
+                const rRes = await this.fetchWithTimeout(`https://api.github.com/users/${user}/repos?sort=stars&per_page=${perPage}&page=${page}`, { timeout: 5000 });
                 if (!rRes.ok) break;
                 const repos = await rRes.json();
                 if (!Array.isArray(repos) || repos.length === 0) break;
@@ -342,8 +357,8 @@ class DataManager {
         }
 
         try {
-            // 尝试从RSS获取
-            const response = await fetch(rssUrl);
+            // 尝试从RSS获取，带超时设置
+            const response = await this.fetchWithTimeout(rssUrl, { timeout: 5000 });
             if (!response.ok) throw new Error('RSS fetch failed');
 
             const xmlText = await response.text();
@@ -385,7 +400,7 @@ class DataManager {
             console.warn("RSS API Fail", e);
             // 降级到本地JSON文件
             try {
-                const response = await fetch('data/articles.json');
+                const response = await this.fetchWithTimeout('data/articles.json', { timeout: 3000 });
                 const data = await response.json();
                 this.renderBlog(data);
             } catch (e2) {