vssh 3.6.1__tar.gz → 3.6.2__tar.gz

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

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

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

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

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

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

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

@@ -515,23 +515,26 @@ _name_cache = {}  # name -> vpn_ip
 _name_cache_time = 0
 
 def resolve_name(host: str) -> str:
-    """Resolve server name to VPN IP via Wire VPN /peers API (standalone)"""
+    """Resolve server name to VPN IP via Wire VPN /peers API (coordinator-first)
+
+    Priority:
+      1. Fresh in-memory cache (< 60s) — avoids repeated network calls
+      2. Wire coordinator /peers — source of truth (IPs change when nodes move)
+      3. ~/.vssh/config static mapping — fallback when coordinator unreachable
+    """
     global _name_cache, _name_cache_time
     # Strip user@ prefix
     if '@' in host:
         host = host.split('@', 1)[1]
     if not host or host[0].isdigit():
         return host
-    # 1. Check ~/.vssh/config local mapping (instant, no network)
-    if host in VSSH_CONFIG:
-        return VSSH_CONFIG[host]
-    # Use cache if fresh (< 60s)
+    # 1. Use fresh cache — coordinator already queried recently
     if host in _name_cache and time.time() - _name_cache_time < 60:
         return _name_cache[host]
-    # Query Wire VPN server
+    # 2. Query Wire coordinator (source of truth — IPs change when nodes move)
+    import urllib.request
     for srv_ip in WIRE_SERVERS:
         try:
-            import urllib.request
             req = urllib.request.Request(f"http://{srv_ip}:8790/peers")
             with urllib.request.urlopen(req, timeout=3) as resp:
                 data = json.loads(resp.read())
@@ -544,9 +547,12 @@ def resolve_name(host: str) -> str:
                 _name_cache_time = time.time()
                 if host in _name_cache:
                     return _name_cache[host]
-                break  # got peers, just no match
+                break  # got peers from coordinator, just no match for this host
         except (OSError, ValueError, TimeoutError):
             continue
+    # 3. Fall back to static config (useful when all coordinators unreachable)
+    if host in VSSH_CONFIG:
+        return VSSH_CONFIG[host]
     return host
 
 
@@ -3873,11 +3879,25 @@ Env: VSSH_SECRET
         import socket as _sock
         import concurrent.futures
         full_mode = '--full' in args or '-f' in args
-        # Use vssh standalone config (no mpop dependency)
+        # Build server list: coordinator first (source of truth), config as supplement
         _servers = {}
+        import urllib.request as _ureq
+        for _srv_ip in WIRE_SERVERS:
+            try:
+                with _ureq.urlopen(f"http://{_srv_ip}:8790/peers", timeout=3) as _r:
+                    _peers = json.loads(_r.read()).get("peers", [])
+                    for _p in _peers:
+                        _nn = _p.get("node_name", "")
+                        _vip = _p.get("vpn_ip", "")
+                        if _nn and _vip:
+                            _servers[_nn] = _vip
+                    break
+            except (OSError, ValueError, TimeoutError):
+                continue
+        # 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
-            if v and v[0].isdigit():
+            if k in ('SECRET', 'SSH_PORT', 'SCP_PORT'): continue
+            if v and v[0].isdigit() and k not in _servers:
                 _servers[k] = v
 
         def _check_node(name, ip):