lifx-emulator-core 3.4.0__py3-none-any.whl → 3.5.0__py3-none-any.whl

lifx_emulator/devices/__init__.py

@@ -10,7 +10,12 @@ This module contains all device-related functionality including:
 """
 
 from lifx_emulator.devices.device import EmulatedLifxDevice
-from lifx_emulator.devices.manager import DeviceManager, IDeviceManager
+from lifx_emulator.devices.manager import (
+    DeviceAddedCallback,
+    DeviceManager,
+    DeviceRemovedCallback,
+    IDeviceManager,
+)
 from lifx_emulator.devices.observers import (
     ActivityLogger,
     ActivityObserver,
@@ -26,6 +31,8 @@ from lifx_emulator.devices.states import DeviceState
 __all__ = [
     "EmulatedLifxDevice",
     "DeviceManager",
+    "DeviceAddedCallback",
+    "DeviceRemovedCallback",
     "IDeviceManager",
     "DeviceState",
     "DevicePersistenceAsyncFile",

lifx_emulator/devices/manager.py

@@ -8,6 +8,7 @@ concerns principle by extracting domain logic from the network layer.
 from __future__ import annotations
 
 import logging
+from collections.abc import Callable
 from typing import TYPE_CHECKING, Protocol, runtime_checkable
 
 if TYPE_CHECKING:
@@ -18,6 +19,10 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
+# Type aliases for device lifecycle callbacks
+DeviceAddedCallback = Callable[["EmulatedLifxDevice"], None]
+DeviceRemovedCallback = Callable[[str], None]
+
 
 @runtime_checkable
 class IDeviceManager(Protocol):
@@ -116,15 +121,27 @@ class DeviceManager:
     This class extracts device management logic from EmulatedLifxServer,
     providing a clean separation between domain logic and network I/O.
     It mirrors the architecture of HierarchicalScenarioManager.
+
+    Supports optional callbacks for device lifecycle events, allowing
+    external systems (like WebSocket managers) to be notified of changes.
     """
 
-    def __init__(self, device_repository: IDeviceRepository):
+    def __init__(
+        self,
+        device_repository: IDeviceRepository,
+        on_device_added: DeviceAddedCallback | None = None,
+        on_device_removed: DeviceRemovedCallback | None = None,
+    ):
         """Initialize the device manager.
 
         Args:
             device_repository: Repository for device storage and retrieval
+            on_device_added: Optional callback invoked when a device is added
+            on_device_removed: Optional callback invoked when a device is removed
         """
         self._device_repository = device_repository
