python-swidget 1.4.0__tar.gz → 1.4.2__tar.gz

{python_swidget-1.4.0 → python_swidget-1.4.2}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: python-swidget
-Version: 1.4.0
+Version: 1.4.2
 Summary: Python API for Swidget smart devices
+Home-page: https://github.com/swidget/python-swidget
 License: GPL-3.0-or-later
 Author: Swidget
 Requires-Python: >=3.8,<4.0
@@ -12,8 +13,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
 Provides-Extra: docs
 Requires-Dist: aiohttp (>=3.8.1)
 Requires-Dist: anyio
@@ -22,13 +21,13 @@ Requires-Dist: importlib-metadata
 Requires-Dist: m2r (>=0,<1) ; extra == "docs"
 Requires-Dist: mistune (<2.0.0) ; extra == "docs"
 Requires-Dist: pydantic (>=2,<3)
-Requires-Dist: requests (==2.32.5)
+Requires-Dist: requests (>=2.32,<3.0)
 Requires-Dist: sphinx (>=4,<5) ; extra == "docs"
 Requires-Dist: sphinx_rtd_theme (>=0,<1) ; extra == "docs"
 Requires-Dist: sphinxcontrib-programoutput (>=0,<1) ; extra == "docs"
 Requires-Dist: ssdp (==1.1.1)
 Requires-Dist: types-requests (>=2.32.0,<3.0.0)
-Requires-Dist: urllib3 (==2.5.0)
+Requires-Dist: urllib3 (>=2.0,<3.0)
 Project-URL: Repository, https://github.com/swidget/python-swidget
 Description-Content-Type: text/markdown
 

{python_swidget-1.4.0 → python_swidget-1.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-swidget"
-version = "1.4.0"
+version = "1.4.2"
 description = "Python API for Swidget smart devices"
 license = "GPL-3.0-or-later"
 authors = ["Swidget"]
@@ -22,9 +22,9 @@ importlib-metadata = "*"
 asyncclick = ">=8"
 pydantic = "^2"
 ssdp = "1.1.1"
-requests = "2.32.5"
+requests = "^2.32"
 types-requests = "^2.32.0"
-urllib3 = '2.5.0'
+urllib3 = "^2.0"
 
 # required only for docs
 sphinx = { version = "^4", optional = true }

{python_swidget-1.4.0 → python_swidget-1.4.2}/swidget/__init__.py

@@ -14,7 +14,12 @@ to be handled by the user of the library.
 
 from importlib_metadata import version
 
-from swidget.discovery import SwidgetDiscoveredDevice, discover_devices, discover_single
+from swidget.discovery import (
+    SwidgetDiscoveredDevice,
+    detect_secure,
+    discover_devices,
+    discover_single,
+)
 from swidget.exceptions import SwidgetException
 from swidget.provision import provision_wifi
 from swidget.swidgetdevice import (

{python_swidget-1.4.0 → python_swidget-1.4.2}/swidget/discovery.py

@@ -6,6 +6,7 @@ from typing import Any, Type
 from urllib.parse import urlparse
 
 import ssdp
+from aiohttp import ClientError, ClientSession, ClientTimeout, TCPConnector
 
 from swidget.swidgetdevice import DeviceType, SwidgetDevice
 
@@ -17,10 +18,50 @@ from .swidgettimerswitch import SwidgetTimerSwitch
 
 RESPONSE_SEC = 5
 SWIDGET_ST = "urn:swidget:pico:1"
+# Generous timeout: TLS handshakes on the device's MCU can take several
+# seconds on first connection.
+DETECT_TIMEOUT_SEC = 10
 _LOGGER = logging.getLogger(__name__)
 devices = dict()
 
 
+async def detect_secure(host: str, timeout: float = DETECT_TIMEOUT_SEC) -> bool:
+    """Determine whether a Swidget device requires HTTPS+auth.
+
+    Probes ``/api/v1/summary`` over HTTPS first (no credentials). A 403
+    response means the firmware enforces auth — the device is in secure
+    mode. If HTTPS is unreachable, falls back to HTTP; a 200 there means
+    the device is in plaintext mode.
+
+    :param host: Hostname or IP of the device.
+    :param timeout: Per-request timeout in seconds. Defaults are generous
+        because the device performs TLS termination on a low-power MCU
+        and the first handshake can be several seconds.
+    :return: True if the device requires HTTPS+auth, False if plaintext.
+    :raises SwidgetException: If neither protocol returns a usable response.
+    """
+    timeout_obj = ClientTimeout(total=timeout)
+    connector = TCPConnector(ssl=False, force_close=True)
+    async with ClientSession(connector=connector, timeout=timeout_obj) as session:
+        try:
+            async with session.get(f"https://{host}/api/v1/summary") as resp:
+                # 403 = "auth required" → secure firmware.
+                # 200 without creds is unusual but still indicates HTTPS works.
+                if resp.status in (200, 403):
+                    return True
+        except (ClientError, asyncio.TimeoutError):
+            pass
+
+        try:
+            async with session.get(f"http://{host}/api/v1/summary") as resp:
+                if resp.status == 200:
+                    return False
+        except (ClientError, asyncio.TimeoutError):
+            pass
+
+    raise SwidgetException(f"Could not reach Swidget device at {host}")
+
+
 class SwidgetDiscoveredDevice:
     """Stub class to capture details about discovered devices."""