From c2620a5b269db75fcadb772e3ae5250886e8814c Mon Sep 17 00:00:00 2001 From: Christophe Besson Date: Fri, 4 Sep 2026 02:35:41 +0200 Subject: fix(node): make init, node.toml editing and CLI output work on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Found by running the daemon on Windows for the first time: - `meshbay-node init` wrote `unlock_file = "C:\Users\..."`, and attach_group / add_root write `path = "C:\..."` — a raw Windows path in a TOML basic string is a parse error (`\U`, `\a`, ... are escape sequences), so the config would not load. All now write `Path(...).as_posix()`; pathlib reads the forward-slash form fine on Windows. - any `print()` carrying a `->` arrow or em dash (the CLI help and messages are full of them) raised UnicodeEncodeError on a cp1252 console and took the command down. New `platform.force_utf8_stdio()` reconfigures stdout/stderr to UTF-8, called at the top of `main()`. Verified on Windows: init writes parseable LF node.toml, the keystore Argon2-decrypts, the loopback control API binds 127.0.0.1, and `_update_node_toml` reads a CRLF file and rewrites it LF-only with its standalone comments intact. Two regression tests added in test_ops.py. Co-Authored-By: Claude Sonnet 5 --- packages/meshbay-node/tests/test_ops.py | 42 +++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) (limited to 'packages/meshbay-node/tests/test_ops.py') diff --git a/packages/meshbay-node/tests/test_ops.py b/packages/meshbay-node/tests/test_ops.py index 83758ae..92e32bf 100644 --- a/packages/meshbay-node/tests/test_ops.py +++ b/packages/meshbay-node/tests/test_ops.py @@ -15,12 +15,11 @@ from pathlib import Path import pytest from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey - -from conftest import one_root from meshbay_node import ops from meshbay_node.indexer.group_index import GroupIndex from meshbay_node.transport.quic_server import Denylist +from conftest import one_root def _state(tmp_path: Path) -> dict: @@ -251,3 +250,42 @@ async def test_start_reload_without_fn_is_refused(tmp_path): state = _state(tmp_path) with pytest.raises(ops.OpError, match="Reload not available"): await ops.start_reload(state) + + +# ── node.toml editing survives Windows (LF, comments, backslash paths) ──────── + +def test_update_node_toml_forces_lf_and_keeps_standalone_comments(tmp_path): + p = tmp_path / "node.toml" + p.write_bytes("\r\n".join([ + "[hub]", 'url = "http://x"', "", + "[node]", + "# how long an invitation lives", + "invite_ttl_hours = 168", + "ui_port = 18000", + "", + "[[groups]]", 'id = "g1"', + ]).encode()) + + ops._update_node_toml(p, {"invite_ttl_hours": 24, "max_concurrent_streams": 4}) + + raw = p.read_bytes() + assert b"\r\n" not in raw, "must be rewritten LF-only, whatever it was read as" + text = raw.decode("utf-8") + assert "# how long an invitation lives" in text + import tomllib + node = tomllib.loads(text)["node"] + assert node["invite_ttl_hours"] == 24 + assert node["max_concurrent_streams"] == 4 + + +def test_a_backslash_path_written_into_node_toml_stays_parseable(): + # attach_group / add_root / init embed a directory into a TOML basic string. + # A raw Windows path there (drive + backslash + "Users" + ...) is a parse + # error since backslash sequences are escapes; the code writes as_posix(). + import tomllib + bs = chr(92) + win_dir = f"C:{bs}Users{bs}alice{bs}Media" + assert tomllib.loads(f'path = "{Path(win_dir).as_posix()}"\n')["path"] == \ + "C:/Users/alice/Media" + with pytest.raises(tomllib.TOMLDecodeError): + tomllib.loads(f'path = "{win_dir}"\n') # the bug this guards against -- cgit v1.2.3