tplinkrouterc6u 5.2.0__py3-none-any.whl → 5.3.0__py3-none-any.whl

test/test_client_ex.py

@@ -11,6 +11,8 @@ from tplinkrouterc6u import (
     IPv4DHCPLease,
     IPv4Status,
     ClientException,
+    VPNStatus,
+    VPN,
 )
 
 
@@ -334,6 +336,65 @@ class TestTPLinkEXClient(TestCase):
         self.assertEqual(check_data, '{"data":{"stack":"1,0,0,0,0,0","pstack":"0,0,0,0,0,0",'
                                      '"primaryEnable":"1"},"operation":"so","oid":"DEV2_ADT_WIFI_COMMON"}')
 
+    def test_get_vpn_status(self) -> None:
+        DEV2_OPENVPN = ('{"data":{"enable":"1","stack":"0,0,0,0,0,0"},'
+                        '"operation":"go","oid":"DEV2_OPENVPN","success":true}')
+        DEV2_PPTPVPN = ('{"data":{"enable":"0","stack":"0,0,0,0,0,0"},'
+                        '"operation":"go","oid":"DEV2_PPTPVPN","success":true}')
+        DEV2_OVPN_CLIENT = ('{"data":[{"connAct":"1","stack":"1,0,0,0,0,0"}, {"connAct":"1","stack":"2,0,0,0,0,0"},'
+                            '{"connAct":"0","stack":"3,0,0,0,0,0"}, {"connAct":"0","stack":"4,0,0,0,0,0"},'
+                            '{"connAct":"0","stack":"5,0,0,0,0,0"}, {"connAct":"0","stack":"6,0,0,0,0,0"},'
+                            '{"connAct":"0","stack":"7,0,0,0,0,0"}, {"connAct":"0","stack":"8,0,0,0,0,0"},'
+                            '{"connAct":"0","stack":"9,0,0,0,0,0"}, {"connAct":"0","stack":"10,0,0,0,0,0"}],'
+                            '"operation":"gl","oid":"DEV2_OVPN_CLIENT","success":true}')
+        DEV2_PVPN_CLIENT = ('{"data":[{"connAct":"0","stack":"1,0,0,0,0,0"}, {"connAct":"0","stack":"2,0,0,0,0,0"},'
+                            '{"connAct":"1","stack":"3,0,0,0,0,0"}, {"connAct":"0","stack":"4,0,0,0,0,0"},'
+                            '{"connAct":"0","stack":"5,0,0,0,0,0"}, {"connAct":"0","stack":"6,0,0,0,0,0"},'
+                            '{"connAct":"0","stack":"7,0,0,0,0,0"}, {"connAct":"0","stack":"8,0,0,0,0,0"},'
+                            '{"connAct":"0","stack":"9,0,0,0,0,0"}, {"connAct":"0","stack":"10,0,0,0,0,0"}],'
+                            '"operation":"gl","oid":"DEV2_PVPN_CLIENT","success":true}')
+
+        class TPLinkEXClientTest(TPLinkEXClient):
+            def _request(self, url, method='POST', data_str=None, encrypt=False):
+                if 'DEV2_OPENVPN' in data_str:
+                    return 200, DEV2_OPENVPN
+                elif 'DEV2_PPTPVPN' in data_str:
+                    return 200, DEV2_PPTPVPN
+                elif 'DEV2_OVPN_CLIENT' in data_str:
+                    return 200, DEV2_OVPN_CLIENT
+                elif 'DEV2_PVPN_CLIENT' in data_str:
+                    return 200, DEV2_PVPN_CLIENT
+                raise ClientException()
+
+        client = TPLinkEXClientTest('', '')
+        status = client.get_vpn_status()
+
+        self.assertIsInstance(status, VPNStatus)
+        self.assertEqual(status.openvpn_enable, True)
+        self.assertEqual(status.pptpvpn_enable, False)
+        self.assertEqual(status.openvpn_clients_total, 2)
+        self.assertEqual(status.pptpvpn_clients_total, 1)
+
+    def test_set_vpn(self) -> None:
+        response = '{"success":true, "errorcode":0}'
+
+        check_url = ''
+        check_data = ''
+
+        class TPLinkEXClientTest(TPLinkEXClient):
+            def _request(self, url, method='POST', data_str=None, encrypt=False):
+                nonlocal check_url, check_data
+                check_url = url
+                check_data = data_str
+                return 200, response
+
+        client = TPLinkEXClientTest('', '')
+        client.set_vpn(VPN.OPEN_VPN, True)
+
+        self.assertIn('http:///cgi_gdpr?9?_=', check_url)
+        self.assertEqual(check_data, '{"data":{"stack":"0,0,0,0,0,0","pstack":"0,0,0,0,0,0",'
+                                     '"enable":"1"},"operation":"so","oid":"DEV2_OPENVPN"}')
+
 
 if __name__ == '__main__':
     main()

