homebridge-kasa-python 2.5.13 → 2.5.15

package/dist/python/kasaApi.py

@@ -1,7 +1,7 @@
 import asyncio, eventlet, eventlet.wsgi, json, os, requests, sys, traceback
 from flask import Flask, request, jsonify
 from flask_socketio import SocketIO
-from kasa import Credentials, Discover, Device, UnsupportedDeviceException
+from kasa import Discover, Device, UnsupportedDeviceException
 from loguru import logger
 
 app = Flask(__name__)
@@ -52,7 +52,6 @@ async def discover_devices(username=None, password=None, additional_broadcasts=N
     app.logger.debug("Starting device discovery")
     devices = {}
     broadcasts = ["255.255.255.255"] + (additional_broadcasts or [])
-    creds = Credentials(username, password) if username and password else None
     
     def on_unsupported(ip):
         app.logger.warning(f"Unsupported device found: {ip}")
@@ -60,12 +59,13 @@ async def discover_devices(username=None, password=None, additional_broadcasts=N
     for broadcast in broadcasts:
         try:
             app.logger.debug(f"Starting discovery on broadcast: {broadcast}")
-            if creds is not None:
+            if username is not None and password is not None:
                 app.logger.debug(f"Using credentials for discovery on broadcast: {broadcast}")
                 try:
                     discovered_devices = await Discover.discover(
                         target=broadcast,
-                        credentials=creds,
+                        username=username,
+                        password=password,
                         on_unsupported=lambda device: on_unsupported(device.host)
                     )
                 except Exception as e:
@@ -102,8 +102,12 @@ async def discover_devices(username=None, password=None, additional_broadcasts=N
                 app.logger.debug(f"Manual device {host} already exists in devices, skipping.")
                 continue
             try:
-                app.logger.debug(f"Discovering manual device: {host}")
-                discovered_device = await Discover.discover_single(host=host, credentials=creds)
+                if username is not None and password is not None:
+                    app.logger.debug(f"Discovering manual device with credentials: {host}")
+                    discovered_device = await Discover.discover_single(host=host, username=username, password=password)
+                else:
+                    app.logger.debug(f"Discovering manual device without credentials: {host}")
+                    discovered_device = await Discover.discover_single(host=host)
                 if discovered_device:
                     if hasattr(discovered_device, 'device_type'):
                         devices[host] = discovered_device
@@ -206,8 +210,8 @@ def run_async(func, *args):
 @app.route('/discover', methods=['POST'])
 def discover():
     auth = request.authorization
-    username = f"'{auth.username}'" if auth else None
-    password = f"'{auth.password}'" if auth else None
+    username = f'{auth.username}' if auth else None
+    password = f'{auth.password}' if auth else None
     additional_broadcasts = request.json.get('additionalBroadcasts', [])
     manual_devices = request.json.get('manualDevices', [])
     app.logger.debug(f"Starting device discovery with additionalBroadcasts: {additional_broadcasts} and manualDevices: {manual_devices}")

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge Kasa Python",
   "name": "homebridge-kasa-python",
-  "version": "2.5.13",
+  "version": "2.5.15",
   "description": "Plugin that uses Python-Kasa API to communicate with Kasa Devices.",
   "license": "MIT",
   "type": "module",