tplinkrouterc6u 5.6.2__tar.gz → 5.8.0__tar.gz

{tplinkrouterc6u-5.6.2 → tplinkrouterc6u-5.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.6.2
+Version: 5.8.0
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -187,6 +187,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 | down_speed | download speed | int, None |
 | up_speed | upload speed | int, None |
 | signal | Signal strength | int, None |
+| active | Is active device | bool |
 
 ### <a id="IPv4Reservation">IPv4Reservation</a>
 | Field | Description | Type |
@@ -288,9 +289,11 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - [TP-LINK routers](#tplink)
 - [MERCUSYS routers](#mercusys)
 ### <a id="tplink">TP-LINK routers</a>
+- Archer A6 V2.0
 - Archer A7 V5
-- Archer A8 1.0
+- Archer A8 (1.0, 2.20)
 - Archer A9 V6
+- Archer A20 v1.0
 - Archer AX10 v1.0
 - Archer AX12 v1.0
 - Archer AX20 (v1.0, v3.0)
@@ -309,6 +312,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
+- Archer BE550 v1.0
 - Archer BE800 v1.0
 - Archer BE805 v1.0
 - Archer BE3600 1.6
@@ -338,6 +342,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 X55 1.0
 - Deco X60 V3
 - Deco X90
 - Deco XE75 (v1.0, v2.0)
@@ -353,6 +358,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-WA1201 3.0
 - TL-WA3001 v1.0
 - TL-XDR3010 V2
+- TL-WDR3600 V1
 - XC220-G3v v2.30
 ### <a id="mercusys">MERCUSYS routers</a>
 - MR47BE v1.0

{tplinkrouterc6u-5.6.2 → tplinkrouterc6u-5.8.0}/README.md

@@ -155,6 +155,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 | down_speed | download speed | int, None |
 | up_speed | upload speed | int, None |
 | signal | Signal strength | int, None |
+| active | Is active device | bool |
 
 ### <a id="IPv4Reservation">IPv4Reservation</a>
 | Field | Description | Type |
@@ -256,9 +257,11 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - [TP-LINK routers](#tplink)
 - [MERCUSYS routers](#mercusys)
 ### <a id="tplink">TP-LINK routers</a>
+- Archer A6 V2.0
 - Archer A7 V5
-- Archer A8 1.0
+- Archer A8 (1.0, 2.20)
 - Archer A9 V6
+- Archer A20 v1.0
 - Archer AX10 v1.0
 - Archer AX12 v1.0
 - Archer AX20 (v1.0, v3.0)
@@ -277,6 +280,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
+- Archer BE550 v1.0
 - Archer BE800 v1.0
 - Archer BE805 v1.0
 - Archer BE3600 1.6
@@ -306,6 +310,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 X55 1.0
 - Deco X60 V3
 - Deco X90
 - Deco XE75 (v1.0, v2.0)
@@ -321,6 +326,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-WA1201 3.0
 - TL-WA3001 v1.0
 - TL-XDR3010 V2
+- TL-WDR3600 V1
 - XC220-G3v v2.30
 ### <a id="mercusys">MERCUSYS routers</a>
 - MR47BE v1.0

{tplinkrouterc6u-5.6.2 → tplinkrouterc6u-5.8.0}/setup.py

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

{tplinkrouterc6u-5.6.2 → tplinkrouterc6u-5.8.0}/test/test_client_c6u.py

@@ -257,6 +257,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.devices[0].hostname, 'SERVER')
         self.assertEqual(status.devices[0].packets_sent, None)
         self.assertEqual(status.devices[0].packets_received, None)
+        self.assertEqual(status.devices[0].active, True)
         self.assertIsInstance(status.devices[0], Device)
         self.assertEqual(status.devices[1].type, Connection.WIRED)
         self.assertEqual(status.devices[1].macaddr, 'AC-04-D6-25-2A-96')
@@ -266,6 +267,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.devices[1].hostname, 'UNKNOWN')
         self.assertEqual(status.devices[1].packets_sent, None)
         self.assertEqual(status.devices[1].packets_received, None)
+        self.assertEqual(status.devices[1].active, True)
         self.assertIsInstance(status.devices[2], Device)
         self.assertEqual(status.devices[2].type, Connection.HOST_2G)
         self.assertEqual(status.devices[2].macaddr, '06-82-9D-2B-8F-C6')
@@ -273,6 +275,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.devices[2].hostname, 'UNKNOWN')
         self.assertEqual(status.devices[2].packets_sent, 450333)
         self.assertEqual(status.devices[2].packets_received, 4867482)
+        self.assertEqual(status.devices[2].active, True)
         self.assertIsInstance(status.devices[3], Device)
         self.assertEqual(status.devices[3].type, Connection.HOST_2G)
         self.assertEqual(status.devices[3].macaddr, '06-55-9D-2B-8F-A7')
@@ -280,6 +283,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.devices[3].hostname, 'Unknown')
         self.assertEqual(status.devices[3].packets_sent, None)
         self.assertEqual(status.devices[3].packets_received, None)
+        self.assertEqual(status.devices[3].active, True)
         self.assertIsInstance(status.devices[4], Device)
         self.assertEqual(status.devices[4].type, Connection.HOST_5G)
         self.assertEqual(status.devices[4].macaddr, '1F-7A-BD-F7-20-0D')
@@ -287,6 +291,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.devices[4].hostname, '')
         self.assertEqual(status.devices[4].packets_sent, 134815)
         self.assertEqual(status.devices[4].packets_received, 2953078)
