tplinkrouterc6u 5.12.2__tar.gz → 5.12.4__tar.gz

{tplinkrouterc6u-5.12.2/tplinkrouterc6u.egg-info → tplinkrouterc6u-5.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.12.2
+Version: 5.12.4
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -63,6 +63,7 @@ from tplinkrouterc6u import (
     TPLinkMRClientGCM, # Class for MR series routers which supports AES cipher GCM mode
     TPLinkMR200Client,
     TPLinkVRClient,
+    TPLinkVR400v2Client,
     TPLinkEXClient, # Class for EX series routers which supports old firmwares with AES cipher CBC mode
     TPLinkEXClientGCM, # Class for EX series routers which supports AES cipher GCM mode
     TPLinkXDRClient,
@@ -355,7 +356,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer MR550 v1
 - Archer MR600 (v1, v2, v3)
 - Archer NX200 v2.0
-- Archer VR400 v3
+- Archer VR400 (v2, v3)
 - Archer VR600 v3
 - Archer VR900v
 - Archer VR1200v v1
@@ -371,6 +372,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 X50-5G 1.20
 - Deco X55 1.0
 - Deco X60 V3
 - Deco X90
@@ -402,6 +404,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - AC10 1.20
 - MR47BE v1.0
 - MR50G 1.0
+- ME30 1.0
 - H60XR 1.0
 - H47BE 2.0
 - Halo H80X 1.0

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4}/README.md

@@ -30,6 +30,7 @@ from tplinkrouterc6u import (
     TPLinkMRClientGCM, # Class for MR series routers which supports AES cipher GCM mode
     TPLinkMR200Client,
     TPLinkVRClient,
+    TPLinkVR400v2Client,
     TPLinkEXClient, # Class for EX series routers which supports old firmwares with AES cipher CBC mode
     TPLinkEXClientGCM, # Class for EX series routers which supports AES cipher GCM mode
     TPLinkXDRClient,
@@ -322,7 +323,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer MR550 v1
 - Archer MR600 (v1, v2, v3)
 - Archer NX200 v2.0
-- Archer VR400 v3
+- Archer VR400 (v2, v3)
 - Archer VR600 v3
 - Archer VR900v
 - Archer VR1200v v1
@@ -338,6 +339,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 X50-5G 1.20
 - Deco X55 1.0
 - Deco X60 V3
 - Deco X90
@@ -369,6 +371,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - AC10 1.20
 - MR47BE v1.0
 - MR50G 1.0
+- ME30 1.0
 - H60XR 1.0
 - H47BE 2.0
 - Halo H80X 1.0

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4}/setup.py

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

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4}/test/test_client_c6u.py

@@ -508,7 +508,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.wired_total, 2)
         self.assertEqual(status.wifi_clients_total, 2)
         self.assertEqual(status.guest_clients_total, 0)
-        self.assertEqual(status.clients_total, 4)
+        self.assertEqual(status.clients_total, 7)
         self.assertEqual(status.iot_clients_total, 3)
         self.assertEqual(status.guest_2g_enable, True)
         self.assertEqual(status.guest_5g_enable, None)

tplinkrouterc6u-5.12.4/test/test_client_vr400v2.py

@@ -0,0 +1,60 @@
+from unittest import main, TestCase
+from unittest.mock import patch, MagicMock
+from requests import Session
+from tplinkrouterc6u import TPLinkVR400v2Client
+
+
+class TestTPLinkVR400v2Client(TestCase):
+    def setUp(self):
+        self.obj = TPLinkVR400v2Client('', '')
+
+    def test_supports_false(self):
+        responses = [
+            'var param1="0x1A"\nvar param2="0x2B"\nignored line\n',
+            '404',
+            'var nn="dfgdfg"\nvar ee="0x2B"\n'
+        ]
+
+        fake_responses = []
+        for text in responses:
+            r = MagicMock()
+            r.text = text
+            fake_responses.append(r)
+
+        with patch.object(Session, "get", side_effect=fake_responses):
+            for _ in range(len(fake_responses)):
+                result = self.obj.supports()
+                self.assertFalse(result)
+
+    def test_supports_false_standard_mr200(self):
+        # Scenario 1: Standard MR200 response (without userSetting)
+        # VR400v2 should return False to let MR200Client handle it
+        fake_response = MagicMock()
+        fake_response.text = (
+            'var nn="0x1A"\n'
+            'var ee="0x2B"\n'
+        )
+
+        with patch.object(Session, "get", return_value=fake_response):
+            result = self.obj.supports()
+
+        self.assertEqual(result, False)
+
+    def test_supports_true_vr400v2_style(self):
+        # Scenario 2: VR400v2 style response with extra lines
+        fake_response = MagicMock()
+        fake_response.text = (
+            'var userSetting=1;\n'
+            'var ee="010001";\n'
+            'var nn="0x123456";\n'
+            '$.ret=0;\n'
+        )
+
+        with patch.object(Session, "get", return_value=fake_response):
+            result = self.obj.supports()
+
+        self.assertEqual(result, True)
+
+
+if __name__ == '__main__':
+    main()

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4}/tplinkrouterc6u/__init__.py

