Release v1.2.0

Author: AuuCoder

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.2.0 - 2026-07-25
+
++ [新增] Grok 注册支持在同一有头浏览器会话内完成中文资料填写、邮箱确认、Turnstile 与账号创建，并增加页面状态诊断、截图和确认邮件兜底。
++ [新增] Grok OAuth 账号轮询改为显式开关，关闭后立即停止历史无额度复检、自动重新授权和未授权回填；开启后立即调度并持久化状态。
++ [新增] Grok OAuth 日志按授权阶段自动清理，账号页支持批量重新授权，并完整显示相关邮箱账号与处理状态。
++ [修复] Device OAuth 补齐 Cookie 会话复用、consent 状态识别和权限待生效复检，明确区分拒绝授权、真实无额度、限流与上游未返回额度。
++ [修复] Grok 账号统计和列表使用上游 billing 返回的真实请求及 Token 额度，未知额度不再错误显示为满额或无额度。
++ [优化] ZooProxy 注册任务自动生成独立 SID，并在单个任务的注册、验证、Turnstile 和 OAuth 全链路保持同一出口；Playwright 兼容 `socks5h` 代理配置。
++ [工具] 增加 Grok 4.5 账号批量探测与无额度账号导出清理脚本。
+
 ## 1.1.0 - 2026-07-23
 
 + [修复] Grok PKCE 能识别 `accounts.x.ai` consent Server Action 返回的 `Access denied`，明确标记为账号未获 Build/API OAuth 授权资格且不可重试，不再误报为 OAuth redirect loop。

VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

captcha-solver/common/browser.py

@@ -44,6 +44,13 @@ def _rewrite_loopback_proxy(proxy: str) -> str:
     return urlunsplit((parts.scheme, f"{userinfo}{host}{port}", parts.path, parts.query, parts.fragment))
 
 
+def _playwright_proxy_url(proxy: str) -> str:
+    candidate = _rewrite_loopback_proxy(proxy)
+    if candidate.lower().startswith("socks5h://"):
+        return "socks5://" + candidate[len("socks5h://") :]
+    return candidate
+
+
 async def resolve_selector(page, selector: str, timeout: int = 10000):
     """Resolve a selector string to a Playwright locator.
 
@@ -102,8 +109,8 @@ async def run_pre_actions(page, actions: list):
 def browser_kwargs(prefix: str, proxy: str = None) -> dict:
     """Browser-trust levers, env-configurable per solver.
 
