homebridge-kasa-python 2.7.2-beta.2 → 2.7.2-beta.4

package/README.md

@@ -153,6 +153,7 @@ Some newer Kasa devices require authentication. These are marked with [*] in the
 - **KS225**
   - Hardware: 1.0 (US) / Firmware: 1.0.2[*]
   - Hardware: 1.0 (US) / Firmware: 1.1.0[*]
+  - Hardware: 1.0 (US) / Firmware: 1.1.1[*]
 - **KS230**
   - Hardware: 1.0 (US) / Firmware: 1.0.14
   - Hardware: 2.0 (US) / Firmware: 1.0.11
@@ -183,6 +184,8 @@ Some newer Kasa devices require authentication. These are marked with [*] in the
 - **KL60**
   - Hardware: 1.0 (UN) / Firmware: 1.1.4
   - Hardware: 1.0 (US) / Firmware: 1.1.13
+- **LB100**
+  - Hardware: 1.0 (US) / Firmware: 1.8.11
 - **LB110**
   - Hardware: 1.0 (US) / Firmware: 1.8.11
 
@@ -226,6 +229,7 @@ All Tapo devices require authentication.<br>Hub-Connected Devices may work acros
   - Hardware: 1.0.0 (US) / Firmware: 1.3.7
   - Hardware: 1.0.0 (US) / Firmware: 1.4.0
 - **P110**
+  - Hardware: 1.0 (AU) / Firmware: 1.3.1
   - Hardware: 1.0 (EU) / Firmware: 1.0.7
   - Hardware: 1.0 (EU) / Firmware: 1.2.3
   - Hardware: 1.0 (UK) / Firmware: 1.3.0
@@ -278,10 +282,13 @@ All Tapo devices require authentication.<br>Hub-Connected Devices may work acros
 - **L510E**
   - Hardware: 3.0 (US) / Firmware: 1.0.5
   - Hardware: 3.0 (US) / Firmware: 1.1.2
+- **L530B**
+  - Hardware: 3.0 (EU) / Firmware: 1.1.9
 - **L530E**
   - Hardware: 3.0 (EU) / Firmware: 1.0.6
   - Hardware: 3.0 (EU) / Firmware: 1.1.0
   - Hardware: 3.0 (EU) / Firmware: 1.1.6
+  - Hardware: 2.0 (TW) / Firmware: 1.1.1
   - Hardware: 2.0 (US) / Firmware: 1.1.0
 - **L630**
   - Hardware: 1.0 (EU) / Firmware: 1.1.2
@@ -300,12 +307,15 @@ All Tapo devices require authentication.<br>Hub-Connected Devices may work acros
   - Hardware: 1.0 (US) / Firmware: 1.1.0
   - Hardware: 1.0 (US) / Firmware: 1.1.3
 - **L930-5**
+  - Hardware: 1.0 (EU) / Firmware: 1.2.5
   - Hardware: 1.0 (US) / Firmware: 1.1.2
 
 ### Cameras
 
 - **C100**
   - Hardware: 4.0 / Firmware: 1.3.14
+- **C110**
+  - Hardware: 2.0 (EU) / Firmware: 1.4.3
 - **C210**
   - Hardware: 2.0 / Firmware: 1.3.11
   - Hardware: 2.0 (EU) / Firmware: 1.4.2
@@ -344,6 +354,7 @@ All Tapo devices require authentication.<br>Hub-Connected Devices may work acros
 ### Hubs
 
 - **H100**
+  - Hardware: 1.0 (AU) / Firmware: 1.5.23
   - Hardware: 1.0 (EU) / Firmware: 1.2.3
   - Hardware: 1.0 (EU) / Firmware: 1.5.10
   - Hardware: 1.0 (EU) / Firmware: 1.5.5
@@ -362,6 +373,7 @@ All Tapo devices require authentication.<br>Hub-Connected Devices may work acros
   - Hardware: 1.0 (EU) / Firmware: 1.12.0
 - **T100**
   - Hardware: 1.0 (EU) / Firmware: 1.12.0
+  - Hardware: 1.0 (US) / Firmware: 1.12.0
 - **T110**
   - Hardware: 1.0 (EU) / Firmware: 1.8.0
   - Hardware: 1.0 (EU) / Firmware: 1.9.0

