tplinkrouterc6u 4.2.1__py3-none-any.whl → 4.2.2__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 = '''

tplinkrouterc6u/client.py

@@ -353,9 +353,15 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
 
         devices = {}
 
+        def _getIP(ip: str) -> IPv4Address:
+            try:
+                return IPv4Address(ip)
+            except Exception:
+                return IPv4Address('0.0.0.0')
+
         def _add_device(conn: Connection, item: dict) -> None:
             devices[item['macaddr']] = Device(conn, EUI48(item['macaddr']),
-                                              IPv4Address(item['ipaddr']),
+                                              _getIP(item['ipaddr']),
                                               item['hostname'])
 
         for item in data.get('access_devices_wired', []):
@@ -381,7 +387,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']), _getIP(item['ip']),
                                                   item['deviceName'])
                     if conn.is_iot():
                         if status.iot_clients_total is None:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 4.2.1
+Version: 4.2.2
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -244,7 +244,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

{tplinkrouterc6u-4.2.1.dist-info → tplinkrouterc6u-4.2.2.dist-info}/RECORD

@@ -1,16 +1,16 @@
 test/__init__.py,sha256=McQmUjeN3AwmwdS6QNfwGXXE77OKoPK852I2BM9XsrU,210
-test/test_client.py,sha256=W9pGExVv5mMNpRedtCSWnBtyXzEbbPqSP9-DlIfvYEw,29994
+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=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/client.py,sha256=7-S8FFD9ML5qHT0-7mzb-FQhmcmytNlB0J778235N4Q,51626
 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,,
+tplinkrouterc6u-4.2.2.dist-info/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
+tplinkrouterc6u-4.2.2.dist-info/METADATA,sha256=50OdAco8AZW3sdxHol7OuMlVYU56h_cQiws-XjG6kFY,13036
+tplinkrouterc6u-4.2.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+tplinkrouterc6u-4.2.2.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
+tplinkrouterc6u-4.2.2.dist-info/RECORD,,