serverish 2.2.0__tar.gz → 2.2.1__tar.gz

{serverish-2.2.0 → serverish-2.2.1}/PKG-INFO

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

{serverish-2.2.0 → serverish-2.2.1}/pyproject.toml

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

{serverish-2.2.0 → serverish-2.2.1}/serverish/messenger/messenger.py

@@ -24,7 +24,7 @@ from nats.aio.msg import Msg
 from serverish.base import dt_utcnow_array, dt_from_array, Task, create_task, dt_ensure_array
 from serverish.base.collector import Collector
 from serverish.connection.connection_jets import ConnectionJetStream
-from serverish.base.idmanger import gen_id
+from serverish.base.idmanger import gen_id, gen_uid
 from serverish.base.manageable import Manageable
 from serverish.messenger.msgvalidator import MsgValidator
 from serverish.base.singleton import Singleton
@@ -51,6 +51,13 @@ class Messenger(Singleton):
     def __init__(self, name: str = None, parent: Collector = None, **kwargs) -> None:
         self.validator = MsgValidator()
         self.opener_task: Task | None = None
+        # Random per-process token, part of the Nats-Msg-Id dedup header.
+        # meta.id (gen_id) is only process-locally unique - two processes (or one
+        # process restarted within the stream's duplicate window) both emit
+        # 'msg-1', 'msg-2', ..., and JetStream would silently drop the later
+        # publishes as duplicates. The instance prefix makes the dedup identity
+        # global while retries still reuse the exact same header.
+        self.instance_id: str = gen_uid('mi', 12)
         super().__init__(name, parent, **kwargs)
 
     @property

{serverish-2.2.0 → serverish-2.2.1}/serverish/messenger/msg_publisher.py

@@ -75,7 +75,11 @@ class MsgPublisher(MsgDriver):
             raise e
         self.messenger.log_msg_trace(msg['data'], msg['meta'], f"PUB to {self.subject}")
         headers = dict(kwargs.pop('headers', None) or {})
-        headers.setdefault('Nats-Msg-Id', msg['meta']['id'])  # server-side dedup, makes ack-timeout retries safe
+        # Server-side dedup id: makes ack-timeout retries safe. Must be globally
+        # unique, hence the per-process instance prefix - meta.id alone is only
+        # process-locally unique and would collide across processes/restarts,
+        # silently dropping messages within the stream's duplicate window.
+        headers.setdefault('Nats-Msg-Id', f"{self.messenger.instance_id}:{msg['meta']['id']}")
         try:
             await self._publish_with_ack_retries(bdata, headers, msg['meta']['id'], **kwargs)
             # Track successful publish