tplinkrouterc6u 5.0.1__tar.gz → 5.0.3__tar.gz

{tplinkrouterc6u-5.0.1 → tplinkrouterc6u-5.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 5.0.1
+Version: 5.0.3
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -257,8 +257,9 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer GX90 v1.0
 - Archer MR200 (v5, v5.3)
 - Archer MR600 (v1, v2, v3)
-- Archer VR2100v v1
+- Archer VR600 v3
 - Archer VR900v
+- Archer VR2100v v1
 - Deco M4 2.0
 - Deco M4R 2.0
 - Deco M5 v3
@@ -289,7 +290,6 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer C900 V1
 - Archer C1200 V3
 - Archer C1900 V2
-- Archer C2300 V2
 - Archer C4000 (V2 and V3)
 - Archer C5400 V2
 - TL-WR1043N V5

{tplinkrouterc6u-5.0.1 → tplinkrouterc6u-5.0.3}/README.md

@@ -235,8 +235,9 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer GX90 v1.0
 - Archer MR200 (v5, v5.3)
 - Archer MR600 (v1, v2, v3)
-- Archer VR2100v v1
+- Archer VR600 v3
 - Archer VR900v
+- Archer VR2100v v1
 - Deco M4 2.0
 - Deco M4R 2.0
 - Deco M5 v3
@@ -267,7 +268,6 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer C900 V1
 - Archer C1200 V3
 - Archer C1900 V2
-- Archer C2300 V2
 - Archer C4000 (V2 and V3)
 - Archer C5400 V2
 - TL-WR1043N V5

{tplinkrouterc6u-5.0.1 → tplinkrouterc6u-5.0.3}/setup.py

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

{tplinkrouterc6u-5.0.1 → tplinkrouterc6u-5.0.3}/test/test_client_deco.py

@@ -70,7 +70,7 @@ class TestTPLinkDecoClient(TestCase):
                 "connection_type": "band5", "space_id": "1", "ip": "192.168.68.104", "client_mesh": true,
                 "online": true, "name": "d2lyZWxlc3M0", "enable_priority": false, "remain_time": 0, "owner_id": "",
                 "client_type": "other", "interface": "guest"},
-        {"mac": "56:32:c3:de:ce:f0", "up_speed": 3, "down_speed": 1, "wire_type": "wireless", "access_host": "1",
+        {"mac": "", "up_speed": 3, "down_speed": 1, "wire_type": "wireless", "access_host": "1",
                 "connection_type": "band2_4", "space_id": "1", "ip": "UNKNOWN", "client_mesh": true,
                 "online": true, "name": "d2lyZWxlc3M1", "enable_priority": false, "remain_time": 0, "owner_id": "",
                 "client_type": "other", "interface": "guest"}
@@ -149,7 +149,7 @@ class TestTPLinkDecoClient(TestCase):
         self.assertEqual(status.devices[3].packets_received, None)
         self.assertIsInstance(status.devices[4], Device)
         self.assertEqual(status.devices[4].type, Connection.GUEST_2G)
-        self.assertEqual(status.devices[4].macaddr, '56-32-C3-DE-CE-F0')
+        self.assertEqual(status.devices[4].macaddr, '00-00-00-00-00-00')
         self.assertEqual(status.devices[4].ipaddr, '0.0.0.0')
         self.assertEqual(status.devices[4].hostname, 'wireless5')
         self.assertEqual(status.devices[4].packets_sent, None)

{tplinkrouterc6u-5.0.1 → tplinkrouterc6u-5.0.3}/tplinkrouterc6u/client.py

@@ -10,7 +10,7 @@ from datetime import timedelta
 from macaddress import EUI48
 from ipaddress import IPv4Address
 from logging import Logger
-from tplinkrouterc6u.helper import get_ip
+from tplinkrouterc6u.helper import get_ip, get_mac
 from tplinkrouterc6u.encryption import EncryptionWrapper, EncryptionWrapperMR
 from tplinkrouterc6u.package_enum import Connection
 from tplinkrouterc6u.dataclass import Firmware, Status, Device, IPv4Reservation, IPv4DHCPLease, IPv4Status
@@ -355,7 +355,7 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
         devices = {}
 
         def _add_device(conn: Connection, item: dict) -> None:
-            devices[item['macaddr']] = Device(conn, EUI48(item['macaddr']),
+            devices[item['macaddr']] = Device(conn, get_mac(item.get('macaddr', '00:00:00:00:00:00')),
                                               get_ip(item['ipaddr']),
                                               item['hostname'])
 
@@ -382,8 +382,8 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
             for item in smart_network:
                 if item['mac'] not in devices:
                     conn = self._map_wire_type(item.get('deviceTag'), not item.get('isGuest'))
-                    devices[item['mac']] = Device(conn, EUI48(item['mac']), get_ip(item['ip']),
-                                                  item['deviceName'])
+                    devices[item['mac']] = Device(conn, get_mac(item.get('mac', '00:00:00:00:00:00')),
+                                                  get_ip(item['ip']), item['deviceName'])
                     if conn.is_iot():
                         if status.iot_clients_total is None:
                             status.iot_clients_total = 0
@@ -581,7 +581,7 @@ class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
                 status.iot_clients_total += 1
 
             device = Device(conn,
-                            EUI48(item['mac']),
+                            get_mac(item.get('mac', '00:00:00:00:00:00')),
                             get_ip(item.get('ip', '0.0.0.0')),
                             b64decode(item['name']).decode())
             device.down_speed = item.get('down_speed')
@@ -1440,8 +1440,10 @@ class TplinkRouterProvider:
         router = TplinkC1200Router(host, password, username, logger, verify_ssl, timeout)
         try:
             router.authorize()
+            return router
         except AuthorizeError as e:
-            logger.error(e.__str__())
+            if logger:
+                logger.error(e.__str__())
             raise ClientException(('Login failed! Please check if your router local password is correct or '
                                    'try to use web encrypted password instead. Check the documentation!'
                                    ))

{tplinkrouterc6u-5.0.1 → tplinkrouterc6u-5.0.3}/tplinkrouterc6u/helper.py

@@ -1,4 +1,5 @@
 from ipaddress import IPv4Address
+from macaddress import EUI48
 
 
 def get_ip(ip: str) -> IPv4Address:
@@ -6,3 +7,10 @@ def get_ip(ip: str) -> IPv4Address:
         return IPv4Address(ip)
     except Exception:
         return IPv4Address('0.0.0.0')
+
+
+def get_mac(mac: str) -> EUI48:
+    try:
+        return EUI48(mac)
+    except Exception:
+        return EUI48('00:00:00:00:00:00')

{tplinkrouterc6u-5.0.1 → tplinkrouterc6u-5.0.3}/tplinkrouterc6u.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 5.0.1
+Version: 5.0.3
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -257,8 +257,9 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer GX90 v1.0
 - Archer MR200 (v5, v5.3)
 - Archer MR600 (v1, v2, v3)
-- Archer VR2100v v1
+- Archer VR600 v3
 - Archer VR900v
+- Archer VR2100v v1
 - Deco M4 2.0
 - Deco M4R 2.0
 - Deco M5 v3
@@ -289,7 +290,6 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer C900 V1
 - Archer C1200 V3
 - Archer C1900 V2
-- Archer C2300 V2
 - Archer C4000 (V2 and V3)
 - Archer C5400 V2
 - TL-WR1043N V5