tplinkrouterc6u 4.2.1__py3-none-any.whl → 4.2.3__py3-none-any.whl

test/test_client.py

@@ -53,6 +53,12 @@ class TestTPLinkClient(TestCase):
                 "macaddr": "06:82:9d:2b:8f:c6",
                 "ipaddr": "192.168.1.186",
                 "hostname": "UNKNOWN"
+            },
+            {
+                "wire_type": "2.4G",
+                "macaddr": "06:55:9d:2b:8f:a7",
+                "ipaddr": "Unknown",
+                "hostname": "Unknown"
             }
         ],
         "guest_5g_psk_key": "",
@@ -225,9 +231,9 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.wan_ipv4_gateway, '192.168.1.254')
         self.assertIsInstance(status.wan_ipv4_address, IPv4Address)
         self.assertEqual(status.wired_total, 2)
-        self.assertEqual(status.wifi_clients_total, 2)
+        self.assertEqual(status.wifi_clients_total, 3)
         self.assertEqual(status.guest_clients_total, 0)
-        self.assertEqual(status.clients_total, 4)
+        self.assertEqual(status.clients_total, 5)
         self.assertEqual(status.iot_clients_total, None)
         self.assertEqual(status.guest_2g_enable, False)
         self.assertEqual(status.guest_5g_enable, False)
@@ -238,7 +244,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.wan_ipv4_uptime, None)
         self.assertEqual(status.mem_usage, 0.43)
         self.assertEqual(status.cpu_usage, 0.28)
-        self.assertEqual(len(status.devices), 4)
+        self.assertEqual(len(status.devices), 5)
         self.assertIsInstance(status.devices[0], Device)
         self.assertEqual(status.devices[0].type, Connection.WIRED)
         self.assertEqual(status.devices[0].macaddr, '3D-24-25-24-30-79')
@@ -265,12 +271,19 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.devices[2].packets_sent, 450333)
         self.assertEqual(status.devices[2].packets_received, 4867482)
         self.assertIsInstance(status.devices[3], Device)
-        self.assertEqual(status.devices[3].type, Connection.HOST_5G)
-        self.assertEqual(status.devices[3].macaddr, '1F-7A-BD-F7-20-0D')
+        self.assertEqual(status.devices[3].type, Connection.HOST_2G)
+        self.assertEqual(status.devices[3].macaddr, '06-55-9D-2B-8F-A7')
         self.assertEqual(status.devices[3].ipaddr, '0.0.0.0')
