Number of bugfixes

wlanpi_core/api/api_v1/endpoints/utils_api.py

@@ -1,5 +1,6 @@
 import json
 import logging
+from typing import Union
 
 from fastapi import APIRouter, Response
 
@@ -122,7 +123,7 @@ async def ufw_information():
         return Response(content=f"Internal Server Error", status_code=500)
 
 
-@router.post("/ping", response_model=utils.PingResult)
+@router.post("/ping", response_model=Union[utils.PingResult, utils.PingFailure])
 async def execute_ping(request: utils.PingRequest):
     """
     Pings a target and returns the results

wlanpi_core/schemas/utils/__init__.py

@@ -8,6 +8,7 @@
     Iperf3ClientRequest,
     PingRequest,
     PingResponse,
+    PingFailure,
     PingResult,
     ReachabilityTest,
     SpeedTest,

wlanpi_core/schemas/utils/utils.py

@@ -88,14 +88,19 @@ class PingResult(
     packet_loss_percent: float = Field(examples=[0.0])
     duplicates: int = Field(examples=[0])
     time_ms: float = Field(examples=[9012.0])
-    round_trip_ms_min: float = Field(examples=[24.108])
-    round_trip_ms_avg: float = Field(examples=[29.318])
-    round_trip_ms_max: float = Field(examples=[37.001])
-    round_trip_ms_stddev: float = Field(examples=[4.496])
+    round_trip_ms_min: Optional[float] = Field(examples=[24.108])
+    round_trip_ms_avg: Optional[float] = Field(examples=[29.318])
+    round_trip_ms_max: Optional[float] = Field(examples=[37.001])
+    round_trip_ms_stddev: Optional[float] = Field(examples=[4.496])
     jitter: Optional[float] = Field(examples=[37.001], default=None)
     responses: list[PingResponse] = Field()
 
 
+class PingFailure(BaseModel):
+    destination: str = Field(examples=["google.com"])
+    message: str = Field(examples=["No route to host"])
+
+
 class Iperf3ClientRequest(BaseModel):
     host: str = Field(examples=["192.168.1.1"])
     port: int = Field(examples=[5001], default=5001)

wlanpi_core/services/utils_service.py

@@ -1,11 +1,11 @@
 import os
 import re
 import time
-from typing import Optional
+from typing import Optional, Union
 
 from wlanpi_core.constants import UFW_FILE
 from wlanpi_core.models.runcommand_error import RunCommandError
-from wlanpi_core.schemas.utils import PingResult
+from wlanpi_core.schemas.utils import PingResult, PingFailure
 from wlanpi_core.utils.general import run_command_async
 from wlanpi_core.utils.network import get_default_gateways, get_ip_address
 
@@ -210,7 +210,7 @@ async def ping(
     interval: float = 1,
     ttl: Optional[int] = None,
     interface: Optional[str] = None,
-) -> PingResult:
+) -> Union[PingResult, PingFailure]:
     def calculate_jitter(values: list[float], precision: int = 3) -> float:
         return round(
             sum([abs(values[i + 1] - values[i]) for i in range(len(values) - 1)])
@@ -227,6 +227,8 @@ def calculate_jitter(values: list[float], precision: int = 3) -> float:
     command.append(host)
     res = await run_command_async(command)
     result: dict = res.output_from_json()  # type: ignore
+    if not result:
+        return PingFailure(message=res.stderr, destination=host)
     # Calculate jitter if we can
     result["jitter"] = (
         calculate_jitter([x["time_ms"] for x in result["responses"]])

wlanpi_core/utils/network.py

@@ -383,10 +383,10 @@ def get_interface_details(
         iw_list_data = parse_iw_list(run_command(["iw", "list"]).stdout.split("\n"))
 
     return {
-        get_phy_interface_name(k.split(" ")[1].split("phy")[1]): {
+        get_phy_interface_name(k.split(" ")[1].split("phy")[1]).split()[0]: {
             "phy_name": k.split(" ")[1],
             "mac": get_interface_mac(
-                get_phy_interface_name(k.split(" ")[1].split("phy")[1])
+                get_phy_interface_name(k.split(" ")[1].split("phy")[1]).split()[0]
             ),
             "details": v,
         }