serverish 2.0.2__tar.gz → 2.0.4__tar.gz

{serverish-2.0.2 → serverish-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverish
-Version: 2.0.2
+Version: 2.0.4
 Summary: helpers for server alike projects
 License-File: LICENSE
 Author: Mikołaj Kałuszyński

{serverish-2.0.2 → serverish-2.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "serverish"
-version = "2.0.2"
+version = "2.0.4"
 description = "helpers for server alike projects"
 authors = ["Mikołaj Kałuszyński", "MMME team"]
 readme = "README.md"

{serverish-2.0.2 → serverish-2.0.4}/serverish/messenger/msg_callback_sub.py

@@ -42,7 +42,9 @@ class MsgCallbackSubscriber(MsgReader):
         Args:
             callback: a callback function to call on each message, may be asynchronous
             callback is called with two arguments: message dict and metadata dict,
-            and should return True to continue reading messages, False to stop
+            and may return False to stop reading messages. Any other return value
+            (including None — i.e. callbacks with no explicit return — and True)
+            keeps the subscription running.
         """
         self.callback = callback
         if asyncio.iscoroutinefunction(callback):
@@ -59,7 +61,7 @@ class MsgCallbackSubscriber(MsgReader):
         assert scb is not None or acb is not None
         assert not (scb is not None and acb is not None)
         cb = scb or acb
-        cont = True
+        cont: object = True
         log.debug(f"Entering sync interation{self}")
         async for data, meta in self:
             try:
@@ -74,7 +76,11 @@ class MsgCallbackSubscriber(MsgReader):
                 break
             except Exception as e:
                 log.exception(f'Error in callback {cb} for message {meta}{str(data):20}: {e}')
-            if not cont or self._stop_event.is_set() :
+            # Stop only on explicit False — None (the implicit "no return" value
+            # of a Python function) and any truthy value keep the subscription
+            # alive. Treating None as "stop" would silently kill any callback
+            # that doesn't bother returning anything, which is the common case.
+            if cont is False or self._stop_event.is_set():
                 break
         log.debug(f"Exiting sync interation{self}")
 

{serverish-2.0.2 → serverish-2.0.4}/serverish/messenger/msg_reader.py

@@ -292,10 +292,13 @@ class MsgReader(MsgDriver):
                             log.debug(self.fmt(f"No messages available, finishing due to nowait"))
                             raise self.EndIterationException('nowait')
 
-                        # Non-nowait mode: wait for NEW messages to arrive
-                        # Break into shorter intervals to allow health checks and reconnection handling
-                        blocking_interval = 10.0  # Check every 10 seconds
-                        max_wait_cycles = 10  # Total wait: 10 * 10s = 100s
+                        # Non-nowait mode: wait for NEW messages to arrive.
+                        # Break into shorter intervals so the reconnect-needed
+                        # check at the top of the loop runs often enough that
+                        # low-rate subjects don't sit on a stale subscription
+                        # for tens of seconds after a NATS reconnect.
+                        blocking_interval = 2.0
+                        max_wait_cycles = 50  # Total wait: 50 * 2s = 100s (unchanged)
 
                         for cycle in range(max_wait_cycles):
                             # Check for reconnection before each wait cycle
@@ -621,12 +624,28 @@ class MsgReader(MsgDriver):
         max_retries = 3
         for attempt in range(max_retries):
             try:
-                # Clean up existing subscription
+                # Clean up existing subscription. `unsubscribe()` only detaches the
+                # local handle; the JetStream consumer must be deleted explicitly
+                # or it leaks server-side across every reconnect (one orphan per
+                # reopen, accumulating until the stream's consumer cap or the
+                # process restarts).
                 if self.pull_subscription is not None:
+                    try:
+                        ci = await self.pull_subscription.consumer_info()
+                    except Exception as e:
+                        log.debug(f"Error fetching consumer_info during reopen attempt {attempt + 1}: {e}")
+                        ci = None
                     try:
                         await self.pull_subscription.unsubscribe()
                     except Exception as e:
                         log.debug(f"Error unsubscribing during reopen attempt {attempt + 1}: {e}")
+                    if ci is not None:
+                        try:
+                            await self.connection.js.delete_consumer(stream=ci.stream_name, consumer=ci.name)
+                        except nats.js.errors.NotFoundError:
+                            pass  # already gone, nothing to delete
+                        except Exception as e:
+                            log.debug(f"Error deleting old consumer during reopen attempt {attempt + 1}: {e}")
                 
                 # Create new consumer configuration
                 consumer_conf = await self._create_consumer_cfg()