-    prefix is TURNSTILE | RECAPTCHA | HCAPTCHA. Turnstile defaults headless=1;
-    the interactive-checkbox solvers (recaptcha/hcaptcha) default headless=0.
+    prefix is TURNSTILE | RECAPTCHA | HCAPTCHA | XAI. Turnstile defaults
+    headless=1; interactive flows (recaptcha/hcaptcha/xAI) default headless=0.
     """
     default_headless = "1" if prefix == "TURNSTILE" else "0"
     headless = os.getenv(f"{prefix}_HEADLESS", default_headless) != "0"
@@ -113,7 +120,7 @@ def browser_kwargs(prefix: str, proxy: str = None) -> dict:
         kw["_suppress_maximize"] = True
     configured_proxy = str(proxy or os.getenv(f"{prefix}_PROXY") or "").strip()
     if configured_proxy:
-        kw["proxy"] = _rewrite_loopback_proxy(configured_proxy)
+        kw["proxy"] = _playwright_proxy_url(configured_proxy)
     if configured_proxy and os.getenv(f"{prefix}_GEOIP") == "1":
         kw["geoip"] = True
     return kw

captcha-solver/common/browser_test.py

@@ -56,6 +56,17 @@ def test_docker_keeps_non_loopback_proxy_unchanged(self):
 
         self.assertEqual(kwargs["proxy"], "http://10.0.0.8:8080")
 
+    def test_playwright_uses_supported_socks5_scheme_for_socks5h_proxy(self):
+        kwargs = browser_kwargs(
+            "XAI",
+            "socks5h://proxy-user:proxy-password@proxy.example.test:5000",
+        )
+
+        self.assertEqual(
+            kwargs["proxy"],
+            "socks5://proxy-user:proxy-password@proxy.example.test:5000",
+        )
+
 
 if __name__ == "__main__":
     unittest.main()

captcha-solver/server.py

@@ -210,6 +210,8 @@ class SolveRequest(BaseModel):
     concurrency: Optional[int] = Field(
         None, ge=0, le=64, description="Turnstile-only maximum simultaneous browser attempts. "
         "Use 0 for unlimited; otherwise overrides TURNSTILE_CONCURRENCY.")
+    cookies: Optional[list[dict[str, Any]]] = Field(
+        None, description="Browser cookies to restore before real-page navigation.")
 
     # reCAPTCHA-only
     version: Optional[str] = Field(None, description="reCAPTCHA only: v2 | v3 | invisible (default v2).")
@@ -232,6 +234,41 @@ class SolveRequest(BaseModel):
     render_flow: Optional[str] = Field(None, description="perimeterx: named site trigger that makes the gate render when it doesn't show on plain load (default 'outlook_signup'). Throwaway navigation only — NOT account creation. Pass null with a `url` for deployments whose gate renders on goto(). Harvests the _px3 clearance cookie (bound to _pxvid+IP+UA; replay under the same proxy+UA within TTL).")
 
 
+class XaiSessionStartRequest(BaseModel):
+    signup_url: str = "https://accounts.x.ai/sign-up?redirect=grok-com"
+    proxy: Optional[str] = None
+    timeout_s: int = Field(120, ge=15, le=180)
+
+
+class XaiSessionEmailRequest(BaseModel):
+    session_id: str
+    email: str
+
+
+class XaiSessionVerifyRequest(XaiSessionEmailRequest):
+    code: str
+
+
+class XaiSessionSignupRequest(XaiSessionVerifyRequest):
+    password: str
+    given_name: str
+    family_name: str
+    turnstile_token: str
+    action_id: str
+    next_router_state_tree: str
+
+
+class XaiSessionAuthorizeRequest(BaseModel):
+    session_id: str
+    verification_url: str
+    user_code: str
+    timeout_s: int = Field(120, ge=15, le=600)
+
+
+class XaiSessionCloseRequest(BaseModel):
+    session_id: str
+
+
 # Named request examples → Swagger UI renders these as a dropdown picker on /solve.
 _SOLVE_EXAMPLES = {
     "turnstile": {
@@ -344,6 +381,102 @@ async def health():
     return {"status": "ok", "supported_types": SUPPORTED}
 
 
+def _xai_http_error(error: Exception) -> HTTPException:
+    from xai_browser.flow import XaiBrowserFlowError
+
+    if isinstance(error, XaiBrowserFlowError):
+        status = 409 if error.stage in {"browser_session", "cookie_setter", "approve"} else 400
+        if error.retryable:
+            status = 503
+        return HTTPException(status, detail=str(error))
+    return HTTPException(500, detail=f"xAI browser flow failed: {type(error).__name__}")
+
+
+@app.post("/xai/session/start", dependencies=[Depends(_bearer)], tags=["solve"])
+async def xai_session_start(req: XaiSessionStartRequest):
+    from xai_browser.flow import start_session
+
+    _assert_public_url(req.signup_url, "signup_url")
+    try:
+        return await start_session(
+            signup_url=req.signup_url,
+            proxy=req.proxy or "",
+            timeout_s=req.timeout_s,
+        )
+    except Exception as error:
+        raise _xai_http_error(error) from error
+
+
+@app.post("/xai/session/send-email", dependencies=[Depends(_bearer)], tags=["solve"])
+async def xai_session_send_email(req: XaiSessionEmailRequest):
+    from xai_browser.flow import send_email
+
+    try:
+        return await send_email(req.session_id, req.email)
+    except Exception as error:
+        raise _xai_http_error(error) from error
+
+
+@app.post("/xai/session/verify-email", dependencies=[Depends(_bearer)], tags=["solve"])
+async def xai_session_verify_email(req: XaiSessionVerifyRequest):
+    from xai_browser.flow import verify_email
+
+    try:
+        return await verify_email(req.session_id, req.email, req.code)
+    except Exception as error:
+        raise _xai_http_error(error) from error
+
+
+@app.post("/xai/session/signup", dependencies=[Depends(_bearer)], tags=["solve"])
+async def xai_session_signup(req: XaiSessionSignupRequest):
+    from xai_browser.flow import signup
+
+    try:
+        return await signup(
+            req.session_id,
+            email=req.email,
+            password=req.password,
+            code=req.code,
+            given_name=req.given_name,
+            family_name=req.family_name,
+            turnstile_token=req.turnstile_token,
+            action_id=req.action_id,
+            next_router_state_tree=req.next_router_state_tree,
+        )
+    except Exception as error:
+        raise _xai_http_error(error) from error
+
+
+@app.post("/xai/session/authorize-device", dependencies=[Depends(_bearer)], tags=["solve"])
+async def xai_session_authorize_device(req: XaiSessionAuthorizeRequest):
+    from xai_browser.flow import authorize_device
+
+    _assert_public_url(req.verification_url, "verification_url")
+    try:
+        return await authorize_device(
+            req.session_id,
+            verification_url=req.verification_url,
+            user_code=req.user_code,
+            timeout_s=req.timeout_s,
+        )
+    except Exception as error:
+        raise _xai_http_error(error) from error
+
+
+@app.post("/xai/session/close", dependencies=[Depends(_bearer)], tags=["solve"])
+async def xai_session_close(req: XaiSessionCloseRequest):
+    from xai_browser.flow import close_session
+
+    return {"ok": True, "closed": await close_session(req.session_id)}
+
+
+@app.on_event("shutdown")
+async def close_xai_browser_sessions():
+    from xai_browser.flow import close_all_sessions
+
+    await close_all_sessions()
+
+
 def _extract(req: SolveRequest):
     """Unpack pre_actions + post_fetch for realpage endpoints."""
     actions = [a.model_dump() for a in req.pre_actions] if req.pre_actions else None
@@ -371,7 +504,8 @@ async def _dispatch(req: SolveRequest) -> dict:
                 actions, fetches = _extract(req)
                 r = await solve_turnstile_realpage(
                     req.url, req.sitekey, req.timeout_s, actions, fetches, req.proxy,
-                    req.action, req.cdata, req.concurrency, req.queue_timeout_s)
+                    req.action, req.cdata, req.concurrency, req.queue_timeout_s,
+                    req.cookies)
             else:
                 r = await solve_turnstile(
                     req.sitekey, req.url, req.action, req.cdata, req.proxy,