tplinkrouterc6u 5.9.1__tar.gz → 5.9.3__tar.gz

{tplinkrouterc6u-5.9.1 → tplinkrouterc6u-5.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.9.1
+Version: 5.9.3
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -314,6 +314,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
+- Archer BE230 v1.0
 - Archer BE400 v1.0
 - Archer BE550 v1.0
 - Archer BE800 v1.0
@@ -358,6 +359,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TD-W9960 (v1, V1.20)
 - TL-MR100 v2.0
 - TL-MR105
+- TL-MR110-Outdoor v1.0
 - TL-MR6400 (v5, v5.3)
 - TL-MR6500v
 - TL-WA1201 3.0
@@ -370,6 +372,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - MR47BE v1.0
 - MR50G 1.0
 - H60XR 1.0
+- Halo H80X 1.0
 
 Please let me know if you have tested integration with any other model. Open an issue with info about router's model, hardware and firmware versions.
 

{tplinkrouterc6u-5.9.1 → tplinkrouterc6u-5.9.3}/README.md

@@ -282,6 +282,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
+- Archer BE230 v1.0
 - Archer BE400 v1.0
 - Archer BE550 v1.0
 - Archer BE800 v1.0
@@ -326,6 +327,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TD-W9960 (v1, V1.20)
 - TL-MR100 v2.0
 - TL-MR105
+- TL-MR110-Outdoor v1.0
 - TL-MR6400 (v5, v5.3)
 - TL-MR6500v
 - TL-WA1201 3.0
@@ -338,6 +340,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - MR47BE v1.0
 - MR50G 1.0
 - H60XR 1.0
+- Halo H80X 1.0
 
 Please let me know if you have tested integration with any other model. Open an issue with info about router's model, hardware and firmware versions.
 

{tplinkrouterc6u-5.9.1 → tplinkrouterc6u-5.9.3}/setup.py

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

{tplinkrouterc6u-5.9.1 → tplinkrouterc6u-5.9.3}/test/test_client_ex.py

@@ -122,6 +122,88 @@ class TestTPLinkEXClient(TestCase):
         self.assertEqual(status.devices[1].packets_sent, None)  # TODO
         self.assertEqual(status.devices[1].packets_received, None)  # TODO
 
+    def test_get_status(self) -> None:
+
+        DEV2_ADT_LAN = ('{"data":[{"MACAddress":"a0:28:84:de:dd:5c","IPAddress":"192.168.4.1","stack":"1,0,0,0,0,0"}],'
+                        '"operation":"gl","oid":"DEV2_ADT_LAN","success":true}')
+        DEV2_ADT_WAN = ('{"data":[{"enable":"1","stack":"1,0,0,0,0,0"}],"operation":"gl",'
+                        '"oid":"DEV2_ADT_WAN","success":true}')
+        DEV2_ADT_WIFI_COMMON = ('{"data":[{"primaryEnable":"1","guestEnable":"0","stack":"1,0,0,0,0,0"},'
+                                '{"primaryEnable":"0","guestEnable":"1","stack":"2,0,0,0,0,0"}],"operation":"gl",'
+                                '"oid":"DEV2_ADT_WIFI_COMMON","success":true}')
+        DEV2_HOST_ENTRY = ('{"data":[{"active":"1","X_TP_LanConnType":"0","physAddress":"66-E2-02-BD-B5-1B",'
+                           '"IPAddress":"192.168.30.10","hostName":"host1","stack":"1,0,0,0,0,0"},'
+                           '{"active":"1","X_TP_LanConnType":"1","physAddress":"F4-A3-86-2D-41-B5",'
+                           '"IPAddress":"192.168.30.11","hostName":"host2","stack":"2,0,0,0,0,0"}],"operation":"gl",'
+                           '"oid":"DEV2_HOST_ENTRY","success":true}')
+        DEV2_MEM_STATUS = ('{"data":{"total":"192780","free":"78400","stack":"0,0,0,0,0,0"},"operation":"go",'
+                           '"oid":"DEV2_MEM_STATUS","success":true}')
+        DEV2_PROC_STATUS = ('{"data":{"CPUUsage":"47","stack":"0,0,0,0,0,0"},"operation":"go",'
+                            '"oid":"DEV2_PROC_STATUS","success":true}')
+
+        class TPLinkEXClientTest(TPLinkEXClient):
+            self._token = True
+
+            def _request(self, url, method='POST', data_str=None, encrypt=False):
+                if 'DEV2_ADT_LAN' in data_str:
+                    return 200, DEV2_ADT_LAN
+                elif 'DEV2_ADT_WAN' in data_str:
+                    return 200, DEV2_ADT_WAN
+                elif 'DEV2_ADT_WIFI_COMMON' in data_str:
+                    return 200, DEV2_ADT_WIFI_COMMON
+                elif 'DEV2_HOST_ENTRY' in data_str:
+                    return 200, DEV2_HOST_ENTRY
+                elif 'DEV2_MEM_STATUS' in data_str:
+                    return 200, DEV2_MEM_STATUS
+                elif 'DEV2_PROC_STATUS' in data_str:
+                    return 200, DEV2_PROC_STATUS
+                raise ClientException()
+
+        client = TPLinkEXClientTest('', '')
+        status = client.get_status()
+
+        self.assertIsInstance(status, Status)
+        self.assertEqual(status.wan_macaddr, None)
+        self.assertEqual(status.lan_macaddr, 'A0-28-84-DE-DD-5C')
+        self.assertIsInstance(status.lan_macaddress, EUI48)
+        self.assertEqual(status.wan_ipv4_addr, None)
+        self.assertEqual(status.lan_ipv4_addr, '192.168.4.1')
+        self.assertEqual(status.wan_ipv4_gateway, None)
+        self.assertEqual(status.wired_total, 1)
+        self.assertEqual(status.wifi_clients_total, 1)
+        self.assertEqual(status.guest_clients_total, 0)
+        self.assertEqual(status.clients_total, 2)
+        self.assertEqual(status.guest_2g_enable, False)
+        self.assertEqual(status.guest_5g_enable, True)
+        self.assertEqual(status.iot_2g_enable, None)
+        self.assertEqual(status.iot_5g_enable, None)
+        self.assertEqual(status.wifi_2g_enable, True)
+        self.assertEqual(status.wifi_5g_enable, False)
+        self.assertEqual(status.wan_ipv4_uptime, None)
+        self.assertGreaterEqual(status.mem_usage, 0)
+        self.assertLessEqual(status.mem_usage, 1)
+        self.assertGreaterEqual(status.cpu_usage, 0)
+        self.assertLessEqual(status.cpu_usage, 1)
+        self.assertEqual(len(status.devices), 2)
+        self.assertIsInstance(status.devices[0], Device)
+        self.assertEqual(status.devices[0].type, Connection.WIRED)
+        self.assertEqual(status.devices[0].macaddr, '66-E2-02-BD-B5-1B')
+        self.assertIsInstance(status.devices[0].macaddress, EUI48)
+        self.assertEqual(status.devices[0].ipaddr, '192.168.30.10')
+        self.assertIsInstance(status.devices[0].ipaddress, IPv4Address)
+        self.assertEqual(status.devices[0].hostname, 'host1')
+        self.assertEqual(status.devices[0].packets_sent, None)
+        self.assertEqual(status.devices[0].packets_received, None)
+        self.assertIsInstance(status.devices[1], Device)
+        self.assertEqual(status.devices[1].type, Connection.HOST_2G)
+        self.assertEqual(status.devices[1].macaddr, 'F4-A3-86-2D-41-B5')
+        self.assertIsInstance(status.devices[1].macaddress, EUI48)
+        self.assertEqual(status.devices[1].ipaddr, '192.168.30.11')
+        self.assertIsInstance(status.devices[1].ipaddress, IPv4Address)
+        self.assertEqual(status.devices[1].hostname, 'host2')
+        self.assertEqual(status.devices[1].packets_sent, None)  # TODO
+        self.assertEqual(status.devices[1].packets_received, None)  # TODO
+
     def test_get_ipv4_reservations(self) -> None:
 
         response = ('{"data":[{"enable":"1","chaddr":"bf:75:44:4c:dc:9e","yiaddr":"192.168.8.21",'

{tplinkrouterc6u-5.9.1 → tplinkrouterc6u-5.9.3}/tplinkrouterc6u/client/ex.py

@@ -109,9 +109,9 @@ class TPLinkEXClient(TPLinkMRClientBase):
         for item in values[1]:
             if int(item['enable']) == 0 and values[1].__class__ == list:
                 continue
-            status._wan_macaddr = EUI48(item['MACAddr']) if item['MACAddr'] else None
-            status._wan_ipv4_addr = IPv4Address(item['connIPv4Address'])
-            status._wan_ipv4_gateway = IPv4Address(item['connIPv4Gateway'])
+            status._wan_macaddr = EUI48(item['MACAddr']) if item.get('MACAddr') else None
+            status._wan_ipv4_addr = IPv4Address(item['connIPv4Address']) if item.get('connIPv4Address') else None
+            status._wan_ipv4_gateway = IPv4Address(item['connIPv4Gateway']) if item.get('connIPv4Address') else None
 
         if values[2].__class__ != list:
             status.wifi_2g_enable = bool(int(values[2]['primaryEnable']))

{tplinkrouterc6u-5.9.1 → tplinkrouterc6u-5.9.3}/tplinkrouterc6u/client/mr.py

@@ -550,10 +550,12 @@ class TPLinkMRClientBase(AbstractRouter):
                 raise Exception('Unsupported method ' + str(method))
 
             # sometimes we get 500 here, not sure why... just retry the request
-            if r.status_code != 500 and '<title>500 Internal Server Error</title>' not in r.text:
+            if (r.status_code not in [500, 406]
+                    and '<title>500 Internal Server Error</title>' not in r.text
+                    and '<title>406 Not Acceptable</title>' not in r.text):
                 break
 
-            sleep(0.05)
+            sleep(0.1)
             retry += 1
 
         # decrypt the response, if needed

{tplinkrouterc6u-5.9.1 → tplinkrouterc6u-5.9.3}/tplinkrouterc6u.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.9.1
+Version: 5.9.3
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -314,6 +314,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
+- Archer BE230 v1.0
 - Archer BE400 v1.0
 - Archer BE550 v1.0
 - Archer BE800 v1.0
@@ -358,6 +359,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TD-W9960 (v1, V1.20)
 - TL-MR100 v2.0
 - TL-MR105
+- TL-MR110-Outdoor v1.0
 - TL-MR6400 (v5, v5.3)
 - TL-MR6500v
 - TL-WA1201 3.0
@@ -370,6 +372,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - MR47BE v1.0
 - MR50G 1.0
 - H60XR 1.0
+- Halo H80X 1.0
 
 Please let me know if you have tested integration with any other model. Open an issue with info about router's model, hardware and firmware versions.