tplinkrouterc6u 5.4.0__tar.gz → 5.4.2__tar.gz

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: tplinkrouterc6u
-Version: 5.4.0
+Version: 5.4.2
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -19,6 +19,15 @@ License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: pycryptodome
 Requires-Dist: macaddress
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+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)
@@ -280,7 +289,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX20 v1.0
 - Archer AX20 v3.0
 - Archer AX21 (v1.20, v3.0)
-- Archer AX23 v1.0
+- Archer AX23 (v1.0, v1.2)
 - Archer AX50 v1.0
 - Archer AX53 v2
 - Archer AX55 (v1.0, V1.60, v4.0)
@@ -290,6 +299,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX90 V1.20
 - Archer AXE75 V1
 - Archer AXE16000
+- Archer AX1800
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
@@ -309,6 +319,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer VR600 v3
 - Archer VR900v
 - Archer VR2100v v1
+- Archer VX1800v v1.0
 - Deco M4 2.0
 - Deco M4R 2.0
 - Deco M5 v3
@@ -321,14 +332,15 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Deco X90
 - Deco XE75 (v1.0, v2.0)
 - EX511 v2.0
+- HX510 v1.0
+- NX510v v1.0
 - TD-W9960 (v1, V1.20)
 - TL-MR100 v2.0
 - TL-MR105
 - TL-MR6400 (v5, v5.3)
 - TL-MR6500v
-- TL-XDR3010 V2
 - TL-WA3001 v1.0
-- NX510v v1.0
+- TL-XDR3010 V2
 
 ### Not fully tested Hardware Versions
 - AD7200 V2

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/README.md

@@ -258,7 +258,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX20 v1.0
 - Archer AX20 v3.0
 - Archer AX21 (v1.20, v3.0)
-- Archer AX23 v1.0
+- Archer AX23 (v1.0, v1.2)
 - Archer AX50 v1.0
 - Archer AX53 v2
 - Archer AX55 (v1.0, V1.60, v4.0)
@@ -268,6 +268,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX90 V1.20
 - Archer AXE75 V1
 - Archer AXE16000
+- Archer AX1800
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
@@ -287,6 +288,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer VR600 v3
 - Archer VR900v
 - Archer VR2100v v1
+- Archer VX1800v v1.0
 - Deco M4 2.0
 - Deco M4R 2.0
 - Deco M5 v3
@@ -299,14 +301,15 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Deco X90
 - Deco XE75 (v1.0, v2.0)
 - EX511 v2.0
+- HX510 v1.0
+- NX510v v1.0
 - TD-W9960 (v1, V1.20)
 - TL-MR100 v2.0
 - TL-MR105
 - TL-MR6400 (v5, v5.3)
 - TL-MR6500v
-- TL-XDR3010 V2
 - TL-WA3001 v1.0
-- NX510v v1.0
+- TL-XDR3010 V2
 
 ### Not fully tested Hardware Versions
 - AD7200 V2

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/setup.py

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

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/test/test_client_c6u.py

@@ -6,6 +6,7 @@ from tplinkrouterc6u import (
     TplinkRouter,
     Connection,
     Status,
+    IPv4Status,
     Device,
     ClientException,
 )
@@ -694,6 +695,33 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(check_url, 'admin/wireless?&form=guest&form=iot_6g')
         self.assertEqual(check_data, 'operation=write&iot_6g_enable=on')
 
