monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BizHawkClient: Restore use of ConnectorErrors (#2480)

This commit is contained in:
Bryce Wilson 2023-11-23 11:51:53 -08:00 committed by GitHub
parent f840ed3a94
commit 7efec64745
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
worlds/_bizhawk/__init__.py
View File

@ -9,6 +9,7 @@ import asyncio
import base64 import base64
import enum import enum
import json import json
import sys
import typing import typing
@ -125,7 +126,20 @@ async def send_requests(ctx: BizHawkContext, req_list: typing.List[typing.Dict[s
"""Sends a list of requests to the BizHawk connector and returns their responses. """Sends a list of requests to the BizHawk connector and returns their responses.
It's likely you want to use the wrapper functions instead of this.""" It's likely you want to use the wrapper functions instead of this."""
return json.loads(await ctx._send_message(json.dumps(req_list))) responses = json.loads(await ctx._send_message(json.dumps(req_list)))
errors: typing.List[ConnectorError] = []
for response in responses:
if response["type"] == "ERROR":
errors.append(ConnectorError(response["err"]))
if errors:
if sys.version_info >= (3, 11, 0):
raise ExceptionGroup("Connector script returned errors", errors) # noqa
else:
raise errors[0]
return responses
async def ping(ctx: BizHawkContext) -> None: async def ping(ctx: BizHawkContext) -> None: