tplinkrouterc6u 5.6.2__py3-none-any.whl → 5.8.0__py3-none-any.whl

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()

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('', '')

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)

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/__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/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/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
 

tplinkrouterc6u/client/wdr.py

@@ -0,0 +1,672 @@
+import base64
+from ipaddress import IPv4Address
+from requests import get, Response
+from logging import Logger
+from macaddress import EUI48
+from tplinkrouterc6u.common.helper import get_ip
+from tplinkrouterc6u.common.package_enum import Connection
+from tplinkrouterc6u.common.exception import ClientError
+from tplinkrouterc6u.common.dataclass import (
+    Firmware,
+    Status,
+    Device,
+    IPv4Reservation,
+    IPv4DHCPLease,
+    IPv4Status,
+)
+from tplinkrouterc6u.client_abstract import AbstractRouter
+
+from dataclasses import dataclass
+from html.parser import HTMLParser
+
+dataUrls = {
+    "check": "/StatusRpm.htm",
+    "summary": "/StatusRpm.htm",
+    "netWan": "/WanDynamicIpCfgRpm.htm?wan=0",
+    "netLan": "/NetworkCfgRpm.htm",
+    # 'macClone': "",
+    # WIFI
+    "dualBand": "/WlanBandRpm.htm",
+    # 2.4 Ghz"
+    "w24settings": "/WlanNetworkRpm.htm",
+    "w24wps": "/WpsCfgRpm.htm",
+    "w24sec": "/WlanSecurityRpm.htm",
+    "w24macflt": "/WlanMacFilterRpm.htm",
+    "w24adv": "/WlanAdvRpm.htm",
+    "w24stations": "/WlanStationRpm.htm?Page=1",
+    # 5.0 Ghz
+    "w50settings": "/WlanNetworkRpm_5g.htm",
+    "w50wps": "/WpsCfgRpm_5g.htm",
+    "w50sec": "/WlanSecurityRpm_5g.htm",
+    "w50macflt": "/WlanMacFilterRpm_5g.htm",
+    "w50adv": "/WlanAdvRpm_5g.htm",
+    "w50stations": "/WlanStationRpm_5g.htm?Page=1",
+    # Guest Network
+    "wgsettings": "/GuestNetWirelessCfgRpm.htm",
+    "wgshare": "/GuestNetUsbCfgRpm.htm",
+    # DHCP
+    "dhcpconfig": "/LanDhcpServerRpm.htm",
+    "dhcplease": "/AssignedIpAddrListRpm.htm",
+    "dhcpreserve": "/FixMapCfgRpm.htm",
+    # Referer
+    "defReferer": "/MenuRpm.htm",
+    # routing
+    "sysroute": "/SysRouteTableRpm.htm",
+    "portFwd": "/VirtualServerRpm.htm",
+    "upnpFwd": "/UpnpCfgRpm.htm",
+    # Reboot
+    "reboot": "/SysRebootHelpRpm.htm",
+}
+
+
+def defaultHeaders():
+    # default headers for all requests
+    return {
+        "Accept": "application/json, text/javascript, */*; q=0.01",
+        "User-Agent": "TP-Link Scrapper",
+        "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+        "X-Requested-With": "XMLHttpRequest",
+    }
+
+
+@dataclass
+class HostId:
+    def __init__(self, ipaddr: str, host: str) -> None:
+        self.ipaddr = ipaddr
+        self.host = host
+
+
+@dataclass
+class NetInfo:
+    def __init__(self) -> None:
+        self.wlan24Gcfg = {}
+        self.wlan24Gsec = {}
+        self.wlan24Gadv = {}
+        self.wlan24Gcli: list[Device] = []
+
+        self.wlan50Gcfg = {}
+        self.wlan50Gsec = {}
+        self.wlan50Gadv = {}
+        self.wlan50Gcli: list[Device] = []
+
+        self.guest24Gcfg = {}
+        self.guest50Gcfg = {}
+
+        self.ipv4 = {}
+        self.routing = {}
+        self.fwd_static = {}
+        self.fwd_pnp = {}
+        self.dhcp_cfg = {}
+        self.security = {}
+
+
+class muParser(HTMLParser):
+    def __init__(self, tag, convert_charrefs: bool = True):
+        super().__init__(convert_charrefs=convert_charrefs)
+
+        self.tag = tag
+        self.data: list = []
+        self.cTag = ""
+        self.cIdx = 0
+        self.cBlock = ""
+
+    def handle_starttag(self, tag, attrs):
+        if tag == self.tag:
+            self.cBlock = ""
+            self.cTag = tag
+
+    def handle_endtag(self, tag):
+        if tag == self.tag:
+            self.data.append(self.cBlock.strip("\r\n"))
+            self.cIdx += 1
+            self.cBlock = ""
+            self.cTag = ""
+
+    def handle_data(self, data):
+        if self.cTag == self.tag:
+            self.cBlock += data
+
+
+class WDRRequest:
+    host = ""
+    credentials = ""
+    timeout = 10
+    _logged = False
+    _verify_ssl = False
+    _logger = None
+    _headers_request = {}
+
+    def buildUrl(self, section: str):
+        return "{}/userRpm{}".format(self.host, dataUrls[section])
+
+    def request(
+        self,
+        section: str,
+        data: str,
+        ignore_response: bool = False,
+        ignore_errors: bool = False,
+    ) -> str | dict | None:
+        if not self._headers_request:
+            self._headers_request = defaultHeaders()
+
+        # add xtra headers: User-Agent, Authorization and Referer
+        self._headers_request["Referer"] = self.buildUrl("defReferer")
+        self._headers_request["User-Agent"] = "TP-Link Scrapper"
+        self._headers_request["Authorization"] = "Basic {}".format(self.credentials)
+
+        path = dataUrls[section]
+        url = self.buildUrl(section)
+        if section == "reboot":
+            url = url + "?Reboot=Reboot"
+
+        # Always GET, so data always is a query
+        if data:
+            url = url + f"?{data}"
+
+        response = get(
+            url,
+            headers=self._headers_request,
+            timeout=self.timeout,
+            verify=self._verify_ssl,
+        )
+
+        data = response.content  # better than .text  for later parsing
+        if response.ok:
+            if ignore_response:
+                return None
+            if section == "check":
+                return response
+
+            return data
+        else:
+            if ignore_errors:
+                return data
+            error = ""
+            error = (
+                (
+                    "WDRRouter - {} - Response with error; Request {} - Response {}".format(
+                        self.__class__.__name__, path, data
+                    )
+                )
+                if not error
+                else error
+            )
+            if self._logger:
+                self._logger.debug(error)
+            raise ClientError(error)
+
+
+class TplinkWDRRouter(AbstractRouter, WDRRequest):
+    # _smart_network = True
+    _perf_status = False
+
+    def __init__(
+        self,
+        host: str,
+        password: str,
+        username: str = "admin",
+        logger: Logger = None,
+        verify_ssl: bool = True,
+        timeout: int = 30,
+    ) -> None:
+        super().__init__(host, password, username, logger, verify_ssl, timeout)
+
+        self.credentials = base64.b64encode(
+            bytes(f"{self.username}:{self.password}", "utf8")
+        ).decode("utf8")
+        # device data
+        self.status: Status = Status()  # {}
+        self.brand = "TP-Link"
+        self.firmware: Firmware = {}
+        self.hostname = ""
+        self.ipv4status: IPv4Status = IPv4Status()
+        self.network: NetInfo = NetInfo()
+        self.ipv4Reserves: list[IPv4Reservation] = []
+        self.dhcpLeases: list[IPv4DHCPLease] = []
+        self.connDevices: list[Device] = []
+
+    # N/A. WDR family has no session support , so no "logged" state
+    def authorize(self) -> None:
+        pass
+
+    def logout(self) -> None:
+        pass
+
+    def supports(self) -> bool:
+        try:
+            response: Response = self.request("check", "")
+            return response.status_code == 200
+        except Exception:
+            return False
+
+    def get_firmware(self) -> Firmware:
+        self._updateStatus()
+        return self.firmware
+
+    def get_status(self) -> Status:
+        self._updateStatus()
+        return self.status
+
+    def get_ipv4_status(self) -> IPv4Status:
+        self._updateStatus()
+        self._updateNet()
+        return self.ipv4status
+
+    def get_ipv4_reservations(self):
+        self._updateNet()
+        return self.ipv4Reserves
+
+    def get_ipv4_dhcp_leases(self):
+        self._updateNet()
+        return self.dhcpLeases
+
+    def get_clients(self):
+        self._updateNet()
+        return self.connDevices
+
+    def reboot(self) -> None:
+        self.request("reboot", "Reboot=Reboot", True)
+
+    def set_wifi(self, wifi: Connection, enable: bool) -> None:
+        # main wifi cannot be activated / deactivated via software. Only by the phisical button
+        # Guest wifi can, but saved changes won't activate until next reboot
+        if wifi == Connection.GUEST_2G:
+            section = "wgsettings"
+            query = "setNetworkMode=1"
+        if wifi == Connection.GUEST_2G:
+            section = "wgsettings"
+            query = "setNetworkMode_5G=1"
+
+        self.request(section, query, True)
+
+    def update(self, what: str = "") -> None:
+        if what == "":
+            return None
+        if what.lower() == "status":
+            return self._updateStatus()
+        if what.lower() == "firmware":
+            return self._updateStatus()
+        if what.lower() == "net":
+            return self._updateNet()
+        if what.lower() == "all":
+            self._updateStatus()
+            self._updateNet()
+            return None
+
+    def _updateStatus(self) -> None:
+        raw = self.request("summary", "")
+        self._parseSummary(raw)
+        self._updateNet()
+
+    def _updateNet(self) -> None:
+        sections = "netWan,netLan,dualBand,"
+        sections += "w24settings,w24wps,w24sec,w24adv,"
+        sections += "w50settings,w50wps,w50sec,w50adv,"
+        sections += "wgsettings,wgshare,dhcpconfig,dhcplease,"
+        sections += "sysroute,upnpFwd"
+
+        section_list = sections.split(",")
+        for section in section_list:
+            self._updateSection(section)
+
+        multiPage_list = "w24stations,w50stations,dhcpreserve,portFwd".split(",")
+        for section in multiPage_list:
+            self._updateMultiSection(section)
+
+        self._updateDevices()
+
+    def _updateDevices(self):
+        isWireless: list = []
+        w24s: list = self.network.wlan24Gcli
+
+        self.connDevices = []
+        for wl24 in w24s:
+            if wl24[0] not in isWireless:
+                _dev: HostId = self._findHostInLeases(wl24[0])
+                thisone = Device(Connection.HOST_2G, wl24[0], _dev.ipaddr, _dev.host)
+                thisone.packets_received = wl24[3]
+                thisone.packets_sent = wl24[2]
+                self.connDevices.append(thisone)
+                isWireless.append(wl24[0])
+
+        w50s = self.network.wlan50Gcli
+        for wl50 in w50s:
+            if wl50[0] not in isWireless:
+                _dev: HostId = self._findHostInLeases(wl50[0])
+                thisone = Device(Connection.HOST_5G, wl50[0], _dev.ipaddr, _dev.host)
+                thisone.packets_received = wl50[3]
+                thisone.packets_sent = wl50[2]
+                self.connDevices.append(thisone)
+                isWireless.append(wl50[0])
+
+        self.status.wifi_clients_total = len(isWireless)
+
+        connected: list[IPv4DHCPLease] = self.dhcpLeases
+        client: IPv4DHCPLease = {}
+
+        wired_speed = 1 * 1024 * 1024 * 1024
+
+        for client in connected:
+            if client.macaddr not in isWireless:
+                thisone = Device(
+                    Connection.WIRED, client.macaddr, client.ipaddr, client.hostname
+                )
+                thisone.up_speed = wired_speed
+                thisone.down_speed = wired_speed
+                self.connDevices.append(thisone)
+
+        self.status.devices = self.connDevices
+
+        wifiCli = len(isWireless)
+        totalCli = len(self.connDevices)
+        wiredCli = totalCli - wifiCli
+
+        self.status.wifi_clients_total = wifiCli
+        self.status.guest_clients_total = 0
+        self.status.clients_total = totalCli
+        self.status.wired_total = wiredCli
+
+    def _updateSection(self, section: str) -> None:
+        raw = self.request(section, "")
+        data = self._parseRawHTML(raw)
+        self._parseSection(section, data)
+
+    def _updateMultiSection(self, section: str) -> None:
+        # For sections with potentially more than one page
+        if section == "w24stations" or section == "w50stations":
+            raw = self.request(section, "")
+            data = self._parseRawHTML(raw)
+            mainData = data["script0"]
+            listData: list = data["script1"]
+            numTotal = mainData[0] - (mainData[1] - 1) * mainData[2]
+
+            nextPage = False
+            if numTotal > mainData[2]:
+                numTotal = mainData[2]
+                nextPage = True
+
+            while nextPage:
+                query = "Page=+int(mainData[1]+1"
+                raw = self.request(section, query)
+                nextPage = False
+                data = self._parseRawHTML(raw)
+                mainData = data["script0"]
+                listData.extend(data["script1"])
+                numTotal = mainData[0] - (mainData[1] - 1) * mainData[2]
+                if numTotal > mainData[2]:
+                    numTotal = mainData[2]
+                    nextPage = True
+
+            self._parseSection(section, {"script0": mainData, "script1": listData})
+
+        elif section == "dhcpreserve":
+            raw = self.request(section, "")
+            data = self._parseRawHTML(raw)
+            currpage = int(data["script1"][0])
+            lastpage = int(data["script1"][3])
+            tmpData = {}
+            while currpage < lastpage:
+                query = f"Page={str(currpage + 1)}"
+                raw = self.request(section, query)
+                tmpData = self._parseRawHTML(raw)
+
+                tArr = tmpData["script0"]
+                for item in tArr:
+                    data["script0"].append(item)
+
+                currpage = int(tmpData["script1"][0])
+                lastpage = int(tmpData["script1"][3])
+                data["script1"] = tmpData["script1"]
+
+            self._parseSection(section, data)
+
+        elif section == "portFwd":
+            # TODO
+            # self._parseSection(section, data)
+            pass
+
+    def _parseSection(self, section: str, data: dict) -> None:
+
+        if section == "netLan":
+            lanData = data["script0"]
+            self.ipv4status._lan_ipv4_netmask = IPv4Address(lanData[3])
+            self.network.ipv4["igmpProxy"] = lanData[4]
+            self.ipv4status.lan_ipv4_dhcp_enable = False
+
+        elif section == "netWan":
+            wanData = data["script1"]
+            connType = self._get_conn_type(int(wanData[0]) - 1)
+            if not connType:
+                connType = "unkown"
+            self.ipv4status._wan_ipv4_conntype = connType
+            self.status.conn_type = connType
+
+            self.ipv4status._wan_ipv4_netmask = IPv4Address(wanData[14] or "0.0.0.0")
+            dns = ["0.0.0.0", "0.0.0.0"]
+            # self.ipv4status._wan_ipv4_pridns = '0.0.0.0'
+            # self.ipv4status._wan_ipv4_snddns = '0.0.0.0'
+            if wanData[19] == "1":
+                dns[0] = wanData[20]
+                dns[1] = wanData[22]
+
+            self.ipv4status._wan_ipv4_pridns = IPv4Address(dns[0])
+            self.ipv4status._wan_ipv4_snddns = IPv4Address(dns[1])
+
+            self.hostname = wanData[26]
+
+        elif section == "dualBand":
+            # TODO
+            pass
+        elif section == "w24settings" or section == "w50settings":
+            # TODO
+            pass
+        elif section == "w24sec" or section == "w50sec":
+            # TODO
+            pass
+        elif section == "w24adv" or section == "w50adv":
+            # TODO
+            pass
+        elif section == "w24stations" or section == "w50stations":
+            listData = data["script1"]
+            if len(listData) > 3:
+                for i in range(0, len(listData), 4):
+                    tmpcli = [
+                        listData[i],
+                        int(listData[i + 1]),
+                        int(listData[i + 2]),
+                        int(listData[i + 3]),
+                    ]
+                    if section == "w24stations":
+                        self.network.wlan24Gcli.append(tmpcli)
+                    elif section == "w50stations":
+                        self.network.wlan50Gcli.append(tmpcli)
+        elif section == "wgsettings":
+            guestData = data["script3"]
+            self.status.guest_2g_enable = bool(int(guestData[2]))
+            self.status.guest_5g_enable = bool(int(guestData[3]))
+
+        elif section == "wgshare":
+            # TODO
+            pass
+        elif section == "sysroute":
+            # TODO
+            pass
+        elif section == "portFwd":
+            # TODO
+            pass
+        elif section == "upnpFwd":
+            # TODO
+            pass
+        elif section == "dhcpconfig":
+            cfg = data["script0"]
+            if cfg[0] == 1:
+                self.ipv4status.lan_ipv4_dhcp_enable = True
+            oCfg = {}
+            oCfg["enabled"] = bool(int(cfg[0]))
+            oCfg["range_start"] = cfg[1]
+            oCfg["range_end"] = cfg[2]
+            oCfg["lease_time"] = int(cfg[3])
+            oCfg["gateway"] = cfg[4]
+            oCfg["domain"] = cfg[5] or None
+            oCfg["dns_pri"] = cfg[6] or None
+            oCfg["dns_sec"] = cfg[7] or None
+            self.network.dhcp_cfg = oCfg
+        elif section == "dhcpreserve":
+            item: IPv4Reservation = {}
+            self.ipv4Reserves = []
+            for i in range(0, len(data["script0"]), 3):
+                _dev: HostId = self._findHostInLeases(data["script0"][i])
+                item = IPv4Reservation(
+                    data["script0"][i],
+                    data["script0"][i + 1],
+                    _dev.host,
+                    bool(int(data["script0"][i + 2])),
+                )
+                self.ipv4Reserves.append(item)
+        elif section == "dhcplease":
+            self.dhcpLeases = []
+            for i in range(0, len(data["script0"]), 4):
+                item = IPv4DHCPLease(
+                    EUI48(data["script0"][i + 1]),
+                    IPv4Address(data["script0"][i + 2]),
+                    data["script0"][i],
+                    data["script0"][i + 3],
+                )
+                self.dhcpLeases.append(item)
+        elif section == "portFwd":
+            # TODO
+            pass
+
+    def _parseSummary(self, raw: str) -> None:
+        data = self._parseRawHTML(raw)
+        tFirm = data["script0"][6]
+        tHard = data["script0"][7]
+        # WDR3600 v1 00000000
+        tModel = tHard.split(" ")
+        self.firmware = Firmware(tHard, tModel[0], tFirm)
+        self.status = Status()
+        self.status.wan_ipv4_uptime = int(data["script0"][8])
+        self.status._lan_ipv4_addr = get_ip(data["script1"][1])
+        self.status._lan_macaddr = EUI48(data["script1"][0])
+
+        self.ipv4status._lan_ipv4_ipaddr = get_ip(data["script1"][1])
+        self.ipv4status._lan_macaddr = EUI48(data["script1"][0])
+
+        self.status._wan_macaddr = EUI48(data["script5"][1])
+        self.status._wan_ipv4_addr = get_ip(data["script5"][2])
+        self.status._wan_ipv4_gateway = get_ip(data["script5"][7])
+
+        self.ipv4status._wan_macaddr = EUI48(data["script5"][1])
+        self.ipv4status._wan_ipv4_ipaddr = get_ip(data["script5"][2])
+        self.ipv4status._wan_ipv4_netmask = ""
+        self.ipv4status._wan_ipv4_gateway = get_ip(data["script5"][7])
+
+        self.status.guest_2g_enable = None
+        self.status.guest_5g_enable = None
+        self.status.wifi_2g_enable = bool(int(data["script2"][0]))
+        self.status.wifi_5g_enable = bool(int(data["script3"][0]))
+
+        self.status.conn_type = "unknown"
+        self.status.devices = []
+
+    def _get_conn_type(self, n: int) -> str:
+        wantypeinfo = [
+            6,
+            0,
+            "WanDynamicIpCfgRpm.htm",
+            1,
+            "WanStaticIpCfgRpm.htm",
+            2,
+            "PPPoECfgRpm.htm",
+            5,
+            "BPACfgRpm.htm",
+            6,
+            "L2TPCfgRpm.htm",
+            7,
+            "PPTPCfgRpm.htm",
+            0,
+            0,
+        ]
+        wantype_filtered = wantypeinfo[2 * n + 1]
+
+        wan_type: list = [
+            "Dynamic IP",
+            "Static IP",
+            "PPPoE/Russia PPPoE",
+            "802.1x DHCP",
+            "802.1x Static IP",
+            "BigPond Cable",
+            "L2TP/Russia L2TP",
+            "PPTP/Russia PPTP",
+        ]
+        return wan_type[wantype_filtered]
+
+    def _findHostInLeases(self, macaddr: str) -> HostId:
+        arr = self.dhcpLeases
+        for lease in arr:
+            if lease.macaddr == macaddr:
+                return HostId(lease.ipaddr, lease.hostname)
+
+        return HostId("0.0.0.0", "-")
+
+    def _parseRawHTML(self, rawHTML: str) -> dict:
+
+        parser = muParser("script")
+        if not rawHTML:
+            return {}
+        parser.feed(rawHTML.decode("utf8", "ignore"))
+
+        all_scripts = parser.data
+        data = {}
+        count = 0
+        for script in all_scripts:
+
+            if script == "":
+                continue
+
+            if not str(script).startswith(("var")):
+                continue
+
+            oneLiner = self._parseDataBlock(script)
+
+            newArr = []
+            for item in oneLiner.split(","):
+                newVal = None
+                try:
+                    newVal = int(item)
+                except Exception:
+                    try:
+                        newVal = float(item)
+                    except Exception:
+                        newVal = item
+                newArr.append(newVal)
+
+            data["script" + str(count)] = newArr
+            count += 1
+
+        return data
+
+    def _parseDataBlock(self, text) -> str:
+        lines = text.splitlines()
+        if len(lines) < 1:
+            return []
+        if lines[0] == "":
+            lines.pop(0)  # delete first line if empty
+        if lines[-1] == "":
+            lines.pop()  # delete last line if empty
+        lines.pop(0)
+        lines.pop()
+        result: str = ""
+        if len(lines) == 1:
+            result = lines[0].replace(", ", ",").replace('"', "")
+        else:
+            linesNew = []
+            for oneLine in lines:
+                oneLine = oneLine.replace(", ", ",").replace('"', "")
+                linesNew.append(oneLine)
+            lines = linesNew
+            result = "".join(lines)
+
+        if result.endswith(","):
+            result = result[:-1]
+        return result

tplinkrouterc6u/common/dataclass.py

@@ -25,6 +25,7 @@ class Device:
         self.down_speed: int | None = None
         self.up_speed: int | None = None
         self.signal: int | None = None
+        self.active: bool = True
 
     @property
     def macaddr(self):

tplinkrouterc6u/provider.py

@@ -11,6 +11,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.wdr import TplinkWDRRouter
 
 
 class TplinkRouterProvider:
@@ -18,7 +19,7 @@ class TplinkRouterProvider:
     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, TPLinkEXClient, TPLinkMRClient, TPLinkDecoClient,
-                       TPLinkXDRClient, TplinkRouter, TplinkC80Router]:
+                       TPLinkXDRClient, TplinkRouter, TplinkC80Router, TplinkWDRRouter]:
             router = client(host, password, username, logger, verify_ssl, timeout)
             if router.supports():
                 return router

{tplinkrouterc6u-5.6.2.dist-info → tplinkrouterc6u-5.8.0.dist-info}/METADATA

@@ -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.dist-info → tplinkrouterc6u-5.8.0.dist-info}/RECORD

@@ -1,32 +1,34 @@
 test/__init__.py,sha256=McQmUjeN3AwmwdS6QNfwGXXE77OKoPK852I2BM9XsrU,210
 test/test_client_c1200.py,sha256=4RdwMEwTGWLOxOVTuPikifXDcUJFQ13DuyWGm2Aevrk,8811
-test/test_client_c6u.py,sha256=3nvhybxYxiCVjjLXB3nBYrAkXS8zoLtJibgvsqsTQ3U,32140
-test/test_client_c80.py,sha256=ZW4Ad-Y-o_IVNz1YPdrtq6At-_hujT1sMtOEOLkgu24,42081
+test/test_client_c6u.py,sha256=ulKoOJiwQVaBslY7kxCa7HmLaqTPzKJaNjm-xIBjB6A,33755
+test/test_client_c80.py,sha256=RY_1SgRVcQQdN9h0_IXA0YW4_0flEB_uel05QvDDfws,42359
 test/test_client_deco.py,sha256=YPLKRD8GoyDYHfRgdXvCk8iVNw8zdMJW-AHVnNbpdTM,31719
 test/test_client_ex.py,sha256=0dVvOJqxpR2xNca99vadfdpxmzW-4sk9X_4tAK8x9-c,21710
-test/test_client_mr.py,sha256=NxTgXv_wN50K8KsJhykoU-TX0ddDGlX_7jp50FXOLjg,33517
+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=-YGlTq78D4jE7pTTs4xTW3NamoiSIrNtpswne5ohb0s,951
+tplinkrouterc6u/__init__.py,sha256=DDy6XVFH8Ne5C9JToRWNzRqevUfNutLUTlDhvIMsebo,1006
 tplinkrouterc6u/client_abstract.py,sha256=3UYzmll774S_Gb5E0FTVO_rI3-XFM7PSklg1-V-2jls,1419
