feat: add method to list normal tokens and update Cloudflare clearance handling

Author: basketikun

api/support.py

@@ -86,15 +86,17 @@ def worker() -> None:
         while not stop_event.is_set():
             try:
                 limited_tokens = account_service.list_limited_tokens()
+                normal_tokens = account_service.list_normal_tokens()
                 expiring_tokens = account_service.list_expiring_access_tokens()
                 keepalive_tokens = account_service.list_refresh_token_keepalive_tokens()
-                tokens = list(dict.fromkeys([*limited_tokens, *expiring_tokens]))
+                tokens = list(dict.fromkeys([*limited_tokens, *normal_tokens, *expiring_tokens]))
                 expiring_token_set = set(expiring_tokens)
                 keepalive_tokens = [token for token in keepalive_tokens if token not in expiring_token_set]
                 if tokens:
                     print(
                         "[account-watcher] checking "
                         f"{len(limited_tokens)} limited accounts, "
+                        f"{len(normal_tokens)} normal accounts, "
                         f"{len(expiring_tokens)} expiring access tokens"
                     )
                     account_service.refresh_accounts(tokens)

config.json

@@ -1,6 +1,6 @@
 {
   "auth-key": "chatgpt2api",
-  "refresh_account_interval_minute": 60,
+  "refresh_account_interval_minute": 5,
   "image_retention_days": 15,
   "image_poll_timeout_secs": 120,
   "auto_remove_rate_limited_accounts": false,
@@ -13,7 +13,7 @@
   ],
   "proxy": "",
   "proxy_runtime": {
-    "enabled": true,
+    "enabled": false,
     "egress_mode": "single_proxy",
     "proxy_url": "http://privoxy:8118",
     "resource_proxy_url": "",

services/account_service.py

@@ -1076,6 +1076,15 @@ def list_limited_tokens(self) -> list[str]:
                    and (token := item.get("access_token") or "")
             ]
 
+    def list_normal_tokens(self) -> list[str]:
+        with self._lock:
+            return [
+                token
+                for item in self._accounts.values()
+                if item.get("status") == "正常"
+                   and (token := item.get("access_token") or "")
+            ]
+
     @staticmethod
     def _account_payload_token(item: dict) -> str:
         return str(item.get("access_token") or item.get("accessToken") or "").strip()

services/register/openai_register.py

@@ -194,25 +194,20 @@ def _response_debug_detail(resp, limit: int = 800) -> str:
 def _is_cloudflare_challenge(resp) -> bool:
     if resp is None:
         return False
-    text = str(getattr(resp, "text", "") or "").lower()
-    headers = getattr(resp, "headers", {}) or {}
-    server = str(headers.get("server") or "").lower()
     try:
         status_code = int(getattr(resp, "status_code", 0) or 0)
     except (TypeError, ValueError):
         status_code = 0
