sync from GitHub da1963f: feat: 增加超时保护和错误处理，优化用户文件的获取和下载逻辑 fix: 更新版本号至183，调整用户文件同步间隔至1分钟 fix: 扩展请求日志中记录的路径

app/api/user_files.py

@@ -299,10 +299,18 @@ async def list_my_files(user: dict = Depends(require_user)):
     user_id = str(user["sub"])
     items = _list_files_from_db(user_id)
     # SQLite 为空时尝试从 Hub 恢复（Space 重建场景）
-    if not items:
-        restored = await _restore_files_from_hub_async(user_id)
-        if restored > 0:
-            items = _list_files_from_db(user_id)
+    # 加超时保护，避免 Hub 网络问题导致前端一直卡在"拉取列表"
+    if not items and is_hub_enabled():
+        try:
+            restored = await asyncio.wait_for(
+                _restore_files_from_hub_async(user_id), timeout=8.0
+            )
+            if restored > 0:
+                items = _list_files_from_db(user_id)
+        except asyncio.TimeoutError:
+            logger.warning("[list] restore from hub timeout uid=%s, return empty", user_id)
+        except Exception as e:
+            logger.warning("[list] restore from hub failed uid=%s: %s", user_id, e)
     return ok_with_cors({"items": items, "count": len(items)})
 
 
@@ -397,36 +405,50 @@ async def download_file(
             (key,),
         ).fetchone()
     # SQLite 没有则尝试从 Hub 恢复单条 meta（Space 重建场景）
-    if not row:
-        metas = await user_files_store.restore_file_metas(user_id)
-        target = next((m for m in metas if m.get("key") == key), None)
-        if target:
-            try:
+    if not row and is_hub_enabled():
+        try:
+            metas = await asyncio.wait_for(
+                user_files_store.restore_file_metas(user_id), timeout=8.0
+            )
+            target = next((m for m in metas if m.get("key") == key), None)
+            if target:
+                try:
+                    with get_conn() as conn:
+                        conn.execute(
+                            "INSERT OR IGNORE INTO file_meta(key, namespace, filename, mime, size, "
+                            "sha256, uploaded_at, uploaded_by, access_key, refs) "
+                            "VALUES(?,?,?,?,?,?,?,?,?,?)",
+                            (target["key"], NS_USER_FILES, target.get("filename", "unnamed"),
+                             target.get("mime", "application/octet-stream"),
+                             int(target.get("size", 0)), target.get("sha256"),
+                             int(target.get("uploaded_at", 0)), str(user_id),
+                             target.get("access_key", ""), ""),
+                        )
+                except Exception:
+                    pass
                 with get_conn() as conn:
-                    conn.execute(
-                        "INSERT OR IGNORE INTO file_meta(key, namespace, filename, mime, size, "
-                        "sha256, uploaded_at, uploaded_by, access_key, refs) "
-                        "VALUES(?,?,?,?,?,?,?,?,?,?)",
-                        (target["key"], NS_USER_FILES, target.get("filename", "unnamed"),
-                         target.get("mime", "application/octet-stream"),
-                         int(target.get("size", 0)), target.get("sha256"),
-                         int(target.get("uploaded_at", 0)), str(user_id),
-                         target.get("access_key", ""), ""),
-                    )
-            except Exception:
-                pass
-            with get_conn() as conn:
-                row = conn.execute(
-                    "SELECT filename, mime, uploaded_by FROM file_meta WHERE key = ?",
-                    (key,),
-                ).fetchone()
+                    row = conn.execute(
+                        "SELECT filename, mime, uploaded_by FROM file_meta WHERE key = ?",
+                        (key,),
+                    ).fetchone()
+        except asyncio.TimeoutError:
+            logger.warning("[download] restore meta timeout uid=%s key=%s", user_id, key)
+        except Exception as e:
+            logger.warning("[download] restore meta failed uid=%s key=%s: %s", user_id, key, e)
     if not row:
         raise HttpError("file not found", status=404, code="not_found")
     if row["uploaded_by"] != user_id:
         raise HttpError("forbidden", status=403, code="forbidden")
 
-    # 读文件内容：本地优先，Hub 回退
-    content = user_files_store.download_user_file_content(user_id, key)
+    # 读文件内容：本地优先，Hub 回退（同步网络 IO 放到线程池，加超时保护）
+    try:
+        content = await asyncio.wait_for(
+            asyncio.to_thread(user_files_store.download_user_file_content, user_id, key),
+            timeout=15.0,
+        )
+    except asyncio.TimeoutError:
+        logger.warning("[download] content fetch timeout uid=%s key=%s", user_id, key)
+        raise HttpError("file content fetch timeout", status=504, code="upstream_timeout")
     if content is None:
         raise HttpError("file content missing", status=410, code="gone")
 

app/request_log_middleware.py

@@ -25,7 +25,7 @@ from .services import request_log_store
 
 
 # 记录范围
-_RECORDED_PREFIXES = ("/v1/", "/admin/api/")
+_RECORDED_PREFIXES = ("/v1/", "/admin/api/", "/u/api/")
 # 排除项（避免日志刷屏：admin HTML 轮询、health）
 _EXCLUDED_PATHS = {"/admin/api/request-log"}  # 避免查询日志本身被记录导致递归刷屏
 

app/services/user_files_sync.py

@@ -23,7 +23,7 @@ from ..hf_storage import (
 logger = logging.getLogger(__name__)
 
 # 同步间隔（秒）
-SYNC_INTERVAL_SEC = 300  # 5 分钟
+SYNC_INTERVAL_SEC = 60  # 1 分钟
 
 # 需要定时扫描同步的 namespace 前缀
 SYNC_NS_PREFIXES = ["user_accounts", "user_files/", "user_files_meta/"]