-tplinkrouterc6u/provider.py,sha256=FGwdxiebku-Bgr6OM9YZQqdus68t1twHw7eRPco2NjE,2080
+tplinkrouterc6u/provider.py,sha256=bzH0WW2peC66f8NqfiI3t_niX6MFO8SAdKP9WZL-IV4,2152
 tplinkrouterc6u/client/__init__.py,sha256=KBy3fmtA9wgyFrb0Urh2x4CkKtWVnESdp-vxmuOvq0k,27
 tplinkrouterc6u/client/c1200.py,sha256=_nY_pJ-wPWODAaes9kHPdVcM6YM54f1E54CfdoFHqbE,4771
 tplinkrouterc6u/client/c5400x.py,sha256=9E0omBSbWY_ljrs5MTCMu5brmrLtzsDB5O62Db8lP8Q,4329
-tplinkrouterc6u/client/c6u.py,sha256=TbS8qbwfPzIVDEMNNlKMhWuGeo-RUvaCkG_bF7Y4L0Q,17637
-tplinkrouterc6u/client/c80.py,sha256=3Cy9FCYHZaGzTGAjsB2BdjxpzJmBoW6TMDTDaCyUDjI,18437
+tplinkrouterc6u/client/c6u.py,sha256=zcnMFsP-rn219PLfav-7KtHhOFkfrdtYnCyHWdcdKOw,17661
+tplinkrouterc6u/client/c80.py,sha256=ArVhza_fnXcEO-_fsQOd1l2QvmSfsswtohKxrZxEnoU,18568
 tplinkrouterc6u/client/deco.py,sha256=cpKRggKD2RvSmMZuD6tzsZmehAUCU9oLiTTHcZBW81Y,8898
 tplinkrouterc6u/client/ex.py,sha256=ZK08mlOts3fbBJh9NUrzBADP0N9LHgzOXCKY2tF9gG0,13111
 tplinkrouterc6u/client/mr.py,sha256=kJ-meAgMPub6aKtzBEVI3CNNzsVab7pLkOlXU9dj030,26030
 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
 tplinkrouterc6u/common/__init__.py,sha256=pCTvVZ9CAwgb7MxRnLx0y1rI0sTKSwT24FfxWfQXeTM,33
