susops 3.0.0rc3.dev7__tar.gz → 3.0.0rc3.dev9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: susops
-Version: 3.0.0rc3.dev7
+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.dev7 → susops-3.0.0rc3.dev9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "susops"
-version = "3.0.0-rc3.dev7"
+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" }
@@ -51,7 +51,12 @@ susops-tray = "susops.tray:main"
 where = ["src"]
 
 [tool.setuptools.package-data]
-susops = ["assets/*.png", "assets/icons/**/*.svg", "assets/icons/**/*.png"]
+susops = [
+    "assets/*.png",
+    "assets/icons/**/*.svg",
+    "assets/icons/**/*.png",
+    "tui/**/*.tcss",
+]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]

{susops-3.0.0rc3.dev7 → 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.dev7 → susops-3.0.0rc3.dev9}/src/susops/core/rpc_server.py

@@ -45,6 +45,9 @@ _ALLOWED_METHODS: set[str] = {
     "get_pac_url", "get_status_url",
     # 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.dev7 → susops-3.0.0rc3.dev9}/src/susops/facade.py

@@ -376,6 +376,11 @@ class _BandwidthSampler:
         with self._lock:
             return self._totals.get(tag, (0.0, 0.0))
 
+    def get_history(self, tag: str) -> list[list[float]]:
+        """Return the persisted (rx_bps, tx_bps) samples for *tag* (newest last)."""
+        with self._lock:
+            return list(self._history.get(tag, []))
+
     def reset_totals(self, tag: str | None = None) -> None:
         """Reset cumulative counters. Pass tag=None to reset all."""
         with self._lock:
@@ -620,26 +625,54 @@ 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)."""
         self._status_server.emit(event, data)
@@ -2143,6 +2176,19 @@ class SusOpsManager:
         """Return cumulative (rx_bytes, tx_bytes) since last start. Resets on stop."""
         return self._bw_sampler.get_totals(tag)
 
+    def get_bandwidth_history(self, tag: str) -> list[list[float]]:
+        """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.dev7 → 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.dev7 → 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.dev9/src/susops/tui/app.tcss

@@ -0,0 +1,63 @@
+/* SusOps TUI — global theme */
+
+/* ── Base ── */
+Screen { background: $background; }
+Header { background: $primary-darken-3; }
+Footer { background: $surface-darken-2; }
+.footer-row { dock: bottom; height: 1; }
+.footer-row Footer { dock: none; width: 1fr; height: 1; }
+.footer-version { width: auto; padding: 0 1; background: $surface-darken-2; color: $text-muted; content-align: center middle; }
+.footer-edit-config { width: auto; padding: 0 1; background: $surface-darken-2; color: $accent; content-align: center middle; }
+.footer-logo { width: auto; padding: 0 1; background: $surface-darken-2; content-align: center middle; }
+
+/* ── Dashboard ── */
+#conn-list > ListItem { height: 1; padding: 0 1; }
+
+/* ── Connection editor ── */
+.tab-actions { height: 3; layout: horizontal; padding: 0 1; background: $surface-darken-1; }
+.tab-actions Button { margin-right: 1; }
+#detail-preview { height: 6; border: round $primary-darken-1; border-title-align: left; padding: 0 1; margin: 0 1 1 1; color: $text-muted; }
+
+/* ── Share ── */
+#share-toolbar { height: 3; layout: horizontal; padding: 0 1; background: $surface-darken-1; }
+#share-toolbar Button { margin-right: 1; }
+#share-list-panel { width: 35; background: $surface-darken-1; border-right: solid $primary-darken-2; }
+#share-list { height: 1fr; margin: 1; border: round $primary-darken-1; border-title-align: left; }
+#share-list > ListItem { height: 1; padding: 0 1; }
+#share-detail { width: 1fr; padding: 1 2; height: 1fr; }
+#share-status { height: 1; padding: 0 1; background: $surface-darken-2; color: $text-muted; }
+
+/* ── Logs ── */
+#log-toolbar { height: 3; layout: horizontal; padding: 0 1; background: $surface-darken-1; align: left middle; }
+#log-toolbar Label { margin-right: 1; height: 1; }
+#log-toolbar Switch { margin-right: 2; }
+#log-toolbar Button { margin-left: 2; }
+#log-view { height: 1fr; border: round $primary-darken-1; border-title-align: left; margin: 0 1 1 1; }
+
+/* ── Config ── */
+#config-toolbar { height: 3; layout: horizontal; padding: 0 1; background: $surface-darken-1; }
+#config-toolbar Button { margin-right: 1; }
+#config-area { height: 1fr; border: round $primary-darken-1; border-title-align: left; margin: 0 1 1 1; }
+
+/* ── PAC viewer ── */
+#pac-area { height: 1fr; border: round $primary-darken-1; border-title-align: left; margin: 0 1 1 1; }
+
+/* ── Modals ── */
+ModalScreen { align: center middle; background: rgba(0, 0, 0, 0.75); }
+.modal-dialog { width: 76; height: auto; border: round $primary; padding: 1 2; background: $surface; }
+.modal-dialog Label { margin-top: 1; }
+.modal-dialog > Label:first-child { margin-top: 0; }
+.modal-dialog Input { margin-bottom: 1; }
+.modal-dialog Select { margin-bottom: 1; }
+.modal-dialog .modal-error { color: $error; margin-top: 0; }
+.modal-dialog .modal-hint { margin-top: 0; }
+.modal-btn-row { layout: horizontal; height: auto; margin-top: 1; }
+.modal-btn-row Button { margin-right: 1; }
+/* 2-column form rows */
+.modal-form-row { height: auto; margin-top: 1; }
+.modal-proto-row { height: auto; }
+.modal-field { width: 1fr; height: auto; layout: vertical; padding-right: 1; }
+.modal-field:last-child { padding-right: 0; }
+.modal-field Label { margin-top: 0; }
+.modal-field Input { margin-bottom: 0; }
+.modal-field Select { margin-bottom: 0; }

