vssh 3.3.4__tar.gz → 3.3.7__tar.gz

{vssh-3.3.4/vssh.egg-info → vssh-3.3.7}/PKG-INFO

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

{vssh-3.3.4 → vssh-3.3.7}/pyproject.toml

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

{vssh-3.3.4 → vssh-3.3.7/vssh.egg-info}/PKG-INFO

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

{vssh-3.3.4 → vssh-3.3.7}/vssh.py

@@ -35,7 +35,14 @@ def _load_vssh_secret():
         s = sf.read_text().strip()
         if s: return s
     conf = _load_vssh_config()
-    return conf.get('SECRET', '')
+    s = conf.get('SECRET', '')
+    if s: return s
+    # Auto-generate on first install
+    import secrets as _sec
+    s = _sec.token_hex(16)
+    VSSH_DIR_CONF.mkdir(parents=True, exist_ok=True)
+    sf.write_text(s)
+    return s
 
 VSSH_CONFIG = _load_vssh_config()
 SECRET = _load_vssh_secret()
@@ -2961,6 +2968,57 @@ def server():
                     result = subprocess.run(cmdline, shell=True, capture_output=True, timeout=60)
                     conn.sendall(result.stdout + result.stderr + b'__END__')
 
+            elif cmd == 'PTY_SESSION':
+                # PTY_SESSION:auth:rows:cols  →  full bash PTY relay
+                try:
+                    rows = int(parts[2]) if len(parts) > 2 else 24
+                    cols = int(parts[3]) if len(parts) > 3 else 80
+                except (IndexError, ValueError):
+                    rows, cols = 24, 80
+                conn.sendall(b'PTY_OK\n')
+                print(f'[PTY] {addr[0]} {rows}x{cols}')
+                import pty as _pty, select as _sel, fcntl as _fcntl
+                import termios as _ter, struct as _stru
+                mfd, sfd = _pty.openpty()
+                _fcntl.ioctl(sfd, _ter.TIOCSWINSZ,
+                             _stru.pack('HHHH', rows, cols, 0, 0))
+                proc = subprocess.Popen(
+                    ['/bin/bash', '-l'],
+                    stdin=sfd, stdout=sfd, stderr=sfd,
+                    preexec_fn=os.setsid, close_fds=True
+                )
+                os.close(sfd)
+                cfd = conn.fileno()
+                try:
+                    while proc.poll() is None:
+                        r, _, _ = _sel.select([cfd, mfd], [], [], 0.05)
+                        if cfd in r:
+                            data = conn.recv(4096)
+                            if not data:
+                                break
+                            try:
+                                os.write(mfd, data)
+                            except OSError:
+                                break
+                        if mfd in r:
+                            try:
+                                data = os.read(mfd, 4096)
+                                if data:
+                                    conn.sendall(data)
+                            except OSError:
+                                break
+                finally:
+                    try:
+                        proc.terminate()
+                        proc.wait(timeout=2)
+                    except Exception:
+                        pass
+                    try:
+                        os.close(mfd)
+                    except Exception:
+                        pass
+                print(f'[PTY] {addr[0]} session ended')
+
             elif cmd == 'INFO':
                 conn.sendall(b'OK\n')
 
@@ -3279,6 +3337,117 @@ def server():
     except KeyboardInterrupt:
         print('\nStopped')
 