+        self.assertEqual(status.devices[4].active, True)
 
     def test_get_status_ax_55(self) -> None:
         response_status = '''
@@ -724,6 +729,45 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(result.lan_ipv4_dhcp_enable, False)
         self.assertEqual(result.remote, None)
 
+    def test_get_status_wan_macaddr_empty(self) -> None:
+        response_status = '''
+    {
+        "success": true,
+        "data": {
+            "lan_macaddr": "06:e6:97:9e:23:f5",
+            "wan_macaddr": "",
+            "wan_ipv4_ipaddr": "0.0.0.0",
+            "wan_ipv4_gateway": "0.0.0.0"
+        }
+    }
+    '''
+        response_stats = '''
+      {
+          "data": [],
+          "timeout": false,
+          "success": true,
+          "operator": "load"
+      }
+    '''
+
+        class TPLinkRouterTest(TplinkRouter):
+            def request(self, path: str, data: str,
+                        ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
+                if path == 'admin/status?form=all&operation=read':
+                    return loads(response_status)['data']
+                elif path == 'admin/wireless?form=statistics':
+                    return loads(response_stats)['data']
+                raise ClientException()
+
+        client = TPLinkRouterTest('', '')
+        result = client.get_status()
+
+        self.assertIsInstance(result, Status)
+        self.assertEqual(result.wan_macaddr, None)
+        self.assertEqual(result.wan_ipv4_addr, '0.0.0.0')
+        self.assertEqual(result.wan_ipv4_gateway, '0.0.0.0')
+        self.assertEqual(result.lan_macaddr, '06-E6-97-9E-23-F5')
+
 
 if __name__ == '__main__':
     main()

{tplinkrouterc6u-5.6.2 → tplinkrouterc6u-5.8.0}/test/test_client_c80.py

@@ -474,6 +474,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'Laptop')
         self.assertEqual(device.up_speed, 0)
         self.assertEqual(device.down_speed, 0)
+        self.assertEqual(device.active, False)
 
         device = status.devices[1]
         self.assertIsInstance(device, Device)
@@ -485,6 +486,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'iPhone')
         self.assertEqual(device.up_speed, 0)
         self.assertEqual(device.down_speed, 0)
+        self.assertEqual(device.active, False)
 
         device = status.devices[2]
         self.assertIsInstance(device, Device)
@@ -496,6 +498,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'Laptop2')
         self.assertEqual(device.up_speed, 30)
         self.assertEqual(device.down_speed, 200)
+        self.assertEqual(device.active, True)
 
         device = status.devices[3]
         self.assertIsInstance(device, Device)
@@ -507,6 +510,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'iPhone2')
         self.assertEqual(device.up_speed, 800)
         self.assertEqual(device.down_speed, 400)
+        self.assertEqual(device.active, True)
 
         device = status.devices[4]
         self.assertIsInstance(device, Device)
@@ -518,6 +522,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'IoT_thing')
         self.assertEqual(device.up_speed, 1824)
         self.assertEqual(device.down_speed, 800)
+        self.assertEqual(device.active, True)
 
         device = status.devices[5]
         self.assertIsInstance(device, Device)
@@ -529,6 +534,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(device.hostname, 'PC')
         self.assertEqual(device.up_speed, 600)
         self.assertEqual(device.down_speed, 50)
+        self.assertEqual(device.active, True)
 
     def test_get_status_without_iot(self) -> None:
         client = TplinkC80RouterTest('', '')

{tplinkrouterc6u-5.6.2 → tplinkrouterc6u-5.8.0}/test/test_client_mr.py

@@ -734,7 +734,6 @@ ussdStatus=1
 
         class TPLinkMRClientTest(TPLinkMRClient):
             def _request(self, url, method='POST', data_str=None, encrypt=False):
-                nonlocal check_url, check_data
                 check_url.append(url)
                 check_data.append(data_str)
                 return 200, responses.pop(0)
@@ -776,7 +775,6 @@ ussdStatus=2
 
         class TPLinkMRClientTest(TPLinkMRClient):
             def _request(self, url, method='POST', data_str=None, encrypt=False):
-                nonlocal check_url, check_data
                 check_url.append(url)
                 check_data.append(data_str)
                 return 200, responses.pop(0)

tplinkrouterc6u-5.8.0/test/test_client_wdr.py

@@ -0,0 +1,292 @@
+from unittest import main, TestCase
+from ipaddress import IPv4Address
+from macaddress import EUI48
+from tplinkrouterc6u.common.dataclass import Firmware, Status
+from tplinkrouterc6u.common.dataclass import IPv4Status, IPv4Reservation, IPv4DHCPLease
+from tplinkrouterc6u import ClientError
+from tplinkrouterc6u.client.wdr import TplinkWDRRouter
+
+_NETWAN = (
+    '<SCRIPT language="javascript" type="text/javascript">\nvar wanTypeDetectInfoArray = '
+    + "new Array(\n1, 0, 4500, \n0,0 );\n</SCRIPT>\n"
+    + '<SCRIPT language="javascript" type="text/javascript">\nvar dhcpInf = new Array(\n1,\n'
+    + '0,\n1,\n0,\n0,\n0,\n0,\n0,\n"",\n"",\n0,\n0,\n"",\n"192.168.0.129",\n"255.255.255.0",\n'
+    + '"192.168.0.1",\n1,\n0,\n1500,\n0,\n"8.8.8.8",\n1,\n"8.8.4.4",\n0,\n0,\n0,\n"TL-WDR3600",\n0,0 );\n</SCRIPT>\n'
+    + '<SCRIPT language="javascript" type="text/javascript">\nvar wantypeinfo = new Array(\n6,\n0,\n'
+    + '"WanDynamicIpCfgRpm.htm",\n1,\n"WanStaticIpCfgRpm.htm",\n'
+    + '2,\n"PPPoECfgRpm.htm",\n5,\n"BPACfgRpm.htm",\n6,\n"L2TPCfgRpm.htm",\n7,\n"PPTPCfgRpm.htm",\n0,0 );\n</SCRIPT>'
+)
+_NETLAN = (
+    '<SCRIPT language="javascript" type="text/javascript">\nvar lanPara = new Array(\n"C4-6E-1F-41-67-C0",\n'
+    + '"192.168.1.254",\n2,\n"255.255.255.0",\n1,\n0,0 );\n</SCRIPT>'
+)
+
+_W24STA = (
+    '<SCRIPT language="javascript" type="text/javascript">\nvar wlanHostPara = new Array(\n1, 1, 8, 5000, 4,\n'
+    + '0,0);\n</SCRIPT>\n<SCRIPT language="javascript" type="text/javascript">\nvar hostList = new Array(\n'
+    + '"D0-BD-53-57-3E-4A", 1, 170893827, 0,\n"08-16-AC-03-E2-FA", 1, 873409583, 0,\n"F8-F1-E8-CD-0A-CF", 1, '
+    + '240958643, 0,\n"ED-49-92-1A-1D-D7", 1, 358743698, 0,\n"0E-50-99-5D-9A-D5", 1, 572346959, 0,\n0,0 );\n</SCRIPT>'
+)
+_W50STA = (
+    '<SCRIPT language="javascript" type="text/javascript">\nvar wlanHostPara = new Array(\n1, 1, 8, 5000, 4,\n'
+    + '0,0 );\n</SCRIPT>\n<SCRIPT language="javascript" type="text/javascript">\nvar hostList = new Array(\n'
+    + '"50-A6-FC-6D-EB-D3", 1, 708938274, 0,\n"6A-D0-5F-2A-FA-2D", 1, 287340958, 0,\n"DA-69-2D-59-B3-FA", 1'
+    + ", 540958641, 0,\n0,0 );\n</SCRIPT>"
+)
+
+_WLANGUEST = (
+    '<SCRIPT language="javascript" type="text/javascript">\nvar guestNetworkBandwidthInf = '
+    + "new Array(\n"
+    + '0,\n1000000,\n1000000,\n1024,\n1024,\n1,\n0,0);\n</SCRIPT>\n<SCRIPT language="javascript" '
+    + 'type="text/javascript">'
+    + '\nvar guestNetAccTime2gInf = new Array(\n1,\n1,\n0,\n0,\n0,\n1,\n0,\n0,\n0,\n0,\n0,\n0,\n0,\n1,\n"",\n"",\n'
+    + "0,0 );"
+    + '\n</SCRIPT>\n<SCRIPT language="javascript" type="text/javascript">\nvar guestNetAccTime5gInf = new Array(\n'
+    + '1,\n0,\n0,\n0,\n0,\n1,\n0,\n0,\n0,\n0,\n0,\n0,\n0,\n1,\n"",\n"",\n0,0 );\n</SCRIPT>\n'
+    + '<SCRIPT language="javascript" type="text/javascript">\nvar guestNetworkInf = '
+    + 'new Array(\n1, 1, 1, 0, "Pegasus", '
+    + '"Pegasus", 1, 1, 3, 3, "333", "333", 0, 0, "p4ssw0rd", "p4ssw0rd", '
+    + "0, 0, 0, 0, 3, 3, 1, 1, 5, 8, 0, \n0,0 );\n"
+    + "</SCRIPT>"
+)
+
+_DHCPCFG = (
+    '<SCRIPT language="javascript" type="text/javascript">\nvar DHCPPara = new Array(\n1,\n"192.168.1.129",\n'
+    + '"192.168.1.192",\n120,\n"192.168.1.254",\n"internal.lan",\n"8.8.8.8",\n"8.8.4.4",\n0,\n0,0 );\n</SCRIPT>'
+)
+
+_DHCPLEASES = (
+    '<SCRIPT language="javascript" type="text/javascript">var DHCPDynList = new Array(\n"aliquam",'
+    + '"A9-A8-2B-F7-9F-5D","192.168.1.123","Permanent",\n"pharetra","B3-A5-1E-C3-92-A9","192.168.1.163","Permanent",\n'
+    + '"ligula","71-34-47-FD-DE-84","192.168.1.165","Permanent",\n"vulputate","46-5F-5F-27-23-9F","192.168.1.103",'
+    + '"Permanent",\n"amet","86-9F-53-91-04-2B","192.168.1.72","Permanent",\n"volutpat","FA-5C-6F-87-A3-5A",'
+    + '"192.168.1.43",'
+    + '"Permanent",\n"eget","C4-ED-6C-B6-F6-B9","192.168.1.112","Permanent",\n"ante","FF-C1-A3-93-C8-E6",'
+    + '"192.168.1.38",'
+    + '"Permanent",\n"pellentesque","E3-5E-59-2E-CF-AD","192.168.1.148","Permanent",\n"metus","AE-15-51-37-0E-9E",'
+    + '"192.168.1.178","Permanent",\n0,0 );\n</SCRIPT>\n<SCRIPT language="javascript" type="text/javascript">\n'
+    + "var DHCPDynPara = new Array(\n10,\n4,\n0,0 );\n</SCRIPT>"
+)
+
+_DHCPRESERVES = (
+    '<SCRIPT language="javascript" type="text/javascript">\nvar dhcpList = new Array(\n"9B-FA-04-D8-AB-8D",'
+    + '"192.168.1.56",1,\n"EE-7C-6B-B6-05-2F","192.168.1.51",1,\n"09-51-B3-0B-92-01","192.168.1.21",1,\n'
+    + '"49-6F-72-CD-68-5D","192.168.1.25",1,\n"DF-24-38-C1-FE-BB","192.168.1.51",1,\n"1A-08-6C-52-31-3D",'
+    + '"192.168.1.22",1,\n"DE-E4-DF-9A-AD-0D","192.168.1.17",1,\n"DF-F2-CB-FE-46-15","192.168.1.26",1,\n'
+    + '0,0 )\n</SCRIPT>\n<SCRIPT language="javascript" type="text/javascript">var DHCPStaticPara = '
+    + "new Array(\n1,\n1,\n8,\n1,\n8,\n0,0 );\n</SCRIPT>"
+)
+
+ABSTRACT_STATUS = (
+    '<SCRIPT language="javascript" type="text/javascript">\nvar statusPara = new Array(\n1,\n1,\n1,\n'
+    + '22,\n20000,\n1468171,\n"3.13.34 Build 130909 Rel.53148n ",\n"WDR3600 v1 00000000",\n6732336,\n0, 0);\n'
+    + '</SCRIPT>\n'
+    + '<SCRIPT language="javascript" type="text/javascript">\nvar lanPara = new Array(\n"C4-6E-1F-41-67-C0", '
+    + '"192.168.1.254", "255.255.255.0",\n0, 0);\n</SCRIPT>\n<SCRIPT language="javascript" type="text/javascript">\n'
+    + 'var wlanPara = new Array(\n1,\n"testSSID24",\n15,\n5,\n"C4-6E-1F-41-67-BF",\n"192.168.1.254",\n2,\n8,\n71,\n6,\n'
+    + '6,\n0, 0);\n</SCRIPT>\n<SCRIPT language="javascript" type="text/javascript">\nvar wlan5GPara = new Array(\n1,\n'
+    + '"testSSID",\n15,\n8,\n"C4-6E-1F-41-67-C0",\n"192.168.1.254",\n2,\n8,\n83,\n36,\n6,\n0, 0);\n</SCRIPT>\n'
+    + '<SCRIPT language="javascript" type="text/javascript">\nvar statistList = '
+    + "new Array(\n1129349328, 3900411475, 200068023, 165562287,\n0, 0);\n</SCRIPT>\n"
+    + '<SCRIPT language="javascript" type="text/javascript">\nvar wanPara = new Array(\n4, '
+    + '"C4-6E-1F-41-67-C1", "192.168.0.129", 1, "255.255.255.0", 0, 0, "192.168.0.1", 1, 1, 0, '
+    + '"8.8.8.8 , 8.8.4.4", "", 0, 0, "0.0.0.0", "0.0.0.0", "0.0.0.0", "0.0.0.0 , 0.0.0.0", '
+    + "0, 0, 0, 0, 0,\n0, 0);\n</SCRIPT>"
+)
+
+ABSTRACT_NETWORK = {
+    "netWan": _NETWAN,
+    "netLan": _NETLAN,
+    "w24stations": _W24STA,
+    "w50stations": _W50STA,
+    "wgsettings": _WLANGUEST,
+    "dhcpconfig": _DHCPCFG,
+    "dhcplease": _DHCPLEASES,
+    "dhcpreserve": _DHCPRESERVES,
+}
+
+
+class ResponseMock:
+    def __init__(self, text: str, status_code=0):
+        self.content = text.encode("utf8")
+        self.status_code = status_code
+        self.headers: dict = {}
+
+
+class TplinkWDRRouterTest(TplinkWDRRouter):
+    response = ""
+
+    def request(
+        self,
+        section: str,
+        data: str,
+        ignore_response: bool = False,
+        ignore_errors: bool = False,
+    ) -> str | dict | None:
+        # only a test, so no extra headers
+        # Responses
+        sections = "summary,status,"
+        sections += "netWan,netLan,dualBand,"
+        sections += "w24settings,w24wps,w24sec,w24adv,w24stations,"
+        sections += "w50settings,w50wps,w50sec,w50adv,w50stations,"
+        sections += "wgsettings,wgshare,dhcpconfig,dhcplease,dhcpreserve,"
+        sections += "portFwd,sysroute,upnpFwd"
+
+        section_list = sections.split(",")
+
+        if ignore_response:
+            return None
+        elif section == "check":
+            resp = ResponseMock("", 200)
+            resp.headers["www-authenticate"] = (
+                'Basic realm="TP-LINK Wireless Dual Band Gigabit Router WDR3600"'
+            )
+            return resp
+        elif section in section_list:
+            if section in ["summary", "status"]:
+                return ResponseMock(ABSTRACT_STATUS).content
+            elif section in ["w24stations", "w50stations", "dhcpreserve"]:
+                return ResponseMock(ABSTRACT_NETWORK[section]).content
+            elif section in [
+                "netLan",
+                "netWan",
+                # 'w24stations',
+                # 'w50stations',
+                "wgsettings",
+                "dhcpconfig",
+                "dhcplease",
+                # 'dhcpreserve',
+            ]:
+                return ResponseMock(ABSTRACT_NETWORK[section]).content
+            else:
+                return ""
+                # raise ClientError (f'Section {section} not allowed')
+
+        else:
+            error = ""
+            error = (
+                (
+                    "WDRRouter - {} - Response with error; Request {} - Response {}".format(
+                        self.__class__.__name__, section, data
+                    )
+                )
+                if not error
+                else error
+            )
+            if self._logger:
+                self._logger.debug(error)
+
+            raise ClientError(error)
+
+
+class TestTPLinkWDRClient(TestCase):
+
+    def test_supports(self) -> None:
+        client = TplinkWDRRouterTest("", "")
+        # client.response =  ResponseMock(ABSTRACT_STATUS)
+        supports = client.supports()
+        self.assertTrue(supports)
+
+    def test_get_firmware(self) -> None:
+
+        client = TplinkWDRRouterTest("", "")
+        client.response = ResponseMock(ABSTRACT_STATUS)
+        firmware = client.get_firmware()
+
+        self.assertIsInstance(firmware, Firmware)
+        self.assertEqual(firmware.hardware_version, "WDR3600 v1 00000000")
+        self.assertEqual(firmware.model, "WDR3600")
+        self.assertEqual(
+            firmware.firmware_version.strip(), "3.13.34 Build 130909 Rel.53148n"
+        )
+
+    def test_get_ipv4(self) -> None:
+
+        client = TplinkWDRRouterTest("", "")
+        ipv4status: IPv4Status = IPv4Status()
+        ipv4status = client.get_ipv4_status()
+
+        self.assertIsInstance(ipv4status, IPv4Status)
+        self.assertEqual(ipv4status._wan_macaddr, EUI48("C4-6E-1F-41-67-C1"))
+        self.assertEqual(
+            IPv4Address(ipv4status.wan_ipv4_ipaddr), IPv4Address("192.168.0.129")
+        )
+        self.assertEqual(
+            IPv4Address(ipv4status.wan_ipv4_gateway), IPv4Address("192.168.0.1")
+        )
+        self.assertEqual(ipv4status.wan_ipv4_conntype, "Dynamic IP")
+        self.assertEqual(
+            IPv4Address(ipv4status.wan_ipv4_netmask), IPv4Address("255.255.255.0")
+        )
+        self.assertEqual(
+            IPv4Address(ipv4status.wan_ipv4_pridns), IPv4Address("0.0.0.0")
+        )
+        self.assertEqual(
+            IPv4Address(ipv4status.wan_ipv4_snddns), IPv4Address("0.0.0.0")
+        )
+        self.assertEqual(ipv4status._lan_macaddr, EUI48("C4-6E-1F-41-67-C0"))
+        self.assertEqual(
+            IPv4Address(ipv4status.lan_ipv4_ipaddr), IPv4Address("192.168.1.254")
+        )
+        self.assertEqual(ipv4status.lan_ipv4_dhcp_enable, True)
+        self.assertEqual(
+            IPv4Address(ipv4status.lan_ipv4_netmask), IPv4Address("255.255.255.0")
+        )
+
+    def test_get_ipv4_reservations(self) -> None:
+        client = TplinkWDRRouterTest("", "")
+        ipv4_reservations: list[IPv4Reservation] = client.get_ipv4_reservations()
+        fRes: IPv4Reservation = ipv4_reservations[0]
+
+        self.assertIsInstance(fRes, IPv4Reservation)
+        self.assertEqual(EUI48(fRes.macaddress), EUI48("9B-FA-04-D8-AB-8D"))
+        self.assertEqual(IPv4Address(fRes.ipaddress), IPv4Address("192.168.1.56"))
+        self.assertEqual(fRes.enabled, True)
+
+    def test_get_ipv4_dhcp_leases(self) -> None:
+        client = TplinkWDRRouterTest("", "")
+        dhcp_leases: list[IPv4DHCPLease] = client.get_ipv4_dhcp_leases()
+
+        self.assertIsInstance(dhcp_leases[0], IPv4DHCPLease)
+        self.assertEqual(dhcp_leases[0].macaddress, EUI48("A9-A8-2B-F7-9F-5D"))
+        self.assertEqual(dhcp_leases[0].ipaddress, IPv4Address("192.168.1.123"))
+        self.assertEqual(dhcp_leases[0].hostname, "aliquam")
+        self.assertEqual(dhcp_leases[0].lease_time, "Permanent")
+
+        self.assertIsInstance(dhcp_leases[1], IPv4DHCPLease)
+        self.assertEqual(dhcp_leases[1].macaddress, EUI48("B3-A5-1E-C3-92-A9"))
+        self.assertEqual(dhcp_leases[1].ipaddress, IPv4Address("192.168.1.163"))
+        self.assertEqual(dhcp_leases[1].hostname, "pharetra")
+        self.assertEqual(dhcp_leases[1].lease_time, "Permanent")
+
+    def test_get_status(self) -> None:
+        client = TplinkWDRRouterTest("", "")
+        client.response = ResponseMock(ABSTRACT_STATUS)
+
+        status = client.get_status()
+
+        self.assertIsInstance(status, Status)
+        self.assertEqual(status.wan_macaddr, "C4-6E-1F-41-67-C1")
+        self.assertIsInstance(status.wan_macaddress, EUI48)
+        self.assertEqual(status.lan_macaddr, "C4-6E-1F-41-67-C0")
+        self.assertIsInstance(status.lan_macaddress, EUI48)
+        self.assertEqual(status.wan_ipv4_addr, "192.168.0.129")
+        self.assertIsInstance(status.lan_ipv4_address, IPv4Address)
+        self.assertEqual(status.lan_ipv4_addr, "192.168.1.254")
+        self.assertEqual(status.wan_ipv4_gateway, "192.168.0.1")
+        self.assertIsInstance(status.wan_ipv4_address, IPv4Address)
+
+        self.assertEqual(status.wired_total, 10)
+        self.assertEqual(status.wifi_clients_total, 8)
+        self.assertEqual(status.guest_clients_total, 0)
+        self.assertEqual(status.clients_total, 18)
+
+        self.assertTrue(status.guest_2g_enable)
+        self.assertFalse(status.guest_5g_enable)
+        self.assertTrue(status.wifi_2g_enable)
+        self.assertTrue(status.wifi_5g_enable)
+        self.assertEqual(status.wan_ipv4_uptime, 6732336)
+
+
+if __name__ == "__main__":
+    main()

{tplinkrouterc6u-5.6.2 → tplinkrouterc6u-5.8.0}/tplinkrouterc6u/__init__.py

@@ -8,6 +8,7 @@ from tplinkrouterc6u.client.c80 import TplinkC80Router
 from tplinkrouterc6u.client.c5400x import TplinkC5400XRouter
 from tplinkrouterc6u.client.c1200 import TplinkC1200Router
 from tplinkrouterc6u.client.xdr import TPLinkXDRClient
+from tplinkrouterc6u.client.wdr import TplinkWDRRouter
 from tplinkrouterc6u.provider import TplinkRouterProvider
 from tplinkrouterc6u.common.package_enum import Connection, VPN
 from tplinkrouterc6u.common.dataclass import (

{tplinkrouterc6u-5.6.2 → tplinkrouterc6u-5.8.0}/tplinkrouterc6u/client/c6u.py

@@ -275,7 +275,7 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
         data = self.request('admin/status?form=all&operation=read', 'operation=read')
 
         status = Status()
-        status._wan_macaddr = EUI48(data['wan_macaddr']) if 'wan_macaddr' in data else None
+        status._wan_macaddr = EUI48(data['wan_macaddr']) if 'wan_macaddr' in data and data['wan_macaddr'] else None
         status._lan_macaddr = EUI48(data['lan_macaddr'])
         status._wan_ipv4_addr = IPv4Address(data['wan_ipv4_ipaddr']) if 'wan_ipv4_ipaddr' in data else None
         status._lan_ipv4_addr = IPv4Address(data['lan_ipv4_ipaddr']) if 'lan_ipv4_ipaddr' in data else None

{tplinkrouterc6u-5.6.2 → tplinkrouterc6u-5.8.0}/tplinkrouterc6u/client/c80.py

@@ -82,8 +82,11 @@ class TplinkC80Router(AbstractRouter):
         self._encryption = EncryptionState()
 
     def supports(self) -> bool:
-        response = self.request(2, 1, data='0|1,0,0')
-        return response.status_code == 200 and response.text.startswith('00000')
+        try:
+            response = self.request(2, 1, data='0|1,0,0')
+            return response.status_code == 200 and response.text.startswith('00000')
+        except Exception:
+            return False
 
     def authorize(self) -> None:
         encoded_password = TplinkC80Router._encrypt_password(self.password)
@@ -328,6 +331,7 @@ class TplinkC80Router(AbstractRouter):
             device_to_add = Device(connection_type, EUI48(device['mac']), IPv4Address(device['ip']), device['name'])
             device_to_add.up_speed = int(device['up'])
             device_to_add.down_speed = int(device['down'])
+            device_to_add.active = device['online'] == '1'
             mapped_devices.append(device_to_add)
         return mapped_devices