tplinkrouterc6u 5.6.0__tar.gz → 5.6.1__tar.gz

{tplinkrouterc6u-5.6.0 → tplinkrouterc6u-5.6.1}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.2
 Name: tplinkrouterc6u
-Version: 5.6.0
-Summary: TP-Link Router API
+Version: 5.6.1
+Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
 Author-email: alexanderErohin@yandex.ru
@@ -29,8 +29,8 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# TP-Link Router API
-Python package for API access and management for TP-Link Routers. See [Supported routers](#supports)
+# TP-Link Router API (supports also Mercusys Router)
+Python package for API access and management for TP-Link and Mercusys Routers. See [Supported routers](#supports)
 
 [![Pypi](https://img.shields.io/pypi/v/tplinkrouterc6u)](https://pypi.org/project/tplinkrouterc6u/)
 [![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/)
@@ -284,8 +284,11 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - VPN.PPTP_VPN
 
 ## <a id="supports">Supported routers</a>
-### Fully tested Hardware Versions
+- [TP-LINK routers](#tplink)
+- [MERCUSYS routers](#mercusys)
+### <a id="tplink">TP-LINK routers</a>
 - Archer A7 V5
+- Archer A8 1.0
 - Archer A9 V6
 - Archer AX10 v1.0
 - Archer AX12 v1.0
@@ -311,10 +314,11 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer BE3600 1.6
 - Archer C1200 (v1.0, v2.0)
 - Archer C2300 (v1.0, v2.0)
-- Archer C6 (v2.0, v3.0)
+- Archer C6 (v2.0, v3.0, 4.0)
 - Archer C6U v1.0
 - Archer C7 (v4.0, v5.0)
-- Archer C80 2.20
+- Archer C60 v2.0
+- Archer C80 (1.0, 2.20)
 - Archer C5400X V1
 - Archer GX90 v1.0
 - Archer MR200 (v5, v5.3, v6.0)
@@ -348,24 +352,11 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-WA3001 v1.0
 - TL-XDR3010 V2
 - XC220-G3v v2.30
+### <a id="mercusys">MERCUSYS routers</a>
+- MR47BE v1.0
+- H60XR 1.0
 
-### Not fully tested Hardware Versions
-- AD7200 V2
-- Archer A6 (V2 and V3)
-- Archer A10 (V1 and V2)
-- Archer A20 (V1, V3)
-- Archer C8 (V3 and V4)
-- Archer C9 (V4 and V5)
-- Archer C59 V2
-- Archer C90 V6
-- Archer C900 V1
-- Archer C1200 V3
-- Archer C1900 V2
-- Archer C4000 (V2 and V3)
-- Archer C5400 V2
-- TL-WR1043N V5
-
-Please let me know if you have tested integration with one of this or other model. Open an issue with info about router's model, hardware and firmware versions.
+Please let me know if you have tested integration with any other model. Open an issue with info about router's model, hardware and firmware versions.
 
 ## <a id="add_support">Adding Support For More Models</a>
 Guidelines [CONTRIBUTING.md](https://github.com/AlexandrErohin/TP-Link-Archer-C6U/blob/master/CONTRIBUTING.md)

{tplinkrouterc6u-5.6.0 → tplinkrouterc6u-5.6.1}/README.md

@@ -1,5 +1,5 @@
-# TP-Link Router API
-Python package for API access and management for TP-Link Routers. See [Supported routers](#supports)
+# TP-Link Router API (supports also Mercusys Router)
+Python package for API access and management for TP-Link and Mercusys Routers. See [Supported routers](#supports)
 
 [![Pypi](https://img.shields.io/pypi/v/tplinkrouterc6u)](https://pypi.org/project/tplinkrouterc6u/)
 [![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/)
@@ -253,8 +253,11 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - VPN.PPTP_VPN
 
 ## <a id="supports">Supported routers</a>
-### Fully tested Hardware Versions
+- [TP-LINK routers](#tplink)
+- [MERCUSYS routers](#mercusys)
+### <a id="tplink">TP-LINK routers</a>
 - Archer A7 V5
+- Archer A8 1.0
 - Archer A9 V6
 - Archer AX10 v1.0
 - Archer AX12 v1.0
@@ -280,10 +283,11 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer BE3600 1.6
 - Archer C1200 (v1.0, v2.0)
 - Archer C2300 (v1.0, v2.0)
-- Archer C6 (v2.0, v3.0)
+- Archer C6 (v2.0, v3.0, 4.0)
 - Archer C6U v1.0
 - Archer C7 (v4.0, v5.0)
-- Archer C80 2.20
+- Archer C60 v2.0
+- Archer C80 (1.0, 2.20)
 - Archer C5400X V1
 - Archer GX90 v1.0
 - Archer MR200 (v5, v5.3, v6.0)
@@ -317,24 +321,11 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-WA3001 v1.0
 - TL-XDR3010 V2
 - XC220-G3v v2.30
+### <a id="mercusys">MERCUSYS routers</a>
+- MR47BE v1.0
+- H60XR 1.0
 
-### Not fully tested Hardware Versions
-- AD7200 V2
-- Archer A6 (V2 and V3)
-- Archer A10 (V1 and V2)
-- Archer A20 (V1, V3)
-- Archer C8 (V3 and V4)
-- Archer C9 (V4 and V5)
-- Archer C59 V2
-- Archer C90 V6
-- Archer C900 V1
-- Archer C1200 V3
-- Archer C1900 V2
-- Archer C4000 (V2 and V3)
-- Archer C5400 V2
-- TL-WR1043N V5
-
-Please let me know if you have tested integration with one of this or other model. Open an issue with info about router's model, hardware and firmware versions.
+Please let me know if you have tested integration with any other model. Open an issue with info about router's model, hardware and firmware versions.
 
 ## <a id="add_support">Adding Support For More Models</a>
 Guidelines [CONTRIBUTING.md](https://github.com/AlexandrErohin/TP-Link-Archer-C6U/blob/master/CONTRIBUTING.md)

{tplinkrouterc6u-5.6.0 → tplinkrouterc6u-5.6.1}/setup.py

@@ -5,10 +5,10 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tplinkrouterc6u",
-    version="5.6.0",
+    version="5.6.1",
     author="Alex Erohin",
     author_email="alexanderErohin@yandex.ru",
-    description="TP-Link Router API",
+    description="TP-Link Router API (supports also Mercusys Router)",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/AlexandrErohin/TP-Link-Archer-C6U",

{tplinkrouterc6u-5.6.0 → tplinkrouterc6u-5.6.1}/test/test_client_c80.py

@@ -162,6 +162,106 @@ STATUS_RESPONSE_TEXT = ('00000\r\nid 1|1,0,0\r\nauthKey aaa3eKKee\r\nreserved\r\
                         '\r\nuMaxDownloadSpeed -1\r\nbwCtrlEnable 0\r\nenableBackup 0\r\nbTr069APEnable 0'
                         '\r\nbTr069SSIDEnable 0')
 
+STATUS_RESPONSE_IOT = ('00000\r\nid 1|1,0,0\r\nauthKey aaa3eKKee\r\nreserved\r\nsetWzd 8\r\nmode 1\r\n'
+                       'logLevel 3\r\nfastpath 1\r\nmac 0 00-00-00-00-00-00\r\nmac 1 00-00-00-00-00-01'
+                       '\r\nwanMacType 0\r\nmodelMergeCursor 8\r\nid 4|1,0,0\r\nip 192.168.0.1\r\n'
+                       'mask 255.255.255.0\r\nmode 0\r\nsmartIp 1\r\ngateway 192.168.0.1\r\nid 23|1,0,0'
+                       '\r\nip 100.100.100.100\r\nmask 255.255.252.0\r\ngateway 100.100.105.1\r\n'
+                       'dns 0 100.100.0.1\r\ndns 1 100.100.0.1\r\nstatus 1\r\ncode 0\r\nupTime 30814980'
+                       '\r\ninPkts 3014881\r\ninOctets 1502000045\r\noutPkts 8216676\r\noutOctets 2500478193'
+                       '\r\ninRates 337\r\noutRates 714\r\ndualMode 0\r\ndualIp 0.0.0.0\r\ndualMask 0.0.0.0'
+                       '\r\ndualGateway 0.0.0.0\r\ndualDns 0 0.0.0.0\r\ndualDns 1 0.0.0.0\r\ndualCode 0'
+                       '\r\ndualStatus 0\r\ninternetDnsDetect 1\r\nid 13|1,0,0\r\nip 0 192.168.0.1\r\n'
+                       'ip 1 192.168.0.2\r\nip 2 192.168.0.3\r\nip 3 192.168.0.4\r\nip 4 192.168.0.5'
+                       '\r\nip 5 192.168.0.6\r\nmac 0 00-00-00-00-00-02\r\nmac 1 00-00-00-00-00-03'
+                       '\r\nmac 2 00-00-00-00-00-04\r\nmac 3 00-00-00-00-00-05\r\nmac 4 00-00-00-00-00-06'
+                       '\r\nmac 5 00-00-00-00-00-07\r\nbindEntry 0 0\r\nbindEntry 1 0\r\nbindEntry 2 0'
+                       '\r\nbindEntry 3 0\r\nbindEntry 4 0\r\nbindEntry 5 0\r\nstaMgtEntry 0 0\r\n'
+                       'staMgtEntry 1 0\r\nstaMgtEntry 2 0\r\nstaMgtEntry 3 0\r\nstaMgtEntry 4 1'
+                       '\r\nstaMgtEntry 5 0\r\ntype 0 3\r\ntype 1 1\r\ntype 2 2\r\ntype 3 1\r\ntype 4 13'
+                       '\r\ntype 5 0\r\nonline 0 0\r\nonline 1 0\r\nonline 2 1\r\nonline 3 1\r\nonline 4 1'
+                       '\r\nonline 5 1\r\nblocked 0 0\r\nblocked 1 0\r\nblocked 2 0\r\nblocked 3 0\r\n'
+                       'blocked 4 0\r\nblocked 5 0\r\nqosPrior 0 0\r\nqosPrior 1 0\r\nqosPrior 2 0\r\n'
+                       'qosPrior 3 0\r\nqosPrior 4 0\r\nqosPrior 5 0\r\nup 0 0\r\nup 1 0\r\nup 2 30\r\n'
+                       'up 3 800\r\nup 4 1824\r\nup 5 600\r\ndown 0 0\r\ndown 1 0\r\ndown 2 200\r\n'
+                       'down 3 400\r\ndown 4 800\r\ndown 5 50\r\nupLimit 0 204800\r\nupLimit 1 204800\r\n'
+                       'upLimit 2 204800\r\nupLimit 3 204800\r\nupLimit 4 204800\r\nupLimit 5 204800\r\n'
+                       'downLimit 0 1048576\r\ndownLimit 1 1048576\r\ndownLimit 2 1048576\r\n'
+                       'downLimit 3 1048576\r\ndownLimit 4 1048576\r\ndownLimit 5 1048576\r\nname 0 Laptop'
+                       '\r\nname 1 iPhone\r\nname 2 Laptop2\r\nname 3 iPhone2\r\nname 4 IoT_thing\r\n'
+                       'name 5 PC\r\nuBandwidth 0 0\r\nuBandwidth 1 0\r\nuBandwidth 2 0\r\nuBandwidth 3 0'
+                       '\r\nuBandwidth 4 0\r\nuBandwidth 5 0\r\nuStandard 0 0\r\nuStandard 1 0\r\n'
+                       'uStandard 2 0\r\nuStandard 3 2\r\nuStandard 4 2\r\nuStandard 5 0\r\ndevType 0 0'
+                       '\r\ndevType 1 0\r\ndevType 2 0\r\ndevType 3 0\r\ndevType 4 0\r\ndevType 5 0\r\n'
+                       'priTime 0 0\r\npriTime 1 0\r\npriTime 2 0\r\npriTime 3 0\r\npriTime 4 0\r\n'
+                       'priTime 5 0\r\nleaseTime 0 0\r\nleaseTime 1 0\r\nleaseTime 2 0\r\nleaseTime 3 0'
+                       '\r\nleaseTime 4 0\r\nleaseTime 5 0\r\ntotalVal 0 450\r\ntotalVal 1 5\r\n'
+                       'totalVal 2 13\r\ntotalVal 3 956\r\ntotalVal 4 13\r\ntotalVal 5 53\r\ntotalUnit 0 2'
+                       '\r\ntotalUnit 1 2\r\ntotalUnit 2 2\r\ntotalUnit 3 2\r\ntotalUnit 4 2\r\n'
+                       'totalUnit 5 2\r\ndhcpsEntry 0 0\r\ndhcpsEntry 1 0\r\ndhcpsEntry 2 0\r\n'
+                       'dhcpsEntry 3 0\r\ndhcpsEntry 4 0\r\ndhcpsEntry 5 0\r\nduration 0 0\r\n'
+                       'duration 1 0\r\nduration 2 0\r\nduration 3 73\r\nduration 4 5388\r\n'
+                       'duration 5 8559\r\ntxRate 0 0\r\ntxRate 1 0\r\ntxRate 2 0\r\ntxRate 3 156\r\n'
+                       'txRate 4 130\r\ntxRate 5 0\r\nrxRate 0 0\r\nrxRate 1 0\r\nrxRate 2 0\r\n'
+                       'rxRate 3 130\r\nrxRate 4 173\r\nrxRate 5 0\r\naveRssi 0 0\r\naveRssi 1 0\r\n'
+                       'aveRssi 2 0\r\naveRssi 3 33\r\naveRssi 4 46\r\naveRssi 5 0\r\nslEnable 0 0\r\n'
+                       'slEnable 1 0\r\nslEnable 2 0\r\nslEnable 3 0\r\nslEnable 4 0\r\nslEnable 5 0'
+                       '\r\npriScheStatus 0 0\r\npriScheStatus 1 0\r\npriScheStatus 2 0\r\n'
+                       'priScheStatus 3 0\r\npriScheStatus 4 0\r\npriScheStatus 5 0\r\nstart 0 0\r\n'
+                       'start 1 0\r\nstart 2 0\r\nstart 3 0\r\nstart 4 0\r\nstart 5 0\r\nend 0 0\r\n'
+                       'end 1 0\r\nend 2 0\r\nend 3 0\r\nend 4 0\r\nend 5 0\r\nday 0 0\r\nday 1 0\r\n'
+                       'day 2 0\r\nday 3 0\r\nday 4 0\r\nday 5 0\r\nstartMin 0 0\r\nstartMin 1 0\r\n'
+                       'startMin 2 0\r\nstartMin 3 0\r\nstartMin 4 0\r\nstartMin 5 0\r\nendMin 0 0\r\n'
+                       'endMin 1 0\r\nendMin 2 0\r\nendMin 3 0\r\nendMin 4 0\r\nendMin 5 0\r\nrate 0 0'
+                       '\r\nrate 1 0\r\nrate 2 0\r\nrate 3 156\r\nrate 4 173\r\nrate 5 0\r\ntxPkt 0 0'
+                       '\r\ntxPkt 1 0\r\ntxPkt 2 0\r\ntxPkt 3 42602\r\ntxPkt 4 119683\r\ntxPkt 5 0'
+                       '\r\nrxPkt 0 0\r\nrxPkt 1 0\r\nrxPkt 2 0\r\nrxPkt 3 6343\r\nrxPkt 4 275076\r\n'
+                       'rxPkt 5 0\r\nid 33|1,1,0\r\nuUnit 0\r\ncSsidPrefix\r\nuRadiusIp 0.0.0.0\r\n'
+                       'uRadiusGKUpdateIntvl 0\r\nuPskGKUpdateIntvl 0\r\nuKeyLength 0 0\r\nuKeyLength 1 0'
+                       '\r\nuKeyLength 2 0\r\nuKeyLength 3 0\r\ncKeyVal 0\r\ncKeyVal 1\r\ncKeyVal 2\r\n'
+                       'cKeyVal 3\r\nuRadiusPort 1812\r\nuKeyType 0\r\nuDefaultKey 1\r\nbEnable 1\r\n'
+                       'bBcastSsid 1\r\ncSsid TP-Link\r\nbSecurityEnable 1\r\nuAuthType 3\r\nuWEPSecOpt 3'
+                       '\r\nuRadiusSecOpt 3\r\nuPSKSecOpt 2\r\nuRadiusEncryptType 1\r\nuPSKEncryptType 3'
+                       '\r\ncRadiusSecret\r\ncPskSecret admin\r\nbSecCheck 0\r\nbEnabled 1\r\n'
+                       'cUsrPIN 11100111\r\nbConfigured 1\r\nbIsLocked 0\r\nbEnRtPIN 1\r\n'
+                       'bWifiBtnRecEnable 1\r\nuVid 0\r\nbMumimo 0\r\nbMwdsEnable 0\r\nbLanAccess 1'
+                       '\r\nSecurityType 2\r\nbApIsolated 0\r\neffectiveTime 0\r\nuMaxUploadSpeed -1'
+                       '\r\nuMaxDownloadSpeed -1\r\nbwCtrlEnable 0\r\nenableBackup 1\r\nbTr069APEnable 0'
+                       '\r\nbTr069SSIDEnable 0\r\nid 33|2,1,0\r\nuUnit 0\r\ncSsidPrefix\r\nuRadiusIp 0.0.0.0'
+                       '\r\nuRadiusGKUpdateIntvl 0\r\nuPskGKUpdateIntvl 0\r\nuKeyLength 0 0\r\nuKeyLength 1 0'
+                       '\r\nuKeyLength 2 0\r\nuKeyLength 3 0\r\ncKeyVal 0\r\ncKeyVal 1\r\ncKeyVal 2\r\n'
+                       'cKeyVal 3\r\nuRadiusPort 1812\r\nuKeyType 0\r\nuDefaultKey 1\r\nbEnable 1\r\n'
+                       'bBcastSsid 1\r\ncSsid TP-Link\r\nbSecurityEnable 1\r\nuAuthType 3\r\nuWEPSecOpt 3'
+                       '\r\nuRadiusSecOpt 3\r\nuPSKSecOpt 2\r\nuRadiusEncryptType 1\r\nuPSKEncryptType 3'
+                       '\r\ncRadiusSecret\r\ncPskSecret admin\r\nbSecCheck 0\r\nbEnabled 1\r\n'
+                       'cUsrPIN 11100111\r\nbConfigured 1\r\nbIsLocked 0\r\nbEnRtPIN 1\r\nbWifiBtnRecEnable 1'
+                       '\r\nuVid 0\r\nbMumimo 0\r\nbMwdsEnable 0\r\nbLanAccess 1\r\nSecurityType 2\r\n'
+                       'bApIsolated 0\r\neffectiveTime 0\r\nuMaxUploadSpeed -1\r\nuMaxDownloadSpeed -1\r\n'
+                       'bwCtrlEnable 0\r\nenableBackup 1\r\nbTr069APEnable 0\r\nbTr069SSIDEnable 0\r\n'
+                       'id 33|1,2,0\r\nuUnit 1\r\ncSsidPrefix Guest\r\nuRadiusIp 0.0.0.0\r\n'
+                       'uRadiusGKUpdateIntvl 0\r\nuPskGKUpdateIntvl 0\r\nuKeyLength 0 0\r\nuKeyLength 1 0'
+                       '\r\nuKeyLength 2 0\r\nuKeyLength 3 0\r\ncKeyVal 0\r\ncKeyVal 1\r\ncKeyVal 2\r\n'
+                       'cKeyVal 3\r\nuRadiusPort 1812\r\nuKeyType 0\r\nuDefaultKey 1\r\nbEnable 0\r\n'
+                       'bBcastSsid 1\r\ncSsid TP-Link_Guest\r\nbSecurityEnable 0\r\nuAuthType 3\r\n'
+                       'uWEPSecOpt 3\r\nuRadiusSecOpt 3\r\nuPSKSecOpt 3\r\nuRadiusEncryptType 1\r\n'
+                       'uPSKEncryptType 3\r\ncRadiusSecret\r\ncPskSecret\r\nbSecCheck 0\r\nbEnabled 1'
+                       '\r\ncUsrPIN 11100111\r\nbConfigured 0\r\nbIsLocked 0\r\nbEnRtPIN 0\r\n'
+                       'bWifiBtnRecEnable 1\r\nuVid 0\r\nbMumimo 0\r\nbMwdsEnable 0\r\nbLanAccess 0'
+                       '\r\nSecurityType 1\r\nbApIsolated 1\r\neffectiveTime 0\r\nuMaxUploadSpeed -1'
+                       '\r\nuMaxDownloadSpeed -1\r\nbwCtrlEnable 0\r\nenableBackup 0\r\nbTr069APEnable 0'
+                       '\r\nbTr069SSIDEnable 0\r\nid 33|2,2,0\r\nuUnit 1\r\ncSsidPrefix Guest\r\n'
+                       'uRadiusIp 0.0.0.0\r\nuRadiusGKUpdateIntvl 0\r\nuPskGKUpdateIntvl 0\r\n'
+                       'uKeyLength 0 0\r\nuKeyLength 1 0\r\nuKeyLength 2 0\r\nuKeyLength 3 0\r\n'
+                       'cKeyVal 0\r\ncKeyVal 1\r\ncKeyVal 2\r\ncKeyVal 3\r\nuRadiusPort 1812\r\n'
+                       'uKeyType 0\r\nuDefaultKey 1\r\nbEnable 0\r\nbBcastSsid 1\r\ncSsid TP-Link_Guest_5G'
+                       '\r\nbSecurityEnable 0\r\nuAuthType 3\r\nuWEPSecOpt 3\r\nuRadiusSecOpt 3\r\n'
+                       'uPSKSecOpt 3\r\nuRadiusEncryptType 1\r\nuPSKEncryptType 3\r\ncRadiusSecret\r\n'
+                       'cPskSecret\r\nbSecCheck 0\r\nbEnabled 1\r\ncUsrPIN 11100111\r\nbConfigured 0\r\n'
+                       'bIsLocked 0\r\nbEnRtPIN 0\r\nbWifiBtnRecEnable 1\r\nuVid 0\r\nbMumimo 0\r\n'
+                       'bMwdsEnable 0\r\nbLanAccess 0\r\nSecurityType 1\r\nbApIsolated 1\r\neffectiveTime 0'
+                       '\r\nuMaxUploadSpeed -1\r\nuMaxDownloadSpeed -1\r\nbwCtrlEnable 0\r\nenableBackup 0'
+                       '\r\nbTr069APEnable 0\r\nbTr069SSIDEnable 0')
+
 
 class ResponseMock():
     def __init__(self, text, status_code=0):
@@ -430,6 +530,39 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.up_speed, 600)
         self.assertEqual(device.down_speed, 50)
 
+    def test_get_status_without_iot(self) -> None:
+        client = TplinkC80RouterTest('', '')
+        client.authorize()
+
+        client.set_encrypted_response(STATUS_RESPONSE_IOT)
+        status = client.get_status()
+
+        self.assertIsInstance(status, Status)
+        self.assertEqual(status.wan_macaddr, '00-00-00-00-00-01')
+        self.assertIsInstance(status.wan_macaddress, EUI48)
+        self.assertEqual(status.lan_macaddr, '00-00-00-00-00-00')
+        self.assertIsInstance(status.lan_macaddress, EUI48)
+        self.assertEqual(status.wan_ipv4_addr, '100.100.100.100')
+        self.assertIsInstance(status.lan_ipv4_address, IPv4Address)
+        self.assertEqual(status.lan_ipv4_addr, '192.168.0.1')
+        self.assertEqual(status.wan_ipv4_gateway, '100.100.105.1')
+        self.assertIsInstance(status.wan_ipv4_address, IPv4Address)
+        self.assertEqual(status.wired_total, 1)
+        self.assertEqual(status.wifi_clients_total, 1)
+        self.assertEqual(status.guest_clients_total, 1)
+        self.assertEqual(status.clients_total, 4)
+        self.assertEqual(status.iot_clients_total, 1)
+        self.assertFalse(status.guest_2g_enable)
+        self.assertFalse(status.guest_5g_enable)
+        self.assertIsNone(status.iot_2g_enable)
+        self.assertIsNone(status.iot_5g_enable)
+        self.assertTrue(status.wifi_2g_enable)
+        self.assertTrue(status.wifi_5g_enable)
+        self.assertEqual(status.wan_ipv4_uptime, 308149)
+        self.assertEqual(status.mem_usage, None)
+        self.assertEqual(status.cpu_usage, None)
+        self.assertEqual(len(status.devices), 6)
+
     def test_get_ipv4(self) -> None:
         client = TplinkC80RouterTest('', '')
         client.authorize()

{tplinkrouterc6u-5.6.0 → tplinkrouterc6u-5.6.1}/tplinkrouterc6u/client/c80.py

@@ -77,6 +77,8 @@ class TplinkC80Router(AbstractRouter):
                  verify_ssl: bool = True, timeout: int = 30) -> None:
         super().__init__(host, password, username, logger, verify_ssl, timeout)
         self._session = Session()
+        if self._verify_ssl is False:
+            self._session.verify = False
         self._encryption = EncryptionState()
 
     def supports(self) -> bool:
@@ -161,8 +163,10 @@ class TplinkC80Router(AbstractRouter):
             'uptime': extract_value(data_blocks[wan_ip_request], "upTime ")
         }
 
-        wifi_status = {key: extract_value(data_blocks[request], "bEnable ") == '1'
-                       for key, request in RouterConstants.CONNECTION_REQUESTS_MAP.items()}
+        wifi_status = {}
+        for key, request in RouterConstants.CONNECTION_REQUESTS_MAP.items():
+            value = data_blocks.get(request)
+            wifi_status[key] = extract_value(data_blocks.get(request), "bEnable ") == '1' if value else None
 
         device_data_response = data_blocks[device_data_request]
 
@@ -396,7 +400,7 @@ class TplinkC80Router(AbstractRouter):
         if use_token:
             url += f"&id={self._encryption.token}"
         try:
-            response = self._session.post(url, data=data, timeout=self.timeout)
+            response = self._session.post(url, data=data, timeout=self.timeout, verify=self._verify_ssl)
             # Raises exception for 4XX/5XX status codes for all requests except 1st in authorize
             if not (code == 2 and asyn == 1 and use_token is False and data is None):
                 response.raise_for_status()

{tplinkrouterc6u-5.6.0 → tplinkrouterc6u-5.6.1}/tplinkrouterc6u/client/mr.py

@@ -77,6 +77,8 @@ class TPLinkMRClientBase(AbstractRouter):
         super().__init__(host, password, username, logger, verify_ssl, timeout)
 
         self.req = Session()
+        if self._verify_ssl is False:
+            self.req.verify = False
         self._token = None
         self._hash = md5(f"{self.username}{self.password}".encode()).hexdigest()
         self._nn = None

{tplinkrouterc6u-5.6.0 → tplinkrouterc6u-5.6.1}/tplinkrouterc6u/client/xdr.py

@@ -22,6 +22,8 @@ class TPLinkXDRClient(AbstractRouter):
                  verify_ssl: bool = True, timeout: int = 30) -> None:
         super().__init__(host, password, username, logger, verify_ssl, timeout)
         self._session = Session()
+        if self._verify_ssl is False:
+            self._session.verify = False
 
     def supports(self) -> bool:
         response = self._session.get(self.host, timeout=self.timeout, verify=self._verify_ssl)

{tplinkrouterc6u-5.6.0 → tplinkrouterc6u-5.6.1}/tplinkrouterc6u.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.2
 Name: tplinkrouterc6u
-Version: 5.6.0
-Summary: TP-Link Router API
+Version: 5.6.1
+Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
 Author-email: alexanderErohin@yandex.ru
@@ -29,8 +29,8 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# TP-Link Router API
-Python package for API access and management for TP-Link Routers. See [Supported routers](#supports)
+# TP-Link Router API (supports also Mercusys Router)
+Python package for API access and management for TP-Link and Mercusys Routers. See [Supported routers](#supports)
 
 [![Pypi](https://img.shields.io/pypi/v/tplinkrouterc6u)](https://pypi.org/project/tplinkrouterc6u/)
 [![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/)
@@ -284,8 +284,11 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - VPN.PPTP_VPN
 
 ## <a id="supports">Supported routers</a>
-### Fully tested Hardware Versions
+- [TP-LINK routers](#tplink)
+- [MERCUSYS routers](#mercusys)
+### <a id="tplink">TP-LINK routers</a>
 - Archer A7 V5
+- Archer A8 1.0
 - Archer A9 V6
 - Archer AX10 v1.0
 - Archer AX12 v1.0
@@ -311,10 +314,11 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer BE3600 1.6
 - Archer C1200 (v1.0, v2.0)
 - Archer C2300 (v1.0, v2.0)
-- Archer C6 (v2.0, v3.0)
+- Archer C6 (v2.0, v3.0, 4.0)
 - Archer C6U v1.0
 - Archer C7 (v4.0, v5.0)
-- Archer C80 2.20
+- Archer C60 v2.0
+- Archer C80 (1.0, 2.20)
 - Archer C5400X V1
 - Archer GX90 v1.0
 - Archer MR200 (v5, v5.3, v6.0)
@@ -348,24 +352,11 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-WA3001 v1.0
 - TL-XDR3010 V2
 - XC220-G3v v2.30
+### <a id="mercusys">MERCUSYS routers</a>
+- MR47BE v1.0
+- H60XR 1.0
 
-### Not fully tested Hardware Versions
-- AD7200 V2
-- Archer A6 (V2 and V3)
-- Archer A10 (V1 and V2)
-- Archer A20 (V1, V3)
-- Archer C8 (V3 and V4)
-- Archer C9 (V4 and V5)
-- Archer C59 V2
-- Archer C90 V6
-- Archer C900 V1
-- Archer C1200 V3
-- Archer C1900 V2
-- Archer C4000 (V2 and V3)
-- Archer C5400 V2
-- TL-WR1043N V5
-
-Please let me know if you have tested integration with one of this or other model. Open an issue with info about router's model, hardware and firmware versions.
+Please let me know if you have tested integration with any other model. Open an issue with info about router's model, hardware and firmware versions.
 
 ## <a id="add_support">Adding Support For More Models</a>
 Guidelines [CONTRIBUTING.md](https://github.com/AlexandrErohin/TP-Link-Archer-C6U/blob/master/CONTRIBUTING.md)

{tplinkrouterc6u-5.6.0 → tplinkrouterc6u-5.6.1}/tplinkrouterc6u.egg-info/SOURCES.txt

@@ -21,7 +21,6 @@ tplinkrouterc6u/client/__init__.py
 tplinkrouterc6u/client/c1200.py
 tplinkrouterc6u/client/c5400x.py
 tplinkrouterc6u/client/c6u.py
-tplinkrouterc6u/client/c6v4.py
 tplinkrouterc6u/client/c80.py
 tplinkrouterc6u/client/deco.py
 tplinkrouterc6u/client/ex.py

tplinkrouterc6u-5.6.0/tplinkrouterc6u/client/c6v4.py

@@ -1,41 +0,0 @@
-from requests import post
-from tplinkrouterc6u.common.package_enum import Connection
-from tplinkrouterc6u.common.dataclass import Firmware, Status, IPv4Status
-from tplinkrouterc6u.common.exception import ClientException
-from tplinkrouterc6u.client_abstract import AbstractRouter
-
-
-class TplinkC6V4Router(AbstractRouter):
-    def supports(self) -> bool:
-        url = '{}/?code=2&asyn=1'.format(self.host)
-        try:
-            response = post(url, timeout=self.timeout, verify=self._verify_ssl)
-        except BaseException:
-            return False
-        if response.status_code == 401 and response.text.startswith('00'):
-            raise ClientException(('Your router is not supported. Please add your router support to '
-                                   'https://github.com/AlexandrErohin/TP-Link-Archer-C6U '
-                                   'by implementing methods for TplinkC6V4Router class'
-                                   ))
-        return False
-
-    def authorize(self) -> None:
-        raise ClientException('Not Implemented')
-
-    def logout(self) -> None:
-        raise ClientException('Not Implemented')
-
-    def get_firmware(self) -> Firmware:
-        raise ClientException('Not Implemented')
-
-    def get_status(self) -> Status:
-        raise ClientException('Not Implemented')
-
-    def get_ipv4_status(self) -> IPv4Status:
-        raise ClientException('Not Implemented')
-
-    def reboot(self) -> None:
-        raise ClientException('Not Implemented')
-
-    def set_wifi(self, wifi: Connection, enable: bool) -> None:
-        raise ClientException('Not Implemented')