test/test_client_xdr.py

@@ -13,6 +13,54 @@ from tplinkrouterc6u.common.package_enum import Connection
 
 
 class TestTPLinkXDRClient(TestCase):
+
+    def test_supports_false(self) -> None:
+        class SessionTest:
+            def get(self, host, timeout, verify):
+                class ResponseTest:
+                    def __init__(self):
+                        self.text = 'text'
+
+                return ResponseTest()
+
+        client = TPLinkXDRClient('', '')
+        client._session = SessionTest()
+
+        self.assertEqual(client.supports(), False)
+
+    def test_supports_true(self) -> None:
+        response = '''<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>TL-XDR3010易展版</title>
+<meta name="MobileOptimized" content="240" />
+<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=0.5,
+maximum-scale=2.0, user-scalable=yes" />
+<link rel="shortcut Icon" href="../web-static/images/icon.ico" type="image/x-icon" />
+<link rel="stylesheet" href="../web-static/dynaform/class.css">
+<script type="text/javascript" src="../web-static/dynaform/class.js"></script>
+<script type="text/javascript" src="../web-static/dynaform/jtopo.js"></script>
+</head>
+<body><div id="Error"></div><div id="Confirm"></div><div id="Con"></div><div id="Help"></div><div id="Cover"></div>
+<div id="Login"></div><script type="text/javascript">var gBeInCNA = "NO";var proName="TL-XDR3010易展版";pageOnload();
+</script>
+</body>
+</html>
+'''
+
+        class SessionTest:
+            def get(self, host, timeout, verify):
+                class ResponseTest:
+                    def __init__(self):
+                        self.text = response
+
+                return ResponseTest()
+
+        client = TPLinkXDRClient('', '')
+        client._session = SessionTest()
+
+        self.assertEqual(client.supports(), True)
+
     def test_logout(self) -> None:
         mock_data = json.loads('''{"error_code":0}''')
         check_payload = {}

tplinkrouterc6u/client/c5400x.py

@@ -42,7 +42,7 @@ class TplinkC5400XRouter(TplinkBaseRouter):
         if current_state != enable:
             self.request('admin/ledgeneral?form=setting&operation=write', 'operation=write')
 
-    def get_led(self) -> bool:
+    def get_led(self) -> bool | None:
 
         data = self.request('admin/ledgeneral?form=setting&operation=read', 'operation=read')
         led_status = data.get('enable') if 'enable' in data else None

tplinkrouterc6u/client/ex.py

@@ -4,8 +4,15 @@ from datetime import timedelta
 from macaddress import EUI48
 from ipaddress import IPv4Address
 from logging import Logger
-from tplinkrouterc6u.common.package_enum import Connection
-from tplinkrouterc6u.common.dataclass import Firmware, Status, Device, IPv4Reservation, IPv4DHCPLease, IPv4Status
+from tplinkrouterc6u.common.package_enum import Connection, VPN
+from tplinkrouterc6u.common.dataclass import (
+    Firmware,
+    Status,
+    Device,
+    IPv4Reservation,
+    IPv4DHCPLease,
+    IPv4Status,
+    VPNStatus)
 from tplinkrouterc6u.common.exception import ClientException, ClientError
 from tplinkrouterc6u.client.mr import TPLinkMRClientBase
 
@@ -293,3 +300,33 @@ class TPLinkEXClient(TPLinkMRClientBase):
             if self._logger:
                 self._logger.debug(error)
             raise ClientException(error)
