vssh 3.7.3__tar.gz → 3.7.4__tar.gz

{vssh-3.7.3/vssh.egg-info → vssh-3.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vssh
-Version: 3.7.3
+Version: 3.7.4
 Summary: Secure SSH/SCP tool with Tailscale failover, P2P transport, and MCP server
 Author-email: MeshPOP <mpop@mpop.dev>
 License: MIT
@@ -157,7 +157,7 @@ vssh history 20 web1     # Last 20 commands for specific host
 
 **Example `vssh status` output:**
 ```
-vssh v3.7.2 - Connection Status
+vssh v3.7.4 - Connection Status
 ======================================================================
   c1     10.99.248.51       ● online  (12ms)
   c2     10.99.14.187       ● online  (11ms)
@@ -168,7 +168,7 @@ Total: 3/3 online
 
 **Example `vssh status --full` output:**
 ```
-vssh v3.7.2 - Cluster Status (full)
+vssh v3.7.4 - Cluster Status (full)
 ======================================================================
   web1   10.99.1.10   ● online  (8ms)
     disk: 45% used (120GB / 250GB)  mem: 4.2GB / 16GB  load: 0.42
@@ -213,7 +213,6 @@ vssh get  --retry=3 <host>:<remote> <local> # Download with retry
 vssh sync <local_dir> <host>:<remote_dir>   # Directory sync (8 parallel streams)
 vssh mput <host>:<base_path> <file1> <file2> ...  # Multi-file single connection
 vssh fast <local> <host>:<remote>           # Auto-select best method
-vssh p2p  <local> <host>:<remote>           # P2P direct (NAT hole-punch)
 vssh rsync <local> <host>:<remote>          # Delta sync (only changed blocks)
 ```
 
@@ -234,7 +233,6 @@ vssh get  web1:/var/log/app.log ./app.log        # Download
 vssh sync ./config/ web1:/etc/app/              # Sync directory
 vssh mput web1:/backup/ file1.txt file2.txt file3.log   # Multi-file
 vssh rsync ./src/ web1:/opt/src/                # Delta sync (only changes)
-vssh p2p  ./dataset.tar.gz web2:/data/          # P2P bypass VPN relay
 ```
 
 vssh auto-compresses text files (`.py`, `.js`, `.json`, `.log`, `.md`, etc.) and skips upload for files with matching MD5.
@@ -623,16 +621,6 @@ Used internally for LAN-direct optimization.
 
 ---
 
-#### `p2p_signal` — P2P Signaling
-
-Used internally by `vssh p2p` to coordinate NAT hole-punch. Exchanges external IP/port info between peers via the VPN mesh relay.
-
-```bash
-vssh rpc relay p2p_signal '{"external_ip":"203.0.113.1","external_port":48300,"local_port":48300}'
-```
-
----
-
 ### RPC via Session
 
 You can run multiple RPC calls on a single persistent connection using `vssh session`:
@@ -899,22 +887,6 @@ Test upload and download speed to a server.
 
 ---
 
-#### `vssh_p2p_status` — P2P Status
-
-Check NAT hole-punch capability.
-
-```json
-// Output:
-{
-  "p2p_available": true,
-  "external_ip": "203.0.113.1",
-  "external_port": 48310,
-  "nat_type": "cone"
-}
-```
-
----
-
 #### `vssh_tunnel` — SSH Tunnel (Port Forwarding)
 
 Create an SSH tunnel to access a remote service locally.

{vssh-3.7.3 → vssh-3.7.4}/README.md

@@ -134,7 +134,7 @@ vssh history 20 web1     # Last 20 commands for specific host
 
 **Example `vssh status` output:**
 ```
-vssh v3.7.2 - Connection Status
+vssh v3.7.4 - Connection Status
 ======================================================================
   c1     10.99.248.51       ● online  (12ms)
   c2     10.99.14.187       ● online  (11ms)
@@ -145,7 +145,7 @@ Total: 3/3 online
 
 **Example `vssh status --full` output:**
 ```
-vssh v3.7.2 - Cluster Status (full)
+vssh v3.7.4 - Cluster Status (full)
 ======================================================================
   web1   10.99.1.10   ● online  (8ms)
     disk: 45% used (120GB / 250GB)  mem: 4.2GB / 16GB  load: 0.42
@@ -190,7 +190,6 @@ vssh get  --retry=3 <host>:<remote> <local> # Download with retry
 vssh sync <local_dir> <host>:<remote_dir>   # Directory sync (8 parallel streams)
 vssh mput <host>:<base_path> <file1> <file2> ...  # Multi-file single connection
 vssh fast <local> <host>:<remote>           # Auto-select best method
-vssh p2p  <local> <host>:<remote>           # P2P direct (NAT hole-punch)
 vssh rsync <local> <host>:<remote>          # Delta sync (only changed blocks)
 ```
 
@@ -211,7 +210,6 @@ vssh get  web1:/var/log/app.log ./app.log        # Download
 vssh sync ./config/ web1:/etc/app/              # Sync directory
 vssh mput web1:/backup/ file1.txt file2.txt file3.log   # Multi-file
 vssh rsync ./src/ web1:/opt/src/                # Delta sync (only changes)
-vssh p2p  ./dataset.tar.gz web2:/data/          # P2P bypass VPN relay
 ```
 
 vssh auto-compresses text files (`.py`, `.js`, `.json`, `.log`, `.md`, etc.) and skips upload for files with matching MD5.
@@ -600,16 +598,6 @@ Used internally for LAN-direct optimization.
 
 ---
 
-#### `p2p_signal` — P2P Signaling
-
-Used internally by `vssh p2p` to coordinate NAT hole-punch. Exchanges external IP/port info between peers via the VPN mesh relay.
-
-```bash
-vssh rpc relay p2p_signal '{"external_ip":"203.0.113.1","external_port":48300,"local_port":48300}'
-```
-
----
-
 ### RPC via Session
 
 You can run multiple RPC calls on a single persistent connection using `vssh session`:
@@ -876,22 +864,6 @@ Test upload and download speed to a server.
 
 ---
 
-#### `vssh_p2p_status` — P2P Status
-
-Check NAT hole-punch capability.
-
-```json
-// Output:
-{
-  "p2p_available": true,
-  "external_ip": "203.0.113.1",
-  "external_port": 48310,
-  "nat_type": "cone"
-}
-```
-
----
-
 #### `vssh_tunnel` — SSH Tunnel (Port Forwarding)
 
 Create an SSH tunnel to access a remote service locally.

{vssh-3.7.3 → vssh-3.7.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vssh"
-version = "3.7.3"
+version = "3.7.4"
 description = "Secure SSH/SCP tool with Tailscale failover, P2P transport, and MCP server"
 readme = "README.md"
 license = {text = "MIT"}
@@ -38,4 +38,4 @@ Repository = "https://github.com/meshpop/vssh"
 vssh = "vssh_mcp_server"
 
 [tool.setuptools]
-py-modules = ["vssh", "vssh_p2p", "vssh_mcp_server"]
+py-modules = ["vssh", "vssh_mcp_server"]

{vssh-3.7.3 → vssh-3.7.4/vssh.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vssh
-Version: 3.7.3
+Version: 3.7.4
 Summary: Secure SSH/SCP tool with Tailscale failover, P2P transport, and MCP server
 Author-email: MeshPOP <mpop@mpop.dev>
 License: MIT
@@ -157,7 +157,7 @@ vssh history 20 web1     # Last 20 commands for specific host
 
 **Example `vssh status` output:**
 ```
-vssh v3.7.2 - Connection Status
+vssh v3.7.4 - Connection Status
 ======================================================================
   c1     10.99.248.51       ● online  (12ms)
   c2     10.99.14.187       ● online  (11ms)
@@ -168,7 +168,7 @@ Total: 3/3 online
 
 **Example `vssh status --full` output:**
 ```
-vssh v3.7.2 - Cluster Status (full)
+vssh v3.7.4 - Cluster Status (full)
 ======================================================================
   web1   10.99.1.10   ● online  (8ms)
     disk: 45% used (120GB / 250GB)  mem: 4.2GB / 16GB  load: 0.42
@@ -213,7 +213,6 @@ vssh get  --retry=3 <host>:<remote> <local> # Download with retry
 vssh sync <local_dir> <host>:<remote_dir>   # Directory sync (8 parallel streams)
 vssh mput <host>:<base_path> <file1> <file2> ...  # Multi-file single connection
 vssh fast <local> <host>:<remote>           # Auto-select best method
-vssh p2p  <local> <host>:<remote>           # P2P direct (NAT hole-punch)
 vssh rsync <local> <host>:<remote>          # Delta sync (only changed blocks)
 ```
 
@@ -234,7 +233,6 @@ vssh get  web1:/var/log/app.log ./app.log        # Download
 vssh sync ./config/ web1:/etc/app/              # Sync directory
 vssh mput web1:/backup/ file1.txt file2.txt file3.log   # Multi-file
 vssh rsync ./src/ web1:/opt/src/                # Delta sync (only changes)
-vssh p2p  ./dataset.tar.gz web2:/data/          # P2P bypass VPN relay
 ```
 
 vssh auto-compresses text files (`.py`, `.js`, `.json`, `.log`, `.md`, etc.) and skips upload for files with matching MD5.
@@ -623,16 +621,6 @@ Used internally for LAN-direct optimization.
 
 ---
 
-#### `p2p_signal` — P2P Signaling
-
-Used internally by `vssh p2p` to coordinate NAT hole-punch. Exchanges external IP/port info between peers via the VPN mesh relay.
-
-```bash
-vssh rpc relay p2p_signal '{"external_ip":"203.0.113.1","external_port":48300,"local_port":48300}'
-```
-
----
-
 ### RPC via Session
 
 You can run multiple RPC calls on a single persistent connection using `vssh session`:
@@ -899,22 +887,6 @@ Test upload and download speed to a server.
 
 ---
 
-#### `vssh_p2p_status` — P2P Status
-
-Check NAT hole-punch capability.
-
-```json
-// Output:
-{
-  "p2p_available": true,
-  "external_ip": "203.0.113.1",
-  "external_port": 48310,
-  "nat_type": "cone"
-}
-```
-
----
-
 #### `vssh_tunnel` — SSH Tunnel (Port Forwarding)
 
 Create an SSH tunnel to access a remote service locally.

{vssh-3.7.3 → vssh-3.7.4}/vssh.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ README.md
 pyproject.toml
 vssh.py
 vssh_mcp_server.py
-vssh_p2p.py
 vssh.egg-info/PKG-INFO
 vssh.egg-info/SOURCES.txt
 vssh.egg-info/dependency_links.txt

{vssh-3.7.3 → vssh-3.7.4}/vssh.egg-info/top_level.txt

@@ -1,3 +1,2 @@
 vssh
 vssh_mcp_server
-vssh_p2p

{vssh-3.7.3 → vssh-3.7.4}/vssh.py

@@ -1009,67 +1009,6 @@ def _rpc_get_network_info(payload: dict) -> dict:
         'public_ip': get_cached_public_ip(),
     }
 
-# P2P signaling storage (in-memory, temporary)
-_p2p_signals = {}  # {peer_ip: {external_ip, external_port, local_port, timestamp}}
-_P2P_SIGNAL_TTL = 60  # 60 seconds
-
-@rpc_method('p2p_signal', 'read')
-def _rpc_p2p_signal(payload: dict) -> dict:
-    """Exchange P2P signaling info for hole punching
-
-    Payload: {external_ip, external_port, local_port, peer_vpn_ip (optional)}
-    Returns: Peer's info if available, or stores sender's info
-    """
-    import time
-
-    sender_ip = payload.get('_sender_ip', 'unknown')
-    ext_ip = payload.get('external_ip')
-    ext_port = payload.get('external_port')
-    local_port = payload.get('local_port')
-    peer_vpn_ip = payload.get('peer_vpn_ip')
-
-    if not all([ext_ip, ext_port, local_port]):
-        return {'error': 'external_ip, external_port, local_port required'}
-
-    now = time.time()
-
-    # Clean old signals
-    expired = [k for k, v in _p2p_signals.items() if now - v.get('timestamp', 0) > _P2P_SIGNAL_TTL]
-    for k in expired:
-        del _p2p_signals[k]
-
-    # Store sender's info
-    _p2p_signals[sender_ip] = {
-        'external_ip': ext_ip,
-        'external_port': ext_port,
-        'local_port': local_port,
-        'timestamp': now
-    }
-
-    # If peer_vpn_ip specified, return their info if available
-    if peer_vpn_ip and peer_vpn_ip in _p2p_signals:
-        peer_info = _p2p_signals[peer_vpn_ip]
-        return {
-            'status': 'peer_found',
-            'external_ip': peer_info['external_ip'],
-            'external_port': peer_info['external_port'],
-            'local_port': peer_info['local_port']
-        }
-
-    return {'status': 'registered', 'waiting_for_peer': True}
-
-@rpc_method('p2p_get_peer', 'read')
-def _rpc_p2p_get_peer(payload: dict) -> dict:
-    """Get peer's P2P signal info"""
-    peer_vpn_ip = payload.get('peer_vpn_ip')
-    if not peer_vpn_ip:
-        return {'error': 'peer_vpn_ip required'}
-
-    if peer_vpn_ip in _p2p_signals:
-        return _p2p_signals[peer_vpn_ip]
-
-    return {'error': 'peer not found'}
-
 @rpc_method('restart_service', 'admin')
 def _rpc_restart_service(payload: dict) -> dict:
     """Restart a systemd service (admin only)"""
@@ -1618,43 +1557,6 @@ def put_fast(local: str, remote: str, lan: bool = True) -> bool:
         return _put_file(path, host, rpath)
 
 
-# ========== P2P Transfer (NAT Hole-Punch) ==========
-def put_p2p(local: str, remote: str, fallback: bool = True) -> bool:
-    """Upload via P2P hole-punching (bypasses VPN relay)
-
-    Attempts P2P direct transfer for higher speed between NAT'd hosts.
-    Falls back to regular VPN transfer if P2P fails.
-
-    Best for: Large files between NAT'd machines (e.g., local <-> remote)
-    Speed: ~11MB/s P2P vs ~10MB/s VPN relay
-    """
-    try:
-        from vssh_p2p import p2p_transfer_tcp
-    except ImportError:
-        print('[P2P] vssh_p2p module not found, using VPN')
-        return put_fast(local, remote)
-
-    path = Path(local)
-    if not path.is_file():
-        print(f'Not a file: {local}')
-        return False
-
-    host, rpath = remote.split(':', 1)
-
-    # Try P2P first
-    print(f'[P2P] Attempting direct transfer to {host}...')
-    success = p2p_transfer_tcp(str(path), host, rpath)
-
-    if success:
-        return True
-
-    if fallback:
-        print('[P2P] Falling back to VPN relay...')
-        return put_fast(local, remote)
-
-    return False
-
-
 # ========== Multi-connection Large File Transfer ==========
 def put_large_file(path: Path, host: str, rpath: str) -> bool:
     """Large file multi-connection upload"""
@@ -3653,7 +3555,6 @@ File transfer:
   sync <local_dir> <host>:<remote> Directory sync (8 parallel streams)
   mput <host>:<base> file1 file2   Multi-file upload (single connection)
   fast <local> <host>:<remote>     Auto-select best transfer method
-  p2p  <local> <host>:<remote>     P2P direct (NAT hole-punch)
   rsync <local> <host>:<remote>    Delta sync (only changed blocks)
 
 Pipes:
@@ -3709,14 +3610,6 @@ Env: VSSH_SECRET
         no_lan = '--no-lan' in args
         fast_args = [a for a in args[1:] if not a.startswith('-')]
         sys.exit(0 if put_fast(fast_args[0], fast_args[1], lan=not no_lan) else 1)
-    elif cmd == 'p2p':
-        # P2P direct transfer (NAT hole-punch, bypasses VPN relay)
-        no_fallback = '--no-fallback' in args
-        p2p_args = [a for a in args[1:] if not a.startswith('-')]
-        if len(p2p_args) < 2:
-            print('Usage: vssh p2p <local> <host>:<remote> [--no-fallback]')
-            sys.exit(1)
-        sys.exit(0 if put_p2p(p2p_args[0], p2p_args[1], fallback=not no_fallback) else 1)
     elif cmd == 'rsync':
         # Delta sync (only changed blocks)
         no_lan = '--no-lan' in args

{vssh-3.7.3 → vssh-3.7.4}/vssh_mcp_server.py

@@ -8,8 +8,9 @@ Tools:
 - vssh_put: Upload file to server
 - vssh_get: Download file from server
 - vssh_sync: Sync directory between servers
-- vssh_p2p_status: P2P connection status
 - vssh_speed_test: Test transfer speed
+- vssh_tunnel: SSH port forwarding tunnel
+- vssh_keys: Manage vssh keys and secrets
 
 Run: python3 vssh-mcp-server.py
 """
@@ -467,24 +468,6 @@ def tool_vssh_speed_test(server: str, size_mb: int = 10):
         "latency_ms": round((upload_time + download_time) * 500 / size_mb, 1)
     }
 
-def tool_vssh_p2p_status():
-    """Check P2P connection capabilities"""
-    # Check if P2P module is available
-    try:
-        from vssh_p2p import stun_get_external
-        external = stun_get_external()
-        return {
-            "p2p_available": True,
-            "external_ip": external[0] if external else "unknown",
-            "external_port": external[1] if external else 0,
-            "nat_type": "cone" if external else "unknown"
-        }
-    except Exception as e:
-        return {
-            "p2p_available": False,
-            "note": "P2P module not loaded"
-        }
-
 def tool_vssh_tunnel(server: str, local_port: int, remote_port: int, remote_host: str = "localhost"):
     """Create SSH tunnel (port forwarding). Launches tunnel in background and returns PID."""
     servers = get_servers()
@@ -732,15 +715,6 @@ TOOLS = [
             "required": ["server"]
         }
     },
-    {
-        "name": "vssh_p2p_status",
-        "description": "Check P2P (NAT hole-punch) connection capabilities for direct peer-to-peer transfers.",
-        "inputSchema": {
-            "type": "object",
-            "properties": {},
-            "required": []
-        }
-    },
     {
         "name": "vssh_tunnel",
         "description": "Create SSH tunnel (port forwarding) to access remote services locally. Launches tunnel in background, returns PID and access URL.",
@@ -822,8 +796,6 @@ def handle_request(request):
             result = tool_vssh_sync(args.get("source"), args.get("dest"), args.get("path"))
         elif tool_name == "vssh_speed_test":
             result = tool_vssh_speed_test(args.get("server"), args.get("size_mb", 10))
-        elif tool_name == "vssh_p2p_status":
-            result = tool_vssh_p2p_status()
         elif tool_name == "vssh_tunnel":
             result = tool_vssh_tunnel(
                 args.get("server"),