python-kasa · ZeliardM · Sep 29, 2025 · Sep 29, 2025 · Sep 29, 2025 · Sep 29, 2025
diff --git a/README.md b/README.md
@@ -187,7 +187,7 @@ The following devices have been tested and confirmed as working. If your device
 ### Supported Kasa devices
 
 - **Plugs**: EP10, EP25[^2], HS100[^2], HS103, HS105, HS110, KP100, KP105, KP115, KP125, KP125M[^1], KP401
-- **Power Strips**: EP40, EP40M[^1], HS107, HS300, KP200, KP303, KP400
+- **Power Strips**: EP40, EP40M[^1], HS107, HS300[^2], KP200, KP303, KP400
 - **Wall Switches**: ES20M, HS200[^2], HS210, HS220[^2], KP405, KS200, KS200M, KS205[^1], KS220, KS220M, KS225[^1], KS230, KS240[^1]
 - **Bulbs**: KL110, KL110B, KL120, KL125, KL130, KL135, KL50, KL60, LB100, LB110, LB130
 - **Light Strips**: KL400L10, KL400L5, KL420L5, KL430

diff --git a/SUPPORTED.md b/SUPPORTED.md
@@ -68,6 +68,7 @@ Some newer Kasa devices require authentication. These are marked with [^1] in th
   - Hardware: 1.0 (US) / Firmware: 1.0.21
   - Hardware: 2.0 (US) / Firmware: 1.0.12
   - Hardware: 2.0 (US) / Firmware: 1.0.3
+  - Hardware: 2.0 (US) / Firmware: 1.1.2[^1]
 - **KP200**
   - Hardware: 3.0 (US) / Firmware: 1.0.3
 - **KP303**

diff --git a/devtools/dump_devinfo.py b/devtools/dump_devinfo.py
@@ -303,6 +303,7 @@ def capture_raw(discovered: DiscoveredRaw):
                 login_version=dr.mgt_encrypt_schm.lv,
                 https=dr.mgt_encrypt_schm.is_support_https,
                 http_port=dr.mgt_encrypt_schm.http_port,
+                new_klap=dr.mgt_encrypt_schm.new_klap,
             )
             dc = DeviceConfig(
                 host=host,
@@ -320,11 +321,16 @@ def capture_raw(discovered: DiscoveredRaw):
                 batch_size=batch_size,
             )
         elif device_family and encrypt_type:
+            new_klap = None
+            if encrypt_type == DeviceEncryptionType.Klapv2.value:
+                encrypt_type = DeviceEncryptionType.Klap.value
+                new_klap = True
             ctype = DeviceConnectionParameters(
                 DeviceFamily(device_family),
                 DeviceEncryptionType(encrypt_type),
                 login_version,
                 https,
+                new_klap=new_klap,
             )
             config = DeviceConfig(
                 host=host,

diff --git a/kasa/cli/discover.py b/kasa/cli/discover.py
@@ -15,6 +15,7 @@
     Discover,
     UnsupportedDeviceError,
 )
+from kasa.deviceconfig import DeviceConnectionParameters, DeviceEncryptionType
 from kasa.discover import (
     NEW_DISCOVERY_REDACTORS,
     ConnectAttempt,
@@ -59,6 +60,13 @@ def _discover_is_root_cmd(ctx: click.Context) -> bool:
     )
 
 
+def _get_cli_encrypt_type(cparams: DeviceConnectionParameters) -> str:
+    """Return the encryption type value needed to recreate the connection."""
+    if cparams.new_klap:
+        return DeviceEncryptionType.Klapv2.value
+    return cparams.encryption_type.value
+
+
 @discover.command()
 @click.pass_context
 async def detail(ctx: click.Context) -> DeviceDict:
@@ -275,10 +283,11 @@ def on_attempt(connect_attempt: ConnectAttempt, success: bool) -> None:
     )
     if dev:
         cparams = dev.config.connection_type
+        encrypt_type = _get_cli_encrypt_type(cparams)
         echo("Managed to connect, cli options to connect are:")
         echo(
             f"--device-family {cparams.device_family.value} "
-            f"--encrypt-type {cparams.encryption_type.value} "
+            f"--encrypt-type {encrypt_type} "
             f"{'--https' if cparams.https else '--no-https'}"
         )
         return {host: dev}