+
+    def get_vpn_status(self) -> VPNStatus:
+        status = VPNStatus()
+        acts = [
+            self.ActItem(self.ActItem.GET, 'DEV2_OPENVPN', attrs=['enable']),
+            self.ActItem(self.ActItem.GET, 'DEV2_PPTPVPN', attrs=['enable']),
+            self.ActItem(self.ActItem.GL, 'DEV2_OVPN_CLIENT', attrs=['connAct']),
+            self.ActItem(self.ActItem.GL, 'DEV2_PVPN_CLIENT', attrs=['connAct']),
+        ]
+        _, values = self.req_act(acts)
+
+        status.openvpn_enable = values[0]['enable'] == '1'
+        status.pptpvpn_enable = values[1]['enable'] == '1'
+
+        for item in values[2]:
+            if item['connAct'] == '1':
+                status.openvpn_clients_total += 1
+
+        for item in values[3]:
+            if item['connAct'] == '1':
+                status.pptpvpn_clients_total += 1
+
+        return status
+
+    def set_vpn(self, vpn: VPN, enable: bool) -> None:
+        acts = [
+            self.ActItem(self.ActItem.SET, "DEV2_" + vpn.value, attrs=[f'"enable":"{int(enable)}"'])
+        ]
+
+        self.req_act(acts)

tplinkrouterc6u/client/mr.py

@@ -599,7 +599,7 @@ class TPLinkMRClient(TPLinkMRClientBase):
                 messages.append(
                     SMS(
                         i, item['from'], item['content'], datetime.fromisoformat(item['receivedTime']),
-                        True if item['unread'] == '1' else False
+                        item['unread'] == '1'
                     )
                 )
                 i += 1
@@ -691,8 +691,8 @@ class TPLinkMRClient(TPLinkMRClientBase):
         ]
         _, values = self.req_act(acts)
 
-        status.openvpn_enable = True if values['0']['enable'] == '1' else False
-        status.pptpvpn_enable = True if values['1']['enable'] == '1' else False
+        status.openvpn_enable = values['0']['enable'] == '1'
+        status.pptpvpn_enable = values['1']['enable'] == '1'
 
         for item in values['2']:
             if item['connAct'] == '1':

tplinkrouterc6u/client/xdr.py

@@ -25,7 +25,7 @@ class TPLinkXDRClient(AbstractRouter):
 
     def supports(self) -> bool:
         response = self._session.get(self.host, timeout=self.timeout, verify=self._verify_ssl)
