vssh 3.6.7__tar.gz → 3.7.0__tar.gz

{vssh-3.6.7/vssh.egg-info → vssh-3.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vssh
-Version: 3.6.7
+Version: 3.7.0
 Summary: Secure SSH/SCP tool with Tailscale failover, P2P transport, and MCP server
 Author-email: MeshPOP <mpop@mpop.dev>
 License: MIT

{vssh-3.6.7 → vssh-3.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vssh"
-version = "3.6.7"
+version = "3.7.0"
 description = "Secure SSH/SCP tool with Tailscale failover, P2P transport, and MCP server"
 readme = "README.md"
 license = {text = "MIT"}

{vssh-3.6.7 → vssh-3.7.0/vssh.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vssh
-Version: 3.6.7
+Version: 3.7.0
 Summary: Secure SSH/SCP tool with Tailscale failover, P2P transport, and MCP server
 Author-email: MeshPOP <mpop@mpop.dev>
 License: MIT

{vssh-3.6.7 → vssh-3.7.0}/vssh.py

@@ -159,8 +159,9 @@ def vssh_connect(host: str, timeout: float = 5.0) -> socket.socket:
         pass  # Timeout — WireGuard may be re-handshaking, retry once
 
     if not _wire_refused:
-        # Retry: wait 1s for WireGuard handshake to complete, then retry
-        time.sleep(1.0)
+        # Retry: wait 300ms for WireGuard handshake to complete, then retry
+        # (WireGuard handshake typically completes in <200ms; 1s was too slow)
+        time.sleep(0.3)
         try:
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             sock.settimeout(min(timeout, 5.0))  # 5s: handshake should be done by now
@@ -527,7 +528,22 @@ def check_transfer_safety(host: str) -> bool:
 
 
 # Wire VPN coordinator servers for name resolution
-WIRE_SERVERS = ["10.99.85.143", "158.247.247.115", "10.99.74.131", "10.99.249.158"]
+# Dynamically read from /etc/wire/config.json (server_url field)
+# Falls back to hardcoded list only if config is missing
+def _load_wire_servers() -> list:
+    import json as _json, re as _re
+    try:
+        with open("/etc/wire/config.json") as _f:
+            _cfg = _json.load(_f)
+        _url = _cfg.get("server_url", "")
+        _m = _re.match(r'https?://([^:/]+)', _url)
+        if _m:
+            return [_m.group(1)]
+    except (OSError, ValueError, KeyError):
+        pass
+    return []
+
+WIRE_SERVERS = _load_wire_servers()
 _name_cache = {}  # name -> vpn_ip
 _name_cache_time = 0
 
@@ -2479,6 +2495,8 @@ def pty_session(host: str, name: str = ''):
                         if not data:
                             raise EOFError
                         sock.sendall(data)
+                    except BlockingIOError:
+                        pass  # send buffer full, drop keystroke (rare)
                     except (EOFError, BrokenPipeError):
                         raise EOFError
                 elif r == sock:
@@ -2500,7 +2518,7 @@ def pty_session(host: str, name: str = ''):
         if old_settings:
             try:
                 import termios as _termios
-                _termios.tcsetattr(sys.stdin.fileno(), _termios.TCSADRAIN, old_settings)
+                _termios.tcsetattr(sys.stdin.fileno(), _termios.TCSAFLUSH, old_settings)
             except Exception:
                 pass  # safe to ignore
         sock.close()
@@ -4030,9 +4048,27 @@ Env: VSSH_SECRET
 
         online = 0
         total = 0
-        # Run checks in parallel for speed
+        # Pre-warm WireGuard tunnels BEFORE status checks.
+        # Fires short-timeout TCP probes to all peers simultaneously → triggers
+        # WireGuard handshakes, then waits 1.2 s for them to finish.
+        # By the time real checks run, all tunnels are warm → zero handshakes
+        # during status → no disruption of the caller's active session.
+        _peer_ips = [ip for ip in _servers.values() if ip and ip != _my_vpn_ip]
+        def _prewarm(ip):
+            try:
+                _pw = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                _pw.settimeout(0.15)
+                _pw.connect((ip, PORT))
+                _pw.close()
+            except Exception:
+                pass
+        with concurrent.futures.ThreadPoolExecutor(max_workers=len(_peer_ips) or 1) as _wp:
+            list(_wp.map(_prewarm, _peer_ips))
+        time.sleep(1.2)  # wait for WireGuard handshakes to complete
+
+        # Run checks in parallel for speed — tunnels are warm, no handshakes
         results = []
-        with concurrent.futures.ThreadPoolExecutor(max_workers=5) as pool:  # 5 concurrent: limits WireGuard handshake burst that disrupts active sessions
+        with concurrent.futures.ThreadPoolExecutor(max_workers=14) as pool:
             futures = {pool.submit(_check_node, n, ip): n for n, ip in sorted(_servers.items()) if ip}
             for f in concurrent.futures.as_completed(futures):
                 results.append(f.result())