tplinkrouterc6u 5.6.1__tar.gz → 5.7.0__tar.gz

{tplinkrouterc6u-5.6.1 → tplinkrouterc6u-5.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.6.1
+Version: 5.7.0
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -25,6 +25,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -186,6 +187,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 | down_speed | download speed | int, None |
 | up_speed | upload speed | int, None |
 | signal | Signal strength | int, None |
+| active | Is active device | bool |
 
 ### <a id="IPv4Reservation">IPv4Reservation</a>
 | Field | Description | Type |
@@ -288,12 +290,12 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - [MERCUSYS routers](#mercusys)
 ### <a id="tplink">TP-LINK routers</a>
 - Archer A7 V5
-- Archer A8 1.0
+- Archer A8 (1.0, 2.20)
 - Archer A9 V6
+- Archer A20 v1.0
 - Archer AX10 v1.0
 - Archer AX12 v1.0
-- Archer AX20 v1.0
-- Archer AX20 v3.0
+- Archer AX20 (v1.0, v3.0)
 - Archer AX21 (v1.20, v3.0)
 - Archer AX23 (v1.0, v1.2)
 - Archer AX50 v1.0
@@ -317,6 +319,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer C6 (v2.0, v3.0, 4.0)
 - Archer C6U v1.0
 - Archer C7 (v4.0, v5.0)
+- Archer C24 (1.0, 2.0)
 - Archer C60 v2.0
 - Archer C80 (1.0, 2.20)
 - Archer C5400X V1
@@ -337,6 +340,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Deco P7
 - Deco X20
 - Deco X50 v1.3
+- Deco X55 1.0
 - Deco X60 V3
 - Deco X90
 - Deco XE75 (v1.0, v2.0)
@@ -349,11 +353,13 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-MR105
 - TL-MR6400 (v5, v5.3)
 - TL-MR6500v
+- TL-WA1201 3.0
 - TL-WA3001 v1.0
 - TL-XDR3010 V2
 - XC220-G3v v2.30
 ### <a id="mercusys">MERCUSYS routers</a>
 - MR47BE v1.0
+- MR50G 1.0
 - H60XR 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.6.1 → tplinkrouterc6u-5.7.0}/README.md

@@ -155,6 +155,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 | down_speed | download speed | int, None |
 | up_speed | upload speed | int, None |
 | signal | Signal strength | int, None |
+| active | Is active device | bool |
 
 ### <a id="IPv4Reservation">IPv4Reservation</a>
 | Field | Description | Type |
@@ -257,12 +258,12 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - [MERCUSYS routers](#mercusys)
 ### <a id="tplink">TP-LINK routers</a>
 - Archer A7 V5
-- Archer A8 1.0
+- Archer A8 (1.0, 2.20)
 - Archer A9 V6
+- Archer A20 v1.0
 - Archer AX10 v1.0
 - Archer AX12 v1.0
-- Archer AX20 v1.0
-- Archer AX20 v3.0
+- Archer AX20 (v1.0, v3.0)
 - Archer AX21 (v1.20, v3.0)
 - Archer AX23 (v1.0, v1.2)
 - Archer AX50 v1.0
@@ -286,6 +287,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer C6 (v2.0, v3.0, 4.0)
 - Archer C6U v1.0
 - Archer C7 (v4.0, v5.0)
+- Archer C24 (1.0, 2.0)
 - Archer C60 v2.0
 - Archer C80 (1.0, 2.20)
 - Archer C5400X V1
@@ -306,6 +308,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Deco P7
 - Deco X20
 - Deco X50 v1.3
+- Deco X55 1.0
 - Deco X60 V3
 - Deco X90
 - Deco XE75 (v1.0, v2.0)
@@ -318,11 +321,13 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-MR105
 - TL-MR6400 (v5, v5.3)
 - TL-MR6500v
+- TL-WA1201 3.0
 - TL-WA3001 v1.0
 - TL-XDR3010 V2
 - XC220-G3v v2.30
 ### <a id="mercusys">MERCUSYS routers</a>
 - MR47BE v1.0
+- MR50G 1.0
 - H60XR 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.6.1 → tplinkrouterc6u-5.7.0}/setup.py

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

{tplinkrouterc6u-5.6.1 → tplinkrouterc6u-5.7.0}/test/test_client_c6u.py

@@ -257,6 +257,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.devices[0].hostname, 'SERVER')
         self.assertEqual(status.devices[0].packets_sent, None)
         self.assertEqual(status.devices[0].packets_received, None)