-        return response.text.index('TL-XDR') >= 0
+        return 'TL-XDR' in response.text
 
     def authorize(self) -> None:
         response = self._session.post(self.host, json={

{tplinkrouterc6u-5.2.0.dist-info → tplinkrouterc6u-5.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 5.2.0
+Version: 5.3.0
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -304,6 +304,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer C5400X V1
 - Archer GX90 v1.0
 - Archer MR200 (v5, v5.3)
+- Archer MR550 v1
 - Archer MR600 (v1, v2, v3)
 - Archer VR600 v3
 - Archer VR900v

{tplinkrouterc6u-5.2.0.dist-info → tplinkrouterc6u-5.3.0.dist-info}/RECORD

@@ -2,29 +2,29 @@ test/__init__.py,sha256=McQmUjeN3AwmwdS6QNfwGXXE77OKoPK852I2BM9XsrU,210
 test/test_client_c1200.py,sha256=O6NK9uXIEb_vks6lI3g7j6q8TYJ9MSDFYzGA_wOBhOA,4620
 test/test_client_c6u.py,sha256=qC0PNE-Hz3d8PYIGej4j_M4cLDqffnPiXu_ff7Ft29M,30709
 test/test_client_deco.py,sha256=ur4u-pWB-6WaYW6PSpK9OvCg3rfo2x06V5Cf_eE2UYU,30447
-test/test_client_ex.py,sha256=cSIMh6yjiAknt0mk7u1dCpXVzZTR_Y95XvXRBRusbpg,17092
+test/test_client_ex.py,sha256=YGY3auCiZTM91640LHmsL6r2-xcK5n5cB_CpvD83GeI,20429
 test/test_client_mr.py,sha256=Uomg3T_SA5Y1tb4wlniMKQDi_uJ2Vqm30I-GKgOXBRc,32703
-test/test_client_xdr.py,sha256=G64aS5yvjuFMImvTzVTcbI4-FVOJY_hm8d0y69H-1Gc,18965
+test/test_client_xdr.py,sha256=Tm3fXAmSxa8F_YNv66eN3zSvy2GKi_q6tuuw8GWqL-c,20698
 tplinkrouterc6u/__init__.py,sha256=bLlCkiL9ycyRVG7VqPOJWPcoPmUfMkdTcUKFYKNP8QI,900
 tplinkrouterc6u/client_abstract.py,sha256=OgftTH6bELzhFWom0MOX4EJe3RNS003ezpHyyRnh2tQ,1328
 tplinkrouterc6u/provider.py,sha256=SsyGu_2SZ-a46ADl9aw_0wx0lgbsJhS6wnwUzb_1qGg,1900
 tplinkrouterc6u/client/__init__.py,sha256=KBy3fmtA9wgyFrb0Urh2x4CkKtWVnESdp-vxmuOvq0k,27
 tplinkrouterc6u/client/c1200.py,sha256=4XEYidEGmVIJk0YQLvmTnd0Gqa7glH2gUWvjreHpWrk,3178
-tplinkrouterc6u/client/c5400x.py,sha256=EhcNcaj2U8OBSv1Bftrg3rH9ylP_73P2VO1JHA9CYO4,4322
+tplinkrouterc6u/client/c5400x.py,sha256=9E0omBSbWY_ljrs5MTCMu5brmrLtzsDB5O62Db8lP8Q,4329
 tplinkrouterc6u/client/c6u.py,sha256=8n3nMW20k3SEXamCYzq7-mzBM6wyn5Txl6XxzjHEa6c,17411
 tplinkrouterc6u/client/c6v4.py,sha256=-IF7SqTZx56lRAVmiyxK9VKkrmD7srQSJWFvn2Z0DII,1489
 tplinkrouterc6u/client/deco.py,sha256=0Hwy_kVQshYd-5Oa3mIASaZI_4NUD09NFEdRyPtzjdI,8265
-tplinkrouterc6u/client/ex.py,sha256=jkxCgqbjp-SfjlzgKeNj4WhV3v9gEOzKgrgfVgy9SB4,11604
-tplinkrouterc6u/client/mr.py,sha256=1-aP8xo5JUiFzKmeyOjolzyKR_yIUwTBrRG562tmfAg,25638
-tplinkrouterc6u/client/xdr.py,sha256=1YWM00OSTTj3XCJ2bINf2qU3yQZmORmWzLqFwOVqC_0,9782
+tplinkrouterc6u/client/ex.py,sha256=PxMKq7Yj-2iJBtSKzgxaJ1D0SrblFwhPWJYyrac0c9Q,12706
+tplinkrouterc6u/client/mr.py,sha256=eQuHi37pIVaKXWb_S34HJ416xxpGvZNWxxaJTv8Bz4I,25581
+tplinkrouterc6u/client/xdr.py,sha256=lqsBGxi9wZsz1IqQ9KZjAY6gd9-IgK0Cm2oRaswYFSs,9773
 tplinkrouterc6u/common/__init__.py,sha256=pCTvVZ9CAwgb7MxRnLx0y1rI0sTKSwT24FfxWfQXeTM,33
 tplinkrouterc6u/common/dataclass.py,sha256=__u8I8URLk_AdIEN4Jd8Pswh4ujURlJxw8YunuVStwk,7630
 tplinkrouterc6u/common/encryption.py,sha256=4HelTxzN6esMfDZRBt3m8bwB9Nj_biKijnCnrGWPWKg,6228
 tplinkrouterc6u/common/exception.py,sha256=_0G8ZvW5__CsGifHrsZeULdl8c6EUD071sDCQsQgrHY,140
 tplinkrouterc6u/common/helper.py,sha256=phcPUdpY7lJVWF8Ih4KHNdsdem2ed6qFSDXuEAtAgug,334
 tplinkrouterc6u/common/package_enum.py,sha256=py31wF7SntZ0D_o0PS7az29wtsWdp0r0uE7QMmiWigY,1451
-tplinkrouterc6u-5.2.0.dist-info/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
-tplinkrouterc6u-5.2.0.dist-info/METADATA,sha256=yDOAsf0yPwBDG8Xius3t5HpaSkwkxeFUHVdJtVYZSlA,14917
-tplinkrouterc6u-5.2.0.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-tplinkrouterc6u-5.2.0.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
-tplinkrouterc6u-5.2.0.dist-info/RECORD,,
+tplinkrouterc6u-5.3.0.dist-info/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
+tplinkrouterc6u-5.3.0.dist-info/METADATA,sha256=KT2VlcenWtGibT_nhekDi8QW7yDPN9j0pZ5DOm32Q2w,14935
+tplinkrouterc6u-5.3.0.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+tplinkrouterc6u-5.3.0.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
+tplinkrouterc6u-5.3.0.dist-info/RECORD,,