+
+def _cmd_install(args):
+    """Install vssh as a system daemon (systemd on Linux, LaunchAgent on macOS)."""
+    import sys as _sys, os as _os, platform as _plat, subprocess as _sp, stat as _stat
+
+    python_exe = _sys.executable
+    vssh_py = _os.path.abspath(__file__)
+    secret = _load_vssh_secret()
+
+    print(f"[vssh install]")
+    print(f"  python  : {python_exe}")
+    print(f"  vssh.py : {vssh_py}")
+    print(f"  secret  : {secret[:6]}...{secret[-4:]} ({'auto-generated' if not _os.environ.get('VSSH_SECRET') else 'from env'})")
+
+    if _plat.system() == 'Linux':
+        service = f"""[Unit]
+Description=vssh daemon
+After=network.target
+
+[Service]
+Type=simple
+ExecStart={python_exe} {vssh_py} server
+Environment="VSSH_SECRET={secret}"
+Restart=always
+RestartSec=5
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
+"""
+        svc_path = '/etc/systemd/system/vssh.service'
+        try:
+            with open(svc_path, 'w') as f:
+                f.write(service)
+            print(f"  Created : {svc_path}")
+            _sp.run(['systemctl', 'daemon-reload'], check=True, capture_output=True)
+            _sp.run(['systemctl', 'enable', 'vssh'], check=True, capture_output=True)
+            _sp.run(['systemctl', 'restart', 'vssh'], check=True, capture_output=True)
+            import time; time.sleep(1)
+            r = _sp.run(['systemctl', 'is-active', 'vssh'], capture_output=True, text=True)
+            status = r.stdout.strip()
+            print(f"  Service : {status}")
+            if status == 'active':
+                print("[vssh install] ✓ Done. vssh daemon running.")
+            else:
+                print("[vssh install] ✗ Service not active — check: journalctl -u vssh -n 20")
+        except PermissionError:
+            print("[vssh install] ✗ Need root. Run: sudo vssh install")
+        except Exception as e:
+            print(f"[vssh install] ✗ Error: {e}")
+
+    elif _plat.system() == 'Darwin':
+        home = _os.path.expanduser('~')
+        plist_dir = _os.path.join(home, 'Library', 'LaunchAgents')
+        _os.makedirs(plist_dir, exist_ok=True)
+        plist_path = _os.path.join(plist_dir, 'com.vssh.server.plist')
+        plist = f"""<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>com.vssh.server</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>{python_exe}</string>
+        <string>{vssh_py}</string>
+        <string>server</string>
+    </array>
+    <key>EnvironmentVariables</key>
+    <dict>
+        <key>VSSH_SECRET</key>
+        <string>{secret}</string>
+    </dict>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <true/>
+    <key>StandardOutPath</key>
+    <string>/tmp/vssh.log</string>
+    <key>StandardErrorPath</key>
+    <string>/tmp/vssh.err</string>
+</dict>
+</plist>"""
+        # Unload existing if any
+        _sp.run(['launchctl', 'unload', plist_path], capture_output=True)
+        with open(plist_path, 'w') as f:
+            f.write(plist)
+        print(f"  Created : {plist_path}")
+        r = _sp.run(['launchctl', 'load', plist_path], capture_output=True, text=True)
+        if r.returncode == 0:
+            import time; time.sleep(1)
+            r2 = _sp.run(['pgrep', '-f', 'vssh.py server'], capture_output=True, text=True)
+            if r2.stdout.strip():
+                print("[vssh install] ✓ Done. vssh daemon running.")
+            else:
+                print("[vssh install] ✗ Process not found — check: cat /tmp/vssh.err")
+        else:
+            print(f"[vssh install] ✗ launchctl error: {r.stderr.strip()}")
+    else:
+        print(f"[vssh install] ✗ Unsupported OS: {_plat.system()}")
+
+
+def _get_vssh_version():
+    try:
+        from importlib.metadata import version as _v
+        return _v('vssh')
+    except Exception:
+        return '?'
+
+
 def main():
     args = sys.argv[1:]
     # Handle --version and --help flags
@@ -3594,6 +3763,8 @@ Env: VSSH_SECRET
         sys.exit(0 if result['fail'] == 0 else 1)
     elif cmd == 'server':
         server()
+    elif cmd == 'install':
+        _cmd_install(args)
     elif cmd == 'help' or cmd == '-h' or cmd == '--help':
         main_args_bak = sys.argv[1:]
         sys.argv = sys.argv[:1]
@@ -3615,7 +3786,7 @@ Env: VSSH_SECRET
             result = {'name': name, 'ip': ip, 'online': False, 'latency': 0}
             try:
                 s = _sock.socket(_sock.AF_INET, _sock.SOCK_STREAM)
-                s.settimeout(3)
+                s.settimeout(1)
                 t0 = time.time()
                 s.connect((ip, 48291))
                 result['latency'] = (time.time() - t0) * 1000
@@ -3649,9 +3820,9 @@ Env: VSSH_SECRET
             return result
 
         if full_mode:
-            print("vssh v3.2.2 - Cluster Status (full)")
+            print(f"vssh v{_get_vssh_version()} - Cluster Status (full)")
         else:
-            print("vssh v3.2.2 - Connection Status")
+            print(f"vssh v{_get_vssh_version()} - Connection Status")
         print("=" * 70)
 
         online = 0