diff --git a/kasa/cli/main.py b/kasa/cli/main.py
@@ -325,11 +325,17 @@ async def cli(
         if not encrypt_type:
             encrypt_type = "KLAP"
 
+        new_klap = None
+        if encrypt_type and encrypt_type == DeviceEncryptionType.Klapv2.value:
+            encrypt_type = DeviceEncryptionType.Klap.value
+            new_klap = True
+
         ctype = DeviceConnectionParameters(
             DeviceFamily(device_family),
             DeviceEncryptionType(encrypt_type),
             login_version,
             https,
+            new_klap=new_klap,
         )
         config = DeviceConfig(
             host=host,

diff --git a/kasa/device_factory.py b/kasa/device_factory.py
@@ -104,21 +104,20 @@ def _perf_log(has_params: bool, perf_type: str) -> None:
     device_class: type[Device] | None
     device: Device | None = None
 
-    if isinstance(protocol, IotProtocol) and isinstance(
-        protocol._transport, XorTransport
-    ):
-        info = await protocol.query(GET_SYSINFO_QUERY)
-        _perf_log(True, "get_sysinfo")
-        device_class = get_device_class_from_sys_info(info)
-        device = device_class(config.host, protocol=protocol)
-        device.update_from_discover_info(info)
-        await device.update()
-        _perf_log(True, "update")
-        return device
-    elif device_class := get_device_class_from_family(
+    if device_class := get_device_class_from_family(
         config.connection_type.device_family.value, https=config.connection_type.https
     ):
-        device = device_class(host=config.host, protocol=protocol)
+        if issubclass(device_class, IotDevice):
+            # IoT devices report a generic device family (e.g. IOT.SMARTPLUGSWITCH)
+            # that does not distinguish plug/strip/switch/etc.  Query sysinfo for
+            # the precise subclass regardless of which transport is in use.
+            info = await protocol.query(GET_SYSINFO_QUERY)
+            _perf_log(True, "get_sysinfo")
+            device_class = get_device_class_from_sys_info(info)
+            device = device_class(config.host, protocol=protocol)
+            device.update_from_discover_info(info)
+        else:
+            device = device_class(host=config.host, protocol=protocol)
         await device.update()
         _perf_log(True, "update")
         return device
@@ -146,7 +145,10 @@ def get_device_class_from_sys_info(sysinfo: dict[str, Any]) -> type[IotDevice]:
 
 
 def get_device_class_from_family(
-    device_type: str, *, https: bool, require_exact: bool = False
+    device_type: str,
+    *,
+    https: bool,
+    require_exact: bool = False,
 ) -> type[Device] | None:
     """Return the device class from the type name."""
     supported_device_types: dict[str, type[Device]] = {
@@ -221,6 +223,7 @@ def get_protocol(config: DeviceConfig, *, strict: bool = False) -> BaseProtocol
         + "."
         + ctype.encryption_type.value
         + (".HTTPS" if ctype.https else "")
+        + (".NEW_KLAP" if ctype.new_klap else "")
     )
 
     _LOGGER.debug("Finding transport for %s", protocol_transport_key)
@@ -229,6 +232,7 @@ def get_protocol(config: DeviceConfig, *, strict: bool = False) -> BaseProtocol
     ] = {
         "IOT.XOR": (IotProtocol, XorTransport),
         "IOT.KLAP": (IotProtocol, KlapTransport),
+        "IOT.KLAP.NEW_KLAP": (IotProtocol, KlapTransportV2),
         "SMART.AES": (SmartProtocol, AesTransport),
         "SMART.KLAP": (SmartProtocol, KlapTransportV2),
         "SMART.KLAP.HTTPS": (SmartProtocol, KlapTransportV2),

diff --git a/kasa/deviceconfig.py b/kasa/deviceconfig.py
@@ -62,6 +62,7 @@ class DeviceEncryptionType(Enum):
     Klap = "KLAP"
     Aes = "AES"
     Xor = "XOR"
+    Klapv2 = "KLAPV2"
 
 
 class DeviceFamily(Enum):
@@ -101,6 +102,7 @@ class DeviceConnectionParameters(_DeviceConfigBaseMixin):
     login_version: int | None = None
     https: bool = False
     http_port: int | None = None
+    new_klap: bool | None = None
 
     @staticmethod
     def from_values(
@@ -110,6 +112,7 @@ def from_values(
         login_version: int | None = None,
         https: bool | None = None,
         http_port: int | None = None,
+        new_klap: bool | None = None,
     ) -> DeviceConnectionParameters:
         """Return connection parameters from string values."""
         try:
@@ -121,6 +124,7 @@ def from_values(
                 login_version,
                 https,
                 http_port=http_port,
+                new_klap=new_klap,
             )
         except (ValueError, TypeError) as ex:
             raise KasaException(