sshplex 1.6.0__tar.gz → 1.6.2__tar.gz

{sshplex-1.6.0/sshplex.egg-info → sshplex-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sshplex
-Version: 1.6.0
+Version: 1.6.2
 Summary: Multiplex your SSH connections with style
 Author-email: MJAHED Sabri <contact@sabrimjahed.com>
 License: MIT
@@ -61,8 +61,8 @@ SSHplex is a Python-based SSH connection multiplexer with a modern TUI. Connect
 
 - 🖥️ **Modern TUI** - Textual-based host selector with search, sort, and multi-select
 - 🔌 **Multiple Sources** - NetBox, Ansible, Consul, static lists - use them together
-- 📦 **3 Backends** - tmux standalone, tmux + iTerm2, or iTerm2 native (macOS)
-- ✏️ **Config Editor** - Built-in YAML editor with validation (`e` key)
+- 📦 **3 Mux Backends** - tmux standalone, tmux + iTerm2, or iTerm2 native (macOS)
+- ✏️ **Config Editor** - Built-in YAML editor with validation 
 - 🔄 **Broadcast Input** - Sync commands across multiple SSH sessions
 - 🔐 **SSH Security** - Configurable host key checking and retry logic
 - 🚀 **Fast Startup** - Intelligent caching with configurable TTL
@@ -83,24 +83,9 @@ sshplex
 ### Prerequisites
 
 - Python 3.8+
-- tmux (Linux/macOS) or iTerm2 (macOS)
+- tmux (Linux/macOS) and/or iTerm2 (macOS)
 - SSH key configured for target hosts
 
-## Usage
-
-| Key | Action |
-|-----|--------|
-| `Space` | Toggle host selection |
-| `a` / `d` | Select / Deselect all |
-| `Enter` | Connect to selected hosts |
-| `/` | Search/filter hosts |
-| `p` | Toggle panes/tabs mode |
-| `b` | Toggle broadcast mode |
-| `e` | Open config editor |
-| `s` | Open session manager |
-| `h` | Show keyboard shortcuts |
-| `q` | Quit |
-
 ## Multiplexer Backends
 
 | Backend | Platform | Best For |
@@ -109,68 +94,28 @@ sshplex
 | **tmux + iTerm2** | macOS | Native UI + persistence |
 | **iTerm2 native** | macOS | Simple setup, no tmux dependency |
 
-```yaml
-# ~/.config/sshplex/sshplex.yaml
-tmux:
-  backend: "tmux"  # or "iterm2-native" on macOS
-  layout: "tiled"
-  max_panes_per_window: 5
-```
 
-## Sources of Truth
+## Local Demo (Consul + Ansible)
 
-### Static Hosts
-```yaml
-sot:
-  import:
-    - name: "my-servers"
-      type: static
-      hosts:
-        - {name: "web-01", ip: "192.168.1.10", tags: ["web"]}
-```
+This repo includes a small demo setup that uses the same IP (`192.168.31.216`) with different host names.
 
-### NetBox
-```yaml
-sot:
-  import:
-    - name: "prod"
-      type: netbox
-      url: "https://netbox.example.com/"
-      token: "your-api-token"
-```
+```bash
+# Start Consul + seed 3 demo nodes
+docker compose -f demo/docker-compose.consul-demo.yml up -d
 
-### Ansible
-```yaml
-sot:
-  import:
-    - name: "inventory"
-      type: ansible
-      inventory_paths: ["/path/to/inventory.yml"]
+# Optional: inspect nodes
+curl -s http://localhost:8500/v1/catalog/nodes | jq
 ```
 
-### Consul
-```bash
-pip install "sshplex[consul]"
-```
-```yaml
-sot:
-  import:
-    - name: "dc1"
-      type: consul
-      config:
-        host: "consul.example.com"
-        token: "your-token"
-```
+Demo files:
+- `demo/ansible-inventory-demo.yml`
+- `demo/docker-compose.consul-demo.yml`
+- `demo/sshplex.demo.yaml`
 
-## CLI Reference
+Run with the bundled demo config:
 
 ```bash
-sshplex                        # Launch TUI
-sshplex --onboarding           # Interactive setup wizard
-sshplex --debug                # Test provider connectivity
-sshplex --show-config          # Show config paths
-sshplex --clear-cache          # Clear host cache
-sshplex --config /path/to.yml  # Use custom config
+sshplex --config demo/sshplex.demo.yaml
 ```
 
 ## Documentation
@@ -187,14 +132,8 @@ sshplex --config /path/to.yml  # Use custom config
 # Basic (tmux only)
 pip install sshplex
 
-# With Consul support
-pip install "sshplex[consul]"
-
-# With iTerm2 native support (macOS)
-pip install "sshplex[iterm2]"
-
-# Development
-pip install -e ".[dev]"
+# With Consul,DEV,Iterm2 support
+pip install "sshplex[dev,consul,iterm2]"
 ```
 
 ## Development

{sshplex-1.6.0 → sshplex-1.6.2}/README.md

@@ -8,8 +8,8 @@ SSHplex is a Python-based SSH connection multiplexer with a modern TUI. Connect
 
 - 🖥️ **Modern TUI** - Textual-based host selector with search, sort, and multi-select
 - 🔌 **Multiple Sources** - NetBox, Ansible, Consul, static lists - use them together
-- 📦 **3 Backends** - tmux standalone, tmux + iTerm2, or iTerm2 native (macOS)
-- ✏️ **Config Editor** - Built-in YAML editor with validation (`e` key)
+- 📦 **3 Mux Backends** - tmux standalone, tmux + iTerm2, or iTerm2 native (macOS)
+- ✏️ **Config Editor** - Built-in YAML editor with validation 
 - 🔄 **Broadcast Input** - Sync commands across multiple SSH sessions
 - 🔐 **SSH Security** - Configurable host key checking and retry logic
 - 🚀 **Fast Startup** - Intelligent caching with configurable TTL
@@ -30,24 +30,9 @@ sshplex
 ### Prerequisites
 
 - Python 3.8+
-- tmux (Linux/macOS) or iTerm2 (macOS)
+- tmux (Linux/macOS) and/or iTerm2 (macOS)
 - SSH key configured for target hosts
 
-## Usage
-
-| Key | Action |
-|-----|--------|
-| `Space` | Toggle host selection |
-| `a` / `d` | Select / Deselect all |
-| `Enter` | Connect to selected hosts |
-| `/` | Search/filter hosts |
-| `p` | Toggle panes/tabs mode |
-| `b` | Toggle broadcast mode |
-| `e` | Open config editor |
-| `s` | Open session manager |
-| `h` | Show keyboard shortcuts |
-| `q` | Quit |
-
 ## Multiplexer Backends
 
 | Backend | Platform | Best For |
@@ -56,68 +41,28 @@ sshplex
 | **tmux + iTerm2** | macOS | Native UI + persistence |
 | **iTerm2 native** | macOS | Simple setup, no tmux dependency |
 
-```yaml
-# ~/.config/sshplex/sshplex.yaml
-tmux:
-  backend: "tmux"  # or "iterm2-native" on macOS
-  layout: "tiled"
-  max_panes_per_window: 5
-```
 
-## Sources of Truth
+## Local Demo (Consul + Ansible)
 
-### Static Hosts
-```yaml
-sot:
-  import:
-    - name: "my-servers"
-      type: static
-      hosts:
-        - {name: "web-01", ip: "192.168.1.10", tags: ["web"]}
-```
+This repo includes a small demo setup that uses the same IP (`192.168.31.216`) with different host names.
 
-### NetBox
-```yaml
-sot:
-  import:
-    - name: "prod"
-      type: netbox
-      url: "https://netbox.example.com/"
-      token: "your-api-token"
-```
+```bash
+# Start Consul + seed 3 demo nodes
+docker compose -f demo/docker-compose.consul-demo.yml up -d
 
-### Ansible
-```yaml
-sot:
-  import:
-    - name: "inventory"
-      type: ansible
-      inventory_paths: ["/path/to/inventory.yml"]
+# Optional: inspect nodes
+curl -s http://localhost:8500/v1/catalog/nodes | jq
 ```
 
-### Consul
-```bash
-pip install "sshplex[consul]"
-```
-```yaml
-sot:
-  import:
-    - name: "dc1"
-      type: consul
-      config:
-        host: "consul.example.com"
-        token: "your-token"
-```
+Demo files:
+- `demo/ansible-inventory-demo.yml`
+- `demo/docker-compose.consul-demo.yml`
+- `demo/sshplex.demo.yaml`
 
-## CLI Reference
+Run with the bundled demo config:
 
 ```bash
-sshplex                        # Launch TUI
-sshplex --onboarding           # Interactive setup wizard
-sshplex --debug                # Test provider connectivity
-sshplex --show-config          # Show config paths
-sshplex --clear-cache          # Clear host cache
-sshplex --config /path/to.yml  # Use custom config
+sshplex --config demo/sshplex.demo.yaml
 ```
 
 ## Documentation
@@ -134,14 +79,8 @@ sshplex --config /path/to.yml  # Use custom config
 # Basic (tmux only)
 pip install sshplex
 
-# With Consul support
-pip install "sshplex[consul]"
-
-# With iTerm2 native support (macOS)
-pip install "sshplex[iterm2]"
-
-# Development
-pip install -e ".[dev]"
+# With Consul,DEV,Iterm2 support
+pip install "sshplex[dev,consul,iterm2]"
 ```
 
 ## Development

{sshplex-1.6.0 → sshplex-1.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sshplex"
-version = "1.6.0"
+version = "1.6.2"
 description = "Multiplex your SSH connections with style"
 authors = [{name = "MJAHED Sabri", email = "contact@sabrimjahed.com"}]
 readme = "README.md"

{sshplex-1.6.0 → sshplex-1.6.2}/sshplex/__init__.py

@@ -1,4 +1,4 @@
 """SSHplex - SSH Connection Multiplexer"""
-__version__ = "1.6.0"
+__version__ = "1.6.2"
 __author__ = "MJAHED Sabri"
 __email__ = "contact@sabrimjahed.com"

{sshplex-1.6.0 → sshplex-1.6.2}/sshplex/lib/multiplexer/iterm2_native.py

@@ -7,9 +7,11 @@ Backend options:
 - backend: "iterm2-native" - Pure iTerm2 Python API (no tmux dependency)
 """
 
+import contextlib
+import io
 import platform
 import re
-from typing import Any, Dict, List, Optional
+from typing import Any, List, Optional, Tuple
 
 from ..logger import get_logger
 from .base import MultiplexerBase
@@ -66,7 +68,7 @@ class ITerm2NativeManager(MultiplexerBase):
         self._check_iterm2_api()
 
         # Session tracking: hostname -> SSH command
-        self._pending_sessions: Dict[str, str] = {}
+        self._pending_sessions: List[Tuple[str, str]] = []
 
         # Broadcast state
         self._broadcast_enabled = False
@@ -184,7 +186,7 @@ class ITerm2NativeManager(MultiplexerBase):
         if command is None:
             command = f"ssh {hostname}"
 
-        self._pending_sessions[hostname] = command
+        self._pending_sessions.append((hostname, command))
         self._max_panes_per_tab = max_panes_per_window
         self.logger.info(f"SSHplex: Queued iTerm2 pane for '{hostname}'")
         return True
@@ -293,7 +295,7 @@ class ITerm2NativeManager(MultiplexerBase):
             return
 
         # Build sessions list for the async function
-        sessions_data = list(self._pending_sessions.items())
+        sessions_data = list(self._pending_sessions)
         max_panes = self._max_panes_per_tab
         profile = self._profile
         split_pattern = self._split_pattern
@@ -544,7 +546,22 @@ class ITerm2NativeManager(MultiplexerBase):
         # Run with iTerm2's run_until_complete to maintain connection
         try:
             print(f"\n🚀 Creating iTerm2 session with {len(sessions_data)} SSH connections...")
-            iterm2.run_until_complete(_create_sessions)
+            noisy_stderr = io.StringIO()
+            with contextlib.redirect_stderr(noisy_stderr):
+                iterm2.run_until_complete(_create_sessions)
+
+            stderr_text = noisy_stderr.getvalue().strip()
+            if stderr_text:
+                benign_markers = [
+                    "ConnectionClosedError",
+                    "CancelledError",
+                    "sent 1000 (OK)",
+                    "no close frame received",
+                ]
+                if any(marker in stderr_text for marker in benign_markers):
+                    self.logger.debug("SSHplex: Suppressed benign iTerm2 websocket shutdown noise")
+                else:
+                    self.logger.warning(f"SSHplex: iTerm2 stderr output: {stderr_text}")
             self.logger.info("SSHplex: iTerm2 session created successfully")
         except Exception as e:
             error_msg = str(e)

{sshplex-1.6.0 → sshplex-1.6.2}/sshplex/lib/multiplexer/tmux.py

@@ -84,6 +84,28 @@ class TmuxManager(MultiplexerBase):
             self.logger.error(f"SSHplex: Failed to initialize tmux server: {e}")
             return False
 
+    @staticmethod
+    def _split_window(window: Any, vertical: bool = True) -> Any:
+        """Split tmux window with libtmux version compatibility."""
+        split_window = getattr(window, "split_window", None)
+        if callable(split_window):
+            try:
+                return split_window(vertical=vertical)
+            except Exception as exc:
+                if "deprecated" not in str(exc).lower() and "removed" not in str(exc).lower():
+                    raise
+
+        split = getattr(window, "split", None)
+        if callable(split):
+            try:
+                from libtmux.window import PaneDirection
+                direction = PaneDirection.Below if vertical else PaneDirection.Right
+                return split(direction=direction)
+            except Exception:
+                return split()
+
+        raise RuntimeError("No compatible tmux split method found")
+
     def create_session(self) -> bool:
         """Create a new tmux session with SSHplex branding."""
         try:
@@ -179,20 +201,20 @@ class TmuxManager(MultiplexerBase):
                 # Additional panes - attempt split with fallback
                 vertical_split = (self.current_window_pane_count % 2 == 0)
                 try:
-                    pane = self.current_window.split_window(vertical=vertical_split)
+                    pane = self._split_window(self.current_window, vertical=vertical_split)
                 except Exception as e:
                     # Handle "no space" error by resizing or creating a new window
                     self.logger.warning(f"Pane split failed ({e}), attempting layout adjustment")
                     try:
                         # Resize window to fit more panes
                         self.current_window.resize(height=80, width=200)
-                        pane = self.current_window.split_window(vertical=vertical_split)
+                        pane = self._split_window(self.current_window, vertical=vertical_split)
                     except Exception:
                         # If still fails, create a new window
                         self.logger.info("Creating new window due to insufficient space")
                         ensure_window_available()
                         vertical_split = True  # first split in new window
-                        pane = self.current_window.split_window(vertical=vertical_split)
+                        pane = self._split_window(self.current_window, vertical=vertical_split)
 
                 if pane is None:
                     raise RuntimeError(f"Failed to create tmux pane for {hostname}")