@@ -5,6 +5,7 @@ from tplinkrouterc6u.client.mr import TPLinkMRClient, TPLinkMRClientGCM
 from tplinkrouterc6u.client.mr200 import TPLinkMR200Client
 from tplinkrouterc6u.client.ex import TPLinkEXClient, TPLinkEXClientGCM
 from tplinkrouterc6u.client.vr import TPLinkVRClient
+from tplinkrouterc6u.client.vr400v2 import TPLinkVR400v2Client
 from tplinkrouterc6u.client.c80 import TplinkC80Router
 from tplinkrouterc6u.client.c5400x import TplinkC5400XRouter
 from tplinkrouterc6u.client.c1200 import TplinkC1200Router

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4}/tplinkrouterc6u/client/c5400x.py

@@ -28,7 +28,6 @@ class TplinkC5400XRouter(TplinkBaseRouter):
             regex_result = 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 - C5400X - Cannot authorize! Error - {}; Response - {}".format(e, response.text)

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4}/tplinkrouterc6u/client/c6u.py

@@ -376,7 +376,8 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
             pass
 
         status.devices = list(devices.values())
-        status.clients_total = status.wired_total + status.wifi_clients_total + status.guest_clients_total
+        status.clients_total = (status.wired_total + status.wifi_clients_total + status.guest_clients_total
+                                + (status.iot_clients_total or 0))
 
         return status
 

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4}/tplinkrouterc6u/client/ex.py

@@ -141,7 +141,7 @@ class TPLinkEXClient(TPLinkMRClientBase):
                 status.wifi_clients_total += 1
             devices[val['physAddress']] = Device(conn,
                                                  EUI48(val['physAddress']),
-                                                 IPv4Address(val['IPAddress']),
+                                                 get_ip(val['IPAddress']),
                                                  val['hostName'])
 
         total = int(values[4]['total'])

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4}/tplinkrouterc6u/client/mr.py

@@ -371,7 +371,7 @@ class TPLinkMRClientBase(AbstractRouter):
         lines = response.split('\n')
         for line in lines:
             if line.startswith('['):
-                regexp = search(r'\[\d,\d,\d,\d,\d,\d\](\d)', line)
+                regexp = search(r'\[\d+,\d+,\d+,\d+,\d+,\d+](\d+)', line)
                 if regexp is not None:
                     obj = {}
                     index = regexp.group(1)

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4}/tplinkrouterc6u/client/mr200.py

@@ -16,13 +16,13 @@ class TPLinkMR200Client(TPLinkMRClient):
 
     def supports(self) -> bool:
         try:
-            self.__get_params()
+            self._get_params()
             return True
         except ClientException:
             return False
 
     def authorize(self) -> None:
-        self.__get_params()
+        self._get_params()
 
         # Construct the RSA public key manually using modulus (n) and exponent (e)
         pub_key = RSA.construct((self._nn, self._ee))
@@ -79,7 +79,7 @@ class TPLinkMR200Client(TPLinkMRClient):
         ]
 
         response, _ = self.req_act(acts)
-        ret_code = self._parse_ret_val(response)
+        ret_code = self._parse_ret_val(response.text)
 
         if ret_code == self.HTTP_RET_OK:
             del self.req.headers["TokenID"]
@@ -114,7 +114,7 @@ class TPLinkMR200Client(TPLinkMRClient):
 
         return status
 
