tplinkrouterc6u 5.4.1__py3-none-any.whl → 5.4.2__py3-none-any.whl

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",'

test/test_client_mr.py

@@ -618,6 +618,7 @@ DNSServers=7.7.7.7,2.2.2.2
 
         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)

tplinkrouterc6u/client/c6u.py

@@ -366,7 +366,7 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
         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_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'))

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/client/deco.py

@@ -132,7 +132,7 @@ class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
         element = get_value(data, ['wan', 'ip_info', 'gateway'])
         ipv4_status._wan_ipv4_gateway = IPv4Address(element) if element else None
         element = get_value(data, ['wan', 'dial_type'])
-        ipv4_status.wan_ipv4_conntype = element if element else ''
+        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
         element = get_value(data, ['wan', 'ip_info', 'dns1'])

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/client/mr.py

@@ -7,7 +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
+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 (
@@ -543,10 +543,10 @@ class TPLinkMRClient(TPLinkMRClientBase):
         _, values = self.req_act(acts)
 
         ipv4_status = IPv4Status()
-        ipv4_status._lan_macaddr = get_mac(values.get('0', {}).get('X_TP_MACAddress', '00:00:00:00:00:00'))
-        ipv4_status._lan_ipv4_ipaddr = get_ip(values.get('0', {}).get('IPInterfaceIPAddress', '0.0.0.0'))
-        ipv4_status._lan_ipv4_netmask = get_ip(values.get('0', {}).get('IPInterfaceSubnetMask', '0.0.0.0'))
-        ipv4_status.lan_ipv4_dhcp_enable = bool(int(values.get('1', {}).get('DHCPServerEnable', '0')))
+        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.get('enable', '0')) == 0 and values.get('2').__class__ == list:
@@ -554,11 +554,11 @@ class TPLinkMRClient(TPLinkMRClientBase):
             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_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) == 2 else '0.0.0.0')
-            ipv4_status._wan_ipv4_snddns = get_ip(dns[1] if len(dns) == 2 else '0.0.0.0')
+            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/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/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/common/helper.py

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

