lifx-emulator-core 3.2.0__py3-none-any.whl → 3.3.0__py3-none-any.whl

lifx_emulator/devices/device.py

@@ -270,10 +270,8 @@ class EmulatedLifxDevice:
                 state_unhandled.PKT_TYPE,
                 len(unhandled_payload),
             )
-            responses.append((unhandled_header, state_unhandled))
-
-            # Still send acknowledgment if requested
-            if header.ack_required:
+            # Send ack before StateUnhandled when scenario controls ack behavior
+            if header.ack_required and scenario.affects_acks:
                 ack_packet = Device.Acknowledgement()
                 ack_payload = ack_packet.pack()
                 ack_header = self._create_response_header(
@@ -282,15 +280,18 @@ class EmulatedLifxDevice:
                     ack_packet.PKT_TYPE,
                     len(ack_payload),
                 )
-                responses.append((ack_header, ack_packet))
+                responses.append((ack_header, ack_packet, ack_payload))
 
-            return responses
+            responses.append((unhandled_header, state_unhandled, unhandled_payload))
+            return self._apply_error_scenarios(responses, scenario)
 
         # Update uptime
         self.state.uptime_ns = self.get_uptime_ns()
 
         # Handle acknowledgment (packet type 45, no payload)
-        if header.ack_required:
+        # Only generate ack here when a scenario targets ack behavior;
+        # otherwise the server sends the ack immediately before calling us.
+        if header.ack_required and scenario.affects_acks:
             ack_packet = Device.Acknowledgement()
             ack_payload = ack_packet.pack()
             ack_header = self._create_response_header(
@@ -336,16 +337,29 @@ class EmulatedLifxDevice:
             # Store both header and pre-packed payload for error scenario processing
             responses.append((resp_header, resp_packet, resp_payload))
 
-        # Apply error scenarios to responses
-        modified_responses = []
+        return self._apply_error_scenarios(responses, scenario)
+
+    def _apply_error_scenarios(
+        self,
+        responses: list[tuple],
+        scenario: ScenarioConfig,
+    ) -> list[tuple[LifxHeader, Any]]:
+        """Apply malformed/invalid-field error scenarios to response packets.
+
+        Args:
+            responses: List of (header, packet, payload) tuples
+            scenario: Resolved scenario config
+
+        Returns:
+            List of (header, packet) tuples with error scenarios applied
+        """
+        modified_responses: list[tuple[LifxHeader, Any]] = []
         for resp_header, resp_packet, resp_payload in responses:
             # Check if we should send malformed packet (truncate payload)
             if resp_header.pkt_type in scenario.malformed_packets:
-                # For malformed packets, truncate the pre-packed payload
                 truncated_len = len(resp_payload) // 2
                 resp_payload_modified = resp_payload[:truncated_len]
                 resp_header.size = LIFX_HEADER_SIZE + truncated_len + 10  # Wrong size
-                # Convert back to bytes for malformed case
                 modified_responses.append((resp_header, resp_payload_modified))
                 logger.info(
                     "Sending malformed packet type %s (truncated)", resp_header.pkt_type
@@ -354,7 +368,6 @@ class EmulatedLifxDevice:
 
             # Check if we should send invalid field values
             if resp_header.pkt_type in scenario.invalid_field_values:
-                # Corrupt the pre-packed payload
                 resp_payload_modified = b"\xff" * len(resp_payload)
                 modified_responses.append((resp_header, resp_payload_modified))
                 pkt_type = resp_header.pkt_type

lifx_emulator/scenarios/models.py

@@ -6,6 +6,8 @@ of the application (domain, API, persistence, etc.).
 
 from pydantic import BaseModel, Field, field_validator
 
+ACK_PACKET_TYPE = 45
+
 
 class ScenarioConfig(BaseModel):
     """Scenario configuration for testing LIFX protocol behavior.
@@ -52,6 +54,16 @@ class ScenarioConfig(BaseModel):
         False, description="Send unhandled message responses for unknown packet types"
     )
 
+    @property
+    def affects_acks(self) -> bool:
+        """Whether this scenario configuration modifies acknowledgment behavior."""
+        return (
+            ACK_PACKET_TYPE in self.drop_packets
+            or ACK_PACKET_TYPE in self.response_delays
+            or ACK_PACKET_TYPE in self.malformed_packets
+            or ACK_PACKET_TYPE in self.invalid_field_values
+        )
+
     @field_validator("drop_packets", mode="before")
     @classmethod
     def convert_drop_packets_keys(cls, v):

lifx_emulator/server.py

@@ -18,7 +18,7 @@ from lifx_emulator.devices import (
     PacketEvent,
 )
 from lifx_emulator.protocol.header import LifxHeader
-from lifx_emulator.protocol.packets import get_packet_class
+from lifx_emulator.protocol.packets import Device, get_packet_class
 from lifx_emulator.repositories import IScenarioStorageBackend
 from lifx_emulator.scenarios import HierarchicalScenarioManager
 
@@ -179,6 +179,54 @@ class EmulatedLifxServer:
                 # Fallback for edge case where loop not yet cached
                 asyncio.create_task(self.server.handle_packet(data, addr))
 
+    def _send_ack(
+        self,
+        device: EmulatedLifxDevice,
+        header: LifxHeader,
+        addr: tuple[str, int],
+    ) -> None:
+        """Send an acknowledgment packet immediately via UDP.
+
+        Args:
+            device: The device acknowledging the packet
+            header: Request header (source/sequence are copied)
+            addr: Client address (host, port)
+        """
+        ack_packet = Device.Acknowledgement()
+        ack_payload = ack_packet.pack()
+        ack_header = device._create_response_header(
+            header.source,
+            header.sequence,
+            ack_packet.PKT_TYPE,
+            len(ack_payload),
+        )
+        response_data = ack_header.pack() + ack_payload
+        if self.transport:
+            self.transport.sendto(response_data, addr)
+
+        self.packets_sent += 1
+        self.packets_sent_by_type[ack_header.pkt_type] += 1
+
+        logger.debug(
+            "→ TX %s to %s:%s (target=%s, seq=%s) [no fields]",
+            _get_packet_type_name(ack_header.pkt_type),
+            addr[0],
+            addr[1],
+            device.state.serial,
+            ack_header.sequence,
+        )
+
+        self.activity_observer.on_packet_sent(
+            PacketEvent(
+                timestamp=time.time(),
+                direction="tx",
+                packet_type=ack_header.pkt_type,
+                packet_name=_get_packet_type_name(ack_header.pkt_type),
+                addr=f"{addr[0]}:{addr[1]}",
+                device=device.state.serial,
+            )
+        )
+
     async def _process_device_packet(
         self,
         device: EmulatedLifxDevice,
@@ -194,10 +242,13 @@ class EmulatedLifxServer:
             packet: Parsed packet payload (or None)
             addr: Client address (host, port)
         """
-        responses = device.process_packet(header, packet)
-
-        # Get resolved scenario for response delays
+        # Send ack immediately before device processing when no scenario
+        # targets ack behavior (fast path for the common case)
         scenario = device._get_resolved_scenario()
+        if header.ack_required and not scenario.affects_acks:
+            self._send_ack(device, header, addr)
+
+        responses = device.process_packet(header, packet)
 
         # Send responses with delay if configured
         for resp_header, resp_packet in responses:

{lifx_emulator_core-3.2.0.dist-info → lifx_emulator_core-3.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lifx-emulator-core
-Version: 3.2.0
+Version: 3.3.0
 Summary: Core LIFX Emulator library for testing LIFX LAN protocol libraries
 Author-email: Avi Miller <me@dje.li>
 Maintainer-email: Avi Miller <me@dje.li>

{lifx_emulator_core-3.2.0.dist-info → lifx_emulator_core-3.3.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 lifx_emulator/__init__.py,sha256=SSnQg0RiCaID7DhHOGZoVIDQ3_8Lyt0J9cA_2StF63s,824
 lifx_emulator/constants.py,sha256=DFZkUsdewE-x_3MgO28tMGkjUCWPeYc3xLj_EXViGOw,1032
-lifx_emulator/server.py,sha256=Fc0AiSeJ43XnF1MMTqWBkeYIW-KOhZpqNp0Y2x4RqEE,16622
+lifx_emulator/server.py,sha256=x-RDfxwmzUfSSROfBzVm2LcGK68sVIM4o7IkcgzkSfI,18363
 lifx_emulator/devices/__init__.py,sha256=QlBTPnFErJcSKLvGyeDwemh7xcpjYvB_L5siKsjr3s8,1089
-lifx_emulator/devices/device.py,sha256=99uxNdK3vFnBHh9M2F92zxNeFkq3w-XXV0Mt8wRTUQw,16556
+lifx_emulator/devices/device.py,sha256=w7Y9VYux3cyGus9mFmruFn6WYtoD7zwhzCL2xrICY-Q,17180
 lifx_emulator/devices/manager.py,sha256=XDrT82um5sgNpNihLj5RsNvHqdVI1bK9YY2eBzWIcf0,8162
 lifx_emulator/devices/observers.py,sha256=-KnUgFcKdhlNo7CNVstP-u0wU2W0JAGg055ZPV15Sj0,3874
 lifx_emulator/devices/persistence.py,sha256=9Mhj46-xrweOmyzjORCi2jKIwa8XJWpQ5CgaKcw6U98,10513
@@ -40,8 +40,8 @@ lifx_emulator/repositories/device_repository.py,sha256=KsXVg2sg7PGSTsK_PvDYeHHwE
 lifx_emulator/repositories/storage_backend.py,sha256=wEgjhnBvAxl6aO1ZGL3ou0dW9P2hBPnK8jEE03sOlL4,3264
 lifx_emulator/scenarios/__init__.py,sha256=CGjudoWvyysvFj2xej11N2cr3mYROGtRb9zVHcOHGrQ,665
 lifx_emulator/scenarios/manager.py,sha256=1esxRdz74UynNk1wb86MGZ2ZFAuMzByuu74nRe3D-Og,11163
-lifx_emulator/scenarios/models.py,sha256=BKS_fGvrbkGe-vK3arZ0w2f9adS1UZhiOoKpu7GENnc,4099
+lifx_emulator/scenarios/models.py,sha256=1cX399JcTYVo29-8Rc4BwYPRty7sMR4fcn0njGfspZg,4504
 lifx_emulator/scenarios/persistence.py,sha256=3vjtPNFYfag38tUxuqxkGpWhQ7uBitc1rLroSAuw9N8,8881
-lifx_emulator_core-3.2.0.dist-info/METADATA,sha256=qxUBmkizy2Eu0QNVQ8y6FNppwJaqbR5pEIDnZzTasu8,3217
-lifx_emulator_core-3.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-lifx_emulator_core-3.2.0.dist-info/RECORD,,
+lifx_emulator_core-3.3.0.dist-info/METADATA,sha256=JtFPPtM9n0gsUawt_SHBvR_d67384-wheXW8viWc5Vc,3217
+lifx_emulator_core-3.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+lifx_emulator_core-3.3.0.dist-info/RECORD,,