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

SoE/SNIClient: auto launch SNI before browser when SNIClient patched (#1861) 

* auto launch SNI before browser

* launch emulator too :)

* don't infinitely await sni connection
This commit is contained in:
Aaron Wagener 2023-06-18 04:27:08 -05:00 committed by GitHub
parent 36499b8983
commit ab64173600
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SNIClient.py
View File

@ -315,7 +315,7 @@ def launch_sni() -> None:
f"please start it yourself if it is not running") f"please start it yourself if it is not running")
async def _snes_connect(ctx: SNIContext, address: str) -> WebSocketClientProtocol: async def _snes_connect(ctx: SNIContext, address: str, retry: bool = True) -> WebSocketClientProtocol:
address = f"ws://{address}" if "://" not in address else address address = f"ws://{address}" if "://" not in address else address
snes_logger.info("Connecting to SNI at %s ..." % address) snes_logger.info("Connecting to SNI at %s ..." % address)
seen_problems: typing.Set[str] = set() seen_problems: typing.Set[str] = set()
@ -336,6 +336,8 @@ async def _snes_connect(ctx: SNIContext, address: str) -> WebSocketClientProtoco
await asyncio.sleep(1) await asyncio.sleep(1)
else: else:
return snes_socket return snes_socket
if not retry:
break
class SNESRequest(typing.TypedDict): class SNESRequest(typing.TypedDict):
@ -684,6 +686,8 @@ async def main() -> None:
logging.info(f"Wrote rom file to {romfile}") logging.info(f"Wrote rom file to {romfile}")
if args.diff_file.endswith(".apsoe"): if args.diff_file.endswith(".apsoe"):
import webbrowser import webbrowser
async_start(run_game(romfile))
await _snes_connect(SNIContext(args.snes, args.connect, args.password), args.snes, False)
webbrowser.open(f"http://www.evermizer.com/apclient/#server={meta['server']}") webbrowser.open(f"http://www.evermizer.com/apclient/#server={meta['server']}")
logging.info("Starting Evermizer Client in your Browser...") logging.info("Starting Evermizer Client in your Browser...")
import time import time