update 2. GTP-6, второй этап поправки ошибок

This commit is contained in:
2026-09-26 22:30:49 +03:00
parent 22e10b53b7
commit c707c60a35
47 changed files with 4579 additions and 1876 deletions

View File

@@ -18,6 +18,7 @@ from pydantic import BaseModel, Field
from sqlalchemy import delete, select, text, update
from .auth_bridge import HockeyUser
from .async_work import db_endpoint, run_db
from .models import Game, MatchCommandReceipt, MatchControlLease, MatchParticipant, OperatorSession, VmixDevice
LEASE_SECONDS = 90
@@ -364,6 +365,12 @@ class MatchAccess:
fail(428, "command_required", "Не указан идентификатор изменения")
digest = hashlib.sha256(request.method.encode() + str(request.url.path).encode()
+ request.url.query.encode() + await request.body()).hexdigest()
return await run_db(self._execute_sync, request, user, game_id, operation,
pid, generation, expected, command_id, digest)
def _execute_sync(self, request: Request, user: HockeyUser, game_id: str,
operation: Callable[[], Any], pid: str, generation: int,
expected: int, command_id: str, digest: str) -> dict[str, Any]:
with self.database.atomic_session() as session:
lease = self._owned(self._lock(session, game_id), user, pid, generation)
receipt = session.get(MatchCommandReceipt, (game_id, command_id))
@@ -389,8 +396,6 @@ class MatchAccess:
fail(409, "stale_revision", "Состояние матча уже изменено")
session.expire(lease)
result = operation()
if inspect.isawaitable(result):
result = await result
result = dict(result)
session.flush()
result["revision"] = expected + 1
@@ -435,31 +440,38 @@ def create_match_access_router(access: MatchAccess, auth_dependency: Callable[..
router = APIRouter()
@router.get("/games/{external_id}/access")
async def status(external_id: str, request: Request, user: HockeyUser = Depends(auth_dependency)):
@db_endpoint
def status(external_id: str, request: Request, user: HockeyUser = Depends(auth_dependency)):
return access.snapshot(external_id, user, participant_id(request))
@router.post("/games/{external_id}/access/join")
async def join(external_id: str, request: Request, payload: JoinPayload, user: HockeyUser = Depends(auth_dependency)):
@db_endpoint
def join(external_id: str, request: Request, payload: JoinPayload, user: HockeyUser = Depends(auth_dependency)):
return access.join(external_id, user, participant_id(request), payload.device_id)
@router.post("/games/{external_id}/access/claim")
async def claim(external_id: str, request: Request, payload: ClaimPayload, user: HockeyUser = Depends(auth_dependency)):
@db_endpoint
def claim(external_id: str, request: Request, payload: ClaimPayload, user: HockeyUser = Depends(auth_dependency)):
return access.change(external_id, user, request, "claim", force=payload.force)
@router.post("/games/{external_id}/access/leave")
async def leave(external_id: str, request: Request, user: HockeyUser = Depends(auth_dependency)):
@db_endpoint
def leave(external_id: str, request: Request, user: HockeyUser = Depends(auth_dependency)):
return access.leave(external_id, user, request)
@router.post("/games/{external_id}/access/heartbeat")
async def heartbeat(external_id: str, request: Request, user: HockeyUser = Depends(auth_dependency)):
@db_endpoint
def heartbeat(external_id: str, request: Request, user: HockeyUser = Depends(auth_dependency)):
return access.change(external_id, user, request, "heartbeat")
@router.post("/games/{external_id}/access/release")
async def release(external_id: str, request: Request, user: HockeyUser = Depends(auth_dependency)):
@db_endpoint
def release(external_id: str, request: Request, user: HockeyUser = Depends(auth_dependency)):
return access.change(external_id, user, request, "release")
@router.post("/games/{external_id}/access/transfer")
async def transfer(external_id: str, request: Request, payload: TransferPayload, user: HockeyUser = Depends(auth_dependency)):
@db_endpoint
def transfer(external_id: str, request: Request, payload: TransferPayload, user: HockeyUser = Depends(auth_dependency)):
return access.change(external_id, user, request, "transfer", target_id=payload.participant_id)
return router