+    def test_get_ipv4_status_empty(self) -> None:
+        response_network = '{"result": {}, "error_code": 0}'
+
+        class TPLinkRouterTest(TplinkRouter):
+            def request(self, path: str, data: str,
+                        ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
+                if path == 'admin/network?form=status_ipv4&operation=read':
+                    return loads(response_network)['result']
+                raise ClientException()
+
+        client = TPLinkRouterTest('', '')
+        result = client.get_ipv4_status()
+
+        self.assertIsInstance(result, IPv4Status)
+        self.assertEqual(result.wan_macaddr, '00-00-00-00-00-00')
+        self.assertEqual(result.wan_ipv4_ipaddr, '0.0.0.0')
+        self.assertEqual(result.wan_ipv4_gateway, '0.0.0.0')
+        self.assertEqual(result.wan_ipv4_conntype, '')
+        self.assertEqual(result.wan_ipv4_netmask, '0.0.0.0')
+        self.assertEqual(result.wan_ipv4_pridns, '0.0.0.0')
+        self.assertEqual(result.wan_ipv4_snddns, '0.0.0.0')
+        self.assertEqual(result.lan_macaddr, '00-00-00-00-00-00')
+        self.assertEqual(result.lan_ipv4_ipaddr, '0.0.0.0')
+        self.assertEqual(result.lan_ipv4_netmask, '0.0.0.0')
+        self.assertEqual(result.lan_ipv4_dhcp_enable, False)
+        self.assertEqual(result.remote, None)
+
 
 if __name__ == '__main__':
     main()

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/test/test_client_deco.py

@@ -365,6 +365,32 @@ class TestTPLinkDecoClient(TestCase):
         self.assertEqual(result.lan_ipv4_dhcp_enable, False)
         self.assertEqual(result.remote, None)
 
+    def test_get_ipv4_status_empty(self) -> None:
+        response_network = '{"result": {}, "error_code": 0}'
+
+        class TPLinkRouterTest(TPLinkDecoClient):
+            def request(self, path: str, data: str,
+                        ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
+                if path == 'admin/network?form=wan_ipv4':
+                    return loads(response_network)['result']
+
+        client = TPLinkRouterTest('', '')
+        result = client.get_ipv4_status()
+
+        self.assertIsInstance(result, IPv4Status)
+        self.assertEqual(result.wan_macaddr, '00-00-00-00-00-00')
+        self.assertEqual(result.wan_ipv4_ipaddr, None)
+        self.assertEqual(result.wan_ipv4_gateway, None)
+        self.assertEqual(result.wan_ipv4_conntype, '')
+        self.assertEqual(result.wan_ipv4_netmask, None)
+        self.assertEqual(result.wan_ipv4_pridns, '0.0.0.0')
+        self.assertEqual(result.wan_ipv4_snddns, '0.0.0.0')
+        self.assertEqual(result.lan_macaddr, '00-00-00-00-00-00')
+        self.assertEqual(result.lan_ipv4_ipaddr, '0.0.0.0')
+        self.assertEqual(result.lan_ipv4_netmask, '0.0.0.0')
+        self.assertEqual(result.lan_ipv4_dhcp_enable, False)
+        self.assertEqual(result.remote, None)
+
     def test_get_ipv4_status_no_internet(self) -> None:
         response_network = '''
 {"result": {

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/test/test_client_ex.py

@@ -277,6 +277,35 @@ class TestTPLinkEXClient(TestCase):
         self.assertEqual(result.lan_ipv4_dhcp_enable, True)
         self.assertEqual(result.remote, None)
 
+    def test_get_ipv4_status_empty(self) -> None:
+
+        DEV2_ADT_LAN = ('{"data":[],"operation":"gl","oid":"DEV2_ADT_LAN","success":true}')
+        DEV2_ADT_WAN = ('{"data":[],"operation":"gl","oid":"DEV2_ADT_WAN","success":true}')
+
+        class TPLinkEXClientTest(TPLinkEXClient):
+            self._token = True
+
+            def _request(self, url, method='POST', data_str=None, encrypt=False):
+                if 'DEV2_ADT_LAN' in data_str:
+                    return 200, DEV2_ADT_LAN
+                elif 'DEV2_ADT_WAN' in data_str:
+                    return 200, DEV2_ADT_WAN
+                raise ClientException()
+
+        client = TPLinkEXClientTest('', '')
+        result = client.get_ipv4_status()
+
+        self.assertIsInstance(result, IPv4Status)
+        self.assertEqual(result.wan_ipv4_ipaddr, None)
+        self.assertEqual(result.wan_ipv4_gateway, None)
+        self.assertEqual(result.wan_ipv4_netmask, None)
+        self.assertEqual(result.wan_ipv4_conntype, '')
+        self.assertEqual(result.lan_macaddr, '00-00-00-00-00-00')
+        self.assertEqual(result.lan_ipv4_ipaddr, '0.0.0.0')
+        self.assertEqual(result.lan_ipv4_netmask, '0.0.0.0')
+        self.assertEqual(result.lan_ipv4_dhcp_enable, False)
+        self.assertEqual(result.remote, None)
+
     def test_get_ipv4_status_one_wlan(self) -> None:
 
         DEV2_ADT_LAN = ('{"data":[{"MACAddress":"bf:75:44:4c:dc:9e","IPAddress":"192.168.5.1",'

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/test/test_client_mr.py

@@ -599,6 +599,30 @@ DNSServers=7.7.7.7,2.2.2.2
         self.assertEqual(result.lan_ipv4_dhcp_enable, True)
         self.assertEqual(result.remote, None)
 
+    def test_get_ipv4_status_empty(self) -> None:
+        response = '''
+[1,1,0,0,0,0]0
+[1,1,0,0,0,0]1
+[1,1,1,0,0,0]2
+[2,1,1,0,0,0]2
+[error]0
+
+'''
+
+        class TPLinkMRClientTest(TPLinkMRClient):
+            def _request(self, url, method='POST', data_str=None, encrypt=False):
+                return 200, response
+
+        client = TPLinkMRClientTest('', '')
+        result = client.get_ipv4_status()
+
+        self.assertIsInstance(result, IPv4Status)
+        self.assertEqual(result.lan_macaddr, '00-00-00-00-00-00')
+        self.assertEqual(result.wan_ipv4_conntype, '')
+        self.assertEqual(result.lan_ipv4_ipaddr, '0.0.0.0')
+        self.assertEqual(result.lan_ipv4_netmask, '0.0.0.0')
+        self.assertEqual(result.lan_ipv4_dhcp_enable, False)
+
     def test_get_ipv4_status_one_wlan(self) -> None:
         response = '''
 [1,1,0,0,0,0]0

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/test/test_client_xdr.py

@@ -579,6 +579,52 @@ maximum-scale=2.0, user-scalable=yes" />
         self.assertIsInstance(ipv4_status.lan_ipv4_netmask_address, IPv4Address)
         self.assertEqual(ipv4_status.lan_ipv4_netmask_address, get_ip('255.255.255.0'))
 
+    def test_get_ipv4_status_empty(self):
+        mock_data = json.loads('{"error_code": 0}')
+        check_payload = {}
+
+        class TPLinkXDRClientTest(TPLinkXDRClient):
+            def _request(self, payload: dict) -> dict:
+                nonlocal check_payload
+                check_payload = payload
+                return mock_data
+
+        client = TPLinkXDRClientTest('', '')
+        ipv4_status = client.get_ipv4_status()
+
+        self.assertEqual(check_payload['method'], 'get')
+        self.assertIsInstance(check_payload['dhcpd'], dict)
+        self.assertEqual(check_payload['dhcpd']['name'], 'udhcpd')
+        self.assertIsInstance(check_payload['network'], dict)
+        self.assertEqual(check_payload['network']['name'], ['lan', 'wan_status'])
+
+        self.assertIsInstance(ipv4_status, IPv4Status)
+        self.assertEqual(ipv4_status.wan_ipv4_ipaddr, '0.0.0.0')
+        self.assertIsInstance(ipv4_status.wan_ipv4_ipaddress, IPv4Address)
+        self.assertEqual(ipv4_status.wan_ipv4_ipaddress, get_ip('0.0.0.0'))
+        self.assertEqual(ipv4_status.wan_ipv4_gateway, '0.0.0.0')
+        self.assertIsInstance(ipv4_status.wan_ipv4_gateway_address, IPv4Address)
+        self.assertEqual(ipv4_status.wan_ipv4_gateway_address, get_ip('0.0.0.0'))
+        self.assertEqual(ipv4_status.wan_ipv4_netmask, '0.0.0.0')
+        self.assertIsInstance(ipv4_status.wan_ipv4_netmask_address, IPv4Address)
+        self.assertEqual(ipv4_status.wan_ipv4_netmask_address, get_ip('0.0.0.0'))
+        self.assertEqual(ipv4_status.wan_ipv4_pridns, '0.0.0.0')
+        self.assertIsInstance(ipv4_status.wan_ipv4_pridns_address, IPv4Address)
+        self.assertEqual(ipv4_status.wan_ipv4_pridns_address, get_ip('0.0.0.0'))
+        self.assertEqual(ipv4_status.wan_ipv4_snddns, '0.0.0.0')
+        self.assertIsInstance(ipv4_status.wan_ipv4_snddns_address, IPv4Address)
+        self.assertEqual(ipv4_status.wan_ipv4_snddns_address, get_ip('0.0.0.0'))
+        self.assertEqual(ipv4_status.lan_macaddr, '00-00-00-00-00-00')
+        self.assertIsInstance(ipv4_status.lan_macaddress, EUI48)
+        self.assertEqual(ipv4_status.lan_macaddress, get_mac('00-00-00-00-00-00'))
+        self.assertEqual(ipv4_status.lan_ipv4_ipaddr, '0.0.0.0')
+        self.assertIsInstance(ipv4_status.lan_ipv4_ipaddress, IPv4Address)
+        self.assertEqual(ipv4_status.lan_ipv4_ipaddress, get_ip('0.0.0.0'))
+        self.assertEqual(ipv4_status.lan_ipv4_dhcp_enable, False)
+        self.assertEqual(ipv4_status.lan_ipv4_netmask, '0.0.0.0')
+        self.assertIsInstance(ipv4_status.lan_ipv4_netmask_address, IPv4Address)
+        self.assertEqual(ipv4_status.lan_ipv4_netmask_address, get_ip('0.0.0.0'))
+
 
 if __name__ == '__main__':
     main()

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/tplinkrouterc6u/client/c6u.py

@@ -363,18 +363,18 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
     def get_ipv4_status(self) -> IPv4Status:
         ipv4_status = IPv4Status()
         data = self.request('admin/network?form=status_ipv4&operation=read', 'operation=read')
-        ipv4_status._wan_macaddr = EUI48(data['wan_macaddr'])
-        ipv4_status._wan_ipv4_ipaddr = IPv4Address(data['wan_ipv4_ipaddr'])
-        ipv4_status._wan_ipv4_gateway = IPv4Address(data['wan_ipv4_gateway'])
-        ipv4_status.wan_ipv4_conntype = data['wan_ipv4_conntype']
-        ipv4_status._wan_ipv4_netmask = IPv4Address(data['wan_ipv4_netmask'])
-        ipv4_status._wan_ipv4_pridns = IPv4Address(data['wan_ipv4_pridns'])
-        ipv4_status._wan_ipv4_snddns = IPv4Address(data['wan_ipv4_snddns'])
-        ipv4_status._lan_macaddr = EUI48(data['lan_macaddr'])
-        ipv4_status._lan_ipv4_ipaddr = IPv4Address(data['lan_ipv4_ipaddr'])
-        ipv4_status.lan_ipv4_dhcp_enable = self._str2bool(data['lan_ipv4_dhcp_enable'])
-        ipv4_status._lan_ipv4_netmask = IPv4Address(data['lan_ipv4_netmask'])
-        ipv4_status.remote = self._str2bool(data.get('remote'))
+        ipv4_status._wan_macaddr = get_mac(data.get('wan_macaddr', '00:00:00:00:00:00'))
+        ipv4_status._wan_ipv4_ipaddr = get_ip(data.get('wan_ipv4_ipaddr', '0.0.0.0'))
+        ipv4_status._wan_ipv4_gateway = get_ip(data.get('wan_ipv4_gateway', '0.0.0.0'))
+        ipv4_status._wan_ipv4_conntype = data.get('wan_ipv4_conntype', '')
+        ipv4_status._wan_ipv4_netmask = get_ip(data.get('wan_ipv4_netmask', '0.0.0.0'))
+        ipv4_status._wan_ipv4_pridns = get_ip(data.get('wan_ipv4_pridns', '0.0.0.0'))
+        ipv4_status._wan_ipv4_snddns = get_ip(data.get('wan_ipv4_snddns', '0.0.0.0'))
+        ipv4_status._lan_macaddr = get_mac(data.get('lan_macaddr', '00:00:00:00:00:00'))
+        ipv4_status._lan_ipv4_ipaddr = get_ip(data.get('lan_ipv4_ipaddr', '0.0.0.0'))
+        ipv4_status.lan_ipv4_dhcp_enable = self._str2bool(data.get('lan_ipv4_dhcp_enable', ''))
+        ipv4_status._lan_ipv4_netmask = get_ip(data.get('lan_ipv4_netmask', '0.0.0.0'))
+        ipv4_status.remote = self._str2bool(data.get('remote', '')) if data.get('remote') else None
 
         return ipv4_status
 

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/tplinkrouterc6u/client/c6v4.py

@@ -1,6 +1,6 @@
 from requests import post
 from tplinkrouterc6u.common.package_enum import Connection
-from tplinkrouterc6u.common.dataclass import Firmware, Status
+from tplinkrouterc6u.common.dataclass import Firmware, Status, IPv4Status
 from tplinkrouterc6u.common.exception import ClientException
 from tplinkrouterc6u.client_abstract import AbstractRouter
 
@@ -31,6 +31,9 @@ class TplinkC6V4Router(AbstractRouter):
     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')
 

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/tplinkrouterc6u/client/deco.py

@@ -3,7 +3,7 @@ from json import dumps
 from macaddress import EUI48
 from ipaddress import IPv4Address
 from logging import Logger
-from tplinkrouterc6u.common.helper import get_ip, get_mac
+from tplinkrouterc6u.common.helper import get_ip, get_mac, get_value
 from tplinkrouterc6u.common.package_enum import Connection
 from tplinkrouterc6u.common.dataclass import Firmware, Status, Device, IPv4Status
 from tplinkrouterc6u.client_abstract import AbstractRouter
@@ -67,14 +67,14 @@ class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
         data = self.request('admin/network?form=wan_ipv4', dumps({'operation': 'read'}))
 
         status = Status()
-        element = self._get_value(data, ['wan', 'ip_info', 'mac'])
+        element = get_value(data, ['wan', 'ip_info', 'mac'])
         status._wan_macaddr = EUI48(element) if element else None
-        status._lan_macaddr = EUI48(self._get_value(data, ['lan', 'ip_info', 'mac']))
-        element = self._get_value(data, ['wan', 'ip_info', 'ip'])
+        status._lan_macaddr = EUI48(get_value(data, ['lan', 'ip_info', 'mac']))
+        element = get_value(data, ['wan', 'ip_info', 'ip'])
         status._wan_ipv4_addr = IPv4Address(element) if element else None
-        element = self._get_value(data, ['lan', 'ip_info', 'ip'])
+        element = get_value(data, ['lan', 'ip_info', 'ip'])
         status._lan_ipv4_addr = IPv4Address(element) if element else None
-        element = self._get_value(data, ['wan', 'ip_info', 'gateway'])
+        element = get_value(data, ['wan', 'ip_info', 'gateway'])
         status._wan_ipv4_gateway = IPv4Address(element) if element else None
 
         data = self.request('admin/network?form=performance', dumps({"operation": "read"}))
@@ -82,12 +82,12 @@ class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
         status.cpu_usage = data.get('cpu_usage')
 
         data = self.request('admin/wireless?form=wlan', dumps({'operation': 'read'}))
-        status.wifi_2g_enable = self._get_value(data, ['band2_4', 'host', 'enable'])
-        status.guest_2g_enable = self._get_value(data, ['band2_4', 'guest', 'enable'])
-        status.wifi_5g_enable = self._get_value(data, ['band5_1', 'host', 'enable'])
-        status.guest_5g_enable = self._get_value(data, ['band5_1', 'guest', 'enable'])
-        status.wifi_6g_enable = self._get_value(data, ['band6', 'host', 'enable'])
-        status.guest_6g_enable = self._get_value(data, ['band6', 'guest', 'enable'])
+        status.wifi_2g_enable = get_value(data, ['band2_4', 'host', 'enable'])
+        status.guest_2g_enable = get_value(data, ['band2_4', 'guest', 'enable'])
+        status.wifi_5g_enable = get_value(data, ['band5_1', 'host', 'enable'])
+        status.guest_5g_enable = get_value(data, ['band5_1', 'guest', 'enable'])
+        status.wifi_6g_enable = get_value(data, ['band6', 'host', 'enable'])
+        status.guest_6g_enable = get_value(data, ['band6', 'guest', 'enable'])
 
         devices = []
         data = self.request('admin/client?form=client_list', dumps(
@@ -125,34 +125,30 @@ class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
     def get_ipv4_status(self) -> IPv4Status:
         ipv4_status = IPv4Status()
         data = self.request('admin/network?form=wan_ipv4', dumps({'operation': 'read'}))
-        ipv4_status._wan_macaddr = EUI48(self._get_value(data, ['wan', 'ip_info', 'mac']))
-        element = self._get_value(data, ['wan', 'ip_info', 'ip'])
+        element = get_value(data, ['wan', 'ip_info', 'mac'])
+        ipv4_status._wan_macaddr = get_mac(element if element else '00:00:00:00:00:00')
+        element = get_value(data, ['wan', 'ip_info', 'ip'])
         ipv4_status._wan_ipv4_ipaddr = IPv4Address(element) if element else None
-        element = self._get_value(data, ['wan', 'ip_info', 'gateway'])
+        element = get_value(data, ['wan', 'ip_info', 'gateway'])
         ipv4_status._wan_ipv4_gateway = IPv4Address(element) if element else None
-        ipv4_status.wan_ipv4_conntype = self._get_value(data, ['wan', 'dial_type'])
-        element = self._get_value(data, ['wan', 'ip_info', 'mask'])
+        element = get_value(data, ['wan', 'dial_type'])
+        ipv4_status._wan_ipv4_conntype = element if element else ''
+        element = get_value(data, ['wan', 'ip_info', 'mask'])
         ipv4_status._wan_ipv4_netmask = IPv4Address(element) if element else None
-        ipv4_status._wan_ipv4_pridns = IPv4Address(self._get_value(data, ['wan', 'ip_info', 'dns1']))
-        ipv4_status._wan_ipv4_snddns = IPv4Address(self._get_value(data, ['wan', 'ip_info', 'dns2']))
-        ipv4_status._lan_macaddr = EUI48(self._get_value(data, ['lan', 'ip_info', 'mac']))
-        ipv4_status._lan_ipv4_ipaddr = IPv4Address(self._get_value(data, ['lan', 'ip_info', 'ip']))
+        element = get_value(data, ['wan', 'ip_info', 'dns1'])
+        ipv4_status._wan_ipv4_pridns = get_ip(element if element else '0.0.0.0')
+        element = get_value(data, ['wan', 'ip_info', 'dns2'])
+        ipv4_status._wan_ipv4_snddns = get_ip(element if element else '0.0.0.0')
+        element = get_value(data, ['lan', 'ip_info', 'mac'])
+        ipv4_status._lan_macaddr = get_mac(element if element else '00:00:00:00:00:00')
+        element = get_value(data, ['lan', 'ip_info', 'ip'])
+        ipv4_status._lan_ipv4_ipaddr = get_ip(element if element else '0.0.0.0')
         ipv4_status.lan_ipv4_dhcp_enable = False
-        ipv4_status._lan_ipv4_netmask = IPv4Address(self._get_value(data, ['lan', 'ip_info', 'mask']))
+        element = get_value(data, ['lan', 'ip_info', 'mask'])
+        ipv4_status._lan_ipv4_netmask = get_ip(element if element else '0.0.0.0')
 
         return ipv4_status
 
-    @staticmethod
-    def _get_value(dictionary: dict, keys: list):
-        nested_dict = dictionary
-
-        for key in keys:
-            try:
-                nested_dict = nested_dict[key]
-            except Exception:
-                return None
-        return nested_dict
-
     def _map_wire_type(self, data: dict) -> Connection:
         if data.get('wire_type') == 'wired':
             return Connection.WIRED
@@ -160,7 +156,7 @@ class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
                    'band5': {'main': Connection.HOST_5G, 'guest': Connection.GUEST_5G, 'iot': Connection.IOT_5G},
                    'band6': {'main': Connection.HOST_6G, 'guest': Connection.GUEST_6G, 'iot': Connection.IOT_6G}
                    }
-        result = self._get_value(mapping, [data.get('connection_type'), data.get('interface')])
+        result = get_value(mapping, [data.get('connection_type'), data.get('interface')])
 
         return result if result else Connection.UNKNOWN
 

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/tplinkrouterc6u/client/ex.py

@@ -5,6 +5,7 @@ from macaddress import EUI48
 from ipaddress import IPv4Address
 from logging import Logger
 from tplinkrouterc6u.common.package_enum import Connection, VPN
+from tplinkrouterc6u.common.helper import get_ip, get_mac, get_value
 from tplinkrouterc6u.common.dataclass import (
     Firmware,
     Status,
@@ -203,26 +204,26 @@ class TPLinkEXClient(TPLinkMRClientBase):
         ]
         _, values = self.req_act(acts)
 
-        if values[0].__class__ == list:
+        if values[0].__class__ == list and len(values[0]) > 0:
             values[0] = values[0][0]
 
         ipv4_status = IPv4Status()
-        ipv4_status._lan_macaddr = EUI48(values[0]['MACAddress'])
-        ipv4_status._lan_ipv4_ipaddr = IPv4Address(values[0]['IPAddress'])
-        ipv4_status._lan_ipv4_netmask = IPv4Address(values[0]['IPSubnetMask'])
-        ipv4_status.lan_ipv4_dhcp_enable = bool(int(values[0]['DHCPv4Enable']))
+        ipv4_status._lan_macaddr = get_mac(get_value(values, [0, 'MACAddress'], '00:00:00:00:00:00'))
+        ipv4_status._lan_ipv4_ipaddr = get_ip(get_value(values, [0, 'IPAddress'], '0.0.0.0'))
+        ipv4_status._lan_ipv4_netmask = get_ip(get_value(values, [0, 'IPSubnetMask'], '0.0.0.0'))
+        ipv4_status.lan_ipv4_dhcp_enable = bool(int(get_value(values, [0, 'DHCPv4Enable'], '0')))
 
         for item in values[1]:
             if int(item['enable']) == 0 and values[1].__class__ == list:
                 continue
-            ipv4_status._wan_macaddr = EUI48(item['MACAddr'])
-            ipv4_status._wan_ipv4_ipaddr = IPv4Address(item['connIPv4Address'])
-            ipv4_status._wan_ipv4_gateway = IPv4Address(item['connIPv4Gateway'])
-            ipv4_status.wan_ipv4_conntype = item['name']
-            ipv4_status._wan_ipv4_netmask = IPv4Address(item['connIPv4SubnetMask'])
-            dns = item['connIPv4DnsServer'].split(',')
-            ipv4_status._wan_ipv4_pridns = IPv4Address(dns[0])
-            ipv4_status._wan_ipv4_snddns = IPv4Address(dns[1])
+            ipv4_status._wan_macaddr = get_mac(get_value(item, ['MACAddr'], '00:00:00:00:00:00'))
+            ipv4_status._wan_ipv4_ipaddr = get_ip(get_value(item, ['connIPv4Address'], '0.0.0.0'))
+            ipv4_status._wan_ipv4_gateway = get_ip(get_value(item, ['connIPv4Gateway'], '0.0.0.0'))
+            ipv4_status._wan_ipv4_conntype = get_value(item, ['name'], '')
+            ipv4_status._wan_ipv4_netmask = get_ip(get_value(item, ['connIPv4SubnetMask'], '0.0.0.0'))
+            dns = get_value(item, ['connIPv4DnsServer'], '').split(',')
+            ipv4_status._wan_ipv4_pridns = get_ip(dns[0] if len(dns) > 0 else '0.0.0.0')
+            ipv4_status._wan_ipv4_snddns = get_ip(dns[1] if len(dns) > 1 else '0.0.0.0')
 
         return ipv4_status
 

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/tplinkrouterc6u/client/mr.py

@@ -7,6 +7,7 @@ from datetime import timedelta, datetime
 from macaddress import EUI48
 from ipaddress import IPv4Address
 from logging import Logger
+from tplinkrouterc6u.common.helper import get_ip, get_mac, get_value
 from tplinkrouterc6u.common.encryption import EncryptionWrapperMR
 from tplinkrouterc6u.common.package_enum import Connection, VPN
 from tplinkrouterc6u.common.dataclass import (
@@ -542,22 +543,22 @@ class TPLinkMRClient(TPLinkMRClientBase):
         _, values = self.req_act(acts)
 
         ipv4_status = IPv4Status()
-        ipv4_status._lan_macaddr = EUI48(values['0']['X_TP_MACAddress'])
-        ipv4_status._lan_ipv4_ipaddr = IPv4Address(values['0']['IPInterfaceIPAddress'])
-        ipv4_status._lan_ipv4_netmask = IPv4Address(values['0']['IPInterfaceSubnetMask'])
-        ipv4_status.lan_ipv4_dhcp_enable = bool(int(values['1']['DHCPServerEnable']))
+        ipv4_status._lan_macaddr = get_mac(get_value(values, ['0', 'X_TP_MACAddress'], '00:00:00:00:00:00'))
+        ipv4_status._lan_ipv4_ipaddr = get_ip(get_value(values, ['0', 'IPInterfaceIPAddress'], '0.0.0.0'))
+        ipv4_status._lan_ipv4_netmask = get_ip(get_value(values, ['0', 'IPInterfaceSubnetMask'], '0.0.0.0'))
+        ipv4_status.lan_ipv4_dhcp_enable = bool(int(get_value(values, ['1', 'DHCPServerEnable'], '0')))
 
         for item in self._to_list(values.get('2')):
-            if int(item['enable']) == 0 and values.get('2').__class__ == list:
+            if int(item.get('enable', '0')) == 0 and values.get('2').__class__ == list:
                 continue
-            ipv4_status._wan_macaddr = EUI48(item['MACAddress'])
-            ipv4_status._wan_ipv4_ipaddr = IPv4Address(item['externalIPAddress'])
-            ipv4_status._wan_ipv4_gateway = IPv4Address(item['defaultGateway'])
-            ipv4_status.wan_ipv4_conntype = item['name']
-            ipv4_status._wan_ipv4_netmask = IPv4Address(item['subnetMask'])
-            dns = item['DNSServers'].split(',')
-            ipv4_status._wan_ipv4_pridns = IPv4Address(dns[0])
-            ipv4_status._wan_ipv4_snddns = IPv4Address(dns[1])
+            ipv4_status._wan_macaddr = get_mac(item.get('MACAddress', '00:00:00:00:00:00'))
+            ipv4_status._wan_ipv4_ipaddr = get_ip(item.get('externalIPAddress', '0.0.0.0'))
+            ipv4_status._wan_ipv4_gateway = get_ip(item.get('defaultGateway', '0.0.0.0'))
+            ipv4_status._wan_ipv4_conntype = item.get('name', '')
+            ipv4_status._wan_ipv4_netmask = get_ip(item.get('subnetMask', '0.0.0.0'))
+            dns = item.get('DNSServers', '').split(',')
+            ipv4_status._wan_ipv4_pridns = get_ip(dns[0] if len(dns) > 0 else '0.0.0.0')
+            ipv4_status._wan_ipv4_snddns = get_ip(dns[1] if len(dns) > 1 else '0.0.0.0')
 
         return ipv4_status
 

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/tplinkrouterc6u/client/xdr.py

@@ -11,7 +11,7 @@ from tplinkrouterc6u.common.dataclass import (Device, Firmware, IPv4DHCPLease,
                                               IPv4Reservation, IPv4Status,
                                               Status)
 from tplinkrouterc6u.common.exception import ClientException
-from tplinkrouterc6u.common.helper import get_ip, get_mac
+from tplinkrouterc6u.common.helper import get_ip, get_mac, get_value
 from tplinkrouterc6u.common.package_enum import Connection
 
 
@@ -170,15 +170,23 @@ class TPLinkXDRClient(AbstractRouter):
         })
 
         ipv4_status = IPv4Status()
-        ipv4_status._wan_ipv4_ipaddr = get_ip(data['network']['wan_status']['ipaddr'])
-        ipv4_status._wan_ipv4_gateway = get_ip(data['network']['wan_status']['gateway'])
-        ipv4_status._wan_ipv4_netmask = get_ip(data['network']['wan_status']['netmask'])
-        ipv4_status._wan_ipv4_pridns = get_ip(data['network']['wan_status']['pri_dns'])
-        ipv4_status._wan_ipv4_snddns = get_ip(data['network']['wan_status']['snd_dns'])
-        ipv4_status._lan_macaddr = get_mac(data['network']['lan']['macaddr'])
-        ipv4_status._lan_ipv4_ipaddr = get_ip(data['network']['lan']['ipaddr'])
-        ipv4_status.lan_ipv4_dhcp_enable = data['dhcpd']['udhcpd']['enable'] == '1'
-        ipv4_status._lan_ipv4_netmask = get_ip(data['network']['lan']['netmask'])
+        element = get_value(data, ['network', 'wan_status', 'ipaddr'])
+        ipv4_status._wan_ipv4_ipaddr = get_ip(element if element else '0.0.0.0')
+        element = get_value(data, ['network', 'wan_status', 'gateway'])
+        ipv4_status._wan_ipv4_gateway = get_ip(element if element else '0.0.0.0')
+        element = get_value(data, ['network', 'wan_status', 'netmask'])
+        ipv4_status._wan_ipv4_netmask = get_ip(element if element else '0.0.0.0')
+        element = get_value(data, ['network', 'wan_status', 'pri_dns'])
+        ipv4_status._wan_ipv4_pridns = get_ip(element if element else '0.0.0.0')
+        element = get_value(data, ['network', 'wan_status', 'snd_dns'])
+        ipv4_status._wan_ipv4_snddns = get_ip(element if element else '0.0.0.0')
+        element = get_value(data, ['network', 'lan', 'macaddr'])
+        ipv4_status._lan_macaddr = get_mac(element if element else '00:00:00:00:00:00')
+        element = get_value(data, ['network', 'lan', 'ipaddr'])
+        ipv4_status._lan_ipv4_ipaddr = get_ip(element if element else '0.0.0.0')
+        ipv4_status.lan_ipv4_dhcp_enable = get_value(data, ['dhcpd', 'udhcpd', 'enable']) == '1'
+        element = get_value(data, ['network', 'lan', 'netmask'])
+        ipv4_status._lan_ipv4_netmask = get_ip(element if element else '0.0.0.0')
         return ipv4_status
 
     def reboot(self) -> None:

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/tplinkrouterc6u/client_abstract.py

@@ -1,7 +1,7 @@
 from requests.packages import urllib3
 from logging import Logger
 from tplinkrouterc6u.common.package_enum import Connection
-from tplinkrouterc6u.common.dataclass import Firmware, Status
+from tplinkrouterc6u.common.dataclass import Firmware, Status, IPv4Status
 from abc import ABC, abstractmethod
 
 
@@ -39,6 +39,10 @@ class AbstractRouter(ABC):
     def get_status(self) -> Status:
         pass
 
+    @abstractmethod
+    def get_ipv4_status(self) -> IPv4Status:
+        pass
+
     @abstractmethod
     def reboot(self) -> None:
         pass

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/tplinkrouterc6u/common/dataclass.py

@@ -167,7 +167,7 @@ class IPv4Status:
         self._wan_macaddr: EUI48
         self._wan_ipv4_ipaddr: IPv4Address | None = None
         self._wan_ipv4_gateway: IPv4Address | None = None
-        self.wan_ipv4_conntype: str
+        self._wan_ipv4_conntype: str
         self._wan_ipv4_netmask: IPv4Address | None = None
         self._wan_ipv4_pridns: IPv4Address
         self._wan_ipv4_snddns: IPv4Address
@@ -189,6 +189,10 @@ class IPv4Status:
     def wan_ipv4_ipaddr(self):
         return str(self._wan_ipv4_ipaddr) if self._wan_ipv4_ipaddr else None
 
+    @property
+    def wan_ipv4_conntype(self):
+        return self._wan_ipv4_conntype if hasattr(self, '_wan_ipv4_conntype') else ''
+
     @property
     def wan_ipv4_ipaddress(self):
         return self._wan_ipv4_ipaddr

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/tplinkrouterc6u/common/helper.py

@@ -14,3 +14,14 @@ def get_mac(mac: str) -> EUI48:
         return EUI48(mac)
     except Exception:
         return EUI48('00:00:00:00:00:00')
+
+
+def get_value(dictionary, keys: list, default=None):
+    nested_dict = dictionary
+
+    for key in keys:
+        try:
+            nested_dict = nested_dict[key]
+        except Exception:
+            return default
+    return nested_dict

{tplinkrouterc6u-5.4.0 → tplinkrouterc6u-5.4.2}/tplinkrouterc6u.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: tplinkrouterc6u
-Version: 5.4.0
+Version: 5.4.2
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -19,6 +19,15 @@ License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: pycryptodome
 Requires-Dist: macaddress
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+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)
@@ -280,7 +289,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX20 v1.0
 - Archer AX20 v3.0
 - Archer AX21 (v1.20, v3.0)
-- Archer AX23 v1.0
+- Archer AX23 (v1.0, v1.2)
 - Archer AX50 v1.0
 - Archer AX53 v2
 - Archer AX55 (v1.0, V1.60, v4.0)
@@ -290,6 +299,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX90 V1.20
 - Archer AXE75 V1
 - Archer AXE16000
+- Archer AX1800
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
@@ -309,6 +319,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer VR600 v3
 - Archer VR900v
 - Archer VR2100v v1
+- Archer VX1800v v1.0
 - Deco M4 2.0
 - Deco M4R 2.0
 - Deco M5 v3
@@ -321,14 +332,15 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Deco X90
 - Deco XE75 (v1.0, v2.0)
 - EX511 v2.0
+- HX510 v1.0
+- NX510v v1.0
 - TD-W9960 (v1, V1.20)
 - TL-MR100 v2.0
 - TL-MR105
 - TL-MR6400 (v5, v5.3)
 - TL-MR6500v
-- TL-XDR3010 V2
 - TL-WA3001 v1.0
-- NX510v v1.0
+- TL-XDR3010 V2
 
 ### Not fully tested Hardware Versions
 - AD7200 V2