{susops-3.0.0rc3.dev7 → susops-3.0.0rc3.dev9}/src/susops/tui/screens/dashboard.py

@@ -290,11 +290,19 @@ class DashboardScreen(Screen):
             bw: dict[str, tuple[float, float]] = {}
             bw_totals: dict[str, tuple[float, float]] = {}
             uptimes: dict[str, float | None] = {}
+            bw_history_seed: dict[str, list] = {}
             for cs in result.connection_statuses:
                 extras[cs.tag] = mgr.get_process_info(cs.tag)
                 bw[cs.tag] = mgr.get_bandwidth(cs.tag)
                 bw_totals[cs.tag] = mgr.get_bandwidth_totals(cs.tag)
                 uptimes[cs.tag] = mgr.get_uptime(cs.tag)
+                # Only fetch persisted history for tags we haven't seeded
+                # yet — saves an RPC per tick once the chart is rolling.
+                if cs.tag not in self._rx_history:
+                    try:
+                        bw_history_seed[cs.tag] = mgr.get_bandwidth_history(cs.tag) or []
+                    except Exception:
+                        bw_history_seed[cs.tag] = []
 
             shares = mgr.list_shares()
             config = mgr.list_config()
@@ -312,7 +320,8 @@ class DashboardScreen(Screen):
             )
             return
         self.app.call_from_thread(
-            self._apply_status, result, extras, bw, bw_totals, uptimes, shares, config, reconnect
+            self._apply_status, result, extras, bw, bw_totals, uptimes, shares,
+            config, reconnect, bw_history_seed,
         )
 
     def _apply_status(
@@ -325,7 +334,9 @@ class DashboardScreen(Screen):
             shares: list,
             config,
             reconnect: dict,
+            bw_history_seed: dict | None = None,
     ) -> None:
+        bw_history_seed = bw_history_seed or {}
         self._last_config = config
         self._last_shares = shares
 
@@ -352,13 +363,22 @@ class DashboardScreen(Screen):
             }
         self._conn_data = new_conn_data
 
-        # Update rolling bandwidth history (60 samples)
+        # Update rolling bandwidth history (60 samples). Seed from the
+        # daemon's persisted history (pre-fetched by refresh_status) on
+        # first encounter so reopening the TUI doesn't reset the chart to
+        # flatlined zeros.
         for cs in result.connection_statuses:
             tag = cs.tag
             rx, tx = bw.get(tag, (0.0, 0.0))
             if tag not in self._rx_history:
-                self._rx_history[tag] = deque([0.0] * 60, maxlen=60)
-                self._tx_history[tag] = deque([0.0] * 60, maxlen=60)
+                rx_seed = [0.0] * 60
+                tx_seed = [0.0] * 60
+                persisted = (bw_history_seed.get(tag) or [])[-60:]
+                if persisted:
+                    rx_seed[-len(persisted):] = [s[0] for s in persisted]
+                    tx_seed[-len(persisted):] = [s[1] for s in persisted]
+                self._rx_history[tag] = deque(rx_seed, maxlen=60)
+                self._tx_history[tag] = deque(tx_seed, maxlen=60)
             self._rx_history[tag].append(rx)
             self._tx_history[tag].append(tx)
 

{susops-3.0.0rc3.dev7 → 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.dev7
+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.dev7 → susops-3.0.0rc3.dev9}/src/susops.egg-info/SOURCES.txt

@@ -63,6 +63,7 @@ src/susops/tray/mac.py
 src/susops/tui/__init__.py
 src/susops/tui/__main__.py
 src/susops/tui/app.py
+src/susops/tui/app.tcss
 src/susops/tui/cli.py
 src/susops/tui/screens/__init__.py
 src/susops/tui/screens/connections.py