vssh 3.6.2__tar.gz → 3.6.7__tar.gz

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

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

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

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

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

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

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

@@ -144,14 +144,31 @@ def vssh_connect(host: str, timeout: float = 5.0) -> socket.socket:
             del _FAILOVER_ACTIVE[host]
 
     # Primary: try Wire VPN IP
+    # First attempt: 2s fast path
+    # If timeout (cold WireGuard peer re-handshake), retry once with longer timeout
+    _wire_refused = False
     try:
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        sock.settimeout(min(timeout, 2.0))  # 2s: enough for WireGuard handshake
+        sock.settimeout(min(timeout, 2.0))  # 2s: fast path
         sock.connect((host, PORT))
-        sock.settimeout(timeout)  # Restore full timeout for I/O
+        sock.settimeout(timeout)
         return sock
-    except (ConnectionRefusedError, ConnectionError, OSError, socket.timeout):
-        pass  # Wire failed, try Tailscale
+    except ConnectionRefusedError:
+        _wire_refused = True  # Port closed — no point retrying
+    except (ConnectionError, OSError, socket.timeout):
+        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)
+        try:
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            sock.settimeout(min(timeout, 5.0))  # 5s: handshake should be done by now
+            sock.connect((host, PORT))
+            sock.settimeout(timeout)
+            return sock
+        except (ConnectionRefusedError, ConnectionError, OSError, socket.timeout):
+            pass  # Wire truly failed, fall through to Tailscale
 
     # Fallback: try Tailscale IP
     ts_ip = TAILSCALE_MAP.get(host)
@@ -3866,6 +3883,65 @@ Env: VSSH_SECRET
             print(f'  Done: {result["ok"]} ok, {result["skip"]} skip, {result["fail"]} fail')
 
         sys.exit(0 if result['fail'] == 0 else 1)
+    elif cmd == 'up':
+        # Start vssh daemon (systemd or direct)
+        import subprocess as _sp, os as _os
+        if _os.path.exists("/run/systemd/system"):
+            r = _sp.run(["systemctl", "start", "vssh"], capture_output=True)
+            if r.returncode == 0:
+                print("vssh started")
+            else:
+                print(r.stderr.decode().strip() or "Failed to start vssh via systemctl")
+        else:
+            print("Starting vssh daemon...")
+            server()
+    elif cmd == 'down':
+        # Stop vssh daemon
+        import subprocess as _sp, os as _os
+        if _os.path.exists("/run/systemd/system"):
+            r = _sp.run(["systemctl", "stop", "vssh"], capture_output=True)
+            if r.returncode == 0:
+                print("vssh stopped")
+            else:
+                print(r.stderr.decode().strip() or "Failed to stop vssh via systemctl")
+        else:
+            import signal as _sig
+            import glob as _glob
+            killed = 0
+            for _f in _glob.glob("/tmp/vssh_*.pid") + _glob.glob("/var/run/vssh.pid"):
+                try:
+                    _pid = int(open(_f).read().strip())
+                    _os.kill(_pid, _sig.SIGTERM)
+                    _os.unlink(_f)
+                    killed += 1
+                except (ValueError, OSError):
+                    pass
+            if killed:
+                print(f"vssh stopped ({killed} process(es))")
+            else:
+                import subprocess as _sp2
+                r = _sp2.run(["pkill", "-f", "vssh.*server"], capture_output=True)
+                print("vssh stopped" if r.returncode == 0 else "vssh was not running")
+    elif cmd == 'restart':
+        # Restart vssh daemon
+        import subprocess as _sp, os as _os
+        if _os.path.exists("/run/systemd/system"):
+            r = _sp.run(["systemctl", "restart", "vssh"], capture_output=True)
+            if r.returncode == 0:
+                print("vssh restarted")
+            else:
+                print(r.stderr.decode().strip() or "Failed to restart vssh via systemctl")
+        else:
+            import signal as _sig, glob as _glob
+            for _f in _glob.glob("/tmp/vssh_*.pid") + _glob.glob("/var/run/vssh.pid"):
+                try:
+                    _pid = int(open(_f).read().strip())
+                    _os.kill(_pid, _sig.SIGTERM)
+                    _os.unlink(_f)
+                except (ValueError, OSError):
+                    pass
+            print("Restarting vssh daemon...")
+            server()
     elif cmd == 'server':
         server()
     elif cmd == 'install':
@@ -3894,6 +3970,14 @@ Env: VSSH_SECRET
                     break
             except (OSError, ValueError, TimeoutError):
                 continue
+        # Detect local node by trying to bind to each VPN IP
+        def _is_local_ip(ip):
+            try:
+                _s = _sock.socket(_sock.AF_INET, _sock.SOCK_DGRAM)
+                _s.bind((ip, 0)); _s.close(); return True
+            except OSError:
+                return False
+        _my_vpn_ip = next((ip for ip in _servers.values() if _is_local_ip(ip)), "")
         # Also include any config entries not in coordinator (offline/static nodes)
         for k, v in VSSH_CONFIG.items():
             if k in ('SECRET', 'SSH_PORT', 'SCP_PORT'): continue
@@ -3902,6 +3986,8 @@ Env: VSSH_SECRET
 
         def _check_node(name, ip):
             """Check a single node — connect + optional INFO query (Wire VPN → Tailscale fallback)"""
+            if ip == _my_vpn_ip:
+                return {'name': name, 'ip': ip, 'online': True, 'latency': 0, 'local': True}
             result = {'name': name, 'ip': ip, 'online': False, 'latency': 0}
             try:
                 t0 = time.time()
@@ -3931,7 +4017,7 @@ Env: VSSH_SECRET
                             result['info'] = json.loads(buf.decode())
                         except (json.JSONDecodeError, ValueError, UnicodeDecodeError) as e:
                             pass  # e silenced
-                s.close()
+                s.close()  # Always close — was only in full_mode, causing 13 dangling sockets on regular status
             except OSError:
                 pass  # safe to ignore
             return result
@@ -3946,7 +4032,7 @@ Env: VSSH_SECRET
         total = 0
         # Run checks in parallel for speed
         results = []
-        with concurrent.futures.ThreadPoolExecutor(max_workers=14) as pool:
+        with concurrent.futures.ThreadPoolExecutor(max_workers=5) as pool:  # 5 concurrent: limits WireGuard handshake burst that disrupts active sessions
             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())
@@ -4013,6 +4099,8 @@ Env: VSSH_SECRET
                     cores = d.get('cores', '')
                     cores_str = f"{cores}c" if cores else ""
                     print(f"  {r['name']:6s} ● {r['latency']:4.0f}ms  mem={mem_str:>12s}  load={load_str:>5s}  up={up_str:>7s}  {cores_str}")
+                elif r.get('local'):
+                    print(f"  {r['name']:6s} {r['ip']:18s} ● online  (local)")
                 else:
                     print(f"  {r['name']:6s} {r['ip']:18s} ● online  ({r['latency']:.0f}ms)")
             else: