Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion openrot/core/bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import contextlib
import json
import socket
import sys
from collections.abc import Callable
from dataclasses import dataclass
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
Expand Down Expand Up @@ -220,7 +221,8 @@ def serve() -> None:
f"bridge: [green]listening[/green] on {url} "
f"(upstream {cfg_obj.bridge_upstream}, level {cfg_obj.active_level.value})"
)
console.print("Ctrl-C to stop.")
if sys.stdout.isatty():
console.print("Ctrl-C to stop.")
host = cfg.listen_address()
warn_if_exposed(host)
signals.keyboard_on_sigterm()
Expand Down
10 changes: 5 additions & 5 deletions openrot/providers/warp.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ def connect() -> bool:
_run("mode", "proxy")
_run("proxy", "port", str(port))
_run("connect")
with console.status("waiting for WARP connection..."):
for _ in range(120):
if is_connected():
return True
time.sleep(0.5)
console.print("waiting for WARP connection...")
for _ in range(120):
if is_connected():
return True
time.sleep(0.5)
return False


Expand Down
56 changes: 56 additions & 0 deletions tests/unit/core/test_bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,62 @@ def server_close(self) -> None:
assert any("SECURITY" in msg for msg in printed)


class _FakeStdout:
def __init__(self, tty: bool) -> None:
self._tty = tty

def isatty(self) -> bool:
return self._tty


def test_serve_hides_ctrl_c_tip_when_not_a_tty(monkeypatch: pytest.MonkeyPatch) -> None:
class FakeServer:
def __init__(self, host: str, port: int) -> None:
self.host = host
self.port = port

def serve_forever(self) -> None:
raise KeyboardInterrupt

def server_close(self) -> None:
pass

printed: list[str] = []
monkeypatch.setattr(bridge, "_running_level", lambda cfg_obj, check: True)
monkeypatch.setattr(bridge.cfg, "load_config", lambda: _cfg(bridge_port=7891))
monkeypatch.setattr(bridge.console, "print", lambda *a, **k: printed.append(a[0]))
monkeypatch.setattr(bridge.sys, "stdout", _FakeStdout(False))
monkeypatch.setattr(bridge, "Bridge", FakeServer)

bridge.serve()

assert not any("Ctrl-C to stop." in msg for msg in printed)


def test_serve_shows_ctrl_c_tip_on_a_tty(monkeypatch: pytest.MonkeyPatch) -> None:
class FakeServer:
def __init__(self, host: str, port: int) -> None:
self.host = host
self.port = port

def serve_forever(self) -> None:
raise KeyboardInterrupt

def server_close(self) -> None:
pass

printed: list[str] = []
monkeypatch.setattr(bridge, "_running_level", lambda cfg_obj, check: True)
monkeypatch.setattr(bridge.cfg, "load_config", lambda: _cfg(bridge_port=7891))
monkeypatch.setattr(bridge.console, "print", lambda *a, **k: printed.append(a[0]))
monkeypatch.setattr(bridge.sys, "stdout", _FakeStdout(True))
monkeypatch.setattr(bridge, "Bridge", FakeServer)

bridge.serve()

assert any("Ctrl-C to stop." in msg for msg in printed)


def test_respond_streams_body_and_skips_hop_by_hop() -> None:
from io import BytesIO
from types import SimpleNamespace
Expand Down
15 changes: 15 additions & 0 deletions tests/unit/providers/test_warp.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,21 @@ def test_connect_sets_proxy_mode(monkeypatch: pytest.MonkeyPatch) -> None:
assert ("proxy", "port", str(w.WARP_PROXY_PORT)) in calls


def test_connect_does_not_use_rich_live(monkeypatch: pytest.MonkeyPatch) -> None:
_patch(monkeypatch, [w.WarpStatus.CONNECTED])

def exploding_status(*args: object, **kwargs: object) -> object:
raise AssertionError("connect() must not start a rich Live")

monkeypatch.setattr(w.console, "status", exploding_status)
printed: list[str] = []

monkeypatch.setattr(w.console, "print", lambda *a, **k: printed.append(a[0]))

assert w.connect() is True
assert "waiting for WARP connection..." in printed


def test_proxy_address_default() -> None:
assert w.proxy_address() == (w.WARP_PROXY_HOST, w.WARP_PROXY_PORT)

Expand Down