tplinkrouterc6u 4.0.1__tar.gz → 4.1.0__tar.gz

{tplinkrouterc6u-4.0.1 → tplinkrouterc6u-4.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 4.0.1
+Version: 4.1.0
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -160,6 +160,8 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 | hostname | client hostname | str |
 | packets_sent | total packets sent | int, None |
 | packets_received | total packets received | int, None |
+| down_speed | download speed | int, None |
+| up_speed | upload speed | int, None |
 
 ### <a id="IPv4Reservation">IPv4Reservation</a>
 | Field | Description | Type |
@@ -228,6 +230,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX21 v1.20
 - Archer AX23 v1.0
 - Archer AX50 v1.0
+- Archer AX53 v2
 - Archer AX55 v1.0
 - Archer AX55 V1.60
 - Archer AX72 V1

{tplinkrouterc6u-4.0.1 → tplinkrouterc6u-4.1.0}/README.md

@@ -139,6 +139,8 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 | hostname | client hostname | str |
 | packets_sent | total packets sent | int, None |
 | packets_received | total packets received | int, None |
+| down_speed | download speed | int, None |
+| up_speed | upload speed | int, None |
 
 ### <a id="IPv4Reservation">IPv4Reservation</a>
 | Field | Description | Type |
@@ -207,6 +209,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX21 v1.20
 - Archer AX23 v1.0
 - Archer AX50 v1.0
+- Archer AX53 v2
 - Archer AX55 v1.0
 - Archer AX55 V1.60
 - Archer AX72 V1

{tplinkrouterc6u-4.0.1 → tplinkrouterc6u-4.1.0}/setup.py

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

{tplinkrouterc6u-4.0.1 → tplinkrouterc6u-4.1.0}/test/test_client_deco.py

@@ -246,6 +246,8 @@ class TestTPLinkDecoClient(unittest.TestCase):
         self.assertIsInstance(status.devices[0], Device)
         self.assertEqual(status.devices[0].type, Connection.HOST_5G)
         self.assertEqual(status.devices[0].macaddr, 'CF-51-C9-04-E1-02')
+        self.assertEqual(status.devices[0].down_speed, 3)
+        self.assertEqual(status.devices[0].up_speed, 17)
         self.assertIsInstance(status.devices[0].macaddress, macaddress.EUI48)
         self.assertIsInstance(status.devices[1], Device)
         self.assertEqual(status.devices[1].type, Connection.IOT_2G)

{tplinkrouterc6u-4.0.1 → tplinkrouterc6u-4.1.0}/tplinkrouterc6u/client.py

@@ -269,7 +269,7 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
     _perf_status = True
 
     def __init__(self, host: str, password: str, username: str = 'admin', logger: Logger = None,
-                 verify_ssl: bool = True, timeout: int = 10) -> None:
+                 verify_ssl: bool = True, timeout: int = 30) -> None:
         super().__init__(host, password, username, logger, verify_ssl, timeout)
 
         self._url_firmware = 'admin/firmware?form=upgrade&operation=read'
@@ -468,7 +468,7 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
 
 class TplinkRouter(TplinkEncryption, TplinkBaseRouter):
     def __init__(self, host: str, password: str, username: str = 'admin', logger: Logger = None,
-                 verify_ssl: bool = True, timeout: int = 10) -> None:
+                 verify_ssl: bool = True, timeout: int = 30) -> None:
         super().__init__(host, password, username, logger, verify_ssl, timeout)
 
         self._url_firmware = 'admin/firmware?form=upgrade'
@@ -478,7 +478,7 @@ class TplinkRouter(TplinkEncryption, TplinkBaseRouter):
 
 class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
     def __init__(self, host: str, password: str, username: str = 'admin', logger: Logger = None,
-                 verify_ssl: bool = True, timeout: int = 10) -> None:
+                 verify_ssl: bool = True, timeout: int = 30) -> None:
         super().__init__(host, password, username, logger, verify_ssl, timeout)
 
         self._headers_request = {'Content-Type': 'application/json'}
@@ -575,10 +575,13 @@ class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
                 status.iot_clients_total += 1
 
             ip = item['ip'] if item.get('ip') else '0.0.0.0'
-            devices.append(Device(conn,
+            device = Device(conn,
                                   macaddress.EUI48(item['mac']),
                                   ipaddress.IPv4Address(ip),
-                                  base64.b64decode(item['name']).decode()))
+                                  base64.b64decode(item['name']).decode())
+            device.down_speed = item.get('down_speed')
+            device.up_speed = item.get('up_speed')
+            devices.append(device)
 
         status.clients_total = (status.wired_total + status.wifi_clients_total + status.guest_clients_total
                                 + (0 if status.iot_clients_total is None else status.iot_clients_total))
@@ -695,6 +698,7 @@ class TplinkC1200Router(TplinkBaseRouter):
             regex_result = re.search('sysauth=(.*);', response.headers['set-cookie'])
             self._sysauth = regex_result.group(1)
             self._logged = True
+            self._smart_network = False
 
         except Exception as e:
             error = "TplinkRouter - C1200 - Cannot authorize! Error - {}; Response - {}".format(e, response.text)
@@ -751,7 +755,7 @@ class TPLinkMRClient(AbstractRouter):
             self.attrs = attrs
 
     def __init__(self, host: str, password: str, username: str = 'admin', logger: Logger = None,
-                 verify_ssl: bool = True, timeout: int = 10) -> None:
+                 verify_ssl: bool = True, timeout: int = 30) -> None:
         super().__init__(host, password, username, logger, verify_ssl, timeout)
 
         self.req = requests.Session()
@@ -1251,7 +1255,7 @@ class TPLinkMRClient(AbstractRouter):
 class TplinkRouterProvider:
     @staticmethod
     def get_client(host: str, password: str, username: str = 'admin', logger: Logger = None,
-                   verify_ssl: bool = True, timeout: int = 10) -> AbstractRouter | None:
+                   verify_ssl: bool = True, timeout: int = 30) -> AbstractRouter | None:
         for client in [TPLinkMRClient, TplinkC6V4Router, TPLinkDecoClient, TplinkRouter, TplinkC1200Router]:
             router = client(host, password, username, logger, verify_ssl, timeout)
             if router.supports():

{tplinkrouterc6u-4.0.1 → tplinkrouterc6u-4.1.0}/tplinkrouterc6u/dataclass.py

@@ -21,6 +21,8 @@ class Device:
         self.hostname = hostname
         self.packets_sent: int | None = None
         self.packets_received: int | None = None
+        self.down_speed: int | None = None
+        self.up_speed: int | None = None
 
     @property
     def macaddr(self):

{tplinkrouterc6u-4.0.1 → tplinkrouterc6u-4.1.0}/tplinkrouterc6u.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 4.0.1
+Version: 4.1.0
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -160,6 +160,8 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 | hostname | client hostname | str |
 | packets_sent | total packets sent | int, None |
 | packets_received | total packets received | int, None |
+| down_speed | download speed | int, None |
+| up_speed | upload speed | int, None |
 
 ### <a id="IPv4Reservation">IPv4Reservation</a>
 | Field | Description | Type |
@@ -228,6 +230,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX21 v1.20
 - Archer AX23 v1.0
 - Archer AX50 v1.0
+- Archer AX53 v2
 - Archer AX55 v1.0
 - Archer AX55 V1.60
 - Archer AX72 V1