Skip to content

Commit

Permalink
fix: 修复错误的异步响应处理方式
Browse files Browse the repository at this point in the history
  • Loading branch information
@WindowsSov8forUs
WindowsSov8forUs committed May 6, 2024
1 parent d3a9685 commit 22b6470
Show file tree
Hide file tree
Showing 4 changed files with 172 additions and 166 deletions.
10 changes: 6 additions & 4 deletions tsugu_api_async/v1/_bandoristation.py
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from httpx import Response

from tsugu_api_async import settings
from tsugu_api_async._network import Api
from tsugu_api_async.exception import RoomSubmitFailure
Expand Down Expand Up @@ -26,12 +28,12 @@ async def submit_room_number(number: int, user_id: str, raw_message: str, source
}

# 发送请求
response = await (
await Api(
response = await Api(
BANDORI_STATION_URL,
proxy=settings.backend_proxy,
params=params
).get()
).json()
).get()
if isinstance(response, Response): response = response.json()
else: response = await response.json()
if response['status'] == 'failure':
raise RoomSubmitFailure(response['response'])
226 changes: 114 additions & 112 deletions tsugu_api_async/v1/_tsugu.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from time import time
from typing import Optional

from httpx import Response

from tsugu_api_async import settings
from tsugu_api_async._network import Api
from tsugu_api_async._typing import (
Expand Down Expand Up @@ -32,13 +34,13 @@ async def get_card_illustration(card_id: int) -> _Response:
}

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def gacha_simulate(server_mode: _Server, gacha_id: Optional[int] = None) -> _Response:
'''模拟抽卡
Expand All @@ -63,13 +65,13 @@ async def gacha_simulate(server_mode: _Server, gacha_id: Optional[int] = None) -
data['gachaId'] = gacha_id

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def search_player(player_id: int, server: _Server) -> _Response:
'''查询玩家状态
Expand All @@ -94,13 +96,13 @@ async def search_player(player_id: int, server: _Server) -> _Response:
}

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def search_gacha(default_servers: list[_Server], gacha_id: int) -> _Response:
'''查询卡池
Expand All @@ -125,13 +127,13 @@ async def search_gacha(default_servers: list[_Server], gacha_id: int) -> _Respon
}

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def search_event(default_servers: list[_Server], text: str) -> _Response:
'''查询活动
Expand All @@ -156,13 +158,13 @@ async def search_event(default_servers: list[_Server], text: str) -> _Response:
}

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def event_stage(server: _Server, meta: bool = False, event_id: Optional[int] = None) -> _Response:
'''查询团队 LIVE 佳节活动舞台数据
Expand All @@ -189,13 +191,13 @@ async def event_stage(server: _Server, meta: bool = False, event_id: Optional[in
data['eventId'] = event_id

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def search_song(default_servers: list[_Server], text: str) -> _Response:
'''查询歌曲
Expand All @@ -220,13 +222,13 @@ async def search_song(default_servers: list[_Server], text: str) -> _Response:
}

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def song_meta(default_servers: list[_Server], server: _Server) -> _Response:
'''查询歌曲分数表
Expand All @@ -250,13 +252,13 @@ async def song_meta(default_servers: list[_Server], server: _Server) -> _Respons
}

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def search_character(default_servers: list[_Server], text: str) -> _Response:
'''查询角色
Expand All @@ -280,13 +282,13 @@ async def search_character(default_servers: list[_Server], text: str) -> _Respon
}

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def song_chart(default_servers: list[_Server], song_id: int, difficulty_text: _Difficulty) -> _Response:
'''查询歌曲谱面
Expand All @@ -312,13 +314,13 @@ async def song_chart(default_servers: list[_Server], song_id: int, difficulty_te
}

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def ycx_all(server: _Server, event_id: Optional[int] = None) -> _Response:
'''查询全挡位预测线
Expand All @@ -343,13 +345,13 @@ async def ycx_all(server: _Server, event_id: Optional[int] = None) -> _Response:
data['eventId'] = event_id

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def ycx(server: _Server, tier: int, event_id: Optional[int] = None) -> _Response:
'''查询排行榜预测线
Expand All @@ -376,13 +378,13 @@ async def ycx(server: _Server, tier: int, event_id: Optional[int] = None) -> _Re
data['eventId'] = event_id

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def lsycx(server: _Server, tier: int, event_id: Optional[int] = None) -> _Response:
'''查询历史排行榜预测线
Expand All @@ -409,13 +411,13 @@ async def lsycx(server: _Server, tier: int, event_id: Optional[int] = None) -> _
data['eventId'] = event_id

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def room_list(room_list: list[_CarData]) -> _Response:
'''绘制车牌绘图
Expand All @@ -437,13 +439,13 @@ async def room_list(room_list: list[_CarData]) -> _Response:
}

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def search_card(default_servers: list[_Server], text: str) -> _Response:
'''查询卡片
Expand All @@ -468,13 +470,13 @@ async def search_card(default_servers: list[_Server], text: str) -> _Response:
}

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()

async def station_query_all_room() -> _QueryResult:
'''查询最近车站车牌
Expand Down Expand Up @@ -528,10 +530,10 @@ async def station_submit_room_number(
}

# 发送请求
return await (
await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
).json()
response = await Api(
url,
proxy=settings.backend_proxy,
data=data
).post()
if isinstance(response, Response): return response.json()
return await response.json()
Loading

0 comments on commit 22b6470

Please sign in to comment.