package/dist/devices/kasaDevices.js

@@ -59,6 +59,7 @@ export const LightBulbs = [
     'KL135',
     'KL50',
     'KL60',
+    'LB100',
     'LB110',
     'L510',
     'L530',
@@ -73,6 +74,7 @@ export const LightBulbs = [
 ];
 export const Unsupported = [
     'C100',
+    'C110',
     'C210',
     'C225',
     'C325WB',

package/dist/devices/kasaDevices.js.map

@@ -1 +1 @@
-{"version":3,"file":"kasaDevices.js","sourceRoot":"","sources":["../../src/devices/kasaDevices.ts"],"names":[],"mappings":"AA4FA,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,QAAQ;IACR,OAAO;IACP,MAAM;IACN,MAAM;IACN,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,MAAM;IACN,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,QAAQ;IACR,OAAO;IACP,OAAO;IACP,QAAQ;IACR,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,MAAM;IACN,OAAO;CACR,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,MAAM;IACN,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,SAAS;IACT,SAAS;IACT,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,MAAM;IACN,MAAM;IACN,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,MAAM;IACN,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;IACP,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;CACP,CAAC"}
+{"version":3,"file":"kasaDevices.js","sourceRoot":"","sources":["../../src/devices/kasaDevices.ts"],"names":[],"mappings":"AA4FA,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,QAAQ;IACR,OAAO;IACP,MAAM;IACN,MAAM;IACN,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,MAAM;IACN,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,QAAQ;IACR,OAAO;IACP,OAAO;IACP,QAAQ;IACR,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,MAAM;IACN,OAAO;CACR,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,SAAS;IACT,SAAS;IACT,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,MAAM;IACN,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;IACP,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;CACP,CAAC"}

package/dist/python/kasaApi.py

@@ -114,7 +114,7 @@ async def discover_devices(
     password: Optional[str] = None,
     additional_broadcasts: Optional[List[str]] = None,
     manual_devices: Optional[List[str]] = None,
-    exlude_mac_addresses: Optional[List[str]] = None,
+    exclude_mac_addresses: Optional[List[str]] = None,
 ) -> Dict[str, Any]:
     devices = {}
     devices_to_remove = []
@@ -132,12 +132,15 @@ async def discover_devices(
         except (UnsupportedDeviceError, AuthenticationError) as e:
             print(f"{e.__class__.__name__}: {device.host}", file=sys.stderr)
             devices_to_remove.append(device.host)
+            await safe_disconnect(device)
         except Exception as e:
             print(f"Error during discovery: {e}", file=sys.stderr)
             devices_to_remove.append(device.host)
+            await safe_disconnect(device)
 
     async def discover_on_broadcast(broadcast: str):
         print(f"Discovering on broadcast: {broadcast}")
+        discovered = {}
         try:
             discovered = await Discover.discover(
                 target=broadcast, credentials=credentials, on_discovered=on_discovered
@@ -148,6 +151,11 @@ async def discover_devices(
             devices.update(discovered)
         except Exception as e:
             print(f"Error during broadcast discovery: {e}", file=sys.stderr)
+        finally:
+            for host in list(discovered.keys()):
+                if host in device_config_cache:
+                    del devices[host]
+            devices.update(discovered)
 
     async def discover_manual_device(host: str):
         if host in devices or host in device_config_cache:
@@ -159,6 +167,8 @@ async def discover_devices(
             devices[host] = device
         except Exception as e:
             print(f"Error during manual device discovery: {e}", file=sys.stderr)
+            devices_to_remove.append(host)
+            await safe_disconnect(device)
 
     discover_tasks = [discover_on_broadcast(bc) for bc in broadcasts]
     manual_discover_tasks = [discover_manual_device(host) for host in (manual_devices or [])]
@@ -171,14 +181,14 @@ async def discover_devices(
 
     for host in devices:
         device = devices[host]
-        if device.mac in (exlude_mac_addresses or []):
+        if device.mac in (exclude_mac_addresses or []):
             devices_to_remove.append(host)
 
     for host in devices_to_remove:
         device = devices.pop(host, None)
         if device:
             print(f"Removing device: {device.alias}")
-            await device.disconnect()
+            await safe_disconnect(device)
 
     for host, device_config_dict in device_config_cache.items():
         device = devices.get(host)
@@ -194,8 +204,7 @@ async def discover_devices(
             await device.update()
         except Exception as e:
             print(f"Error checking device: {e}", file=sys.stderr)
-            if device:
-                await device.disconnect()
+            await safe_disconnect(device)
             continue
 
         try:
@@ -207,11 +216,11 @@ async def discover_devices(
                         print(f"Skipping device {device.alias} due to Native HomeKit support")
                     if matter_component:
                         print(f"Skipping device {device.alias} due to Matter support")
-                    await device.disconnect()
+                    await safe_disconnect(device)
                     continue
         except Exception as e:
             print(f"Error checking HomeKit and Matter modules: {e}", file=sys.stderr)
-            await device.disconnect()
+            await safe_disconnect(device)
             continue
 
         device_type = device.device_type.value
@@ -223,7 +232,7 @@ async def discover_devices(
             update_tasks.append(create_device_info(host, device))
         else:
             print(f"Skipping unsupported device: {host}")
-            await device.disconnect()
+            await safe_disconnect(device)
 
     results = await asyncio.gather(*update_tasks, return_exceptions=True)
 
@@ -231,26 +240,12 @@ async def discover_devices(
         host, info = result
         if isinstance(info, Exception):
             print(f"Error creating device info for host {host}: {info}", file=sys.stderr)
-            try:
-                device_config_dict = device_config_cache.get(host)
-                if device_config_dict:
-                    device_config = DeviceConfig.from_dict(device_config_dict)
-                    device = await get_or_connect_device(host, device_config)
-                    if device:
-                        await device.disconnect()
-                device_cache.pop(host, None)
-            except Exception as e:
-                print(f"Error disconnecting device: {e}", file=sys.stderr)
+            await handle_device_error(host)
             continue
         print(f"Device info created for device: {host}")
         all_device_info[host] = info
 
-    for host, device in devices.items():
-        try:
-            await device.disconnect()
-            print(f"Disconnected device: {host}")
-        except Exception as e:
-            print(f"Error disconnecting device {host}: {e}", file=sys.stderr)
+    await disconnect_all_devices(devices)
 
     return all_device_info
 
@@ -287,21 +282,7 @@ async def get_sys_info(host: str) -> Dict[str, Any]:
             device_info = custom_serializer(device)
             return {"sys_info": device_info["sys_info"]}
     except Exception as e:
-        try:
-            if device:
-                await device.disconnect()
-            device_cache.pop(host, None)
-            device_lock = device_lock_cache.get(host, asyncio.Lock())
-            async with device_lock:
-                device = await get_or_connect_device(host, device_config)
-                device_info = custom_serializer(device)
-                return {"sys_info": device_info["sys_info"]}
-        except Exception as e:
-            print(f"GetSysInfo failed: {e}", file=sys.stderr)
-            if device:
-                await device.disconnect()
-            device_cache.pop(host, None)
-            return {"error": str(e)}
+        return await handle_device_error(host, e)
 
 async def get_or_connect_device(host: str, device_config: DeviceConfig) -> Device:
     try:
@@ -313,9 +294,7 @@ async def get_or_connect_device(host: str, device_config: DeviceConfig) -> Devic
         return device
     except Exception as e:
         print(f"Failed to connect to device: {e}", file=sys.stderr)
-        if device:
-            await device.disconnect()
-        device_cache.pop(host, None)
+        await safe_disconnect(device)
         raise
 
 async def control_device(
@@ -334,20 +313,7 @@ async def control_device(
             device = await get_or_connect_device(host, device_config)
             return await perform_device_action(device, feature, action, value, child_num)
     except Exception as e:
-        try:
-            if device:
-                await device.disconnect()
-            device_cache.pop(host, None)
-            device_lock = device_lock_cache.get(host, asyncio.Lock())
-            async with device_lock:
-                device = await get_or_connect_device(host, device_config)
-                return await perform_device_action(device, feature, action, value, child_num)
-        except Exception as e:
-            print(f"ControlDevice failed: {e}", file=sys.stderr)
-            if device:
-                await device.disconnect()
-            device_cache.pop(host, None)
-            return {"error": str(e)}
+        return await handle_device_error(host, e)
 
 async def perform_device_action(
     device: Device,
@@ -421,8 +387,8 @@ async def discover_route():
         data: Dict[str, Any] = await request.get_json()
         additional_broadcasts = data.get('additionalBroadcasts', [])
         manual_devices = data.get('manualDevices', [])
-        exlude_mac_addresses = data.get('excludeMacAddresses', [])
-        devices_info = await discover_devices(username, password, additional_broadcasts, manual_devices, exlude_mac_addresses)
+        exclude_mac_addresses = data.get('excludeMacAddresses', [])
+        devices_info = await discover_devices(username, password, additional_broadcasts, manual_devices, exclude_mac_addresses)
         return jsonify(devices_info)
     except Exception as e:
         print(f"Discover route error: {e}", file=sys.stderr)
@@ -463,4 +429,29 @@ async def cleanup():
     print("Cleaning up and disconnecting all devices.")
     await close_all_connections()
     device_lock_cache.clear()
-    device_config_cache.clear()
+    device_config_cache.clear()
+
+async def safe_disconnect(device: Optional[Device]):
+    if device:
+        try:
+            await device.disconnect()
+        except Exception as e:
+            print(f"Error disconnecting device: {e}", file=sys.stderr)
+
+async def handle_device_error(host: str, error: Optional[Exception] = None) -> Dict[str, Any]:
+    print(f"Handling device error for host {host}: {error}", file=sys.stderr)
+    try:
+        device_config_dict = device_config_cache.get(host)
+        if device_config_dict:
+            device_config = DeviceConfig.from_dict(device_config_dict)
+            device = await get_or_connect_device(host, device_config)
+            await safe_disconnect(device)
+        device_cache.pop(host, None)
+    except Exception as e:
+        print(f"Error during error handling: {e}", file=sys.stderr)
+    return {"error": str(error)}
+
+async def disconnect_all_devices(devices: Dict[str, Device]):
+    for host, device in devices.items():
+        await safe_disconnect(device)
+        print(f"Disconnected device: {host}")

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge Kasa Python",
   "name": "homebridge-kasa-python",
-  "version": "2.7.2-beta.2",
+  "version": "2.7.2-beta.4",
   "description": "Plugin that uses Python-Kasa API to communicate with Kasa Devices.",
   "license": "MIT",
   "type": "module",
@@ -13,8 +13,8 @@
     "url": "https://github.com/ZeliardM/homebridge-kasa-python/issues"
   },
   "engines": {
-    "homebridge": "^1.8.0 || ^2.0.0-beta.0",
-    "node": "^18.20.6 || ^20.18.3 || ^22.14.0 || ^23.8.0",
+    "homebridge": "^1.9.0 || ^2.0.0-beta.0",
+    "node": "^18.20.7 || ^20.19.0 || ^22.14.0",
     "python": "^3.11.0"
   },
   "main": "dist/index.js",
@@ -48,19 +48,19 @@
     "requirements.txt"
   ],
   "devDependencies": {
-    "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.20.0",
-    "@types/node": "^22.13.4",
-    "@typescript-eslint/parser": "^8.24.1",
-    "@stylistic/eslint-plugin": "^4.0.1",
-    "eslint": "^9.20.1",
-    "globals": "^15.15.0",
+    "@eslint/eslintrc": "^3.3.0",
+    "@eslint/js": "^9.22.0",
+    "@types/node": "^22.13.10",
+    "@typescript-eslint/parser": "^8.26.1",
+    "@stylistic/eslint-plugin": "^4.2.0",
+    "eslint": "^9.22.0",
+    "globals": "^16.0.0",
     "homebridge": "^2.0.0-beta.27",
     "node-persist": "^4.0.4",
     "nodemon": "^3.1.9",
     "rimraf": "^6.0.1",
     "ts-node": "^10.9.2",
-    "typescript-eslint": "^8.24.1"
+    "typescript-eslint": "^8.26.1"
   },
   "homepage": "https://github.com/ZeliardM/homebridge-kasa-python#readme",
   "funding": [
@@ -74,9 +74,9 @@
     }
   ],
   "dependencies": {
-    "axios": "^1.7.9",
+    "axios": "^1.8.3",
     "ts-essentials": "^10.0.4",
-    "typescript": "^5.7.3"
+    "typescript": "^5.8.2"
   },
   "overrides": {
     "node-persist": "^4.0.4"