python-swidget 1.4.9__tar.gz → 1.4.11__tar.gz

{python_swidget-1.4.9 → python_swidget-1.4.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-swidget
-Version: 1.4.9
+Version: 1.4.11
 Summary: Python API for Swidget smart devices
 Home-page: https://github.com/swidget/python-swidget
 License: GPL-3.0-or-later

{python_swidget-1.4.9 → python_swidget-1.4.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-swidget"
-version = "1.4.9"
+version = "1.4.11"
 description = "Python API for Swidget smart devices"
 license = "GPL-3.0-or-later"
 authors = ["Swidget"]

{python_swidget-1.4.9 → python_swidget-1.4.11}/swidget/discovery.py

@@ -17,7 +17,7 @@ from .swidgetswitch import SwidgetSwitch
 from .swidgettimerswitch import SwidgetTimerSwitch
 
 RESPONSE_SEC = 5
-SWIDGET_ST = "urn:swidget:pico:1"
+SWIDGET_STS = ("urn:swidget:pico:1", "urn:swidget:video:1")
 # Generous timeout: TLS handshakes on the device's MCU can take several
 # seconds on first connection.
 DETECT_TIMEOUT_SEC = 10
@@ -91,7 +91,7 @@ class SwidgetProtocol(ssdp.SimpleServiceDiscoveryProtocol):
         headers = {h[0]: h[1] for h in response.headers}
         mac_address = headers["USN"].split("-")[-1]
         ip_address = urlparse(headers["LOCATION"]).hostname
-        if headers["ST"] == SWIDGET_ST:
+        if headers["ST"] in SWIDGET_STS:
             device_type = headers["SERVER"].split(" ")[1].split("+")[0]
             insert_type = headers["SERVER"].split(" ")[1].split("+")[1].split("/")[0]
             friendly_name = headers["SERVER"].split("/")[2].strip('"')
@@ -116,17 +116,19 @@ async def discover_devices(timeout=RESPONSE_SEC):
         SwidgetProtocol, family=socket.AF_INET
     )
 
-    # Send out an M-SEARCH request, requesting Swidget service types.
-    search_request = ssdp.SSDPRequest(
-        "M-SEARCH",
-        headers={
-            "HOST": "239.255.255.250:1900",
-            "MAN": '"ssdp:discover"',
-            "MX": timeout,
-            "ST": SWIDGET_ST,
-        },
-    )
-    search_request.sendto(transport, (SwidgetProtocol.MULTICAST_ADDRESS, 1900))
+    # SSDP M-SEARCH matches one ST per request, so emit one packet per
+    # supported service type. Devices reply only to their matching ST.
+    for st in SWIDGET_STS:
+        search_request = ssdp.SSDPRequest(
+            "M-SEARCH",
+            headers={
+                "HOST": "239.255.255.250:1900",
+                "MAN": '"ssdp:discover"',
+                "MX": timeout,
+                "ST": st,
+            },
+        )
+        search_request.sendto(transport, (SwidgetProtocol.MULTICAST_ADDRESS, 1900))
     await asyncio.sleep(timeout)
     return devices
 

{python_swidget-1.4.9 → python_swidget-1.4.11}/swidget/swidgetdevice.py

@@ -22,14 +22,34 @@ _LOGGER = logging.getLogger(__name__)
 
 
 class DeviceType(Enum):
-    """Device type enum."""
+    """Device type enum.
+
+    Values mirror the host ``type`` strings documented in
+    ``swidget-sdk/docs/summary_description.md``. Add new entries here
+    when firmware introduces a new host type rather than letting it
+    silently resolve to ``Unknown``.
+    """
 
     Dimmer = "dimmer"
+    MultiDimmer = "multi_dimmer"
     Outlet = "outlet"
     Outlet20A = "outlet_20a"
     Switch = "switch"
     TimerSwitch = "pana_switch"
     RelaySwitch = "relay_switch"
+    PesnaFV05 = "pesna_fv05"
+    PesnaFV15 = "pesna_fv15"
+    PesnaFV20 = "pesna_fv20"
+    PesnaIB150 = "pesna_IB150"
+    PesnaIB160 = "pesna_IB160"
+    PesnaFV05G5 = "pesna_fv05_G5"
+    PesnaFV05WrongSlot = "pesna_fv05_wrong_slot"
+    PesnaUnrecognized = "pesna_unrecognized"
+    PesnaError = "pesna_error"
+    Alarm = "alarm"
+    XE300 = "xe300"
+    MalmosetBarrel = "malmoset_barrel"
+    Invalid = "invalid"
     Unknown = -1
 
     @classmethod
@@ -43,17 +63,39 @@ class DeviceType(Enum):
 
 
 class InsertType(Enum):
-    """Insert type enum."""
+    """Insert type enum.
+
+    Values mirror the insert ``type`` strings documented in
+    ``swidget-sdk/docs/summary_description.md``. Add new entries here
+    when firmware introduces a new insert type rather than letting it
+    silently resolve to ``Unknown``.
+    """
 
+    CONTROL = "control"
     USB = "USB"
-    THM = "TEMP HUMI MOTION"
-    TH = "TEMP HUMI"
-    AQ = "AIR QUALITY"
+    USB_C = "USB C"
     GL = "GUIDE LIGHT"
+    ADV_GUIDE = "ADV GUIDE"
     PO = "POWER OUT"
-    VIDEO = "video"  # This is not a mistake.
-    USBC = "USBC"
+    MOTION = "MOTION"
+    AQ = "AIR QUALITY"
+    TH = "TEMP HUMI"
+    THM = "TEMP HUMI MOTION"
+    ENVIRONMENTAL = "ENVIRONMENTAL"
+    SECURITY = "SECURITY"
+    CO2 = "CO2"
+    PM = "PM"
+    PM_CO2 = "PM CO2"
     WD = "WATER DETECTOR"
+    LIGHT_SENSOR = "LIGHT SENSOR"
+    DISTANCE = "DISTANCE"
+    DIRECT_LIGHTS = "DIRECT LIGHTS"
+    DUAL_LV_RELAY = "DUAL LV RELAY"
+    SINGLE_LV_RELAY = "SINGLE LV RELAY"
+    SAS = "SAS"
+    SPEAKER = "SPEAKER"
+    VIDEO = "video"  # This is not a mistake.
+    INVALID = "invalid"
     Unknown = -1
 
     @classmethod