-
-    explicit_challenge_markers = (
-        "challenges.cloudflare.com" in text
-        or "<title>just a moment" in text
-        or "/cdn-cgi/challenge-platform/" in text
+    if status_code not in (403, 503):
+        return False
+    text = str(getattr(resp, "text", "") or "").lower()
+    return (
+        "<title>just a moment" in text
+        or "<title>attention required! | cloudflare" in text
         or "cf-chl-" in text
         or "__cf_chl_" in text
+        or "cf-browser-verification" in text
     )
-    if explicit_challenge_markers:
-        return True
-
-    return "cloudflare" in server and status_code in (403, 503)
 
 
 def _mail_config() -> dict:
@@ -300,10 +295,11 @@ def _headers_with_clearance(
     return normalized
 
 
-def _cloudflare_block_message(resp, prefix: str = "被 Cloudflare 拦截") -> str:
+def _cloudflare_block_message(resp, prefix: str = "被 Cloudflare 拦截", reason: str = "") -> str:
     status = getattr(resp, "status_code", "unknown")
     debug = _response_debug_detail(resp)
-    return f"{prefix}，clearance 刷新失败或重试后仍失败，请更换 IP/代理重试: status={status}, {debug}"
+    reason = reason or "clearance 刷新失败或重试后仍失败，请更换 IP/代理重试"
+    return f"{prefix}，{reason}: status={status}, {debug}"
 
 
 def request_with_local_retry(session: requests.Session, method: str, url: str, retry_attempts: int = 3, **kwargs):
@@ -386,6 +382,7 @@ def __init__(self, proxy: str = "") -> None:
         self.proxy = str(proxy or "").strip()
         self.session = create_session(self.proxy)
         self.clearance_user_agent = ""
+        self.clearance_failure_reason = ""
         self.device_id = str(uuid.uuid4())
         self.code_verifier = ""
         self.platform_auth_code = ""
@@ -407,6 +404,14 @@ def _json_headers(self, referer: str) -> dict[str, str]:
         return headers
 
     def _refresh_cloudflare_clearance(self, target_url: str, index: int) -> ClearanceBundle | None:
+        self.clearance_failure_reason = ""
+        profile = proxy_settings.get_profile(proxy=self.proxy, upstream=True)
+        if not profile.clearance_enabled:
+            self.clearance_failure_reason = (
+                "可尝试使用 FlareSolverr 清障方式，注意需要 Docker 部署 flaresolverr、privoxy、warp-proxy 等相关容器"
+            )
+            step(index, f"检测到 Cloudflare 拦截，{self.clearance_failure_reason}", "yellow")
+            return None
         step(index, "检测到 Cloudflare 拦截，尝试刷新 clearance", "yellow")
         bundle = proxy_settings.refresh_clearance(
             target_url=target_url,
@@ -418,6 +423,9 @@ def _refresh_cloudflare_clearance(self, target_url: str, index: int) -> Clearanc
             _apply_clearance_to_session(self.session, bundle)
             self.clearance_user_agent = bundle.user_agent or self.clearance_user_agent
             step(index, "Cloudflare clearance 刷新完成，重试当前请求", "yellow")
+        else:
+            self.clearance_failure_reason = "clearance 刷新未返回可用 Cookie，请检查 FlareSolverr URL、代理和出口 IP"
+            step(index, f"Cloudflare clearance 刷新失败：{self.clearance_failure_reason}", "yellow")
         return bundle
 
     def _platform_authorize(self, email: str, index: int) -> None:
@@ -453,7 +461,7 @@ def _platform_authorize(self, email: str, index: int) -> None:
         if _is_cloudflare_challenge(resp):
             bundle = self._refresh_cloudflare_clearance(auth_base, index)
             if bundle is None:
-                raise RuntimeError(_cloudflare_block_message(resp))
+                raise RuntimeError(_cloudflare_block_message(resp, reason=self.clearance_failure_reason))
             retry_headers = _headers_with_clearance(self._navigate_headers(f"{platform_base}/"), target_url, self.proxy, self.clearance_user_agent)
             resp, error = request_with_local_retry(self.session, "get", target_url, headers=retry_headers, allow_redirects=True, verify=False)
             if _is_cloudflare_challenge(resp):
@@ -479,7 +487,7 @@ def _register_user(self, email: str, password: str, index: int) -> None:
         if _is_cloudflare_challenge(resp):
             bundle = self._refresh_cloudflare_clearance(auth_base, index)
             if bundle is None:
-                raise RuntimeError(_cloudflare_block_message(resp))
+                raise RuntimeError(_cloudflare_block_message(resp, reason=self.clearance_failure_reason))
             headers = self._json_headers(f"{auth_base}/create-account/password")
             headers["openai-sentinel-token"] = build_sentinel_token(self.session, self.device_id, "username_password_create")
             headers = _headers_with_clearance(headers, url, self.proxy, self.clearance_user_agent)
@@ -502,7 +510,7 @@ def _send_otp(self, index: int) -> None:
         if _is_cloudflare_challenge(resp):
             bundle = self._refresh_cloudflare_clearance(auth_base, index)
             if bundle is None:
-                raise RuntimeError(_cloudflare_block_message(resp))
+                raise RuntimeError(_cloudflare_block_message(resp, reason=self.clearance_failure_reason))
             headers = _headers_with_clearance(self._navigate_headers(f"{auth_base}/create-account/password"), url, self.proxy, self.clearance_user_agent)
             resp, error = request_with_local_retry(self.session, "get", url, headers=headers, allow_redirects=True, verify=False)
             if _is_cloudflare_challenge(resp):
@@ -533,7 +541,7 @@ def _create_account(self, name: str, birthdate: str, index: int) -> None:
         if _is_cloudflare_challenge(resp):
             bundle = self._refresh_cloudflare_clearance(auth_base, index)
             if bundle is None:
-                raise RuntimeError(_cloudflare_block_message(resp))
+                raise RuntimeError(_cloudflare_block_message(resp, reason=self.clearance_failure_reason))
             headers = self._json_headers(f"{auth_base}/about-you")
             headers["openai-sentinel-token"] = build_sentinel_token(self.session, self.device_id, "oauth_create_account")
             headers = _headers_with_clearance(headers, url, self.proxy, self.clearance_user_agent)

web/src/app/settings/components/proxy-runtime-card.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { AlertTriangle, Cookie, LoaderCircle, PlugZap, ShieldCheck } from "lucide-react";
+import { AlertTriangle, Cookie, LoaderCircle, PlugZap, Save, ShieldCheck } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
 
@@ -29,6 +29,7 @@ export function ProxyRuntimeCard() {
   const [targetUrl, setTargetUrl] = useState("https://chatgpt.com");
   const config = useSettingsStore((state) => state.config);
   const isLoadingConfig = useSettingsStore((state) => state.isLoadingConfig);
+  const isSavingConfig = useSettingsStore((state) => state.isSavingConfig);
   const saveConfig = useSettingsStore((state) => state.saveConfig);
   const setProxyRuntimeField = useSettingsStore((state) => state.setProxyRuntimeField);
   const setProxyRuntimeClearanceField = useSettingsStore((state) => state.setProxyRuntimeClearanceField);
@@ -360,6 +361,18 @@ export function ProxyRuntimeCard() {
             ) : null}
           </div>
         </div>
+
+        <div className="flex justify-end">
+          <Button
+            type="button"
+            className="h-10 rounded-xl bg-stone-950 px-5 text-white hover:bg-stone-800"
+            onClick={() => void saveConfig()}
+            disabled={isSavingConfig}
+          >
+            {isSavingConfig ? <LoaderCircle className="size-4 animate-spin" /> : <Save className="size-4" />}
+            保存配置
+          </Button>
+        </div>
       </CardContent>
     </Card>
   );