This commit is contained in:
2026-08-25 19:46:38 +08:00
parent e1416994bc
commit 4cf6b1ffbc
15 changed files with 719 additions and 108 deletions
+130 -21
View File
@@ -3,6 +3,8 @@
FastAPI 应用:提供操作界面 + 编排浏览器自动化流程
"""
import threading
import time
import requests
from pathlib import Path
from fastapi import FastAPI, HTTPException, Request
from fastapi.responses import HTMLResponse
@@ -14,7 +16,7 @@ from loguru import logger
from ..config import client_settings
from ..server_api import ServerAPI
from ..ai import AIClient
from ..fingerprint import generate_client_code, get_machine_summary
from ..fingerprint import get_machine_summary
from ..browser.manager import BrowserManager
from ..browser.resume_scraper import ResumeScraper
from ..browser.applicant import Applicant
@@ -37,20 +39,67 @@ class AppState:
self.applicant: Applicant | None = None
self.connected = False # 是否已注册/登录云端
self.login_polling = False
self._heartbeat_started = False
def ensure_applicant(self) -> Applicant:
if self.applicant is None:
self.applicant = Applicant(self.browser, self.server_api, self.ai)
return self.applicant
# ------------------------------------------------------------------
# 心跳:登录成功后启动后台线程,周期性向服务端上报存活
# ------------------------------------------------------------------
def ensure_heartbeat(self) -> None:
if self._heartbeat_started or not self.server_api.token:
return
self._heartbeat_started = True
threading.Thread(target=self._heartbeat_loop, daemon=True).start()
logger.info(f"心跳线程已启动,间隔 {client_settings.HEARTBEAT_INTERVAL}s")
def _heartbeat_loop(self) -> None:
while True:
if not self.server_api.token:
# 已退出登录,停止心跳
self._heartbeat_started = False
logger.info("已退出登录,心跳停止")
break
self.server_api.heartbeat()
time.sleep(client_settings.HEARTBEAT_INTERVAL)
state = AppState()
# =======================================================
# 前置校验(收敛:所有需要已登录云端的路由统一走这里)
# =======================================================
def _require_auth() -> None:
"""未登录云端时统一抛 400,禁止各路由自行散落判断"""
if not state.connected:
raise HTTPException(status_code=400, detail="请先登录系统账号")
def _require_rpa_online() -> None:
"""
关键操作(开始投递)前的在线预检:
先发一次心跳刷新在线状态,再确认服务端判定为在线,
避免心跳链路异常时启动必然失败的操作。
"""
state.server_api.heartbeat()
try:
me = state.server_api.get_me()
if not me.get("is_online"):
raise HTTPException(status_code=409, detail="RPA 在线状态未确认,请检查网络后重试")
except requests.RequestException as e:
raise HTTPException(status_code=503, detail=f"无法确认在线状态:{e}")
# =======================================================
# 请求模型
# =======================================================
class ConnectReq(BaseModel):
class AuthReq(BaseModel):
username: str
password: str
nickname: str | None = None
@@ -78,15 +127,30 @@ def index(request: Request):
# =======================================================
@app.get("/api/status")
def get_status():
"""返回整体状态,供前端轮询"""
"""返回整体状态,供前端轮询(含本地 token 免登录校验)"""
# 若本地存有 token,尝试校验并获取用户信息(实现二次启动免登录)
me = None
if state.server_api.token:
try:
me = state.server_api.get_me()
state.connected = True
state.ensure_heartbeat() # token 有效时确保心跳线程在跑
except Exception:
state.connected = False
state.server_api.logout() # token 失效,清除本地缓存
else:
state.connected = False
result = {
"client_code": generate_client_code()[:16] + "...",
"machine": get_machine_summary(),
"username": state.server_api.username,
"server_connected": state.connected,
"server_reachable": state.server_api.ping(),
"rpa_online": me.get("is_online", False) if me else False,
"adspower_running": state.browser.is_adspower_running(),
"ai_configured": state.ai.available(),
"login_status": "unknown",
"login_status": me.get("login_status", "unknown") if me else "unknown",
"boss_account": me.get("boss_account") if me else None,
"resume_count": 0,
"has_primary": False,
"applying": False,
@@ -94,14 +158,11 @@ def get_status():
}
if state.connected:
try:
me = state.server_api.get_me()
result["login_status"] = me.get("login_status", "unknown")
result["boss_account"] = me.get("boss_account")
resumes = state.server_api.list_resumes()
result["resume_count"] = len(resumes)
result["has_primary"] = any(r.get("is_primary") for r in resumes)
except Exception as e:
logger.debug(f"获取用户状态失败:{e}")
logger.debug(f"获取简历状态失败:{e}")
if state.applicant and state.applicant.is_running:
result["applying"] = True
result["apply_stats"] = state.applicant.stats
@@ -109,16 +170,50 @@ def get_status():
# =======================================================
# Step 0: 连接云端服务端
# Step 0: 登录 / 注册云端账号(账号密码体系)
# =======================================================
@app.post("/api/connect")
def connect(req: ConnectReq):
def _extract_error(e: requests.HTTPError) -> str:
"""从服务端错误响应中提取 detail 信息"""
try:
data = state.server_api.register(req.nickname)
return e.response.json().get("detail", str(e))
except Exception:
return str(e)
@app.post("/api/register")
def register(req: AuthReq):
"""注册新账号"""
try:
data = state.server_api.register(req.username, req.password, req.nickname)
state.connected = True
return {"ok": True, "user_id": data["user_id"], "is_new": data["is_new"]}
state.ensure_heartbeat()
return {"ok": True, "user_id": data["user_id"], "username": data["username"]}
except requests.HTTPError as e:
raise HTTPException(status_code=e.response.status_code, detail=_extract_error(e))
except Exception as e:
raise HTTPException(status_code=500, detail=f"连接服务端失败:{e}")
raise HTTPException(status_code=500, detail=f"注册失败:{e}")
@app.post("/api/login")
def login(req: AuthReq):
"""账号密码登录"""
try:
data = state.server_api.login(req.username, req.password)
state.connected = True
state.ensure_heartbeat()
return {"ok": True, "user_id": data["user_id"], "username": data["username"]}
except requests.HTTPError as e:
raise HTTPException(status_code=e.response.status_code, detail=_extract_error(e))
except Exception as e:
raise HTTPException(status_code=500, detail=f"登录失败:{e}")
@app.post("/api/logout")
def logout():
"""退出登录,清除本地 token"""
state.server_api.logout()
state.connected = False
return {"ok": True}
# =======================================================
@@ -127,8 +222,7 @@ def connect(req: ConnectReq):
@app.post("/api/start-login")
def start_login():
"""打开 AdsPower 浏览器并跳转到 Boss直聘,等待用户手动登录"""
if not state.connected:
raise HTTPException(status_code=400, detail="请先连接服务端")
_require_auth()
try:
state.server_api.update_login_status("logging_in")
page = state.browser.connect()
@@ -158,6 +252,22 @@ def _poll_login():
state.login_polling = False
@app.post("/api/detect-login")
def detect_login():
"""活体检测 Boss直聘 登录状态(进入登录步骤时自动调用)"""
_require_auth()
try:
logged_in = state.browser.check_boss_login()
except Exception as e:
raise HTTPException(status_code=500, detail=f"检测失败:{e}")
if logged_in:
account = state.browser.get_boss_account_name()
state.server_api.update_login_status("logged_in", account)
return {"logged_in": True, "account": account}
state.server_api.update_login_status("not_login")
return {"logged_in": False}
@app.get("/api/login-status")
def login_status():
"""前端轮询登录状态"""
@@ -180,8 +290,7 @@ def login_status():
@app.post("/api/scrape-resumes")
def scrape_resumes():
"""AI 抓取账号内所有简历并上传到云端"""
if not state.connected:
raise HTTPException(status_code=400, detail="请先连接服务端")
_require_auth()
try:
scraper = ResumeScraper(state.browser, state.ai)
resumes = scraper.scrape_all()
@@ -212,8 +321,8 @@ def set_primary(resume_id: int):
# =======================================================
@app.post("/api/start-apply")
def start_apply(req: StartApplyReq):
if not state.connected:
raise HTTPException(status_code=400, detail="请先连接服务端")
_require_auth()
_require_rpa_online() # 在线预检:与服务端 require_online_user 前置校验呼应
if not state.server_api.get_primary_resume():
raise HTTPException(status_code=400, detail="请先设置主简历")
if not state.browser.is_adspower_running():