ghosttrap-cli 0.3.19__tar.gz → 0.3.21__tar.gz

{ghosttrap_cli-0.3.19 → ghosttrap_cli-0.3.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ghosttrap-cli
-Version: 0.3.19
+Version: 0.3.21
 Summary: Watch for errors streaming from ghosttrap.io
 Project-URL: Homepage, https://github.com/alex-rowley/ghosttrap-cli
 Requires-Python: >=3.10

{ghosttrap_cli-0.3.19 → ghosttrap_cli-0.3.21}/ghosttrap_cli/cli.py

@@ -4,6 +4,7 @@ import argparse
 import asyncio
 import json
 import os
+import signal
 import subprocess
 import sys
 import tempfile
@@ -13,7 +14,20 @@ import urllib.request
 
 import websockets
 
-__version__ = "0.3.19"
+
+def _harden_signals():
+    """Explicitly ignore SIGURG so no process supervisor can nudge peek out
+    with an out-of-band signal. POSIX default is already ignore; this makes
+    it defensive against layers that change the disposition.
+    """
+    s = getattr(signal, "SIGURG", None)
+    if s is not None:
+        try:
+            signal.signal(s, signal.SIG_IGN)
+        except (OSError, ValueError):
+            pass
+
+__version__ = "0.3.21"
 
 GHOSTTRAP_SERVER = "wss://ghosttrap.io/stream/"
 CONFIG_DIR = os.path.expanduser("~/.ghosttrap")
@@ -231,7 +245,10 @@ def _get_repo_token(config, requested=None):
 
 
 async def _connect_and_handle(server_url, token, config, once=False):
-    """Core WebSocket loop. If once=True, exit after the first error."""
+    """Core WebSocket loop. If once=True, returns True after the first error event.
+    Returns False if the server closed the socket without sending an error
+    (e.g. idle timeout) so callers can distinguish 'job done' from 'reconnect me'.
+    """
     since = config.get("cursor")
     url = f"{server_url}?token={token}"
     if since is not None:
@@ -293,7 +310,8 @@ async def _connect_and_handle(server_url, token, config, once=False):
                     print(f"{'='*60}", file=sys.stderr)
 
                 if once:
-                    return
+                    return True
+    return False
 
 
 def _require_setup():
@@ -412,6 +430,31 @@ async def setup(server_url, token):
         sys.exit(1)
 
 
+# Exception types we knowingly retry on. All represent a transient network/transport
+# blip rather than a semantic error from the server:
+#   - ConnectionClosed: peer closed the WebSocket (either side of the handshake)
+#   - InvalidStatus:    non-101 HTTP response during upgrade (e.g. 502 from a proxy)
+#   - ConnectionError:  builtin — refused, reset, unreachable
+#   - OSError:          DNS failure, transient socket errors (gaierror is a subclass)
+# Anything else escapes and prints a diagnostic line first so we can add it here
+# in the next release. Semantic rejections from the server ({"type": "rejected"})
+# raise SystemExit, which we deliberately do NOT catch — those are real errors.
+_RETRYABLE = (
+    websockets.ConnectionClosed,
+    websockets.InvalidStatus,
+    ConnectionError,
+    OSError,
+)
+
+
+def _log_unexpected(e):
+    print(
+        f"unexpected {type(e).__module__}.{type(e).__name__}: {e} — "
+        f"not currently in the retry list; please report so we can add it.",
+        file=sys.stderr,
+    )
+
+
 async def watch(server_url, token):
     config = _load_config()
     print(f"connecting to {server_url}...", file=sys.stderr)
@@ -419,9 +462,13 @@ async def watch(server_url, token):
     while True:
         try:
             await _connect_and_handle(server_url, token, config, once=False)
-        except (websockets.ConnectionClosed, websockets.InvalidStatus, ConnectionError, OSError):
+            print("connection closed by server, reconnecting...", file=sys.stderr)
+        except _RETRYABLE:
             print("connection lost, reconnecting...", file=sys.stderr)
-            await asyncio.sleep(60)
+        except Exception as e:
+            _log_unexpected(e)
+            raise
+        await asyncio.sleep(60)
 
 
 async def peek(server_url, token):
@@ -429,11 +476,16 @@ async def peek(server_url, token):
     _check_cli_version(config)
     while True:
         try:
-            await _connect_and_handle(server_url, token, config, once=True)
-            return  # got an error, printed it, done
-        except (websockets.ConnectionClosed, websockets.InvalidStatus, ConnectionError, OSError):
+            got_error = await _connect_and_handle(server_url, token, config, once=True)
+            if got_error:
+                return
+            print("connection closed by server, reconnecting...", file=sys.stderr)
+        except _RETRYABLE:
             print("connection lost, reconnecting...", file=sys.stderr)
-            await asyncio.sleep(60)
+        except Exception as e:
+            _log_unexpected(e)
+            raise
+        await asyncio.sleep(60)
 
 
 def _advance_cursor(config, token):
@@ -669,6 +721,7 @@ def last(do_clear=False, requested=None):
 
 
 def main():
+    _harden_signals()
     parser = argparse.ArgumentParser(prog="ghosttrap", description="Watch for errors from ghosttrap.io")
     sub = parser.add_subparsers(dest="command")
 

{ghosttrap_cli-0.3.19 → ghosttrap_cli-0.3.21}/ghosttrap_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ghosttrap-cli
-Version: 0.3.19
+Version: 0.3.21
 Summary: Watch for errors streaming from ghosttrap.io
 Project-URL: Homepage, https://github.com/alex-rowley/ghosttrap-cli
 Requires-Python: >=3.10

{ghosttrap_cli-0.3.19 → ghosttrap_cli-0.3.21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ghosttrap-cli"
-version = "0.3.19"
+version = "0.3.21"
 description = "Watch for errors streaming from ghosttrap.io"
 readme = "README.md"
 requires-python = ">=3.10"