Tendokyu/artemis
1
0
Fork 0
mirror of synced 2024-11-12 00:40:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request '[allnet] Enable DFI-encoded responses' (#134) from beerpsi/artemis:fix/allnet/dfi into develop

Browse Source 
Reviewed-on: https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls/134
This commit is contained in:
Hay1tsme 2024-05-05 05:42:22 +00:00
commit c96c9257a6
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/allnet.py
View File

@ -132,7 +132,7 @@ class AllnetServlet:
async def handle_poweron(self, request: Request): async def handle_poweron(self, request: Request):
request_ip = Utils.get_ip_addr(request) request_ip = Utils.get_ip_addr(request)
pragma_header = request.headers.get('Pragma', "") pragma_header = request.headers.get('Pragma', "")
is_dfi = pragma_header is not None and pragma_header == "DFI" is_dfi = pragma_header == "DFI"
data = await request.body() data = await request.body()
try: try:
@ -276,20 +276,23 @@ class AllnetServlet:
self.logger.info(msg) self.logger.info(msg)
resp_dict = {k: v for k, v in vars(resp).items() if v is not None} resp_dict = {k: v for k, v in vars(resp).items() if v is not None}
resp_str = urllib.parse.unquote(urllib.parse.urlencode(resp_dict)) resp_str = urllib.parse.unquote(urllib.parse.urlencode(resp_dict)) + "\n"
self.logger.debug(f"Allnet response: {resp_dict}") self.logger.debug(f"Allnet response: {resp_dict}")
resp_str += "\n"
"""if is_dfi: if is_dfi:
request.responseHeaders.addRawHeader('Pragma', 'DFI') return PlainTextResponse(
return self.to_dfi(resp_str)""" content=self.to_dfi(resp_str) + b"\r\n",
headers={
"Pragma": "DFI",
},
)
return PlainTextResponse(resp_str) return PlainTextResponse(resp_str)
async def handle_dlorder(self, request: Request): async def handle_dlorder(self, request: Request):
request_ip = Utils.get_ip_addr(request) request_ip = Utils.get_ip_addr(request)
pragma_header = request.headers.get('Pragma', "") pragma_header = request.headers.get('Pragma', "")
is_dfi = pragma_header is not None and pragma_header == "DFI" is_dfi = pragma_header == "DFI"
data = await request.body() data = await request.body()
try: try:
@ -341,9 +344,14 @@ class AllnetServlet:
await self.data.base.log_event("allnet", "DLORDER_REQ_SUCCESS", logging.INFO, f"{Utils.get_ip_addr(request)} requested DL Order for {req.serial} {req.game_id} v{req.ver}") await self.data.base.log_event("allnet", "DLORDER_REQ_SUCCESS", logging.INFO, f"{Utils.get_ip_addr(request)} requested DL Order for {req.serial} {req.game_id} v{req.ver}")
res_str = urllib.parse.unquote(urllib.parse.urlencode(vars(resp))) + "\n" res_str = urllib.parse.unquote(urllib.parse.urlencode(vars(resp))) + "\n"
"""if is_dfi:
request.responseHeaders.addRawHeader('Pragma', 'DFI') if is_dfi:
return self.to_dfi(res_str)""" return PlainTextResponse(
content=self.to_dfi(res_str) + b"\r\n",
headers={
"Pragma": "DFI",
},
)
return PlainTextResponse(res_str) return PlainTextResponse(res_str)