-        self.assertEqual(status.devices[3].hostname, '')
-        self.assertEqual(status.devices[3].packets_sent, 134815)
-        self.assertEqual(status.devices[3].packets_received, 2953078)
+        self.assertEqual(status.devices[3].hostname, 'Unknown')
+        self.assertEqual(status.devices[3].packets_sent, None)
+        self.assertEqual(status.devices[3].packets_received, None)
+        self.assertIsInstance(status.devices[4], Device)
+        self.assertEqual(status.devices[4].type, Connection.HOST_5G)
+        self.assertEqual(status.devices[4].macaddr, '1F-7A-BD-F7-20-0D')
+        self.assertEqual(status.devices[4].ipaddr, '0.0.0.0')
+        self.assertEqual(status.devices[4].hostname, '')
+        self.assertEqual(status.devices[4].packets_sent, 134815)
+        self.assertEqual(status.devices[4].packets_received, 2953078)
 
     def test_get_status_ax_55(self) -> None:
         response_status = '''

test/test_client_deco.py

@@ -71,7 +71,7 @@ class TestTPLinkDecoClient(TestCase):
                 "online": true, "name": "d2lyZWxlc3M0", "enable_priority": false, "remain_time": 0, "owner_id": "",
                 "client_type": "other", "interface": "guest"},
         {"mac": "56:32:c3:de:ce:f0", "up_speed": 3, "down_speed": 1, "wire_type": "wireless", "access_host": "1",
-                "connection_type": "band2_4", "space_id": "1", "ip": "192.168.68.105", "client_mesh": true,
+                "connection_type": "band2_4", "space_id": "1", "ip": "UNKNOWN", "client_mesh": true,
                 "online": true, "name": "d2lyZWxlc3M1", "enable_priority": false, "remain_time": 0, "owner_id": "",
                 "client_type": "other", "interface": "guest"}
 ]}, "error_code": 0}
@@ -150,7 +150,7 @@ class TestTPLinkDecoClient(TestCase):
         self.assertIsInstance(status.devices[4], Device)
         self.assertEqual(status.devices[4].type, Connection.GUEST_2G)
         self.assertEqual(status.devices[4].macaddr, '56-32-C3-DE-CE-F0')
-        self.assertEqual(status.devices[4].ipaddr, '192.168.68.105')
+        self.assertEqual(status.devices[4].ipaddr, '0.0.0.0')
         self.assertEqual(status.devices[4].hostname, 'wireless5')
         self.assertEqual(status.devices[4].packets_sent, None)
         self.assertEqual(status.devices[4].packets_received, None)

tplinkrouterc6u/__init__.py

@@ -6,7 +6,7 @@ from tplinkrouterc6u.client import (
     AbstractRouter,
     TPLinkDecoClient,
 )
-from tplinkrouterc6u.enum import Connection
+from tplinkrouterc6u.package_enum import Connection
 from tplinkrouterc6u.dataclass import (
     Firmware,
     Status,

tplinkrouterc6u/client.py

@@ -10,8 +10,9 @@ from datetime import timedelta
 from macaddress import EUI48
 from ipaddress import IPv4Address
 from logging import Logger
+from tplinkrouterc6u.helper import get_ip
 from tplinkrouterc6u.encryption import EncryptionWrapper, EncryptionWrapperMR
-from tplinkrouterc6u.enum import Connection
+from tplinkrouterc6u.package_enum import Connection
 from tplinkrouterc6u.dataclass import Firmware, Status, Device, IPv4Reservation, IPv4DHCPLease, IPv4Status
 from tplinkrouterc6u.exception import ClientException, ClientError
 from abc import ABC, abstractmethod
@@ -355,7 +356,7 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
 
         def _add_device(conn: Connection, item: dict) -> None:
             devices[item['macaddr']] = Device(conn, EUI48(item['macaddr']),
-                                              IPv4Address(item['ipaddr']),
+                                              get_ip(item['ipaddr']),
                                               item['hostname'])
 
         for item in data.get('access_devices_wired', []):
@@ -381,7 +382,7 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
             for item in smart_network:
                 if item['mac'] not in devices:
                     conn = self._map_wire_type(item.get('deviceTag'), not item.get('isGuest'))
-                    devices[item['mac']] = Device(conn, EUI48(item['mac']), IPv4Address(item['ip']),
+                    devices[item['mac']] = Device(conn, EUI48(item['mac']), get_ip(item['ip']),
                                                   item['deviceName'])
                     if conn.is_iot():
                         if status.iot_clients_total is None:
@@ -579,10 +580,9 @@ class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
                     status.iot_clients_total = 0
                 status.iot_clients_total += 1
 
-            ip = item['ip'] if item.get('ip') else '0.0.0.0'
             device = Device(conn,
                             EUI48(item['mac']),
-                            IPv4Address(ip),
+                            get_ip(item.get('ip', '0.0.0.0')),
                             b64decode(item['name']).decode())
             device.down_speed = item.get('down_speed')
             device.up_speed = item.get('up_speed')
@@ -1125,7 +1125,7 @@ class TPLinkMRClient(AbstractRouter):
         lines = response.split('\n')
         for line in lines:
             if line.startswith('['):
-                regexp = search('\[\d,\d,\d,\d,\d,\d\](\d)', line)
+                regexp = search(r'\[\d,\d,\d,\d,\d,\d\](\d)', line)
                 if regexp is not None:
                     obj = {}
                     index = regexp.group(1)
@@ -1315,7 +1315,7 @@ class TPLinkMRClient(AbstractRouter):
         Return value:
             return code (int)
         '''
