Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 46 additions & 7 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ ruff = "*"
codespell = "*"
pyshark = "^0.6"
aioresponses = "^0.7.7"
freezegun = "^1.5.1"

[tool.semantic_release]
branch = "main"
Expand Down
8 changes: 4 additions & 4 deletions roborock/roborock_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import json
import math
import time
from dataclasses import dataclass
from dataclasses import dataclass, field

from roborock import RoborockEnum
from roborock.util import get_next_int
Expand Down Expand Up @@ -155,10 +155,10 @@ class MessageRetry:
class RoborockMessage:
protocol: RoborockMessageProtocol
payload: bytes | None = None
seq: int = get_next_int(100000, 999999)
seq: int = field(default_factory=lambda: get_next_int(100000, 999999))
version: bytes = b"1.0"
random: int = get_next_int(10000, 99999)
timestamp: int = math.floor(time.time())
random: int = field(default_factory=lambda: get_next_int(10000, 99999))
timestamp: int = field(default_factory=lambda: math.floor(time.time()))
message_retry: MessageRetry | None = None

def get_request_id(self) -> int | None:
Expand Down
29 changes: 29 additions & 0 deletions tests/test_roborock_message.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import json

from freezegun import freeze_time

from roborock.roborock_message import RoborockMessage, RoborockMessageProtocol


def test_roborock_message() -> None:
"""Test the RoborockMessage class is initialized."""
with freeze_time("2025-01-20T12:00:00"):
message1 = RoborockMessage(
protocol=RoborockMessageProtocol.RPC_REQUEST,
payload=json.dumps({"dps": {"101": json.dumps({"id": 4321})}}).encode(),
message_retry=None,
)
assert message1.get_request_id() == 4321

with freeze_time("2025-01-20T11:00:00"): # Back in time 1hr to test timestamp
message2 = RoborockMessage(
protocol=RoborockMessageProtocol.RPC_RESPONSE,
payload=json.dumps({"dps": {"94": json.dumps({"id": 444}), "102": json.dumps({"id": 333})}}).encode(),
message_retry=None,
)
assert message2.get_request_id() == 333

# Ensure the sequence, random numbers, etc are initialized properly
assert message1.seq != message2.seq
assert message1.random != message2.random
assert message1.timestamp > message2.timestamp
Loading