+        self.on_device_added = on_device_added
+        self.on_device_removed = on_device_removed
 
     def add_device(
         self,
@@ -152,6 +169,11 @@ class DeviceManager:
         if success:
             serial = device.state.serial
             logger.info("Added device: %s (product=%s)", serial, device.state.product)
+            if self.on_device_added is not None:
+                try:
+                    self.on_device_added(device)
+                except Exception:
+                    logger.exception("Error in on_device_added callback for %s", serial)
         return success
 
     def remove_device(self, serial: str, storage=None) -> bool:
@@ -172,6 +194,14 @@ class DeviceManager:
             if storage:
                 storage.delete_device_state(serial)
 
+            if self.on_device_removed is not None:
+                try:
+                    self.on_device_removed(serial)
+                except Exception:
+                    logger.exception(
+                        "Error in on_device_removed callback for %s", serial
+                    )
+
         return success
 
     def remove_all_devices(self, delete_storage: bool = False, storage=None) -> int:
@@ -184,6 +214,9 @@ class DeviceManager:
         Returns:
             Number of devices removed
         """
+        # Get all device serials before clearing (for callbacks)
+        serials = [d.state.serial for d in self._device_repository.get_all()]
+
         # Clear all devices from repository
         device_count = self._device_repository.clear()
         logger.info("Removed all %s device(s)", device_count)
@@ -193,6 +226,16 @@ class DeviceManager:
             deleted = storage.delete_all_device_states()
             logger.info("Deleted %s device state(s) from persistent storage", deleted)
 
+        # Notify callbacks for each removed device
+        if self.on_device_removed is not None:
+            for serial in serials:
+                try:
+                    self.on_device_removed(serial)
+                except Exception:
+                    logger.exception(
+                        "Error in on_device_removed callback for %s", serial
+                    )
+
         return device_count
 
     def get_device(self, serial: str) -> EmulatedLifxDevice | None:

lifx_emulator/scenarios/manager.py

@@ -60,8 +60,9 @@ class HierarchicalScenarioManager:
         self.type_scenarios: dict[str, ScenarioConfig] = {}  # type → config
         self.location_scenarios: dict[str, ScenarioConfig] = {}  # location → config
         self.group_scenarios: dict[str, ScenarioConfig] = {}  # group → config
+        # Default global scenario: send_unhandled=True matches real LIFX behavior
         self.global_scenario: ScenarioConfig = ScenarioConfig(
-            firmware_version=None, send_unhandled=False
+            firmware_version=None, send_unhandled=True
         )
 
     def set_device_scenario(self, serial: str, config: ScenarioConfig):
@@ -101,9 +102,9 @@ class HierarchicalScenarioManager:
         return self.group_scenarios.pop(group, None) is not None
 
     def clear_global_scenario(self):
-        """Clear global scenario (reset to empty)."""
+        """Clear global scenario (reset to default with send_unhandled=True)."""
         self.global_scenario = ScenarioConfig(
-            firmware_version=None, send_unhandled=False
+            firmware_version=None, send_unhandled=True
         )
 
     def get_global_scenario(self) -> ScenarioConfig:
@@ -184,8 +185,8 @@ class HierarchicalScenarioManager:
         Returns:
             Merged ScenarioConfig
         """
-        # Start with empty config
-        merged = ScenarioConfig(firmware_version=None, send_unhandled=False)
+        # Start with default config (send_unhandled=True matches real LIFX behavior)
+        merged = ScenarioConfig(firmware_version=None, send_unhandled=True)
 
         # Layer in each scope (general to specific)
         # Later scopes override or merge with earlier ones
@@ -219,8 +220,8 @@ class HierarchicalScenarioManager:
             # Scalars: use most specific non-default value
             if config.firmware_version is not None:
                 merged.firmware_version = config.firmware_version
-            if config.send_unhandled:
-                merged.send_unhandled = True
+            # send_unhandled: most specific scope wins (explicit False overrides)
+            merged.send_unhandled = config.send_unhandled
 
         return merged
 

lifx_emulator/scenarios/models.py

@@ -51,7 +51,7 @@ class ScenarioConfig(BaseModel):
         description="List of packet types to send with incomplete data",
     )
     send_unhandled: bool = Field(
-        False, description="Send unhandled message responses for unknown packet types"
+        True, description="Send unhandled message responses for unknown packet types"
     )
 
     @property

lifx_emulator/server.py

@@ -482,7 +482,7 @@ class EmulatedLifxServer:
             "packets_received_by_type": dict(self.packets_received_by_type),
             "packets_sent_by_type": dict(self.packets_sent_by_type),
             "error_count": self.error_count,
-            "activity_enabled": isinstance(self.activity_observer, ActivityLogger),
+            "activity_enabled": hasattr(self.activity_observer, "get_recent_activity"),
         }
 
     def get_recent_activity(self) -> list[dict[str, Any]]:
@@ -492,8 +492,9 @@ class EmulatedLifxServer:
             List of activity event dictionaries, or empty list if observer
             doesn't support activity tracking
         """
-        if isinstance(self.activity_observer, ActivityLogger):
-            return self.activity_observer.get_recent_activity()
+        get_activity = getattr(self.activity_observer, "get_recent_activity", None)
+        if get_activity is not None:
+            return get_activity()
         return []
 
     async def start(self):

{lifx_emulator_core-3.4.0.dist-info → lifx_emulator_core-3.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lifx-emulator-core
-Version: 3.4.0
+Version: 3.5.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.4.0.dist-info → lifx_emulator_core-3.5.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
 lifx_emulator/__init__.py,sha256=SSnQg0RiCaID7DhHOGZoVIDQ3_8Lyt0J9cA_2StF63s,824
 lifx_emulator/constants.py,sha256=DFZkUsdewE-x_3MgO28tMGkjUCWPeYc3xLj_EXViGOw,1032
-lifx_emulator/server.py,sha256=x-RDfxwmzUfSSROfBzVm2LcGK68sVIM4o7IkcgzkSfI,18363
-lifx_emulator/devices/__init__.py,sha256=QlBTPnFErJcSKLvGyeDwemh7xcpjYvB_L5siKsjr3s8,1089
+lifx_emulator/server.py,sha256=UsecEjdxTvJrM3KXc1S8_YIkQIBX9Yi8WnBnja67Og8,18395
+lifx_emulator/devices/__init__.py,sha256=Cfr2L1XqtZcxSTaSFcq0TdQnAjjT4PoGiiMxge3eMI0,1210
 lifx_emulator/devices/device.py,sha256=w7Y9VYux3cyGus9mFmruFn6WYtoD7zwhzCL2xrICY-Q,17180
-lifx_emulator/devices/manager.py,sha256=XDrT82um5sgNpNihLj5RsNvHqdVI1bK9YY2eBzWIcf0,8162
+lifx_emulator/devices/manager.py,sha256=5mc1f8sB_vVYvxwmixFfpbQHVK7VPtBJIE7ChjVCEGk,9961
 lifx_emulator/devices/observers.py,sha256=-KnUgFcKdhlNo7CNVstP-u0wU2W0JAGg055ZPV15Sj0,3874
 lifx_emulator/devices/persistence.py,sha256=9Mhj46-xrweOmyzjORCi2jKIwa8XJWpQ5CgaKcw6U98,10513
 lifx_emulator/devices/state_restorer.py,sha256=eDsRSW-2RviP_0Qlk2DHqMaB-zhV0X1cNQECv2lD1qc,9809
@@ -39,9 +39,9 @@ lifx_emulator/repositories/__init__.py,sha256=x-ncM6T_Q7jNrwhK4a1uAyMrTGHHGeUzPS
 lifx_emulator/repositories/device_repository.py,sha256=KsXVg2sg7PGSTsK_PvDYeHHwEPM9Qx2ZZF_ORncBrYQ,3929
 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=1cX399JcTYVo29-8Rc4BwYPRty7sMR4fcn0njGfspZg,4504
+lifx_emulator/scenarios/manager.py,sha256=pp_XHkEbVofwgng5pYAV8lL5eQM6tubte5Dq4hAlOCA,11377
+lifx_emulator/scenarios/models.py,sha256=1OfQWIr3yEwI5IUTBPewxCvagNNhoLaoqfEp3fZJTtQ,4503
 lifx_emulator/scenarios/persistence.py,sha256=3vjtPNFYfag38tUxuqxkGpWhQ7uBitc1rLroSAuw9N8,8881
-lifx_emulator_core-3.4.0.dist-info/METADATA,sha256=FvDJG20jN-BGRJ03z6HG69c7eJ5E27zhV6EuVIB-qsA,3217
-lifx_emulator_core-3.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-lifx_emulator_core-3.4.0.dist-info/RECORD,,
+lifx_emulator_core-3.5.0.dist-info/METADATA,sha256=BEWJae_4f4ETk31sHpK_dEruIRohKUs5iD9pqJD6VsE,3217
+lifx_emulator_core-3.5.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+lifx_emulator_core-3.5.0.dist-info/RECORD,,