-tplinkrouterc6u/common/dataclass.py,sha256=QQTGb9w4Yt3GNkISgrQhvWPMEEJOsgFFZ2MI1MIAPjw,7807
+tplinkrouterc6u/common/dataclass.py,sha256=UNQdr-tkAQcF3KiefKOIKOtPTJczgcey4zMvbqbv_4M,7840
 tplinkrouterc6u/common/encryption.py,sha256=4HelTxzN6esMfDZRBt3m8bwB9Nj_biKijnCnrGWPWKg,6228
 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.6.2.dist-info/licenses/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
-tplinkrouterc6u-5.6.2.dist-info/METADATA,sha256=OJZ_573ij0N15aCx8DIhTyQ-gM8x794j5gYaygq5310,15365
-tplinkrouterc6u-5.6.2.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
-tplinkrouterc6u-5.6.2.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
-tplinkrouterc6u-5.6.2.dist-info/RECORD,,
+tplinkrouterc6u-5.8.0.dist-info/licenses/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
+tplinkrouterc6u-5.8.0.dist-info/METADATA,sha256=XceOtjPvarwp7C7OvSVjvmFgLTU-nYDwu5K_DSMjbnc,15496
+tplinkrouterc6u-5.8.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+tplinkrouterc6u-5.8.0.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
+tplinkrouterc6u-5.8.0.dist-info/RECORD,,

{tplinkrouterc6u-5.6.2.dist-info → tplinkrouterc6u-5.8.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.1)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any