susops 3.0.0rc3.dev8__tar.gz → 3.0.0rc3.dev9__tar.gz

{susops-3.0.0rc3.dev8 → susops-3.0.0rc3.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: susops
-Version: 3.0.0rc3.dev8
+Version: 3.0.0rc3.dev9
 Summary: SusOps — SSH SOCKS5 proxy manager with PAC server, Textual TUI, and system tray apps
 License: MIT
 Requires-Python: >=3.11

{susops-3.0.0rc3.dev8 → susops-3.0.0rc3.dev9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "susops"
-version = "3.0.0-rc3.dev8"
+version = "3.0.0-rc3.dev9"
 description = "SusOps — SSH SOCKS5 proxy manager with PAC server, Textual TUI, and system tray apps"
 readme = "README.md"
 license = { text = "MIT" }

{susops-3.0.0rc3.dev8 → susops-3.0.0rc3.dev9}/src/susops/client.py

@@ -69,6 +69,24 @@ def ensure_daemon_running(workspace: Path = _WORKSPACE_DEFAULT) -> int:
         port = _read_port(workspace)
         if port:
             return port
+        # Daemon claimed its PID file but hasn't published the port yet.
+        # Wait for it instead of spawning a competitor that would race the
+        # O_EXCL claim and exit rc=2 ("another daemon is already running").
+        deadline = time.monotonic() + _DAEMON_SPAWN_TIMEOUT
+        while time.monotonic() < deadline:
+            if not _is_daemon_alive(workspace):
+                break  # died mid-startup, fall through to spawn a new one
+            port = _read_port(workspace)
+            if port:
+                return port
+            time.sleep(0.1)
+        else:
+            raise DaemonUnavailableError(
+                "An existing susops-services daemon is alive but never "
+                "published an RPC port. Try `kill " +
+                (_pid_path(workspace).read_text().strip() or "<pid>") +
+                "` and start again."
+            )
 
     proc = subprocess.Popen(
         [sys.executable, "-m", "susops.core.services_daemon",

{susops-3.0.0rc3.dev8 → susops-3.0.0rc3.dev9}/src/susops/core/rpc_server.py

@@ -46,6 +46,8 @@ _ALLOWED_METHODS: set[str] = {
     # Bandwidth
     "get_bandwidth", "get_bandwidth_totals", "get_bandwidth_global",
     "get_bandwidth_history",
+    # Frontend coordination
+    "sse_client_count",
     # Reconnect introspection
     "reconnect_monitor_info",
     # Process introspection

{susops-3.0.0rc3.dev8 → susops-3.0.0rc3.dev9}/src/susops/facade.py

@@ -625,25 +625,53 @@ class SusOpsManager:
             print(full, file=sys.stderr)
 
     def _notify(self, title: str, body: str) -> None:
-        """Send a desktop notification. Best-effort — fails silently."""
+        """Send a desktop notification with the SusOps icon. Best-effort."""
         import platform
-        import subprocess
+        from pathlib import Path
+        icon = Path(__file__).parent / "assets" / "icon.png"
         try:
             if platform.system() == "Darwin":
-                subprocess.Popen(
-                    ["osascript", "-e",
-                     f'display notification "{body}" with title "{title}"'],
-                    stdout=subprocess.DEVNULL,
-                    stderr=subprocess.DEVNULL,
-                )
+                self._notify_macos(title, body, icon)
             elif platform.system() == "Linux":
-                subprocess.Popen(
-                    ["notify-send", title, body],
-                    stdout=subprocess.DEVNULL,
-                    stderr=subprocess.DEVNULL,
-                )
+                self._notify_linux(title, body, icon)
+        except Exception:
+            pass
+
+    @staticmethod
+    def _notify_macos(title: str, body: str, icon: "Path") -> None:
+        # NSUserNotification's setContentImage_ puts the SusOps icon on the
+        # right side of the banner. The source-app slot (left side) reflects
+        # the running process — bundled .app shows SusOps, raw pip install
+        # shows Python. osascript can't set either, so it loses both.
+        try:
+            from Foundation import NSUserNotification, NSUserNotificationCenter  # type: ignore
+            from AppKit import NSImage  # type: ignore
+            n = NSUserNotification.alloc().init()
+            n.setTitle_(title)
+            n.setInformativeText_(body)
+            if icon.exists():
+                img = NSImage.alloc().initWithContentsOfFile_(str(icon))
+                if img is not None:
+                    n.setContentImage_(img)
+            NSUserNotificationCenter.defaultUserNotificationCenter().deliverNotification_(n)
+            return
         except Exception:
             pass
+        # Fallback for non-PyObjC environments
+        import subprocess
+        subprocess.Popen(
+            ["osascript", "-e", f'display notification "{body}" with title "{title}"'],
+            stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
+        )
+
+    @staticmethod
+    def _notify_linux(title: str, body: str, icon: "Path") -> None:
+        import subprocess
+        cmd = ["notify-send"]
+        if icon.exists():
+            cmd += ["-i", str(icon)]
+        cmd += [title, body]
+        subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     def _emit(self, event: str, data: dict) -> None:
         """Emit an SSE event and log it when verbose (bandwidth excluded — too noisy)."""
@@ -2152,6 +2180,15 @@ class SusOpsManager:
         """Return persisted [rx_bps, tx_bps] samples for *tag* (oldest → newest)."""
         return self._bw_sampler.get_history(tag)
 
+    def sse_client_count(self) -> int:
+        """Live SSE subscriber count. Used by frontends to decide whether
+        a stop-on-quit should actually stop, or skip because another
+        frontend is still attached to the same daemon."""
+        try:
+            return int(self._status_server.client_count())
+        except Exception:
+            return 0
+
     def get_bandwidth_global(self) -> tuple[float, float]:
         """Return (rx_bps, tx_bps) summed across every connection."""
         rx_total = 0.0

{susops-3.0.0rc3.dev8 → susops-3.0.0rc3.dev9}/src/susops/tray/base.py

@@ -641,7 +641,15 @@ class AbstractTrayApp(ABC):
 
     def do_quit(self) -> None:
         if self.manager.app_config.stop_on_quit:
-            self.manager.stop()
+            # Skip the destructive stop when another frontend (e.g. TUI)
+            # is still attached, otherwise it ends up with its SSH
+            # masters / PAC / reconnect torn out from under it.
+            try:
+                other_clients = int(self.manager.sse_client_count()) - 1
+            except Exception:
+                other_clients = 0
+            if other_clients <= 0:
+                self.manager.stop()
         # else: the daemon is a separate process — it keeps running with
         # PAC server, status SSE, and reconnect monitor independent of the
         # tray's lifetime. No detach calls needed.

{susops-3.0.0rc3.dev8 → susops-3.0.0rc3.dev9}/src/susops/tui/app.py

@@ -121,9 +121,16 @@ class SusOpsTuiApp(App):
 
     def action_quit(self) -> None:
         if self.manager.app_config.stop_on_quit:
-            # Stops SSH tunnels + share servers in the daemon; PAC stays up
-            # via stopped-marker tombstones unless the user reset.
-            self.manager.stop_quick()
+            # Skip the destructive stop when another frontend (e.g. tray)
+            # is still attached. Otherwise the still-running frontend
+            # finds its SSH masters / PAC / reconnect monitor torn out
+            # from under it and looks broken until it's restarted.
+            try:
+                other_clients = int(self.manager.sse_client_count()) - 1
+            except Exception:
+                other_clients = 0
+            if other_clients <= 0:
+                self.manager.stop_quick()
         # No detach calls — the daemon is already a separate process and
         # outlives the TUI.
         self.exit()

{susops-3.0.0rc3.dev8 → susops-3.0.0rc3.dev9}/src/susops.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: susops
-Version: 3.0.0rc3.dev8
+Version: 3.0.0rc3.dev9
 Summary: SusOps — SSH SOCKS5 proxy manager with PAC server, Textual TUI, and system tray apps
 License: MIT
 Requires-Python: >=3.11