python-swidget 1.4.2__tar.gz → 1.4.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {python_swidget-1.4.2 → python_swidget-1.4.4}/PKG-INFO +1 -1
- {python_swidget-1.4.2 → python_swidget-1.4.4}/pyproject.toml +1 -1
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/__init__.py +1 -0
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/discovery.py +10 -9
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/swidgetdevice.py +15 -0
- {python_swidget-1.4.2 → python_swidget-1.4.4}/README.md +0 -0
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/cli.py +0 -0
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/exceptions.py +0 -0
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/provision.py +0 -0
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/py.typed +0 -0
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/swidgetdimmer.py +0 -0
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/swidgetoutlet.py +0 -0
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/swidgetswitch.py +0 -0
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/swidgettimerswitch.py +0 -0
- {python_swidget-1.4.2 → python_swidget-1.4.4}/swidget/websocket.py +0 -0
|
@@ -43,19 +43,20 @@ async def detect_secure(host: str, timeout: float = DETECT_TIMEOUT_SEC) -> bool:
|
|
|
43
43
|
timeout_obj = ClientTimeout(total=timeout)
|
|
44
44
|
connector = TCPConnector(ssl=False, force_close=True)
|
|
45
45
|
async with ClientSession(connector=connector, timeout=timeout_obj) as session:
|
|
46
|
+
# Try plaintext first: it's the cheap path (no TLS handshake on the
|
|
47
|
+
# MCU) and a 200 response unambiguously means plaintext mode.
|
|
46
48
|
try:
|
|
47
|
-
async with session.get(f"
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
if resp.status in (200, 403):
|
|
51
|
-
return True
|
|
49
|
+
async with session.get(f"http://{host}/api/v1/summary") as resp:
|
|
50
|
+
if resp.status == 200:
|
|
51
|
+
return False
|
|
52
52
|
except (ClientError, asyncio.TimeoutError):
|
|
53
53
|
pass
|
|
54
54
|
|
|
55
|
+
# Fall back to HTTPS. A 403 means the firmware is enforcing auth.
|
|
55
56
|
try:
|
|
56
|
-
async with session.get(f"
|
|
57
|
-
if resp.status ==
|
|
58
|
-
return
|
|
57
|
+
async with session.get(f"https://{host}/api/v1/summary") as resp:
|
|
58
|
+
if resp.status == 403:
|
|
59
|
+
return True
|
|
59
60
|
except (ClientError, asyncio.TimeoutError):
|
|
60
61
|
pass
|
|
61
62
|
|
|
@@ -158,7 +159,7 @@ async def discover_single(
|
|
|
158
159
|
|
|
159
160
|
def _get_device_class(device_type: DeviceType) -> Type[SwidgetDevice]:
|
|
160
161
|
"""Find SmartDevice subclass for device described by passed data."""
|
|
161
|
-
if device_type
|
|
162
|
+
if device_type in (DeviceType.Outlet, DeviceType.Outlet20A):
|
|
162
163
|
return SwidgetOutlet
|
|
163
164
|
elif device_type == DeviceType.Switch:
|
|
164
165
|
return SwidgetSwitch
|
|
@@ -26,11 +26,21 @@ class DeviceType(Enum):
|
|
|
26
26
|
|
|
27
27
|
Dimmer = "dimmer"
|
|
28
28
|
Outlet = "outlet"
|
|
29
|
+
Outlet20A = "outlet_20a"
|
|
29
30
|
Switch = "switch"
|
|
30
31
|
TimerSwitch = "pana_switch"
|
|
31
32
|
RelaySwitch = "relay_switch"
|
|
32
33
|
Unknown = -1
|
|
33
34
|
|
|
35
|
+
@classmethod
|
|
36
|
+
def _missing_(cls, value: object) -> "DeviceType":
|
|
37
|
+
"""Map unknown values to ``Unknown`` instead of raising ValueError.
|
|
38
|
+
|
|
39
|
+
Lets the SDK report "Unknown device type: ..." with a usable
|
|
40
|
+
message rather than crashing on a future firmware variant.
|
|
41
|
+
"""
|
|
42
|
+
return cls.Unknown
|
|
43
|
+
|
|
34
44
|
|
|
35
45
|
class InsertType(Enum):
|
|
36
46
|
"""Insert type enum."""
|
|
@@ -46,6 +56,11 @@ class InsertType(Enum):
|
|
|
46
56
|
WD = "WATER DETECTOR"
|
|
47
57
|
Unknown = -1
|
|
48
58
|
|
|
59
|
+
@classmethod
|
|
60
|
+
def _missing_(cls, value: object) -> "InsertType":
|
|
61
|
+
"""Map unknown values to ``Unknown`` instead of raising ValueError."""
|
|
62
|
+
return cls.Unknown
|
|
63
|
+
|
|
49
64
|
|
|
50
65
|
class SelfDiagnosticErrorCodes(Enum):
|
|
51
66
|
"""Self-Diagnostic error codes."""
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|