fix: handle elevated proxy pool services and Windows output
This commit is contained in:
+11
-11
@@ -1,6 +1,5 @@
|
||||
"""Local-only HTTP workbench and production SPA host."""
|
||||
import json
|
||||
import subprocess
|
||||
import uuid
|
||||
from contextlib import asynccontextmanager
|
||||
from pathlib import Path
|
||||
@@ -15,6 +14,7 @@ from studio.imports import import_file, export_sheet
|
||||
from studio.jobs import JobManager
|
||||
from studio.network import ProxyRouter, Transport, ProxyUnavailable, RemoteUnavailable, RateLimited
|
||||
from studio.settings import SettingsStore
|
||||
from studio.pool_service import PoolService
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
|
||||
@@ -24,6 +24,7 @@ def create_app(data_dir=None):
|
||||
directory.mkdir(parents=True, exist_ok=True)
|
||||
db = Database(directory / "studio.db")
|
||||
settings = SettingsStore(directory)
|
||||
pool = PoolService(settings)
|
||||
router = ProxyRouter(settings)
|
||||
transport = Transport(settings, router)
|
||||
auth = AuthService(transport, CookieVault(directory))
|
||||
@@ -39,6 +40,7 @@ def create_app(data_dir=None):
|
||||
app = FastAPI(title="考研数据工作台", lifespan=lifespan, docs_url=None, redoc_url=None)
|
||||
app.state.db, app.state.jobs = db, jobs
|
||||
app.state.settings, app.state.router = settings, router
|
||||
app.state.pool = pool
|
||||
|
||||
@app.middleware("http")
|
||||
async def local_access(request: Request, call_next):
|
||||
@@ -162,18 +164,16 @@ def create_app(data_dir=None):
|
||||
router.rotate()
|
||||
return router.status()
|
||||
|
||||
@app.get("/api/proxy/services")
|
||||
def pool_status():
|
||||
return pool.status()
|
||||
|
||||
@app.post("/api/proxy/manage")
|
||||
def manage(body: dict):
|
||||
action = body.get("action")
|
||||
if action not in ("start", "stop", "status"):
|
||||
raise ValueError("代理池操作无效")
|
||||
script = Path(settings.read()["pool_project"]) / "manage.ps1"
|
||||
if not script.is_file():
|
||||
raise ValueError("代理池目录没有 manage.ps1,请检查配置;也可手动启动原代理池")
|
||||
result = subprocess.run(["powershell.exe", "-NoProfile", "-ExecutionPolicy", "Bypass", "-File", str(script), action], capture_output=True, timeout=55, creationflags=subprocess.CREATE_NO_WINDOW)
|
||||
output = (result.stdout + result.stderr).decode("utf-8", errors="replace")[-5000:]
|
||||
router.reset()
|
||||
return {"ok": result.returncode == 0, "output": output, "action": action}
|
||||
result = pool.manage(body.get("action"))
|
||||
if result["changed"]:
|
||||
router.reset()
|
||||
return result
|
||||
|
||||
@app.post("/api/import")
|
||||
def upload(file: UploadFile = File(...), year: int | None = Form(None)):
|
||||
|
||||
Reference in New Issue
Block a user