{tplinkrouterc6u-5.4.1.dist-info → tplinkrouterc6u-5.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tplinkrouterc6u
-Version: 5.4.1
+Version: 5.4.2
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -319,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

{tplinkrouterc6u-5.4.1.dist-info → tplinkrouterc6u-5.4.2.dist-info}/RECORD

@@ -2,29 +2,29 @@ test/__init__.py,sha256=McQmUjeN3AwmwdS6QNfwGXXE77OKoPK852I2BM9XsrU,210
 test/test_client_c1200.py,sha256=4RdwMEwTGWLOxOVTuPikifXDcUJFQ13DuyWGm2Aevrk,8811
 test/test_client_c6u.py,sha256=rJKJWwUBcmMehvdyyRtWm420X6KIXdrJu75VH6JPvng,32066
 test/test_client_deco.py,sha256=YPLKRD8GoyDYHfRgdXvCk8iVNw8zdMJW-AHVnNbpdTM,31719
-test/test_client_ex.py,sha256=YGY3auCiZTM91640LHmsL6r2-xcK5n5cB_CpvD83GeI,20429
-test/test_client_mr.py,sha256=2ZFNwJGHqFbnePRvmmg5r_4YzqsHo3bjkmBXVzht7YQ,33407
+test/test_client_ex.py,sha256=0dVvOJqxpR2xNca99vadfdpxmzW-4sk9X_4tAK8x9-c,21710
+test/test_client_mr.py,sha256=pKlQwGZNZRek9oFQPm2HkeeU3cI9EPySxtdZ8H2mqWY,33462
 test/test_client_xdr.py,sha256=mgn-xL5mD5sHD8DjTz9vpY7jeh4Ob6Um6Y8v5Qgx2jA,23374
 tplinkrouterc6u/__init__.py,sha256=bLlCkiL9ycyRVG7VqPOJWPcoPmUfMkdTcUKFYKNP8QI,900
-tplinkrouterc6u/client_abstract.py,sha256=OgftTH6bELzhFWom0MOX4EJe3RNS003ezpHyyRnh2tQ,1328
+tplinkrouterc6u/client_abstract.py,sha256=3UYzmll774S_Gb5E0FTVO_rI3-XFM7PSklg1-V-2jls,1419
 tplinkrouterc6u/provider.py,sha256=SsyGu_2SZ-a46ADl9aw_0wx0lgbsJhS6wnwUzb_1qGg,1900
 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=sDlwtccncuVrBRAzbLxgT5hU7VYNM0LCVtyEs-9bk-Q,17587
-tplinkrouterc6u/client/c6v4.py,sha256=-IF7SqTZx56lRAVmiyxK9VKkrmD7srQSJWFvn2Z0DII,1489
-tplinkrouterc6u/client/deco.py,sha256=yL1fmDo7j67_iD4qi9gl402C0IGauAtgrA0EGAOR1jg,8228
-tplinkrouterc6u/client/ex.py,sha256=PxMKq7Yj-2iJBtSKzgxaJ1D0SrblFwhPWJYyrac0c9Q,12706
-tplinkrouterc6u/client/mr.py,sha256=rS9aqAxrzIh0Pl8ZqGQQ9uWA3TzEHijkvY-WESRbVHs,25863
+tplinkrouterc6u/client/c6u.py,sha256=fRNqT8vifpqQoLLNUwEYX1A6jEzat5XGbhCVGmL7ihk,17588
+tplinkrouterc6u/client/c6v4.py,sha256=bvquZ0FHgU_LJfZxQkfyKQz0C52mFytC4mzFSOqp99Y,1596
+tplinkrouterc6u/client/deco.py,sha256=7uVd9wt3aJGShft7L520AzFpQ85xbgRWM-8uyrpxE8Y,8229
+tplinkrouterc6u/client/ex.py,sha256=RVB04rWTFEqYlKr_4TSqzVC3niNWZOcrkxfI2ub9PY0,13070
+tplinkrouterc6u/client/mr.py,sha256=clqCU8q5WM5xKSgJrcgKmDvrvE_INEf5gwja0iHhkPc,25877
 tplinkrouterc6u/client/xdr.py,sha256=9YuVfrmsrDeqnhJXp1Fc4OfcJEz9SkjdmpOoTIDi6Js,10327
 tplinkrouterc6u/common/__init__.py,sha256=pCTvVZ9CAwgb7MxRnLx0y1rI0sTKSwT24FfxWfQXeTM,33
-tplinkrouterc6u/common/dataclass.py,sha256=__u8I8URLk_AdIEN4Jd8Pswh4ujURlJxw8YunuVStwk,7630
+tplinkrouterc6u/common/dataclass.py,sha256=iozL4PzEiFX3Ry4yJA9VU83sr-yPv8AmU1cquusj-Ks,7765
 tplinkrouterc6u/common/encryption.py,sha256=4HelTxzN6esMfDZRBt3m8bwB9Nj_biKijnCnrGWPWKg,6228
 tplinkrouterc6u/common/exception.py,sha256=_0G8ZvW5__CsGifHrsZeULdl8c6EUD071sDCQsQgrHY,140
-tplinkrouterc6u/common/helper.py,sha256=x9Y0zkCnELpzNzuQtq2yMrWmp7nCyJylTBKu4a8RfKc,561
+tplinkrouterc6u/common/helper.py,sha256=23b04fk9HuVinrZXMCS5R1rmF8uZ7eM-Cdnp7Br9NR0,572
 tplinkrouterc6u/common/package_enum.py,sha256=4ykL_2Pw0nDEIH_qR9UJlFF6stTgSfhPz32r8KT-sh8,1624
-tplinkrouterc6u-5.4.1.dist-info/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
-tplinkrouterc6u-5.4.1.dist-info/METADATA,sha256=Z1zydhvJZQU6Ffx_8vpUQgyNjUw4tABTmeTLx1xaabs,15189
-tplinkrouterc6u-5.4.1.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-tplinkrouterc6u-5.4.1.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
-tplinkrouterc6u-5.4.1.dist-info/RECORD,,
+tplinkrouterc6u-5.4.2.dist-info/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
+tplinkrouterc6u-5.4.2.dist-info/METADATA,sha256=FWZupEQ4AcBd0PaHlJHj_hE6UE_zGXr8lqX9lx2SRpc,15211
+tplinkrouterc6u-5.4.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+tplinkrouterc6u-5.4.2.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
+tplinkrouterc6u-5.4.2.dist-info/RECORD,,

{tplinkrouterc6u-5.4.1.dist-info → tplinkrouterc6u-5.4.2.dist-info}/WHEEL

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