tplinkrouterc6u 5.10.1__py3-none-any.whl → 5.10.3__py3-none-any.whl

tplinkrouterc6u/__init__.py

@@ -2,6 +2,7 @@ from tplinkrouterc6u.client.c6u import TplinkRouter
 from tplinkrouterc6u.client.deco import TPLinkDecoClient
 from tplinkrouterc6u.client_abstract import AbstractRouter
 from tplinkrouterc6u.client.mr import TPLinkMRClient
+from tplinkrouterc6u.client.mr200 import TPLinkMR200Client
 from tplinkrouterc6u.client.ex import TPLinkEXClient
 from tplinkrouterc6u.client.vr import TPLinkVRClient
 from tplinkrouterc6u.client.c80 import TplinkC80Router

tplinkrouterc6u/client/mr200.py

@@ -0,0 +1,57 @@
+import base64
+from tplinkrouterc6u.common.exception import ClientException, AuthorizeError
+from tplinkrouterc6u.client.mr import TPLinkMRClient
+from Crypto.PublicKey import RSA
+from re import search
+from binascii import hexlify
+from Crypto.Cipher import PKCS1_v1_5
+
+
+class TPLinkMR200Client(TPLinkMRClient):
+
+    def authorize(self) -> None:
+        params = self.__get_params()
+
+        # Construct the RSA public key manually using modulus (n) and exponent (e)
+        n = int(params["nn"])
+        e = int(params["ee"])
+        pub_key = RSA.construct((n, e))
+
+        # Create an RSA cipher with PKCS#1 v1.5 padding (same as rsa.encrypt)
+        cipher = PKCS1_v1_5.new(pub_key)
+
+        # Encrypt username
+        rsa_username = cipher.encrypt(self.username.encode("utf-8"))
+        rsa_username_hex = hexlify(rsa_username).decode("utf-8")
+
+        # Encrypt password (after base64 encoding, as in your original code)
+        rsa_password = cipher.encrypt(base64.b64encode(self.password.encode("utf-8")))
+        rsa_password_hex = hexlify(rsa_password).decode("utf-8")
+
+        # Send login request
+        self.req.post(
+            f'{self.host}/cgi/login?UserName={rsa_username_hex}&Passwd={rsa_password_hex}&Action=1&LoginStatus=0'
+        )
+
+        # Try to extract token
+        r = self.req.get(self.host)
+        try:
+            self._token = search(r'var token="(.*)";', r.text).group(1)
+        except AttributeError:
+            raise AuthorizeError()
+
+    def __get_params(self, retry=False):
+        try:
+            r = self.req.get(f"{self.host}/cgi/getParm", timeout=5)
+            result = {}
+            for line in r.text.splitlines()[0:2]:
+                match = search(r"var (.*)=\"(.*)\"", line)
+                result[match.group(1)] = int(match.group(2), 16)
+            return result
+        except Exception:
+            if not retry:
+                return self.__get_params(True)
+            raise ClientException()
+
+    def _request(self, url, method='POST', data_str=None, encrypt=False, is_login=False):
+        return super()._request(url, method, data_str, False, is_login)

