feat: proactive Bearer token refresh with unified fallback

- Parse JWT 'exp' claim to track token expiry (token_expires_at)
- Proactively refresh Bearer tokens 1 hour before expiry in
  ensure_authenticated()
- Refresh response without expires_in now falls back to JWT exp for
  expiry derivation
- Support custom refresh_path via bearer auth_config whitelist
- Unify 401 fallback: all bearer types (including Sub2API) now go
  through _refresh_bearer_token() instead of separate old path
- Remove dead _is_sub2api_bearer() / _refresh_sub2api_bearer_token()
- Add 2 new tests: refresh_path override + JWT exp backfill

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

backend/app/services/auth_config.py

@@ -5,7 +5,7 @@ SECRET_KEYS = {"password", "token", "refresh_token", "access_token", "auth_token
 
 AUTH_CONFIG_ALLOWED_KEYS = {
     "none": set(),
-    "bearer": {"token", "refresh_token", "expires_in", "token_expires_at"},
+    "bearer": {"token", "refresh_token", "expires_in", "token_expires_at", "refresh_path"},
     "new_api_token": {"token", "user_id", "new_api_user", "provider"},
     "nox_token": {"token", "user_id", "new_api_user", "provider"},
     "api_key": {"key", "header"},

backend/app/services/upstream_client.py

@@ -1,6 +1,7 @@
 """Upstream HTTP client — ported from monitor_ai98pro_group_rates.py."""
 from __future__ import annotations
 
+import base64
 import hashlib
 import json
 import logging
@@ -133,6 +134,27 @@ def _find_expires_in(value: Any) -> int | None:
     return None
 
 
+def _parse_jwt_exp_timestamp(token: str) -> int | None:
+    """Extract the 'exp' claim (Unix seconds) from a JWT access token.
+
+    Returns None if the token isn't a JWT or has no valid exp claim.
+    """
+    if not token or token.count(".") != 2:
+        return None
+    try:
+        payload_b64 = token.split(".")[1]
+        padding = 4 - len(payload_b64) % 4
+        if padding != 4:
+            payload_b64 += "=" * padding
+        claims = json.loads(base64.urlsafe_b64decode(payload_b64))
+        exp = claims.get("exp")
+        if exp is not None:
+            return int(exp)
+    except Exception:
+        pass
+    return None
+
+
 def _clean_auth_header_value(value: Any, field_name: str) -> str:
     text = str(value or "").strip()
     if not text:
@@ -542,14 +564,12 @@ class UpstreamClient:
             headers["Nox-Api-User"] = self._new_api_user
         return headers
 
-    def _is_sub2api_bearer(self) -> bool:
-        return self.auth_type == "bearer" and self.api_prefix == "api/v1"
-
     def _remember_auth_tokens(
         self,
         token: str = "",
         refresh_token: str = "",
         expires_in: int | None = None,
+        token_expires_at: int | None = None,
     ) -> None:
         changed = False
         if token and self.auth_config.get("token") != token:
@@ -566,6 +586,10 @@ class UpstreamClient:
             if self.auth_config.get("token_expires_at") != token_expires_at:
                 self.auth_config["token_expires_at"] = token_expires_at
                 changed = True
+        elif token_expires_at is not None:
+            if self.auth_config.get("token_expires_at") != token_expires_at:
+                self.auth_config["token_expires_at"] = token_expires_at
+                changed = True
         if changed and self.on_auth_config_update:
             self.on_auth_config_update(dict(self.auth_config))
 
@@ -668,16 +692,25 @@ class UpstreamClient:
         )
         return True
 
-    def _refresh_sub2api_bearer_token(self) -> bool:
-        if not self._is_sub2api_bearer():
-            return False
+    def _refresh_bearer_token(self) -> bool:
+        """Refresh a Bearer access token using its refresh_token.
+
+        Default refresh path depends on api_prefix:
+          - api_prefix == ""           → /api/user/refresh
+          - otherwise                  → /auth/refresh
+        Can be overridden via auth_config ``refresh_path``.
+        When the response has no ``expires_in``, falls back to parsing
+        the new access token's JWT ``exp`` claim.
+        """
         refresh_token = str(self.auth_config.get("refresh_token") or "").strip()
         if not refresh_token:
             return False
+        default_path = "/api/user/refresh" if self.api_prefix == "" else "/auth/refresh"
+        refresh_path = self.auth_config.get("refresh_path") or default_path
         try:
             resp = self._do_request(
                 "POST",
-                self._url("/auth/refresh"),
+                self._url(refresh_path),
                 json={"refresh_token": refresh_token},
                 headers=self._headers(auth=False),
                 cookies=self._cookies,
@@ -691,13 +724,49 @@ class UpstreamClient:
         token = _find_token(payload)
         if not token:
             return False
+
+        expires_in = _find_expires_in(payload)
+        token_expires_at = None
+        if expires_in is None:
+            token_expires_at = _parse_jwt_exp_timestamp(token)
+
         self._remember_auth_tokens(
             token=token,
             refresh_token=_find_refresh_token(payload) or refresh_token,
-            expires_in=_find_expires_in(payload),
+            expires_in=expires_in,
+            token_expires_at=token_expires_at,
         )
         return True
 
+    def _ensure_bearer_token_fresh(self) -> None:
+        """Proactively refresh Bearer token if it will expire within 1 hour.
+
+        Writes missing ``token_expires_at`` from JWT ``exp`` claim if absent.
+        Does nothing if there is no ``refresh_token`` or no expiry info.
+        """
+        refresh_token = str(self.auth_config.get("refresh_token") or "").strip()
+        if not refresh_token:
+            return
+
+        # Try to derive token_expires_at from JWT exp if not already saved
+        if self.auth_config.get("token_expires_at") is None:
+            token = str(self.auth_config.get("token") or "").strip()
+            exp = _parse_jwt_exp_timestamp(token)
+            if exp is not None:
+                self._remember_auth_tokens(token_expires_at=exp)
+
+        token_expires_at = self.auth_config.get("token_expires_at")
+        if token_expires_at is None:
+            return
+        try:
+            expires_at_int = int(token_expires_at)
+        except (TypeError, ValueError):
+            return
+
+        # Refresh if within 1 hour of expiry
+        if int(time.time()) + 3600 >= expires_at_int:
+            self._refresh_bearer_token()
+
     def _send_request(
         self,
         method: str,
@@ -719,8 +788,8 @@ class UpstreamClient:
             and auth
             and allow_refresh
         ):
-            # sub2api bearer: 尝试 refresh
-            if self._is_sub2api_bearer() and self._refresh_sub2api_bearer_token():
+            # bearer: 尝试 refresh（含 Sub2API，统一走 _refresh_bearer_token）
+            if self.auth_type == "bearer" and self._refresh_bearer_token():
                 resp = self._do_request(
                     method,
                     url,
@@ -1050,12 +1119,18 @@ class UpstreamClient:
     def ensure_authenticated(self) -> None:
         """确保已认证，优先复用 token，过期后 refresh，失败再重新登录。
 
-        对于 login_password 类型：
+        对于 bearer 类型：
+        - 有 refresh_token 时，在过期前 1 小时主动 refresh（避免上游在过期后拒绝刷新）
+        - 无 refresh_token 时不做任何事（静默失败，后续 API 调用会 401）
+
+        对于 login_password 类型（保持原有逻辑）：
         - 已有未过期 token：不登录，直接使用
         - token 快过期或已过期且有 refresh_token：先 refresh
         - refresh 失败、无 token、无 refresh token：回退到现有登录流程
-        其他认证类型：调用 login() 保持原有行为
         """
+        if self.auth_type == "bearer":
+            self._ensure_bearer_token_fresh()
+            return
         if self.auth_type != "login_password":
             self.login()
             return