summaryrefslogtreecommitdiffstats
path: root/packages/meshbay-cli/src/meshbay_cli/tui/clipboard.py
diff options
context:
space:
mode:
authorChristophe Besson <cbesson@gmail.com>2026-10-15 17:42:30 +0200
committerChristophe Besson <cbesson@gmail.com>2026-10-15 17:45:41 +0200
commit41d03f0a35a95daa7d54e7f29ab924776bedf6e4 (patch)
tree2e631013746f913413b9811562b9c9a4734a0e41 /packages/meshbay-cli/src/meshbay_cli/tui/clipboard.py
parent39cac2878de059992cb09a1ccf09b6bcece99fae (diff)
downloadmeshbay-41d03f0a35a95daa7d54e7f29ab924776bedf6e4.tar.gz
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 <noreply@anthropic.com>
Diffstat (limited to 'packages/meshbay-cli/src/meshbay_cli/tui/clipboard.py')
-rw-r--r--packages/meshbay-cli/src/meshbay_cli/tui/clipboard.py28
1 files changed, 15 insertions, 13 deletions
diff --git a/packages/meshbay-cli/src/meshbay_cli/tui/clipboard.py b/packages/meshbay-cli/src/meshbay_cli/tui/clipboard.py
index 1a1f0d7..e0bd315 100644
--- a/packages/meshbay-cli/src/meshbay_cli/tui/clipboard.py
+++ b/packages/meshbay-cli/src/meshbay_cli/tui/clipboard.py
@@ -12,6 +12,7 @@ skipped, never an error.
import asyncio
import os
import shutil
+import subprocess
import sys
TIMEOUT = 3.0
@@ -40,24 +41,25 @@ def _encode(text: str) -> bytes:
return ("" + text).encode("utf-16-le") if sys.platform == "win32" else text.encode()
-async def _run(cmd: list[str], data: bytes | None) -> bytes | None:
+def _run_blocking(cmd: list[str], data: bytes | None) -> bytes | None:
if shutil.which(cmd[0]) is None:
return None
env = {**os.environ, "LC_CTYPE": "UTF-8"} if sys.platform == "darwin" else None
try:
- proc = await asyncio.create_subprocess_exec(
- *cmd, stdin=asyncio.subprocess.PIPE if data is not None else asyncio.subprocess.DEVNULL,
- stdout=asyncio.subprocess.PIPE if data is None else asyncio.subprocess.DEVNULL,
- stderr=asyncio.subprocess.DEVNULL, env=env)
- except OSError:
- return None
- try:
- out, _ = await asyncio.wait_for(proc.communicate(data), TIMEOUT)
- except TimeoutError:
- proc.kill()
- await proc.wait()
+ proc = subprocess.run(
+ cmd, input=data, stdin=None if data is not None else subprocess.DEVNULL,
+ stdout=subprocess.PIPE if data is None else subprocess.DEVNULL,
+ stderr=subprocess.DEVNULL, env=env, timeout=TIMEOUT,
+ creationflags=getattr(subprocess, "CREATE_NO_WINDOW", 0))
+ except (OSError, subprocess.TimeoutExpired):
return None
- return (out or b"") if proc.returncode == 0 else None
+ return (proc.stdout or b"") if proc.returncode == 0 else None
+
+
+async def _run(cmd: list[str], data: bytes | None) -> bytes | None:
+ # In a thread, not asyncio's subprocesses: on Windows the client runs a
+ # selector loop (aiortc's ICE needs one), which cannot start a process.
+ return await asyncio.to_thread(_run_blocking, cmd, data)
async def read_text() -> str | None: