tplinkrouterc6u 4.1.1__tar.gz → 4.2.0__tar.gz

{tplinkrouterc6u-4.1.1 → tplinkrouterc6u-4.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 4.1.1
+Version: 4.2.0
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -227,6 +227,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX10 v1.0
 - Archer AX12 v1.0
 - Archer AX20 v1.0
+- Archer AX20 v3.0
 - Archer AX21 v1.20
 - Archer AX23 v1.0
 - Archer AX50 v1.0
@@ -237,6 +238,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX73 V1
 - Archer AX75 V1
 - Archer AXE75 V1
+- Archer AXE16000
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1

{tplinkrouterc6u-4.1.1 → tplinkrouterc6u-4.2.0}/README.md

@@ -206,6 +206,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX10 v1.0
 - Archer AX12 v1.0
 - Archer AX20 v1.0
+- Archer AX20 v3.0
 - Archer AX21 v1.20
 - Archer AX23 v1.0
 - Archer AX50 v1.0
@@ -216,6 +217,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX73 V1
 - Archer AX75 V1
 - Archer AXE75 V1
+- Archer AXE16000
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1

{tplinkrouterc6u-4.1.1 → tplinkrouterc6u-4.2.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tplinkrouterc6u",
-    version="4.1.1",
+    version="4.2.0",
     author="Alex Erohin",
     author_email="alexanderErohin@yandex.ru",
     description="TP-Link Router API",

{tplinkrouterc6u-4.1.1 → tplinkrouterc6u-4.2.0}/test/test_client.py

@@ -425,7 +425,8 @@ class TestTPLinkClient(unittest.TestCase):
         response_game_accelerator = '''
   {
       "data": [
-          {"mac": "06:82:9d:2b:8f:c6", "deviceTag":"2.4G", "isGuest":false, "ip":"192.168.1.186", "deviceName":"name1"},
+          {"mac": "06:82:9d:2b:8f:c6", "deviceTag":"2.4G", "isGuest":false, "ip":"192.168.1.186", "deviceName":"name1",
+          "uploadSpeed":12, "downloadSpeed":77},
           {"mac": "fb:90:b8:2a:8a:b1", "deviceTag":"iot_2.4G", "isGuest":false, "ip":"192.168.1.187", "deviceName":"name2"},
           {"mac": "54:b3:a2:f7:be:ea", "deviceTag":"iot_5G", "isGuest":false, "ip":"192.168.1.188", "deviceName":"name3"},
           {"mac": "3c:ae:e1:83:94:9d", "deviceTag":"iot_6G", "isGuest":false, "ip":"192.168.1.189", "deviceName":"name4"}
@@ -524,6 +525,8 @@ class TestTPLinkClient(unittest.TestCase):
         self.assertEqual(status.devices[2].hostname, 'UNKNOWN')
         self.assertEqual(status.devices[2].packets_sent, 450333)
         self.assertEqual(status.devices[2].packets_received, 4867482)
+        self.assertEqual(status.devices[2].up_speed, 12)
+        self.assertEqual(status.devices[2].down_speed, 77)
         self.assertIsInstance(status.devices[3], Device)
         self.assertEqual(status.devices[3].type, Connection.IOT_2G)
         self.assertEqual(status.devices[3].macaddr, 'FB-90-B8-2A-8A-B1')

tplinkrouterc6u-4.2.0/test/test_client_c1200.py

@@ -0,0 +1,141 @@
+import unittest
+import json
+from tplinkrouterc6u import (
+    TplinkC1200Router,
+    Connection,
+    ClientException
+)
+
+class TestTPLinkC1200Client(unittest.TestCase):
+
+    def test_set_led_on(self) -> None:
+
+        response_led_general_read = '''
+        {
+            "enable": "off",
+            "time_set": "yes",
+            "ledpm_support": "yes"
+        }
+        '''
+
+        response_led_general_write = '''
+        {
+            "enable": "on",
+            "time_set": "yes",
+            "ledpm_support": "yes"
+        }
+        '''
+
+        class TPLinkRouterTest(TplinkC1200Router):
+            def request(self, path: str, data: str,
+                        ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
+                if path == 'admin/ledgeneral?form=setting&operation=read':
+                    return json.loads(response_led_general_read)
+                if path == 'admin/ledgeneral?form=setting&operation=write':
+                    self.captured_path = path
+                    return json.loads(response_led_general_write)
+                raise ClientException()
+
+        client = TPLinkRouterTest('', '')
+        
+        client.set_led(True)
+
+        expected_path = "admin/ledgeneral?form=setting&operation=write"
+        
+        self.assertEqual(client.captured_path, expected_path)
+
+    def test_set_led_off(self) -> None:
+
+        response_led_general_read = '''
+        {
+            "enable": "on",
+            "time_set": "yes",
+            "ledpm_support": "yes"
+        }
+        '''
+
+        response_led_general_write = '''
+        {
+            "enable": "off",
+            "time_set": "yes",
+            "ledpm_support": "yes"
+        }
+        '''
+
+        class TPLinkRouterTest(TplinkC1200Router):
+            def request(self, path: str, data: str,
+                        ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
+                if path == 'admin/ledgeneral?form=setting&operation=read':
+                    return json.loads(response_led_general_read)
+                elif path == 'admin/ledgeneral?form=setting&operation=write':
+                    self.captured_path = path
+                    return json.loads(response_led_general_write)
+                raise ClientException()
+
+        client = TPLinkRouterTest('', '')
+
+        client.set_led(False)
+
+        expected_path = "admin/ledgeneral?form=setting&operation=write"
+        
+        self.assertEqual(client.captured_path, expected_path)
+
+    def test_led_status(self) -> None:
+
+        response_led_general_read = '''
+        {
+            "enable": "on",
+            "time_set": "yes",
+            "ledpm_support": "yes"
+        }
+        '''
+        
+        class TPLinkRouterTest(TplinkC1200Router):
+            def request(self, path: str, data: str,
+                        ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
+                if path == 'admin/ledgeneral?form=setting&operation=read':
+                    return json.loads(response_led_general_read)
+                raise ClientException()
+
+        client = TPLinkRouterTest('', '')
+
+        led_status = client.get_led()
+        self.assertTrue(led_status)
+
+
+    def test_set_wifi(self) -> None:
+
+        class TPLinkRouterTest(TplinkC1200Router):
+            def request(self, path: str, data: str,
+                        ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
+
+                self.captured_path = path
+                self.captured_data = data
+
+        client = TPLinkRouterTest('', '')
+        client.set_wifi(
+            Connection.HOST_5G,
+            enable=True,
+            ssid="TestSSID",
+            hidden="no",
+            encryption="WPA3-PSK",
+            psk_version="2",
+            psk_cipher="AES",
+            psk_key="testkey123",
+            hwmode="11ac",
+            htmode="VHT20",
+            channel=36,
+            txpower="20",
+            disabled_all="no"
+        )
+        
+        expected_data = ("operation=write&enable=on&ssid=TestSSID&hidden=no&encryption=WPA3-PSK&"
+                         "psk_version=2&psk_cipher=AES&psk_key=testkey123&hwmode=11ac&"
+                         "htmode=VHT20&channel=36&txpower=20&disabled_all=no")
+        expected_path = f"admin/wireless?form=wireless_5g&{expected_data}"
+        
+        self.assertEqual(client.captured_path, expected_path)
+        self.assertEqual(client.captured_data, expected_data)
+
+if __name__ == '__main__':
+    unittest.main()

{tplinkrouterc6u-4.1.1 → tplinkrouterc6u-4.2.0}/tplinkrouterc6u/client.py

@@ -317,6 +317,7 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
 
     def get_status(self) -> Status:
         data = self.request('admin/status?form=all&operation=read', 'operation=read')
+
         status = Status()
         status._wan_macaddr = macaddress.EUI48(data['wan_macaddr']) if 'wan_macaddr' in data else None
         status._lan_macaddr = macaddress.EUI48(data['lan_macaddr'])
@@ -386,6 +387,9 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
                             status.iot_clients_total = 0
                         status.iot_clients_total += 1
 
+                devices[item['mac']].down_speed = item.get('downloadSpeed')
+                devices[item['mac']].up_speed = item.get('uploadSpeed')
+
         for item in self.request('admin/wireless?form=statistics', 'operation=load'):
             if item['mac'] not in devices:
                 status.wifi_clients_total += 1
@@ -576,9 +580,9 @@ class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
 
             ip = item['ip'] if item.get('ip') else '0.0.0.0'
             device = Device(conn,
-                                  macaddress.EUI48(item['mac']),
-                                  ipaddress.IPv4Address(ip),
-                                  base64.b64decode(item['name']).decode())
+                            macaddress.EUI48(item['mac']),
+                            ipaddress.IPv4Address(ip),
+                            base64.b64decode(item['name']).decode())
             device.down_speed = item.get('down_speed')
             device.up_speed = item.get('up_speed')
             devices.append(device)
@@ -706,6 +710,77 @@ class TplinkC1200Router(TplinkBaseRouter):
                 self._logger.error(error)
             raise ClientException(error)
 
+    def set_led(self, enable: bool) -> None:
+        current_state = (self.request('admin/ledgeneral?form=setting&operation=read', 'operation=read')
+                         .get('enable', 'off') == 'on')
+        if current_state != enable:
+            self.request('admin/ledgeneral?form=setting&operation=write', 'operation=write')
+
+    def get_led(self) -> bool:
+
+        data = self.request('admin/ledgeneral?form=setting&operation=read', 'operation=read')
+        led_status = data.get('enable') if 'enable' in data else None
+        if led_status == 'on':
+            return True
+        elif led_status == 'off':
+            return False
+        else:
+            return None
+
+    def set_wifi(self, wifi: Connection, enable: bool = None, ssid: str = None, hidden: str = None,
+                 encryption: str = None, psk_version: str = None, psk_cipher: str = None, psk_key: str = None,
+                 hwmode: str = None, htmode: str = None, channel: int = None, txpower: str = None,
+                 disabled_all: str = None) -> None:
+        values = {
+            Connection.HOST_2G: 'wireless_2g',
+            Connection.HOST_5G: 'wireless_5g',
+            Connection.HOST_6G: 'wireless_6g',
+            Connection.GUEST_2G: 'guest_2g',
+            Connection.GUEST_5G: 'guest_5g',
+            Connection.GUEST_6G: 'guest_6g',
+            Connection.IOT_2G: 'iot_2g',
+            Connection.IOT_5G: 'iot_5g',
+            Connection.IOT_6G: 'iot_6g',
+        }
+
+        value = values.get(wifi)
+        if not value:
+            raise ValueError(f"Invalid Wi-Fi connection type: {wifi}")
+
+        if enable is None and ssid is None and hidden is None and encryption is None and psk_version is None and psk_cipher is None and psk_key is None and hwmode is None and htmode is None and channel is None and txpower is None and disabled_all is None:
+            raise ValueError("At least one wireless setting must be provided")
+
+        data = "operation=write"
+
+        if enable is not None:
+            data += f"&enable={'on' if enable else 'off'}"
+        if ssid is not None:
+            data += f"&ssid={ssid}"
+        if hidden is not None:
+            data += f"&hidden={hidden}"
+        if encryption is not None:
+            data += f"&encryption={encryption}"
+        if psk_version is not None:
+            data += f"&psk_version={psk_version}"
+        if psk_cipher is not None:
+            data += f"&psk_cipher={psk_cipher}"
+        if psk_key is not None:
+            data += f"&psk_key={psk_key}"
+        if hwmode is not None:
+            data += f"&hwmode={hwmode}"
+        if htmode is not None:
+            data += f"&htmode={htmode}"
+        if channel is not None:
+            data += f"&channel={channel}"
+        if txpower is not None:
+            data += f"&txpower={txpower}"
+        if disabled_all is not None:
+            data += f"&disabled_all={disabled_all}"
+
+        path = f"admin/wireless?form={value}&{data}"
+
+        self.request(path, data)
+
 
 class TPLinkMRClient(AbstractRouter):
     REQUEST_RETRIES = 3

{tplinkrouterc6u-4.1.1 → tplinkrouterc6u-4.2.0}/tplinkrouterc6u/dataclass.py

@@ -11,7 +11,6 @@ class Firmware:
         self.model = model
         self.firmware_version = firmware
 
-
 @dataclass
 class Device:
     def __init__(self, type: Connection, macaddr: macaddress, ipaddr: ipaddress, hostname: str) -> None:

{tplinkrouterc6u-4.1.1 → tplinkrouterc6u-4.2.0}/tplinkrouterc6u.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 4.1.1
+Version: 4.2.0
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -227,6 +227,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX10 v1.0
 - Archer AX12 v1.0
 - Archer AX20 v1.0
+- Archer AX20 v3.0
 - Archer AX21 v1.20
 - Archer AX23 v1.0
 - Archer AX50 v1.0
@@ -237,6 +238,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX73 V1
 - Archer AX75 V1
 - Archer AXE75 V1
+- Archer AXE16000
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1

{tplinkrouterc6u-4.1.1 → tplinkrouterc6u-4.2.0}/tplinkrouterc6u.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 setup.py
 test/__init__.py
 test/test_client.py
+test/test_client_c1200.py
 test/test_client_deco.py
 test/test_client_mr.py
 tplinkrouterc6u/__init__.py