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

LttPClient: warn when connection is not made to SNI

This commit is contained in:
Fabian Dill 2021-11-03 19:58:40 +01:00
parent fe7f109127
commit 5c25a08dc1
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
LttPClient.py
View File

@ -15,6 +15,7 @@ import asyncio
from json import loads, dumps from json import loads, dumps
import ModuleUpdate import ModuleUpdate
ModuleUpdate.update() ModuleUpdate.update()
from Utils import get_item_name_from_id from Utils import get_item_name_from_id
@ -143,8 +144,8 @@ class Context(CommonContext):
}]) }])
def on_deathlink(self, data: dict): def on_deathlink(self, data: dict):
snes_buffered_write(self, WRAM_START+0xF36D, bytes([0])) snes_buffered_write(self, WRAM_START + 0xF36D, bytes([0]))
snes_buffered_write(self, WRAM_START+0x0373, bytes([8])) snes_buffered_write(self, WRAM_START + 0x0373, bytes([8]))
asyncio.create_task(snes_flush_writes(self)) asyncio.create_task(snes_flush_writes(self))
self.death_state = True self.death_state = True
snes_logger.info(f"Received DeathLink from {data['source']}") snes_logger.info(f"Received DeathLink from {data['source']}")
@ -527,11 +528,22 @@ async def get_snes_devices(ctx: Context):
await socket.send(dumps(DeviceList_Request)) await socket.send(dumps(DeviceList_Request))
reply = loads(await socket.recv()) reply = loads(await socket.recv())
devices = reply['Results'] if 'Results' in reply and len(reply['Results']) > 0 else None devices = reply['Results'] if 'Results' in reply and len(reply['Results']) > 0 else None
await verify_snes_app(socket)
await socket.close() await socket.close()
return devices return devices
async def verify_snes_app(socket):
AppVersion_Request = {
"Opcode": "AppVersion",
}
await socket.send(dumps(AppVersion_Request))
app: str = loads(await socket.recv())["Results"][0]
if not "SNI" in app:
snes_logger.warning(f"Warning: Did not find SNI as the endpoint, instead {app} was found.")
async def snes_connect(ctx: Context, address, deviceIndex=-1): async def snes_connect(ctx: Context, address, deviceIndex=-1):
global SNES_RECONNECT_DELAY global SNES_RECONNECT_DELAY
if ctx.snes_socket is not None and ctx.snes_state == SNESState.SNES_CONNECTED: if ctx.snes_socket is not None and ctx.snes_state == SNESState.SNES_CONNECTED: