Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Secret of Evermore: auto launch SNI before browser when SNIClient patched #1861

Merged
merged 3 commits into from
Jun 18, 2023
Merged

Secret of Evermore: auto launch SNI before browser when SNIClient patched #1861

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7dc01b
auto launch SNI before browser
alwaysintreble Jun 9, 2023
150fa41
launch emulator too :)
alwaysintreble Jun 9, 2023
a8f87b6
don't infinitely await sni connection
alwaysintreble Jun 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion SNIClient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def launch_sni() -> None:
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
snes_logger.info("Connecting to SNI at %s ..." % address)
seen_problems: typing.Set[str] = set()
Expand All @@ -336,6 +336,8 @@ async def _snes_connect(ctx: SNIContext, address: str) -> WebSocketClientProtoco
await asyncio.sleep(1)
else:
return snes_socket
if not retry:
break


class SNESRequest(typing.TypedDict):
Expand Down Expand Up @@ -684,6 +686,8 @@ async def main() -> None:
logging.info(f"Wrote rom file to {romfile}")
if args.diff_file.endswith(".apsoe"):
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']}")
logging.info("Starting Evermizer Client in your Browser...")
import time
Expand Down