tplinkrouterc6u 5.2.1__tar.gz → 5.3.0__tar.gz

{tplinkrouterc6u-5.2.1 → tplinkrouterc6u-5.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 5.2.1
+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.1 → tplinkrouterc6u-5.3.0}/README.md

@@ -282,6 +282,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.1 → tplinkrouterc6u-5.3.0}/setup.py

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

{tplinkrouterc6u-5.2.1 → tplinkrouterc6u-5.3.0}/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()

{tplinkrouterc6u-5.2.1 → tplinkrouterc6u-5.3.0}/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-5.2.1 → tplinkrouterc6u-5.3.0}/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-5.2.1 → tplinkrouterc6u-5.3.0}/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-5.2.1 → tplinkrouterc6u-5.3.0}/tplinkrouterc6u.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 5.2.1
+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