+        self.assertEqual(status.devices[0].active, True)
         self.assertIsInstance(status.devices[0], Device)
         self.assertEqual(status.devices[1].type, Connection.WIRED)
         self.assertEqual(status.devices[1].macaddr, 'AC-04-D6-25-2A-96')
@@ -266,6 +267,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.devices[1].hostname, 'UNKNOWN')
         self.assertEqual(status.devices[1].packets_sent, None)
         self.assertEqual(status.devices[1].packets_received, None)
+        self.assertEqual(status.devices[1].active, True)
         self.assertIsInstance(status.devices[2], Device)
         self.assertEqual(status.devices[2].type, Connection.HOST_2G)
         self.assertEqual(status.devices[2].macaddr, '06-82-9D-2B-8F-C6')
@@ -273,6 +275,7 @@ class TestTPLinkClient(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].active, True)
         self.assertIsInstance(status.devices[3], Device)
         self.assertEqual(status.devices[3].type, Connection.HOST_2G)
         self.assertEqual(status.devices[3].macaddr, '06-55-9D-2B-8F-A7')
@@ -280,6 +283,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.devices[3].hostname, 'Unknown')
         self.assertEqual(status.devices[3].packets_sent, None)
         self.assertEqual(status.devices[3].packets_received, None)
+        self.assertEqual(status.devices[3].active, True)
         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')
@@ -287,6 +291,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.devices[4].hostname, '')
         self.assertEqual(status.devices[4].packets_sent, 134815)
         self.assertEqual(status.devices[4].packets_received, 2953078)