-        result = search('\$\.ret=(.*);', response_text)
+        result = search(r'\$\.ret=(.*);', response_text)
         assert result is not None
         assert result.group(1).isnumeric()
 

tplinkrouterc6u/dataclass.py

@@ -1,7 +1,7 @@
 from macaddress import EUI48
 from ipaddress import IPv4Address
 from dataclasses import dataclass
-from tplinkrouterc6u.enum import Connection
+from tplinkrouterc6u.package_enum import Connection
 
 
 @dataclass

tplinkrouterc6u/helper.py

@@ -0,0 +1,8 @@
+from ipaddress import IPv4Address
+
+
+def get_ip(ip: str) -> IPv4Address:
+    try:
+        return IPv4Address(ip)
+    except Exception:
+        return IPv4Address('0.0.0.0')

{tplinkrouterc6u-4.2.1.dist-info → tplinkrouterc6u-4.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 4.2.1
+Version: 4.2.3
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -225,6 +225,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 ## <a id="supports">Supported routers</a>
 ### Fully tested Hardware Versions
 - Archer A7 V5
+- Archer A9 V6
 - Archer AX10 v1.0
 - Archer AX12 v1.0
 - Archer AX20 v1.0
@@ -237,6 +238,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX72 V1
 - Archer AX73 V1
 - Archer AX75 V1
+- Archer AX90 V1.20
 - Archer AXE75 V1
 - Archer AXE16000
 - Archer AX3000 V1
@@ -244,7 +246,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX11000 V1
 - Archer BE800 v1.0
 - Archer BE805 v1.0
-- Archer C1200 v2.0 (You need to use [web encrypted password](#encrypted_pass))
+- Archer C1200 (v1.0, v2.0) (You need to use [web encrypted password](#encrypted_pass))
 - Archer C2300 v1.0 (You need to use [web encrypted password](#encrypted_pass))
 - Archer C6 (v2.0, v3.0)
 - Archer C6U v1.0
@@ -252,7 +254,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer C5400X V1
 - Archer GX90 v1.0
 - Archer MR200 (v5, v5.3)
-- Archer MR600 (v1, v3)
+- Archer MR600 (v1, v2, v3)
 - Archer VR2100v v1
 - Archer VR900v
 - Deco M4 2.0
@@ -270,15 +272,14 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - TL-MR100 v2.0
 - TL-MR105
 - TL-MR6400 (v5, v5.3)
+- TL-MR6500v
 - TL-WA3001 v1.0
 
 ### Not fully tested Hardware Versions
 - AD7200 V2
 - Archer A6 (V2 and V3)
-- Archer A9 V6
 - Archer A10 (V1 and V2)
 - Archer A20 (V1, V3)
-- Archer C7 V4
 - Archer C8 (V3 and V4)
 - Archer C9 (V4 and V5)
 - Archer C59 V2

tplinkrouterc6u-4.2.3.dist-info/RECORD

@@ -0,0 +1,17 @@
+test/__init__.py,sha256=McQmUjeN3AwmwdS6QNfwGXXE77OKoPK852I2BM9XsrU,210
+test/test_client.py,sha256=8cK4qnheszu-zpUJqttKp5Z5WJXrQy1t_fMzMzNnmvw,30638
+test/test_client_c1200.py,sha256=O6NK9uXIEb_vks6lI3g7j6q8TYJ9MSDFYzGA_wOBhOA,4620
+test/test_client_deco.py,sha256=OqJ9e6_TcX60Ccqj_UH9AQ3Ty25hfdbtPvtzLnWpMn0,30464
+test/test_client_mr.py,sha256=znDA8PBxHOGKbZHzsyERbEEWjkP0U5KpV8Z-kaRnXIM,23046
+tplinkrouterc6u/__init__.py,sha256=EpcrPHORAk_m76WDHMLea_RzCPjqZYAs_774JZChLGs,410
+tplinkrouterc6u/client.py,sha256=dUV4jbx_r4RP_vjvUePxjaZ5LW1D1hJ9BtISWXlPIqM,51458
+tplinkrouterc6u/dataclass.py,sha256=SuAOqKun_ThaeUEa8F9wi6qu4ucUatYMzebo39Kk10s,6617
+tplinkrouterc6u/encryption.py,sha256=2InKlHLQSWkcI8yP8EIGSG-bGXft_KU-bplGjcoeE-k,5546
+tplinkrouterc6u/exception.py,sha256=PUTPsadxiylQhIRUMfkN1RWXh07cHmdav9Pdgxs3Lmw,90
+tplinkrouterc6u/helper.py,sha256=mbPkS_9GfOYMxEIx-q-xLlupR0-m_MDgCWQgx8xxOA8,172
+tplinkrouterc6u/package_enum.py,sha256=bqmnu4gQMEntMCgsya2R7dRcrSJIDPWMj8vNN6JxeME,1382
+tplinkrouterc6u-4.2.3.dist-info/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
+tplinkrouterc6u-4.2.3.dist-info/METADATA,sha256=v6KaqYCwRYqjwvMouDqkLgbp0_X9nz4y1K-qcMoTh4Y,13058
+tplinkrouterc6u-4.2.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+tplinkrouterc6u-4.2.3.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
+tplinkrouterc6u-4.2.3.dist-info/RECORD,,

{tplinkrouterc6u-4.2.1.dist-info → tplinkrouterc6u-4.2.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tplinkrouterc6u-4.2.1.dist-info/RECORD

@@ -1,16 +0,0 @@
-test/__init__.py,sha256=McQmUjeN3AwmwdS6QNfwGXXE77OKoPK852I2BM9XsrU,210
-test/test_client.py,sha256=W9pGExVv5mMNpRedtCSWnBtyXzEbbPqSP9-DlIfvYEw,29994
-test/test_client_c1200.py,sha256=O6NK9uXIEb_vks6lI3g7j6q8TYJ9MSDFYzGA_wOBhOA,4620
-test/test_client_deco.py,sha256=8mo_9KEqVBsrazBHaGUdQTIsSvXcHtCT-l7MBxXSP3o,30478
-test/test_client_mr.py,sha256=znDA8PBxHOGKbZHzsyERbEEWjkP0U5KpV8Z-kaRnXIM,23046
-tplinkrouterc6u/__init__.py,sha256=CECjWGaoM8ABX3-95GUa4Xg9DCKzX2k8IprPg1fvnYw,402
-tplinkrouterc6u/client.py,sha256=5eJG5wSPh623EQGVrL4jCSMnDjZzQiDID8ID_Ung64M,51459
-tplinkrouterc6u/dataclass.py,sha256=VVLeWzH6_HYvjiw31aWisW5w8UTgiojWTgnQB7Tb5eM,6609
-tplinkrouterc6u/encryption.py,sha256=2InKlHLQSWkcI8yP8EIGSG-bGXft_KU-bplGjcoeE-k,5546
-tplinkrouterc6u/enum.py,sha256=bqmnu4gQMEntMCgsya2R7dRcrSJIDPWMj8vNN6JxeME,1382
-tplinkrouterc6u/exception.py,sha256=PUTPsadxiylQhIRUMfkN1RWXh07cHmdav9Pdgxs3Lmw,90
-tplinkrouterc6u-4.2.1.dist-info/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
-tplinkrouterc6u-4.2.1.dist-info/METADATA,sha256=wLzKfTJ16kcr07D36O44WDosOYIv6G6ZziH7ddSP8y4,13028
-tplinkrouterc6u-4.2.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-tplinkrouterc6u-4.2.1.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
-tplinkrouterc6u-4.2.1.dist-info/RECORD,,