feat(message.py): add acknowledged and ack_required properties

CHANGELOG.md

@@ -2,7 +2,42 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.2.0] - 2025-08-28
+## [0.4.3] - 2025-10-05
+
+### Bug Fixes
+
+- [`1ab577e`](https://gitea.pufereq.pl/judas/judas_protocol/commit/1ab577ebd583ed17f813d37745b5dc195855d9c3) **message.py**: provide `id_` in `ack()` and `hello()`
+
+## [0.4.2] - 2025-10-05
+
+### Bug Fixes
+
+- [`37eec56`](https://gitea.pufereq.pl/judas/judas_protocol/commit/37eec56afeb2697955702aba04476ccdde7435e4) **message.py**: allow providing ID via argument
+
+## [0.4.1] - 2025-10-05
+
+### Miscellaneous Tasks
+
+- [`f307a7f`](https://gitea.pufereq.pl/judas/judas_protocol/commit/f307a7f457924ff1717ed4c8ce195ce022dd5680) **message.py**: add `target_id` argument to `Message.ack` classmethod
+
+## [0.4.0] - 2025-10-05
+
+### Features
+
+- [`4cc3a5b`](https://gitea.pufereq.pl/judas/judas_protocol/commit/4cc3a5bb3a0fce0c4d90958f26fa09a1d638a4b3) **message.py**: add message uuid
+
+## [0.3.0] - 2025-09-23
+
+### Features
+
+- [`ffc4ed1`](https://gitea.pufereq.pl/judas/judas_protocol/commit/ffc4ed18974e89c6f1f5554d9e8832065432310a) **message.py**: add `__str__` and `__repr__` methods
+- [`bc1bf46`](https://gitea.pufereq.pl/judas/judas_protocol/commit/bc1bf46388eb904738893a2f86b5050b4ce2489e) **message.py**: raise ValueError if invalid json in `Message.from_bytes()`
+
+### Styling
+
+- [`9b5b104`](https://gitea.pufereq.pl/judas/judas_protocol/commit/9b5b104061859b2dd4ab93258414edd8ce34b4a7) **message.py**: organize imports
+
+## [0.2.0] - 2025-08-29
 
 ### Features
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "judas_protocol"
-version = "0.2.0"
+version = "0.4.3"
 description = "The judas protocol"
 readme = "README.md"
 authors = []

src/judas_protocol/message.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import annotations
 
-from enum import Enum
 import json
-from typing import Any
+import uuid
+from enum import Enum
+from typing import Any, override
 
 from judas_protocol.types import Category, ControlAction
 
@@ -13,21 +14,44 @@ class Message:
 
     def __init__(
         self,
+        id_: str | None,
         category: Category,
         action: Enum,
         payload: dict[str, Any] | None = None,
+        *,
+        acknowledged: bool = False,
+        ack_required: bool = False,
     ) -> None:
         """Initialize a Message.
 
         Args:
+            id_ (str | None): The ID of the message. If None, a new UUID will be generated.
             category (Category): The category of the message.
             action (Enum): The action of the message.
             payload (dict[str, Any] | None): The payload of the message.
+            acknowledged (bool): Whether the message has been acknowledged. Defaults to False.
+            ack_required (bool): Whether the message requires an acknowledgment. Defaults to False.
         """
+        self.id: str = id_ or str(uuid.uuid4())
         self.category: Category = category
         self.action: Enum = action
         self.payload: dict[str, Any] = payload or {}
 
+        self.acknowledged: bool = acknowledged
+        self.ack_required: bool = ack_required
+
+    @override
+    def __str__(self) -> str:
+        return f"Message ({self.id}) ack'd: {self.acknowledged}, req: {self.ack_required} [{self.category.name}] {self.action.name} - {self.payload}"
+
+    @override
+    def __repr__(self) -> str:
+        return (
+            f"Message(id_={self.id}, category={self.category}, action={self.action}"
+            f", payload={self.payload}, acknowledged={self.acknowledged}"
+            f", ack_required={self.ack_required})"
+        )
+
     def to_dict(self) -> dict[str, Any]:
         """Convert the message to a dictionary.
 
@@ -35,9 +59,12 @@ class Message:
             dict[str, Any]: The message as a dictionary.
         """
         return {
+            "id": self.id,
             "category": self.category,
             "action": self.action,
             "payload": self.payload,
+            "acknowledged": self.acknowledged,
+            "ack_required": self.ack_required,
         }
 
     def to_json(self) -> str:
@@ -66,8 +93,14 @@ class Message:
         Returns:
             Message: The created message.
         """
+        if "id" not in data:
+            data["id"] = None
+
+        id_: str | None = data["id"]
         category = Category(data["category"])
         action_str = data["action"]
+        acknowledged = data["acknowledged"]
+        ack_required = data["ack_required"]
 
         match category:
             case Category.CONTROL:
@@ -76,7 +109,14 @@ class Message:
                 raise ValueError(f"Unknown category: {category}")
 
         payload = data.get("payload", {})
-        return cls(category=category, action=action, payload=payload)
+        return cls(
+            id_=id_,
+            category=category,
+            action=action,
+            payload=payload,
+            acknowledged=acknowledged,
+            ack_required=ack_required,
+        )
 
     @classmethod
     def from_json(cls, data: str) -> Message:
@@ -87,7 +127,12 @@ class Message:
         Returns:
             Message: The created message.
         """
-        return cls.from_dict(json.loads(data))
+        try:
+            json_data = json.loads(data)
+        except json.JSONDecodeError as e:
+            raise ValueError("Invalid JSON data") from e
+
+        return cls.from_dict(json_data)
 
     @classmethod
     def from_bytes(cls, data: bytes) -> Message:
@@ -101,14 +146,22 @@ class Message:
         return cls.from_json(data.decode("utf-8"))
 
     @classmethod
-    def ack(cls) -> Message:
+    def ack(cls, target_id: str) -> Message:
         """Create an ACK message.
 
+        Args:
+            target_id (str): The ID of the message to acknowledge.
+
         Returns:
             Message: The created ACK message.
         """
         return cls(
-            category=Category.CONTROL, action=ControlAction.ACK, payload={}
+            id_=None,
+            category=Category.CONTROL,
+            action=ControlAction.ACK,
+            payload={"target_id": target_id},
+            acknowledged=False,
+            ack_required=False,
         )
 
     @classmethod
@@ -121,7 +174,10 @@ class Message:
             Message: The created HELLO message.
         """
         return cls(
+            id_=None,
             category=Category.CONTROL,
             action=ControlAction.HELLO,
             payload={"mac": mac},
+            acknowledged=False,
+            ack_required=True,
         )

uv.lock

@@ -240,7 +240,7 @@ wheels = [
 
 [[package]]
 name = "judas-protocol"
-version = "0.2.0"
+version = "0.4.3"
 source = { editable = "." }
 
 [package.dev-dependencies]