tplinkrouterc6u 5.9.4__py3-none-any.whl → 5.10.1__py3-none-any.whl

test/test_client_c6u.py

@@ -769,6 +769,69 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(result.wan_ipv4_gateway, '0.0.0.0')
         self.assertEqual(result.lan_macaddr, '06-E6-97-9E-23-F5')
 
+    def test_get_status_wifi_disabled(self) -> None:
+        """Test that get_status gracefully handles when WiFi is disabled and wireless statistics fail."""
+        response_status = '''
+    {
+        "success": true,
+        "data": {
+            "lan_macaddr": "06:e6:97:9e:23:f5",
+            "wan_macaddr": "06:e6:97:9e:23:f6",
+            "wan_ipv4_ipaddr": "192.168.1.1",
+            "wan_ipv4_gateway": "192.168.1.254",
+            "lan_ipv4_ipaddr": "192.168.0.1",
+            "mem_usage": 0.43,
+            "cpu_usage": 0.28,
+            "conn_type": "1",
+            "access_devices_wired": [
+                {
+                    "wire_type": "wired",
+                    "macaddr": "3d:24:25:24:30:79",
+                    "ipaddr": "192.168.1.228",
+                    "hostname": "SERVER"
+                }
+            ],
+            "access_devices_wireless_host": [],
+            "access_devices_wireless_guest": [],
+            "wireless_2g_enable": "off",
+            "wireless_5g_enable": "off",
+            "guest_2g_enable": "off",
+            "guest_5g_enable": "off"
+        }
+    }
+    '''
+
+        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':
+                    # Simulate the error that occurs when WiFi is disabled
+                    from tplinkrouterc6u.common.exception import ClientError
+                    raise ClientError('TplinkRouter - An unknown response - Expecting value: line 1 column 1 (char 0)')
+                raise ClientException()
+
+        client = TPLinkRouterTest('', '')
+        result = client.get_status()
+
+        # Should complete successfully without crashing
+        self.assertIsInstance(result, Status)
+        self.assertEqual(result.wan_macaddr, '06-E6-97-9E-23-F6')
+        self.assertEqual(result.lan_macaddr, '06-E6-97-9E-23-F5')
+        self.assertEqual(result.wan_ipv4_addr, '192.168.1.1')
+        self.assertEqual(result.wan_ipv4_gateway, '192.168.1.254')
+        self.assertEqual(result.lan_ipv4_addr, '192.168.0.1')
+        self.assertEqual(result.wired_total, 1)
+        self.assertEqual(result.wifi_clients_total, 0)
+        self.assertEqual(result.guest_clients_total, 0)
+        self.assertEqual(result.clients_total, 1)
+        self.assertEqual(result.wifi_2g_enable, False)
+        self.assertEqual(result.wifi_5g_enable, False)
+        # Devices list should only contain wired devices
+        self.assertEqual(len(result.devices), 1)
+        self.assertEqual(result.devices[0].type, Connection.WIRED)
+
     def test_vpn_status(self) -> None:
         response_openvpn_read = """
         {

tplinkrouterc6u/client/c6u.py

@@ -360,14 +360,19 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
                 devices[item['mac']].up_speed = item.get('uploadSpeed')
                 devices[item['mac']].signal = int(item.get('signal')) if item.get('signal') else None
 
-        for item in self.request('admin/wireless?form=statistics', 'operation=load'):
-            if item['mac'] not in devices:
-                status.wifi_clients_total += 1
-                type = self._map_wire_type(item.get('type'))
-                devices[item['mac']] = Device(type, EUI48(item['mac']), IPv4Address('0.0.0.0'),
-                                              '')
-            devices[item['mac']].packets_sent = item.get('txpkts')
-            devices[item['mac']].packets_received = item.get('rxpkts')
+        try:
+            wireless_stats = self.request('admin/wireless?form=statistics', 'operation=load')
+            for item in wireless_stats:
+                if item['mac'] not in devices:
+                    status.wifi_clients_total += 1
+                    type = self._map_wire_type(item.get('type'))
+                    devices[item['mac']] = Device(type, EUI48(item['mac']), IPv4Address('0.0.0.0'),
+                                                  '')
+                devices[item['mac']].packets_sent = item.get('txpkts')
+                devices[item['mac']].packets_received = item.get('rxpkts')
+        except Exception:
+            # WiFi might be disabled on the router, skip wireless statistics
+            pass
 
         status.devices = list(devices.values())
         status.clients_total = status.wired_total + status.wifi_clients_total + status.guest_clients_total

tplinkrouterc6u/common/dataclass.py

@@ -274,6 +274,36 @@ class LTEStatus:
     rsrq: int | None = None
     snr: int | None = None
     isp_name: str | None = None
+    network_types = {
+        0: "No Service",
+        1: "GSM",
+        2: "WCDMA",
+        3: "4G LTE",
+        4: "TD-SCDMA",
+        5: "CDMA 1x",
+        6: "CDMA 1x Ev-Do",
+        7: "4G+ LTE"
+    }
+    sim_statuses = {
+        0: "No SIM card detected or SIM card error.",
+        1: "No SIM card detected.",
+        2: "SIM card error.",
+        3: "SIM card prepared.",
+        4: "SIM locked.",
+        5: "SIM unlocked. Authentication succeeded.",
+        6: "PIN locked.",
+        7: "SIM card is locked permanently.",
+        8: "suspension of transmission",
+        9: "Unopened"
+    }
+
+    @property
+    def network_type_info(self) -> str:
+        return self.network_types.get(self.network_type, "Unknown network type")
+
+    @property
+    def sim_status_info(self) -> str:
+        return self.sim_statuses.get(self.sim_status, "Unknown SIM status")
 
 
 @dataclass

{tplinkrouterc6u-5.9.4.dist-info → tplinkrouterc6u-5.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.9.4
+Version: 5.10.1
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -258,7 +258,9 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 | enable | is enabled | int |
 | connect_status | connect status | int |
 | network_type | network type | int |
+| network_type_info | Example: 4G LTE  | str |
 | sim_status | sim status | int |
+| sim_status_info | Example: SIM locked. | str |
 | total_statistics | total statistics in bytes | int |
 | cur_rx_speed | current download speed in bytes per second  | int |
 | cur_tx_speed | current upload speed in bytes per second  | int |
@@ -268,6 +270,8 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 | rsrq | RSRQ  | int |
 | snr | SNR  | int |
 | isp_name | ISP name  | str |
+| network_types | All possible network types - {0: "No Service", 1: "GSM", 2: "WCDMA", 3: "4G LTE", 4: "TD-SCDMA", 5: "CDMA 1x", 6: "CDMA 1x Ev-Do", 7: "4G+ LTE"} | dict |
+| sim_statuses | All possible sim statuses - {0: "No SIM card detected or SIM card error.", 1: "No SIM card detected.", 2: "SIM card error.", 3: "SIM card prepared.", 4: "SIM locked.", 5: "SIM unlocked. Authentication succeeded.", 6: "PIN locked.", 7: "SIM card is locked permanently.", 8: "suspension of transmission", 9: "Unopened"} | dict |
 
 ## Enum
 ### <a id="connection">Connection</a>

{tplinkrouterc6u-5.9.4.dist-info → tplinkrouterc6u-5.10.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 test/__init__.py,sha256=McQmUjeN3AwmwdS6QNfwGXXE77OKoPK852I2BM9XsrU,210
 test/test_client_c1200.py,sha256=Sl-85JGqINNg-ckBZCIVqY0CC-V1UOc-yiIUljtePRM,7582
-test/test_client_c6u.py,sha256=VpxF5etPtGYuXX9TfUl78tOj0pjozvPkrVx6FKbZDjQ,37585
+test/test_client_c6u.py,sha256=j9IpkZaWAedqkSktIGhjK8YZMhCkQhHnhqAmAWzEAYc,40399
 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=Kg6svEKtyGAfyF9yrLh2qZa2tK1mlEBJJwXRsq1MAjo,26591
@@ -13,7 +13,7 @@ tplinkrouterc6u/provider.py,sha256=bzH0WW2peC66f8NqfiI3t_niX6MFO8SAdKP9WZL-IV4,2
 tplinkrouterc6u/client/__init__.py,sha256=KBy3fmtA9wgyFrb0Urh2x4CkKtWVnESdp-vxmuOvq0k,27
 tplinkrouterc6u/client/c1200.py,sha256=4XEYidEGmVIJk0YQLvmTnd0Gqa7glH2gUWvjreHpWrk,3178
 tplinkrouterc6u/client/c5400x.py,sha256=9E0omBSbWY_ljrs5MTCMu5brmrLtzsDB5O62Db8lP8Q,4329
-tplinkrouterc6u/client/c6u.py,sha256=3Jon6_WZkaCyrbTAp9TckB-SIXLP_JyB5gtRI65IuVI,19485
+tplinkrouterc6u/client/c6u.py,sha256=n4OMAxg0NXChYaVpWCvx3ZFUxVfynTMy-pyd1CTj9s4,19694
 tplinkrouterc6u/client/c80.py,sha256=ArVhza_fnXcEO-_fsQOd1l2QvmSfsswtohKxrZxEnoU,18568
 tplinkrouterc6u/client/deco.py,sha256=cpKRggKD2RvSmMZuD6tzsZmehAUCU9oLiTTHcZBW81Y,8898
 tplinkrouterc6u/client/ex.py,sha256=gXWsVKAMo4CsX_Qeihb2iCARcsA3E9m2vgIWiJB3sjs,13197
@@ -22,13 +22,13 @@ tplinkrouterc6u/client/vr.py,sha256=7Tbu0IrWtr4HHtyrnLFXEJi1QctzhilciL7agtwQ0R8,
 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=wgVfBEyWgXHfuy2yAxgcFkEO-S4PvX7nNBVs3-JNEGw,6843
+tplinkrouterc6u/common/dataclass.py,sha256=mIQFJoDmKZccV5M3NjguIGm7N9ROEt71Weg0ExYWrEQ,7709
 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.9.4.dist-info/licenses/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
-tplinkrouterc6u-5.9.4.dist-info/METADATA,sha256=_3Ic6Mg31bZ1TM-yym5utr5053CXx12mixtsRAw2VL8,15760
-tplinkrouterc6u-5.9.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tplinkrouterc6u-5.9.4.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
-tplinkrouterc6u-5.9.4.dist-info/RECORD,,
+tplinkrouterc6u-5.10.1.dist-info/licenses/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
+tplinkrouterc6u-5.10.1.dist-info/METADATA,sha256=oiaqPd4N9hGpncj_Zm7WWQNi7w3orZbIRuTOqrEYhBE,16373
+tplinkrouterc6u-5.10.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tplinkrouterc6u-5.10.1.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
+tplinkrouterc6u-5.10.1.dist-info/RECORD,,