vssh 3.3.7__tar.gz → 3.3.9__tar.gz

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

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

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

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

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

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

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

@@ -12,6 +12,8 @@ from pathlib import Path
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from typing import Tuple, Optional
 
+__version__ = '3.3.9'
+
 # ========== Standalone Config (no mpop dependency) ==========
 VSSH_DIR_CONF = Path.home() / '.vssh'
 
@@ -3339,113 +3341,157 @@ def server():
 
 
 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
+    """Install/upgrade vssh as a system daemon. Idempotent — safe to re-run."""
+    import sys as _sys, os as _os, platform as _plat, subprocess as _sp, shutil as _sh
 
     python_exe = _sys.executable
-    vssh_py = _os.path.abspath(__file__)
     secret = _load_vssh_secret()
+    sf = VSSH_DIR_CONF / 'secret'
+    secret_src = 'env' if _os.environ.get('VSSH_SECRET') else ('file' if sf.exists() else 'auto-generated')
 
     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'})")
+    print(f"  secret  : {secret[:6]}...{secret[-4:]} ({secret_src})")
 
+    # --- Step 1: Upgrade pip package ---
+    print(f"  pip     : upgrading vssh...")
+    pip_args = [python_exe, '-m', 'pip', 'install', 'vssh', '--upgrade', '-q']
     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
-"""
+        pip_args.append('--break-system-packages')
+    r = _sp.run(pip_args, capture_output=True, text=True)
+    if r.returncode == 0:
+        print(f"  pip     : \u2713 ok")
+    else:
+        print(f"  pip     : \u2717 {r.stderr.strip()[:120]}")
+
+    # --- Step 2: Find installed vssh.py (after upgrade) ---
+    import importlib, importlib.util as _ilu
+    try:
+        importlib.invalidate_caches()
+        spec = _ilu.find_spec('vssh')
+        installed_py = spec.origin if (spec and spec.origin) else _os.path.abspath(__file__)
+    except Exception:
+        installed_py = _os.path.abspath(__file__)
+
+    # --- Step 3: Copy vssh.py to /usr/local/bin/vssh.py ---
+    target_py = '/usr/local/bin/vssh.py'
+    try:
+        _sh.copy2(installed_py, target_py)
+        _os.chmod(target_py, 0o755)
+        print(f"  copied  : {installed_py} \u2192 {target_py}")
+    except PermissionError:
+        print(f"  warning : cannot write {target_py} (need root) — using {installed_py}")
+        target_py = installed_py
+
+    # --- Step 4: Create /usr/local/bin/vssh wrapper with explicit python path ---
+    wrapper = '/usr/local/bin/vssh'
+    wrapper_txt = f'#!/bin/sh\nexec {python_exe} {target_py} "$@"\n'
+    try:
+        with open(wrapper, 'w') as _f:
+            _f.write(wrapper_txt)
+        _os.chmod(wrapper, 0o755)
+        print(f"  wrapper : {wrapper}")
+    except PermissionError:
+        print(f"  warning : cannot write {wrapper} (need root)")
+
+    if _plat.system() == 'Linux':
+        svc_lines = [
+            "[Unit]", "Description=vssh daemon", "After=network.target", "",
+            "[Service]", "Type=simple",
+            f"ExecStart={python_exe} {target_py} server",
+            f"Environment=\"VSSH_SECRET={secret}\"",
+            "Restart=always", "RestartSec=5",
+            "StandardOutput=journal", "StandardError=journal", "",
+            "[Install]", "WantedBy=multi-user.target", "",
+        ]
+        service = '\n'.join(svc_lines)
         svc_path = '/etc/systemd/system/vssh.service'
         try:
-            with open(svc_path, 'w') as f:
-                f.write(service)
-            print(f"  Created : {svc_path}")
+            with open(svc_path, 'w') as _f:
+                _f.write(service)
+            print(f"  service : {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}")
+            print(f"  status  : {status}")
             if status == 'active':
-                print("[vssh install] ✓ Done. vssh daemon running.")
+                print("[vssh install] \u2713 Done. vssh daemon running.")
             else:
-                print("[vssh install] ✗ Service not active — check: journalctl -u vssh -n 20")
+                print("[vssh install] \u2717 Service not active — check: journalctl -u vssh -n 20")
         except PermissionError:
-            print("[vssh install] ✗ Need root. Run: sudo vssh install")
+            print("[vssh install] \u2717 Need root. Run: sudo vssh install")
         except Exception as e:
-            print(f"[vssh install] ✗ Error: {e}")
+            print(f"[vssh install] \u2717 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
+        plist_lines = [
+            '<?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>',
+            f'        <string>{python_exe}</string>',
+            f'        <string>{target_py}</string>',
+            '        <string>server</string>',
+            '    </array>',
+            '    <key>EnvironmentVariables</key>',
+            '    <dict>',
+            '        <key>VSSH_SECRET</key>',
+            f'        <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>',
+        ]
+        plist = '\n'.join(plist_lines)
+        # Also fix pip entry point if it exists (may use wrong Python)
+        for ep in [_os.path.join(_os.path.dirname(python_exe), 'vssh'),
+                   '/opt/homebrew/bin/vssh', '/usr/local/bin/vssh']:
+            if ep != wrapper and _os.path.exists(ep):
+                try:
+                    _sh.copy2(wrapper, ep)
+                    _os.chmod(ep, 0o755)
+                    print(f"  fixed   : {ep}")
+                except Exception:
+                    pass
         _sp.run(['launchctl', 'unload', plist_path], capture_output=True)
-        with open(plist_path, 'w') as f:
-            f.write(plist)
-        print(f"  Created : {plist_path}")
+        with open(plist_path, 'w') as _f:
+            _f.write(plist)
+        print(f"  plist   : {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)
+            r2 = _sp.run(['pgrep', '-f', f'{target_py} server'], capture_output=True, text=True)
             if r2.stdout.strip():
-                print("[vssh install] ✓ Done. vssh daemon running.")
+                print("[vssh install] \u2713 Done. vssh daemon running.")
             else:
-                print("[vssh install] ✗ Process not found — check: cat /tmp/vssh.err")
+                print("[vssh install] \u2717 Process not found — check: cat /tmp/vssh.err")
         else:
-            print(f"[vssh install] ✗ launchctl error: {r.stderr.strip()}")
+            print(f"[vssh install] \u2717 launchctl error: {r.stderr.strip()}")
     else:
-        print(f"[vssh install] ✗ Unsupported OS: {_plat.system()}")
+        print(f"[vssh install] \u2717 Unsupported OS: {_plat.system()}")
 
 
 def _get_vssh_version():
-    try:
-        from importlib.metadata import version as _v
-        return _v('vssh')
-    except Exception:
-        return '?'
+    return __version__
+
 
 
 def main():
@@ -3456,7 +3502,7 @@ def main():
             from importlib.metadata import version as _v
             print(f"vssh v{_v('vssh')}")
         except Exception:
-            print("vssh v3.3.2")
+            print(f"vssh v{__version__}")
         return
     if not args:
         print('''vssh v3 - Distributed command & file transport daemon for server meshes