fix merged proxy and settings regressions

Co-Authored-By: Codex <noreply@openai.com>

services/api.py

@@ -13,6 +13,7 @@ from services.account_service import account_service
 from services.chatgpt_service import ChatGPTService
 from services.config import config
 from services.cpa_service import cpa_config, cpa_import_service, list_remote_files
+from services.proxy_service import test_proxy
 from services.sub2api_service import (
     list_remote_accounts as sub2api_list_remote_accounts,
     list_remote_groups as sub2api_list_remote_groups,
@@ -593,20 +594,6 @@ def create_app() -> FastAPI:
 
     # ── Upstream proxy endpoints ─────────────────────────────────────
 
-    @router.get("/api/proxy")
-    async def get_proxy(authorization: str | None = Header(default=None)):
-        require_auth_key(authorization)
-        return {"proxy": proxy_config.get_public()}
-
-    @router.post("/api/proxy")
-    async def update_proxy(body: ProxyUpdateRequest, authorization: str | None = Header(default=None)):
-        require_auth_key(authorization)
-        try:
-            proxy_config.update(enabled=body.enabled, url=body.url)
-        except ValueError as exc:
-            raise HTTPException(status_code=400, detail={"error": str(exc)}) from exc
-        return {"proxy": proxy_config.get_public()}
-
     @router.post("/api/proxy/test")
     async def test_proxy_endpoint(
             body: ProxyTestRequest,
@@ -615,7 +602,7 @@ def create_app() -> FastAPI:
         require_auth_key(authorization)
         candidate = (body.url or "").strip()
         if not candidate:
-            candidate = (proxy_config.get().get("url") or "").strip()
+            candidate = config.get_proxy_settings()
         if not candidate:
             raise HTTPException(status_code=400, detail={"error": "proxy url is required"})
         result = await run_in_threadpool(test_proxy, candidate)

services/proxy_service.py

@@ -2,11 +2,15 @@
 
 from __future__ import annotations
 
+import time
+from urllib.parse import urlparse
+
+from curl_cffi.requests import Session
+
 from services.config import config
 
 
 class ProxySettingsStore:
-
     def build_session_kwargs(self, **session_kwargs) -> dict[str, object]:
         proxy = config.get_proxy_settings()
         if proxy:
@@ -14,19 +18,22 @@ class ProxySettingsStore:
         return session_kwargs
 
 
-proxy_settings = ProxySettingsStore()
+def _clean(value: object) -> str:
+    return str(value or "").strip()
+
+
+def _is_valid_proxy_url(url: str) -> bool:
+    parsed = urlparse(url)
+    return parsed.scheme in {"http", "https", "socks5", "socks5h"} and bool(parsed.netloc)
 
 
 def test_proxy(url: str, *, timeout: float = 15.0) -> dict:
-    """Probe chatgpt.com through the given proxy URL. Returns {ok, status, latency_ms, error}."""
     candidate = _clean(url)
     if not candidate:
         return {"ok": False, "status": 0, "latency_ms": 0, "error": "proxy url is required"}
     if not _is_valid_proxy_url(candidate):
         return {"ok": False, "status": 0, "latency_ms": 0, "error": "invalid proxy url"}
-
-    session = Session(impersonate="edge101", verify=True)
-    session.proxies.update({"http": candidate, "https": candidate})
+    session = Session(impersonate="edge101", verify=True, proxy=candidate)
     started = time.perf_counter()
     try:
         response = session.get(
@@ -51,3 +58,6 @@ def test_proxy(url: str, *, timeout: float = 15.0) -> dict:
         }
     finally:
         session.close()
+
+proxy_settings = ProxySettingsStore()
+

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

@@ -1,15 +1,20 @@
 "use client";
 
-import { Link2, LoaderCircle, Save } from "lucide-react";
+import { useState } from "react";
+import { Link2, LoaderCircle, PlugZap, Save } from "lucide-react";
+import { toast } from "sonner";
 
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
+import { testProxy, type ProxyTestResult } from "@/lib/api";
 
 import { useSettingsStore } from "../store";
 
 export function ProxySettingsCard() {
+  const [isTesting, setIsTesting] = useState(false);
+  const [testResult, setTestResult] = useState<ProxyTestResult | null>(null);
   const config = useSettingsStore((state) => state.config);
   const isLoadingConfig = useSettingsStore((state) => state.isLoadingConfig);
   const isSavingConfig = useSettingsStore((state) => state.isSavingConfig);
@@ -18,6 +23,29 @@ export function ProxySettingsCard() {
 
   const proxy = config?.proxy ?? "";
 
+  const handleTest = async () => {
+    const candidate = proxy.trim();
+    if (!candidate) {
+      toast.error("请先填写代理地址");
+      return;
+    }
+    setIsTesting(true);
+    setTestResult(null);
+    try {
+      const data = await testProxy(candidate);
+      setTestResult(data.result);
+      if (data.result.ok) {
+        toast.success(`代理可用（${data.result.latency_ms} ms，HTTP ${data.result.status}）`);
+      } else {
+        toast.error(`代理不可用：${data.result.error ?? "未知错误"}`);
+      }
+    } catch (error) {
+      toast.error(error instanceof Error ? error.message : "测试代理失败");
+    } finally {
+      setIsTesting(false);
+    }
+  };
+
   return (
     <Card className="rounded-2xl border-white/80 bg-white/90 shadow-sm">
       <CardContent className="space-y-6 p-6">
@@ -46,7 +74,10 @@ export function ProxySettingsCard() {
               <label className="text-sm font-medium text-stone-700">代理地址</label>
               <Input
                 value={proxy}
-                onChange={(event) => setProxy(event.target.value)}
+                onChange={(event) => {
+                  setProxy(event.target.value);
+                  setTestResult(null);
+                }}
                 placeholder="http://user:pass@127.0.0.1:7890"
                 className="h-11 rounded-xl border-stone-200 bg-white"
               />
@@ -55,7 +86,30 @@ export function ProxySettingsCard() {
               </p>
             </div>
 
-            <div className="flex justify-end">
+            {testResult ? (
+              <div
+                className={`rounded-xl border px-4 py-3 text-sm leading-6 ${
+                  testResult.ok
+                    ? "border-emerald-200 bg-emerald-50 text-emerald-800"
+                    : "border-rose-200 bg-rose-50 text-rose-800"
+                }`}
+              >
+                {testResult.ok
+                  ? `代理可用：HTTP ${testResult.status}，用时 ${testResult.latency_ms} ms`
+                  : `代理不可用：${testResult.error ?? "未知错误"}（用时 ${testResult.latency_ms} ms）`}
+              </div>
+            ) : null}
+
+            <div className="flex justify-end gap-2">
+              <Button
+                variant="outline"
+                className="h-10 rounded-xl border-stone-200 bg-white px-5 text-stone-700"
+                onClick={() => void handleTest()}
+                disabled={isTesting || isLoadingConfig}
+              >
+                {isTesting ? <LoaderCircle className="size-4 animate-spin" /> : <PlugZap className="size-4" />}
+                测试代理
+              </Button>
               <Button
                 className="h-10 rounded-xl bg-stone-950 px-5 text-white hover:bg-stone-800"
                 onClick={() => void saveConfig()}

web/src/app/settings/page.tsx

@@ -7,6 +7,7 @@ import { CPAPoolsCard } from "./components/cpa-pools-card";
 import { ImportBrowserDialog } from "./components/import-browser-dialog";
 import { ProxySettingsCard } from "./components/proxy-settings-card";
 import { SettingsHeader } from "./components/settings-header";
+import { Sub2APIConnections } from "./components/sub2api-connections";
 import { useSettingsStore } from "./store";
 
 function SettingsDataController() {
@@ -49,6 +50,7 @@ export default function SettingsPage() {
       <section className="space-y-6">
         <ProxySettingsCard />
         <CPAPoolsCard />
+        <Sub2APIConnections />
       </section>
       <CPAPoolDialog />
       <ImportBrowserDialog />