From a73e2a9ede191114b6cd47b761b840b3def1d6ec Mon Sep 17 00:00:00 2001 From: Teemu R Date: Sat, 24 Feb 2024 00:12:19 +0100 Subject: [PATCH] Add H100 fixtures (#737) One direct out of the box, another with upgraded fw & t315 --- README.md | 3 + devtools/dump_devinfo.py | 5 +- devtools/helpers/smartrequests.py | 11 +- kasa/smart/modules/firmware.py | 2 +- kasa/tests/conftest.py | 12 +- kasa/tests/fakeprotocol_smart.py | 16 + .../fixtures/smart/H100(EU)_1.0_1.2.3.json | 221 ++++++++++ .../fixtures/smart/H100(EU)_1.0_1.5.5.json | 391 ++++++++++++++++++ 8 files changed, 657 insertions(+), 4 deletions(-) create mode 100644 kasa/tests/fixtures/smart/H100(EU)_1.0_1.2.3.json create mode 100644 kasa/tests/fixtures/smart/H100(EU)_1.0_1.5.5.json diff --git a/README.md b/README.md index db1bad2d..4b45c822 100644 --- a/README.md +++ b/README.md @@ -317,6 +317,9 @@ At the moment, the following devices have been confirmed to work: * Tapo P300 * Tapo TP25 +#### Hubs + +* Tapo H100 ### Newer Kasa branded devices diff --git a/devtools/dump_devinfo.py b/devtools/dump_devinfo.py index 5ab736e9..8e012606 100644 --- a/devtools/dump_devinfo.py +++ b/devtools/dump_devinfo.py @@ -65,7 +65,10 @@ def scrub(res): "alias", "bssid", "channel", - "original_device_id", # for child devices + "original_device_id", # for child devices on strips + "parent_device_id", # for hub children + "setup_code", # matter + "setup_payload", # matter ] for k, v in res.items(): diff --git a/devtools/helpers/smartrequests.py b/devtools/helpers/smartrequests.py index 27992519..29298e2e 100644 --- a/devtools/helpers/smartrequests.py +++ b/devtools/helpers/smartrequests.py @@ -356,7 +356,7 @@ COMPONENT_REQUESTS = { "energy_monitoring": SmartRequest.energy_monitoring_list(), "power_protection": SmartRequest.power_protection_list(), "current_protection": [], # overcurrent in device_info - "matter": [], + "matter": [SmartRequest.get_raw_request("get_matter_setup_info")], "preset": [SmartRequest.get_preset_rules()], "brightness": [], # in device_info "color": [], # in device_info @@ -372,4 +372,13 @@ COMPONENT_REQUESTS = { "music_rhythm": [], # music_rhythm_enable in device_info "segment": [SmartRequest.get_raw_request("get_device_segment")], "segment_effect": [SmartRequest.get_raw_request("get_segment_effect_rule")], + "device_load": [SmartRequest.get_raw_request("get_device_load_info")], + "child_quick_setup": [ + SmartRequest.get_raw_request("get_support_child_device_category") + ], + "alarm": [ + SmartRequest.get_raw_request("get_support_alarm_type_list"), + SmartRequest.get_raw_request("get_alarm_configure"), + ], + "alarm_logs": [SmartRequest.get_raw_request("get_alarm_triggers")], } diff --git a/kasa/smart/modules/firmware.py b/kasa/smart/modules/firmware.py index 80eca4df..4d1f846c 100644 --- a/kasa/smart/modules/firmware.py +++ b/kasa/smart/modules/firmware.py @@ -103,4 +103,4 @@ class Firmware(SmartModule): async def set_auto_update_enabled(self, enabled: bool): """Change autoupdate setting.""" data = {**self.data["get_auto_update_info"], "enable": enabled} - await self.call("set_auto_update_info", data) #{"enable": enabled}) + await self.call("set_auto_update_info", data) # {"enable": enabled}) diff --git a/kasa/tests/conftest.py b/kasa/tests/conftest.py index c6764108..431da463 100644 --- a/kasa/tests/conftest.py +++ b/kasa/tests/conftest.py @@ -126,6 +126,8 @@ DIMMERS = { *DIMMERS_SMART, } +HUBS_SMART = {"H100"} + WITH_EMETER_IOT = {"HS110", "HS300", "KP115", "KP125", *BULBS_IOT} WITH_EMETER_SMART = {"P110", "KP125M", "EP25"} WITH_EMETER = {*WITH_EMETER_IOT, *WITH_EMETER_SMART} @@ -134,7 +136,10 @@ DIMMABLE = {*BULBS, *DIMMERS} ALL_DEVICES_IOT = BULBS_IOT.union(PLUGS_IOT).union(STRIPS_IOT).union(DIMMERS_IOT) ALL_DEVICES_SMART = ( - BULBS_SMART.union(PLUGS_SMART).union(STRIPS_SMART).union(DIMMERS_SMART) + BULBS_SMART.union(PLUGS_SMART) + .union(STRIPS_SMART) + .union(DIMMERS_SMART) + .union(HUBS_SMART) ) ALL_DEVICES = ALL_DEVICES_IOT.union(ALL_DEVICES_SMART) @@ -257,6 +262,7 @@ bulb_smart = parametrize("bulb devices smart", BULBS_SMART, protocol_filter={"SM dimmers_smart = parametrize( "dimmer devices smart", DIMMERS_SMART, protocol_filter={"SMART"} ) +hubs_smart = parametrize("hubs smart", HUBS_SMART, protocol_filter={"SMART"}) device_smart = parametrize( "devices smart", ALL_DEVICES_SMART, protocol_filter={"SMART"} ) @@ -318,6 +324,7 @@ def check_categories(): + plug_smart.args[1] + bulb_smart.args[1] + dimmers_smart.args[1] + + hubs_smart.args[1] ) diff = set(SUPPORTED_DEVICES) - set(categorized_fixtures) if diff: @@ -355,6 +362,9 @@ def device_for_file(model, protocol): for d in STRIPS_SMART: if d in model: return SmartDevice + for d in HUBS_SMART: + if d in model: + return SmartDevice else: for d in STRIPS_IOT: if d in model: diff --git a/kasa/tests/fakeprotocol_smart.py b/kasa/tests/fakeprotocol_smart.py index 6e59ba3d..a164b735 100644 --- a/kasa/tests/fakeprotocol_smart.py +++ b/kasa/tests/fakeprotocol_smart.py @@ -80,6 +80,22 @@ class FakeSmartTransport(BaseTransport): "firmware", {"enable": True, "random_range": 120, "time": 180}, ), + "get_alarm_configure": ( + "alarm", + { + "get_alarm_configure": { + "duration": 10, + "type": "Doorbell Ring 2", + "volume": "low", + } + }, + ), + "get_support_alarm_type_list": ("alarm", { + "alarm_type_list": [ + "Doorbell Ring 1", + ] + }), + "get_device_usage": ("device", {}), } async def send(self, request: str): diff --git a/kasa/tests/fixtures/smart/H100(EU)_1.0_1.2.3.json b/kasa/tests/fixtures/smart/H100(EU)_1.0_1.2.3.json new file mode 100644 index 00000000..4d4936c6 --- /dev/null +++ b/kasa/tests/fixtures/smart/H100(EU)_1.0_1.2.3.json @@ -0,0 +1,221 @@ +{ + "component_nego": { + "component_list": [ + { + "id": "device", + "ver_code": 2 + }, + { + "id": "firmware", + "ver_code": 2 + }, + { + "id": "quick_setup", + "ver_code": 3 + }, + { + "id": "inherit", + "ver_code": 1 + }, + { + "id": "time", + "ver_code": 1 + }, + { + "id": "wireless", + "ver_code": 1 + }, + { + "id": "account", + "ver_code": 1 + }, + { + "id": "synchronize", + "ver_code": 1 + }, + { + "id": "sunrise_sunset", + "ver_code": 1 + }, + { + "id": "led", + "ver_code": 1 + }, + { + "id": "cloud_connect", + "ver_code": 1 + }, + { + "id": "iot_cloud", + "ver_code": 1 + }, + { + "id": "child_device", + "ver_code": 1 + }, + { + "id": "child_quick_setup", + "ver_code": 1 + }, + { + "id": "child_inherit", + "ver_code": 1 + }, + { + "id": "control_child", + "ver_code": 1 + }, + { + "id": "alarm", + "ver_code": 1 + }, + { + "id": "device_load", + "ver_code": 1 + }, + { + "id": "device_local_time", + "ver_code": 1 + }, + { + "id": "alarm_logs", + "ver_code": 1 + } + ] + }, + "discovery_result": { + "device_id": "00000000000000000000000000000000", + "device_model": "H100(EU)", + "device_type": "SMART.TAPOHUB", + "factory_default": true, + "ip": "127.0.0.123", + "is_support_iot_cloud": true, + "mac": "3C-52-A1-00-00-00", + "mgt_encrypt_schm": { + "encrypt_type": "AES", + "http_port": 80, + "is_support_https": false, + "lv": 2 + }, + "obd_src": "tplink", + "owner": "" + }, + "get_auto_update_info": { + "enable": true, + "random_range": 120, + "time": 180 + }, + "get_child_device_component_list": { + "child_component_list": [], + "start_index": 0, + "sum": 0 + }, + "get_child_device_list": { + "child_device_list": [], + "start_index": 0, + "sum": 0 + }, + "get_connect_cloud_state": { + "status": 1 + }, + "get_device_info": { + "avatar": "", + "device_id": "0000000000000000000000000000000000000000", + "fw_id": "00000000000000000000000000000000", + "fw_ver": "1.2.3 Build 221012 Rel.103821", + "has_set_location_info": false, + "hw_id": "00000000000000000000000000000000", + "hw_ver": "1.0", + "in_alarm": false, + "in_alarm_source": "", + "ip": "127.0.0.123", + "lang": "", + "latitude": 0, + "longitude": 0, + "mac": "3C-52-A1-00-00-00", + "model": "H100", + "nickname": "I01BU0tFRF9OQU1FIw==", + "oem_id": "00000000000000000000000000000000", + "overheated": false, + "region": "", + "rssi": -30, + "signal_level": 3, + "specs": "EU", + "ssid": "I01BU0tFRF9TU0lEIw==", + "time_diff": 0, + "type": "SMART.TAPOHUB" + }, + "get_device_time": { + "region": "", + "time_diff": 0, + "timestamp": 946771480 + }, + "get_fw_download_state": { + "auto_upgrade": false, + "download_progress": 0, + "reboot_time": 5, + "status": 0, + "upgrade_time": 5 + }, + "get_inherit_info": null, + "get_led_info": { + "led_rule": "always", + "led_status": true, + "night_mode": { + "end_time": 420, + "night_mode_type": "sunrise_sunset", + "start_time": 1140, + "sunrise_offset": 0, + "sunset_offset": 0 + } + }, + "get_wireless_scan_info": { + "ap_list": [ + { + "bssid": "000000000000", + "channel": 0, + "cipher_type": 2, + "key_type": "wpa2_psk", + "signal_level": 2, + "ssid": "I01BU0tFRF9TU0lEIw==" + }, + { + "bssid": "000000000000", + "channel": 0, + "cipher_type": 2, + "key_type": "wpa2_psk", + "signal_level": 2, + "ssid": "I01BU0tFRF9TU0lEIw==" + } + ], + "wep_supported": false + }, + "qs_component_nego": { + "component_list": [ + { + "id": "quick_setup", + "ver_code": 3 + }, + { + "id": "sunrise_sunset", + "ver_code": 1 + }, + { + "id": "iot_cloud", + "ver_code": 1 + }, + { + "id": "inherit", + "ver_code": 1 + }, + { + "id": "firmware", + "ver_code": 2 + } + ], + "extra_info": { + "device_model": "H100", + "device_type": "SMART.TAPOHUB" + } + } +} diff --git a/kasa/tests/fixtures/smart/H100(EU)_1.0_1.5.5.json b/kasa/tests/fixtures/smart/H100(EU)_1.0_1.5.5.json new file mode 100644 index 00000000..639122bd --- /dev/null +++ b/kasa/tests/fixtures/smart/H100(EU)_1.0_1.5.5.json @@ -0,0 +1,391 @@ +{ + "component_nego": { + "component_list": [ + { + "id": "device", + "ver_code": 2 + }, + { + "id": "firmware", + "ver_code": 2 + }, + { + "id": "quick_setup", + "ver_code": 3 + }, + { + "id": "inherit", + "ver_code": 1 + }, + { + "id": "time", + "ver_code": 1 + }, + { + "id": "wireless", + "ver_code": 1 + }, + { + "id": "account", + "ver_code": 1 + }, + { + "id": "synchronize", + "ver_code": 1 + }, + { + "id": "sunrise_sunset", + "ver_code": 1 + }, + { + "id": "led", + "ver_code": 1 + }, + { + "id": "cloud_connect", + "ver_code": 1 + }, + { + "id": "iot_cloud", + "ver_code": 1 + }, + { + "id": "child_device", + "ver_code": 1 + }, + { + "id": "child_quick_setup", + "ver_code": 1 + }, + { + "id": "child_inherit", + "ver_code": 1 + }, + { + "id": "control_child", + "ver_code": 1 + }, + { + "id": "alarm", + "ver_code": 1 + }, + { + "id": "device_load", + "ver_code": 1 + }, + { + "id": "device_local_time", + "ver_code": 1 + }, + { + "id": "alarm_logs", + "ver_code": 1 + }, + { + "id": "localSmart", + "ver_code": 1 + }, + { + "id": "matter", + "ver_code": 3 + } + ] + }, + "discovery_result": { + "device_id": "00000000000000000000000000000000", + "device_model": "H100(EU)", + "device_type": "SMART.TAPOHUB", + "factory_default": false, + "ip": "127.0.0.123", + "is_support_iot_cloud": true, + "mac": "3C-52-A1-00-00-00", + "mgt_encrypt_schm": { + "encrypt_type": "AES", + "http_port": 80, + "is_support_https": false, + "lv": 2 + }, + "obd_src": "tplink", + "owner": "00000000000000000000000000000000" + }, + "get_alarm_configure": { + "duration": 10, + "type": "Doorbell Ring 2", + "volume": "low" + }, + "get_auto_update_info": { + "enable": false, + "random_range": 120, + "time": 180 + }, + "get_child_device_component_list": { + "child_component_list": [ + { + "component_list": [ + { + "id": "device", + "ver_code": 2 + }, + { + "id": "quick_setup", + "ver_code": 3 + }, + { + "id": "trigger_log", + "ver_code": 1 + }, + { + "id": "time", + "ver_code": 1 + }, + { + "id": "device_local_time", + "ver_code": 1 + }, + { + "id": "account", + "ver_code": 1 + }, + { + "id": "synchronize", + "ver_code": 1 + }, + { + "id": "cloud_connect", + "ver_code": 1 + }, + { + "id": "iot_cloud", + "ver_code": 1 + }, + { + "id": "firmware", + "ver_code": 1 + }, + { + "id": "localSmart", + "ver_code": 1 + }, + { + "id": "battery_detect", + "ver_code": 1 + }, + { + "id": "temperature", + "ver_code": 1 + }, + { + "id": "humidity", + "ver_code": 1 + }, + { + "id": "temp_humidity_record", + "ver_code": 1 + }, + { + "id": "comfort_temperature", + "ver_code": 1 + }, + { + "id": "comfort_humidity", + "ver_code": 1 + }, + { + "id": "report_mode", + "ver_code": 1 + } + ], + "device_id": "0000000000000000000000000000000000000000" + } + ], + "start_index": 0, + "sum": 1 + }, + "get_child_device_list": { + "child_device_list": [ + { + "at_low_battery": false, + "avatar": "", + "battery_percentage": 100, + "bind_count": 1, + "category": "subg.trigger.temp-hmdt-sensor", + "current_humidity": 56, + "current_humidity_exception": -34, + "current_temp": 22.2, + "current_temp_exception": 0, + "device_id": "0000000000000000000000000000000000000000", + "fw_ver": "1.7.0 Build 230424 Rel.170332", + "hw_id": "00000000000000000000000000000000", + "hw_ver": "1.0", + "jamming_rssi": -118, + "jamming_signal_level": 1, + "lastOnboardingTimestamp": 1706990901, + "mac": "F0A731000000", + "model": "T315", + "nickname": "I01BU0tFRF9OQU1FIw==", + "oem_id": "00000000000000000000000000000000", + "parent_device_id": "0000000000000000000000000000000000000000", + "region": "Europe/Berlin", + "report_interval": 16, + "rssi": -45, + "signal_level": 3, + "specs": "EU", + "status": "online", + "status_follow_edge": false, + "temp_unit": "celsius", + "type": "SMART.TAPOSENSOR" + } + ], + "start_index": 0, + "sum": 1 + }, + "get_connect_cloud_state": { + "status": 0 + }, + "get_device_info": { + "avatar": "hub", + "device_id": "0000000000000000000000000000000000000000", + "fw_id": "00000000000000000000000000000000", + "fw_ver": "1.5.5 Build 240105 Rel.192438", + "has_set_location_info": true, + "hw_id": "00000000000000000000000000000000", + "hw_ver": "1.0", + "in_alarm": false, + "in_alarm_source": "", + "ip": "127.0.0.123", + "lang": "", + "latitude": 0, + "longitude": 0, + "mac": "3C-52-A1-00-00-00", + "model": "H100", + "nickname": "I01BU0tFRF9OQU1FIw==", + "oem_id": "00000000000000000000000000000000", + "overheated": false, + "region": "Europe/Berlin", + "rssi": -62, + "signal_level": 2, + "specs": "EU", + "ssid": "I01BU0tFRF9TU0lEIw==", + "time_diff": 60, + "type": "SMART.TAPOHUB" + }, + "get_device_load_info": { + "cur_load_num": 2, + "load_level": "light", + "max_load_num": 64, + "total_memory": 4352, + "used_memory": 1384 + }, + "get_device_time": { + "region": "Europe/Berlin", + "time_diff": 60, + "timestamp": 1706995844 + }, + "get_device_usage": {}, + "get_fw_download_state": { + "auto_upgrade": false, + "download_progress": 0, + "reboot_time": 5, + "status": 0, + "upgrade_time": 5 + }, + "get_inherit_info": null, + "get_latest_fw": { + "fw_size": 0, + "fw_ver": "1.5.5 Build 240105 Rel.192438", + "hw_id": "", + "need_to_upgrade": false, + "oem_id": "", + "release_date": "", + "release_note": "", + "type": 0 + }, + "get_led_info": { + "led_rule": "always", + "led_status": true, + "night_mode": { + "end_time": 485, + "night_mode_type": "sunrise_sunset", + "start_time": 1046, + "sunrise_offset": 0, + "sunset_offset": 0 + } + }, + "get_matter_setup_info": { + "setup_code": "00000000000", + "setup_payload": "00:0000000000000000000" + }, + "get_support_alarm_type_list": { + "alarm_type_list": [ + "Doorbell Ring 1", + "Doorbell Ring 2", + "Doorbell Ring 3", + "Doorbell Ring 4", + "Doorbell Ring 5", + "Doorbell Ring 6", + "Doorbell Ring 7", + "Doorbell Ring 8", + "Doorbell Ring 9", + "Doorbell Ring 10", + "Phone Ring", + "Alarm 1", + "Alarm 2", + "Alarm 3", + "Alarm 4", + "Dripping Tap", + "Alarm 5", + "Connection 1", + "Connection 2" + ] + }, + "get_support_child_device_category": { + "device_category_list": [ + { + "category": "subg.trv" + }, + { + "category": "subg.trigger" + }, + { + "category": "subg.plugswitch" + } + ] + }, + "get_wireless_scan_info": { + "ap_list": [], + "wep_supported": false + }, + "qs_component_nego": { + "component_list": [ + { + "id": "quick_setup", + "ver_code": 3 + }, + { + "id": "sunrise_sunset", + "ver_code": 1 + }, + { + "id": "iot_cloud", + "ver_code": 1 + }, + { + "id": "inherit", + "ver_code": 1 + }, + { + "id": "firmware", + "ver_code": 2 + }, + { + "id": "matter", + "ver_code": 3 + } + ], + "extra_info": { + "device_model": "H100", + "device_type": "SMART.TAPOHUB", + "is_klap": false + } + } +}