{tplinkrouterc6u-5.10.1.dist-info → tplinkrouterc6u-5.10.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.10.1
+Version: 5.10.3
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -37,6 +37,9 @@ Python package for API access and management for TP-Link and Mercusys Routers. S
 [![Downloads](https://static.pepy.tech/personalized-badge/tplinkrouterc6u?period=total&units=international_system&left_color=grey&right_color=orange&left_text=Downloads)](https://pypi.org/project/tplinkrouterc6u/)
 ![Python versions](https://img.shields.io/pypi/pyversions/tplinkrouterc6u)
 
+> [!WARNING]
+> A new router firmware update breaks the compatibility. Please try [this fix](https://github.com/AlexandrErohin/home-assistant-tplink-router/issues/220#issuecomment-3396658175) 
+
 ## Installation
 `pip install tplinkrouterc6u`
 
@@ -301,14 +304,16 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer A20 v1.0
 - Archer AX10 v1.0
 - Archer AX12 v1.0
+- Archer AX17 v1.0
 - Archer AX20 (v1.0, v3.0)
 - Archer AX21 (v1.20, v3.0)
 - Archer AX23 (v1.0, v1.2)
 - Archer AX50 v1.0
-- Archer AX53 v2
+- Archer AX53 (v1.0, v2)
 - Archer AX55 (v1.0, V1.60, v4.0)
+- Archer AX58 v1.0
 - Archer AX72 V1
-- Archer AX73 V1
+- Archer AX73 (V1, V2.0)
 - Archer AX75 V1
 - Archer AX90 V1.20
 - Archer AXE75 V1
@@ -338,6 +343,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer MR200 (v5, v5.3, v6.0)
 - Archer MR550 v1
 - Archer MR600 (v1, v2, v3)
+- Archer NX200 v2.0
 - Archer VR400 v3
 - Archer VR600 v3
 - Archer VR900v
@@ -374,6 +380,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-XDR3010 V2
 - TL-WDR3600 V1
 - VX420-G2h v1.1
+- VX800v v1
 - XC220-G3v v2.30
 ### <a id="mercusys">MERCUSYS routers</a>
 - MR47BE v1.0

{tplinkrouterc6u-5.10.1.dist-info → tplinkrouterc6u-5.10.3.dist-info}/RECORD

@@ -7,7 +7,7 @@ test/test_client_ex.py,sha256=Kg6svEKtyGAfyF9yrLh2qZa2tK1mlEBJJwXRsq1MAjo,26591
 test/test_client_mr.py,sha256=lePxkmjcPzcrSFcaT8bT67L154cVJIOWrFlXMDOa8oY,33423
 test/test_client_wdr.py,sha256=0ZnRNP57MbuMv2cxFS8iIoVyv8Q6gtY0Q03gtHp9AWY,13492
 test/test_client_xdr.py,sha256=mgn-xL5mD5sHD8DjTz9vpY7jeh4Ob6Um6Y8v5Qgx2jA,23374
-tplinkrouterc6u/__init__.py,sha256=DDy6XVFH8Ne5C9JToRWNzRqevUfNutLUTlDhvIMsebo,1006
+tplinkrouterc6u/__init__.py,sha256=QtZ_rEArMlYRDO0eRHh50hvLuAEiHHw4UOuMyMn63aQ,1065
 tplinkrouterc6u/client_abstract.py,sha256=3UYzmll774S_Gb5E0FTVO_rI3-XFM7PSklg1-V-2jls,1419
 tplinkrouterc6u/provider.py,sha256=bzH0WW2peC66f8NqfiI3t_niX6MFO8SAdKP9WZL-IV4,2152
 tplinkrouterc6u/client/__init__.py,sha256=KBy3fmtA9wgyFrb0Urh2x4CkKtWVnESdp-vxmuOvq0k,27
@@ -18,6 +18,7 @@ tplinkrouterc6u/client/c80.py,sha256=ArVhza_fnXcEO-_fsQOd1l2QvmSfsswtohKxrZxEnoU
 tplinkrouterc6u/client/deco.py,sha256=cpKRggKD2RvSmMZuD6tzsZmehAUCU9oLiTTHcZBW81Y,8898
 tplinkrouterc6u/client/ex.py,sha256=gXWsVKAMo4CsX_Qeihb2iCARcsA3E9m2vgIWiJB3sjs,13197
 tplinkrouterc6u/client/mr.py,sha256=keMii7cetOvY1iq9_gWbWMWjuPShHhLXyrbGwX4Og44,26136
+tplinkrouterc6u/client/mr200.py,sha256=0FJz77ztjXJXJBDjzEU09QdmOr9Py2NA-DboJ8cEwlQ,2116
 tplinkrouterc6u/client/vr.py,sha256=7Tbu0IrWtr4HHtyrnLFXEJi1QctzhilciL7agtwQ0R8,5025
 tplinkrouterc6u/client/wdr.py,sha256=i54PEifjhfOScDpgNBXygw9U4bfsVtle846_YjnDoBs,21679
 tplinkrouterc6u/client/xdr.py,sha256=QaZ_5vCaf8BV_JEs3S2Nz-QDREBYHGh3OUWIVS-fefY,10406
@@ -27,8 +28,8 @@ tplinkrouterc6u/common/encryption.py,sha256=4HelTxzN6esMfDZRBt3m8bwB9Nj_biKijnCn
 tplinkrouterc6u/common/exception.py,sha256=_0G8ZvW5__CsGifHrsZeULdl8c6EUD071sDCQsQgrHY,140
 tplinkrouterc6u/common/helper.py,sha256=23b04fk9HuVinrZXMCS5R1rmF8uZ7eM-Cdnp7Br9NR0,572
 tplinkrouterc6u/common/package_enum.py,sha256=4ykL_2Pw0nDEIH_qR9UJlFF6stTgSfhPz32r8KT-sh8,1624
-tplinkrouterc6u-5.10.1.dist-info/licenses/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
-tplinkrouterc6u-5.10.1.dist-info/METADATA,sha256=oiaqPd4N9hGpncj_Zm7WWQNi7w3orZbIRuTOqrEYhBE,16373
-tplinkrouterc6u-5.10.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tplinkrouterc6u-5.10.1.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
-tplinkrouterc6u-5.10.1.dist-info/RECORD,,
+tplinkrouterc6u-5.10.3.dist-info/licenses/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
+tplinkrouterc6u-5.10.3.dist-info/METADATA,sha256=iclzoaJy0O9Py7OHa5e4IY3yQX_ubFhKTzJQgkThZKk,16652
+tplinkrouterc6u-5.10.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tplinkrouterc6u-5.10.3.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
+tplinkrouterc6u-5.10.3.dist-info/RECORD,,