+        self.assertEqual(status.devices[4].active, True)
 
     def test_get_status_ax_55(self) -> None:
         response_status = '''

{tplinkrouterc6u-5.6.1 → tplinkrouterc6u-5.7.0}/test/test_client_c80.py

@@ -474,6 +474,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'Laptop')
         self.assertEqual(device.up_speed, 0)
         self.assertEqual(device.down_speed, 0)
+        self.assertEqual(device.active, False)
 
         device = status.devices[1]
         self.assertIsInstance(device, Device)
@@ -485,6 +486,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'iPhone')
         self.assertEqual(device.up_speed, 0)
         self.assertEqual(device.down_speed, 0)
+        self.assertEqual(device.active, False)
 
         device = status.devices[2]
         self.assertIsInstance(device, Device)
@@ -496,6 +498,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'Laptop2')
         self.assertEqual(device.up_speed, 30)
         self.assertEqual(device.down_speed, 200)
+        self.assertEqual(device.active, True)
 
         device = status.devices[3]
         self.assertIsInstance(device, Device)
@@ -507,6 +510,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'iPhone2')
         self.assertEqual(device.up_speed, 800)
         self.assertEqual(device.down_speed, 400)
+        self.assertEqual(device.active, True)
 
         device = status.devices[4]
         self.assertIsInstance(device, Device)
@@ -518,6 +522,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'IoT_thing')
         self.assertEqual(device.up_speed, 1824)
         self.assertEqual(device.down_speed, 800)
+        self.assertEqual(device.active, True)
 
         device = status.devices[5]
         self.assertIsInstance(device, Device)
@@ -529,6 +534,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'PC')
         self.assertEqual(device.up_speed, 600)
         self.assertEqual(device.down_speed, 50)
+        self.assertEqual(device.active, True)
 
     def test_get_status_without_iot(self) -> None:
         client = TplinkC80RouterTest('', '')

{tplinkrouterc6u-5.6.1 → tplinkrouterc6u-5.7.0}/test/test_client_mr.py

@@ -734,7 +734,6 @@ ussdStatus=1
 
         class TPLinkMRClientTest(TPLinkMRClient):
             def _request(self, url, method='POST', data_str=None, encrypt=False):
-                nonlocal check_url, check_data
                 check_url.append(url)
                 check_data.append(data_str)
                 return 200, responses.pop(0)
@@ -776,7 +775,6 @@ ussdStatus=2
 
         class TPLinkMRClientTest(TPLinkMRClient):
             def _request(self, url, method='POST', data_str=None, encrypt=False):
-                nonlocal check_url, check_data
                 check_url.append(url)
                 check_data.append(data_str)
                 return 200, responses.pop(0)

{tplinkrouterc6u-5.6.1 → tplinkrouterc6u-5.7.0}/tplinkrouterc6u/client/c80.py

@@ -328,6 +328,7 @@ class TplinkC80Router(AbstractRouter):
             device_to_add = Device(connection_type, EUI48(device['mac']), IPv4Address(device['ip']), device['name'])
             device_to_add.up_speed = int(device['up'])
             device_to_add.down_speed = int(device['down'])
+            device_to_add.active = device['online'] == '1'
             mapped_devices.append(device_to_add)
         return mapped_devices
 

{tplinkrouterc6u-5.6.1 → tplinkrouterc6u-5.7.0}/tplinkrouterc6u/client/deco.py

@@ -1,5 +1,7 @@
 from base64 import b64decode
 from json import dumps
+from requests.exceptions import ConnectTimeout
+from collections.abc import Callable
 from macaddress import EUI48
 from ipaddress import IPv4Address
 from logging import Logger
@@ -149,6 +151,22 @@ class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
 
         return ipv4_status
 
+    def authorize(self) -> None:
+        self._retry_request(super().authorize)
+
+    def request(self, path: str, data: str, ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
+        return self._retry_request(super().request, path, data, ignore_response, ignore_errors)
+
+    def _retry_request(self, callback: Callable, *args):
+        retries = 0
+        while True:
+            try:
+                return callback(*args)
+            except ConnectTimeout as err:
+                if retries > 2:
+                    raise err
+                retries += 1
+
     def _map_wire_type(self, data: dict) -> Connection:
         if data.get('wire_type') == 'wired':
             return Connection.WIRED

{tplinkrouterc6u-5.6.1 → tplinkrouterc6u-5.7.0}/tplinkrouterc6u/common/dataclass.py

@@ -25,6 +25,7 @@ class Device:
         self.down_speed: int | None = None
         self.up_speed: int | None = None
         self.signal: int | None = None
+        self.active: bool = True
 
     @property
     def macaddr(self):

{tplinkrouterc6u-5.6.1 → tplinkrouterc6u-5.7.0}/tplinkrouterc6u.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.6.1
+Version: 5.7.0
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -25,6 +25,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -186,6 +187,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 | down_speed | download speed | int, None |
 | up_speed | upload speed | int, None |
 | signal | Signal strength | int, None |
+| active | Is active device | bool |
 
 ### <a id="IPv4Reservation">IPv4Reservation</a>
 | Field | Description | Type |
@@ -288,12 +290,12 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - [MERCUSYS routers](#mercusys)
 ### <a id="tplink">TP-LINK routers</a>
 - Archer A7 V5
-- Archer A8 1.0
+- Archer A8 (1.0, 2.20)
 - Archer A9 V6
+- Archer A20 v1.0
 - Archer AX10 v1.0
 - Archer AX12 v1.0
-- Archer AX20 v1.0
-- Archer AX20 v3.0
+- Archer AX20 (v1.0, v3.0)
 - Archer AX21 (v1.20, v3.0)
 - Archer AX23 (v1.0, v1.2)
 - Archer AX50 v1.0
@@ -317,6 +319,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer C6 (v2.0, v3.0, 4.0)
 - Archer C6U v1.0
 - Archer C7 (v4.0, v5.0)
+- Archer C24 (1.0, 2.0)
 - Archer C60 v2.0
 - Archer C80 (1.0, 2.20)
 - Archer C5400X V1
@@ -337,6 +340,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Deco P7
 - Deco X20
 - Deco X50 v1.3
+- Deco X55 1.0
 - Deco X60 V3
 - Deco X90
 - Deco XE75 (v1.0, v2.0)
@@ -349,11 +353,13 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-MR105
 - TL-MR6400 (v5, v5.3)
 - TL-MR6500v
+- TL-WA1201 3.0
 - TL-WA3001 v1.0
 - TL-XDR3010 V2
 - XC220-G3v v2.30
 ### <a id="mercusys">MERCUSYS routers</a>
 - MR47BE v1.0
+- MR50G 1.0
 - H60XR 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.