vssh 3.7.0__tar.gz → 3.7.2__tar.gz

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

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

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

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

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

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

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

@@ -81,7 +81,17 @@ def _load_tailscale_map() -> dict:
             pass
 
     # 3. Auto-detect: cross-reference `tailscale status --json` + wire /peers
-    if not ts_map:
+    # Re-run if: no map yet, OR tailscale_map file is older than 24 hours
+    _stale = False
+    if ts_map and ts_file.exists():
+        try:
+            _age = time.time() - ts_file.stat().st_mtime
+            if _age > 86400:  # 24 hours
+                _stale = True
+        except OSError:
+            pass
+
+    if not ts_map or _stale:
         try:
             import urllib.request as _ur, subprocess as _sp2
             ts_out = _sp2.run(['tailscale', 'status', '--json'],
@@ -96,18 +106,32 @@ def _load_tailscale_map() -> dict:
                     ips = [ip for ip in peer.get('TailscaleIPs', []) if ':' not in ip]
                     if name and ips:
                         ts_host[name] = ips[0]
-                for srv_ip in ['10.99.85.143', '158.247.247.115']:
+                detected = {}
+                for srv_url in WIRE_SERVERS:
                     try:
-                        with _ur.urlopen(f'http://{srv_ip}:8790/peers', timeout=3) as r:
+                        with _ur.urlopen(f'{srv_url}/peers', timeout=3) as r:
                             for p in json.loads(r.read()).get('peers', []):
                                 name = p.get('node_name', '').lower()
                                 wire_ip = p.get('vpn_ip', '')
                                 ts_ip = ts_host.get(name)
                                 if wire_ip and ts_ip:
-                                    ts_map[wire_ip] = ts_ip
+                                    detected[wire_ip] = ts_ip
                         break
                     except Exception:
                         continue
+                if detected:
+                    ts_map.update(detected)
+                    # Save auto-detected map to file for future runs
+                    try:
+                        VSSH_DIR_CONF.mkdir(parents=True, exist_ok=True)
+                        lines = [f"{wire_ip} {ts_ip}\n"
+                                 for wire_ip, ts_ip in sorted(detected.items())]
+                        ts_file.write_text(
+                            "# Auto-generated by vssh — wire VPN IP → Tailscale IP\n"
+                            + "".join(lines)
+                        )
+                    except OSError:
+                        pass
         except Exception:
             pass
 
@@ -531,19 +555,23 @@ def check_transfer_safety(host: str) -> bool:
 # 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:
+    """Return list of wire coordinator base URLs (e.g. ['http://1.2.3.4:8790']).
+    Reads from /etc/wire/config.json or ~/.wire/config.json — no hardcoded IPs.
+    """
     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
+    for _cfg_path in ["/etc/wire/config.json",
+                      os.path.expanduser("~/.wire/config.json")]:
+        try:
+            with open(_cfg_path) as _f:
+                _cfg = _json.load(_f)
+            _url = _cfg.get("server_url", "").rstrip("/")
+            if _re.match(r'https?://', _url):
+                return [_url]
+        except (OSError, ValueError, KeyError):
+            continue
     return []
 
-WIRE_SERVERS = _load_wire_servers()
+WIRE_SERVERS = _load_wire_servers()  # list of coordinator base URLs
 _name_cache = {}  # name -> vpn_ip
 _name_cache_time = 0
 
@@ -568,7 +596,7 @@ def resolve_name(host: str) -> str:
     import urllib.request
     for srv_ip in WIRE_SERVERS:
         try:
-            req = urllib.request.Request(f"http://{srv_ip}:8790/peers")
+            req = urllib.request.Request(f"{srv_ip}/peers")
             with urllib.request.urlopen(req, timeout=3) as resp:
                 data = json.loads(resp.read())
                 peers = data.get("peers", [])
@@ -3978,7 +4006,7 @@ Env: VSSH_SECRET
         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:
+                with _ureq.urlopen(f"{_srv_ip}/peers", timeout=3) as _r:
                     _peers = json.loads(_r.read()).get("peers", [])
                     for _p in _peers:
                         _nn = _p.get("node_name", "")