From 41d03f0a35a95daa7d54e7f29ab924776bedf6e4 Mon Sep 17 00:00:00 2001 From: Christophe Besson Date: Thu, 15 Oct 2026 17:42:30 +0200 Subject: fix(cli): make the command-line client work on Windows Its suite had only run on Linux. On Windows, against a real hub and node and from the installed meshbay-cli.exe: - secrets.enc was written in text mode (os.open without O_BINARY): every 0x0A of the ciphertext became CR LF and the saved session "does not open with its key" on the next run. - isatty() is true for NUL, so a script run with `< NUL` or by the Task Scheduler was asked questions instead of told to pass --yes; output.terminal() checks for a real console. - Ctrl+C waited for the selector loop's next timer, up to half a minute in `chat --follow`; the loop now points the signal wakeup at its self-pipe, as the proactor does. - Right-click copy and paste raised: asyncio cannot start a process on the selector loop; the clipboard tool runs in a thread. - Tab completion of remote paths ran on the default (proactor) loop, which never opens a node, and wrote in the locale encoding; the PowerShell script now reads it as UTF-8. - `get -R` into a folder past MAX_PATH died with a traceback; get, put, the resume file and the interactive mode use the extended form at each disk call, as the node does. - `groups` showed a SQLite hub's naive UTC time as local time. The opt-in end-to-end suite now runs on Windows (16 tests: Chrome found under Program Files and started with the real environment, VLC as the player, Ctrl+C through a console of its own, PowerShell 5.1 completion of an accented name). Co-Authored-By: Claude Opus 5.5 --- packages/meshbay-cli/tests/test_ctrl_c.py | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 packages/meshbay-cli/tests/test_ctrl_c.py (limited to 'packages/meshbay-cli/tests/test_ctrl_c.py') diff --git a/packages/meshbay-cli/tests/test_ctrl_c.py b/packages/meshbay-cli/tests/test_ctrl_c.py new file mode 100644 index 0000000..53a798a --- /dev/null +++ b/packages/meshbay-cli/tests/test_ctrl_c.py @@ -0,0 +1,34 @@ +""" +Ctrl+C stops the client at once, whatever its loop is waiting for. + +On Windows the client runs a selector loop (aiortc's ICE needs one), and a +console event does not interrupt select(): Ctrl+C waited for the loop's next +timer — half a minute in `chat --follow` between pings. +""" + +import sys +import time + +from console import ctrl_c, interruptible + +IDLE = ("import asyncio, sys\n" + "from meshbay_cli.__main__ import loop_factory\n" + "print('ready', flush=True)\n" + "try:\n" + " asyncio.run(asyncio.sleep(60), loop_factory=loop_factory())\n" + "except KeyboardInterrupt:\n" + " sys.exit(130)\n") + + +def test_ctrl_c_wakes_an_idle_client_at_once(): + proc = interruptible([sys.executable, "-c", IDLE], None) + try: + assert proc.stdout.readline().strip() == "ready", proc.stderr.read() + started = time.monotonic() + ctrl_c(proc) + proc.wait(timeout=30) + assert proc.returncode == 130, proc.stderr.read() + assert time.monotonic() - started < 5 + finally: + if proc.poll() is None: + proc.kill() -- cgit v1.2.3