-    def __get_params(self, retry=False) -> None:
+    def _get_params(self, retry=False) -> None:
         self.req.headers = {'referer': f'{self.host}/', 'origin': self.host}
         try:
             r = self.req.get(f"{self.host}/cgi/getParm", timeout=5)
@@ -127,7 +127,7 @@ class TPLinkMR200Client(TPLinkMRClient):
             self._ee = int(result["ee"])
         except Exception as e:
             if not retry:
-                self.__get_params(True)
+                self._get_params(True)
             raise ClientException(str(e))
 
     def req_act(self, acts: list):

tplinkrouterc6u-5.12.4/tplinkrouterc6u/client/vr400v2.py

@@ -0,0 +1,114 @@
+"""
+TP-Link Archer VR400 v2 Client
+
+Based on reverse-engineering of network traffic.
+Protocol is similar to MR series but with differences in:
+1. Login: Uses RSA encryption (PKCS1 v1.5) for both Username and Password
+2. Password must be Base64 encoded before encryption
+3. Actions: Uses /cgi endpoint with types in query string and plain text body
+"""
+
+from re import search, findall
+from logging import Logger
+
+from tplinkrouterc6u.client.mr200 import TPLinkMR200Client
+from tplinkrouterc6u.common.exception import ClientException
+from tplinkrouterc6u.common.dataclass import VPNStatus
+
+
+class TPLinkVR400v2Client(TPLinkMR200Client):
+    """Client for TP-Link Archer VR400 v2"""
+
+    def __init__(self, host: str, password: str, username: str = '', logger: Logger = None,
+                 verify_ssl: bool = True, timeout: int = 30):
+        super().__init__(host, password, username, logger, verify_ssl, timeout)
+        self.req.headers['User-Agent'] = (
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 '
+            '(KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'
+        )
+
+    def supports(self) -> bool:
+        """
+        Detect VR400 v2 by checking for 'userSetting' variable in /cgi/getParm response.
+        This distinguishes VR400v2 from standard MR200 routers.
+        """
+        try:
+            self._get_params()
+            # After successful parameter fetch, check for VR400v2-specific signature
+            r = self.req.get(f"{self.host}/cgi/getParm", timeout=5)
+            if 'var userSetting' in r.text:
+                return True
+        except Exception:
+            pass
+
+        return False
+
+    def _get_params(self, retry=False) -> None:
+        """
+        Override to handle VR400v2's response format with extra variables and semicolons.
+        Uses findall to parse entire response instead of just first 2 lines.
+        """
+        self.req.headers = {'referer': f'{self.host}/', 'origin': self.host}
+        try:
+            r = self.req.get(f"{self.host}/cgi/getParm", timeout=5)
+            matches = findall(r'var\s+(.*?)\s*=\s*"(.*?)"', r.text)
+            result = {}
+            for key, val in matches:
+                result[key] = int(val, 16)
+
+            self._nn = int(result["nn"])
+            self._ee = int(result["ee"])
+        except Exception as e:
+            if not retry:
+                self._get_params(True)
+            raise ClientException(str(e))
+
+    def _req_token(self):
+        """Token extraction handled by parent's authorize() method."""
+        pass
+
+    def _parse_ret_val(self, response_text):
+        """Parse return code from VR400v2 response (supports multiple formats)."""
+        # Try $.ret=...; format
+        result = search(r'\$\.ret=([-]?\d+);', response_text)
+        if result:
+            return int(result.group(1))
+
+        # Try [error]... format
+        result = search(r'\[error\](\d+)', response_text)
+        if result:
+            return int(result.group(1))
+
+        # Try var errorcode=... format
+        result = search(r'var\s+errorcode\s*=\s*(\d+)', response_text)
+        if result:
+            return int(result.group(1))
+
+        if '[error]0' in response_text or 'errorcode=0' in response_text:
+            return 0
+
+        if self._logger:
+            self._logger.debug(f"Could not parse return code from: {response_text[:100]}...")
+
+    def get_vpn_status(self) -> VPNStatus:
+        status = VPNStatus()
+        acts = [
+            self.ActItem(self.ActItem.GET, 'OPENVPN', attrs=['enable']),
+            self.ActItem(self.ActItem.GET, 'PPTPVPN', attrs=['enable']),
+            self.ActItem(self.ActItem.GL, 'OVPN_CLIENT', attrs=['connAct']),
+            self.ActItem(self.ActItem.GL, '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

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4}/tplinkrouterc6u/provider.py

@@ -12,6 +12,7 @@ from tplinkrouterc6u.client.c5400x import TplinkC5400XRouter
 from tplinkrouterc6u.client.c1200 import TplinkC1200Router
 from tplinkrouterc6u.client.c80 import TplinkC80Router
 from tplinkrouterc6u.client.vr import TPLinkVRClient
+from tplinkrouterc6u.client.vr400v2 import TPLinkVR400v2Client
 from tplinkrouterc6u.client.wdr import TplinkWDRRouter
 from tplinkrouterc6u.client.re330 import TplinkRE330Router
 
@@ -20,9 +21,22 @@ class TplinkRouterProvider:
     @staticmethod
     def get_client(host: str, password: str, username: str = 'admin', logger: Logger = None,
                    verify_ssl: bool = True, timeout: int = 30) -> AbstractRouter:
-        for client in [TplinkC5400XRouter, TPLinkVRClient, TPLinkEXClientGCM, TPLinkEXClient, TPLinkMRClientGCM,
-                       TPLinkMRClient, TPLinkMR200Client, TPLinkDecoClient, TPLinkXDRClient, TplinkRouter,
-                       TplinkC80Router, TplinkWDRRouter, TplinkRE330Router]:
+        for client in [
+                       TplinkC5400XRouter,
+                       TPLinkVRClient,
+                       TPLinkEXClientGCM,
+                       TPLinkEXClient,
+                       TPLinkMRClientGCM,
+                       TPLinkMRClient,
+                       TPLinkMR200Client,
+                       TPLinkVR400v2Client,
+                       TPLinkDecoClient,
+                       TPLinkXDRClient,
+                       TplinkRouter,
+                       TplinkC80Router,
+                       TplinkWDRRouter,
+                       TplinkRE330Router,
+                       ]:
             router = client(host, password, username, logger, verify_ssl, timeout)
             if router.supports():
                 return router

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4/tplinkrouterc6u.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.12.2
+Version: 5.12.4
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -63,6 +63,7 @@ from tplinkrouterc6u import (
     TPLinkMRClientGCM, # Class for MR series routers which supports AES cipher GCM mode
     TPLinkMR200Client,
     TPLinkVRClient,
+    TPLinkVR400v2Client,
     TPLinkEXClient, # Class for EX series routers which supports old firmwares with AES cipher CBC mode
     TPLinkEXClientGCM, # Class for EX series routers which supports AES cipher GCM mode
     TPLinkXDRClient,
@@ -355,7 +356,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer MR550 v1
 - Archer MR600 (v1, v2, v3)
 - Archer NX200 v2.0
-- Archer VR400 v3
+- Archer VR400 (v2, v3)
 - Archer VR600 v3
 - Archer VR900v
 - Archer VR1200v v1
@@ -371,6 +372,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 X50-5G 1.20
 - Deco X55 1.0
 - Deco X60 V3
 - Deco X90
@@ -402,6 +404,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - AC10 1.20
 - MR47BE v1.0
 - MR50G 1.0
+- ME30 1.0
 - H60XR 1.0
 - H47BE 2.0
 - Halo H80X 1.0

{tplinkrouterc6u-5.12.2 → tplinkrouterc6u-5.12.4}/tplinkrouterc6u.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ test/test_client_ex.py
 test/test_client_mr.py
 test/test_client_mr_200.py
 test/test_client_re330.py
+test/test_client_vr400v2.py
 test/test_client_wdr.py
 test/test_client_xdr.py
 tplinkrouterc6u/__init__.py
@@ -31,6 +32,7 @@ tplinkrouterc6u/client/mr.py
 tplinkrouterc6u/client/mr200.py
 tplinkrouterc6u/client/re330.py
 tplinkrouterc6u/client/vr.py
+tplinkrouterc6u/client/vr400v2.py
 tplinkrouterc6u/client/wdr.py
 tplinkrouterc6u/client/xdr.py
 tplinkrouterc6u/common/__init__.py