Improve namespaces to handle non-present SSIDs and improve monitor mode handling (#108)

Author: bentumbler

wlanpi_core/app.py

@@ -26,6 +26,8 @@
     CURRENT_CONFIG_FILE,
     SECRETS_DIR,
     SUPPORTED_MODELS,
+    CREATE_MONITOR_PAIRS_DEFAULT,
+    CREATE_MONITOR_PAIRS_UNINIT,
 )
 from wlanpi_core.core.config import endpoints, settings
 from wlanpi_core.core.database import DatabaseError, DatabaseManager
@@ -35,7 +37,7 @@
 from wlanpi_core.core.system import SystemManager
 from wlanpi_core.core.token import TokenManager
 from wlanpi_core.services.system_service import get_model
-from wlanpi_core.utils.network_config import activate_config, get_current_config
+from wlanpi_core.utils.network_config import activate_config, get_current_config, interfaces_in_root
 from wlanpi_core.views.api import router as views_router
 
 
@@ -330,12 +332,13 @@ async def initialize_components(self):
                     self.log.info(f"Default config activated sucessfully")
 
 
-                system_initialized = await self._initialize_system_manager("wlanpi")
-                if not system_initialized:
-                    self.log.error(
-                        "System manager initialization failed - cannot proceed"
-                    )
-                    return False
+                if CREATE_MONITOR_PAIRS_DEFAULT:
+                    system_initialized = await self._initialize_system_manager("wlanpi", exclusions=[])
+                    if not system_initialized:
+                        self.log.error(
+                            "System manager initialization failed - cannot proceed"
+                        )
+                        return False
             else:
                 model = get_model()
                 if model not in SUPPORTED_MODELS:
@@ -351,6 +354,14 @@ async def initialize_components(self):
 
                     else:
                         self.log.info(f"Default config activated sucessfully")
+                                                
+                    if CREATE_MONITOR_PAIRS_DEFAULT:
+                        system_initialized = await self._initialize_system_manager("wlanpi", exclusions=[])
+                        if not system_initialized:
+                            self.log.error(
+                                "System manager initialization failed - cannot proceed"
+                            )
+                            return False
                 else:
                     self.log.info(
                         f"Activating current network configuration: {current_config}"
@@ -363,6 +374,15 @@ async def initialize_components(self):
                         )
                     else:
                         self.log.info(f"Config {current_config} activated sucessfully")
+                    
+                    if CREATE_MONITOR_PAIRS_UNINIT:
+                        exclusions = interfaces_in_root(current_config)
+                        system_initialized = await self._initialize_system_manager("wlanpi", exclusions=[])
+                        if not system_initialized:
+                            self.log.error(
+                                "System manager initialization failed - cannot proceed"
+                            )
+                            return False
 
         except FileNotFoundError:
             self.log.warning("No current network configuration found")
@@ -445,10 +465,10 @@ async def _initialize_token_manager(self):
             self.log.error(f"Token manager initialization failed: {e}")
             return False
 
-    async def _initialize_system_manager(self, iface_name: str):
+    async def _initialize_system_manager(self, iface_name: str, exclusions: list[str] = []):
         """Initialize the system manager"""
         try:
-            self.app.state.system_manager = SystemManager(iface_name)
+            self.app.state.system_manager = SystemManager(iface_name, exclusions=exclusions)
             self.log.debug("System manager initialized succcessfully")
             return True
         except Exception as e:

wlanpi_core/constants.py

@@ -59,6 +59,8 @@
 PID_DIR = "/home/wlanpi/.local/share/wlanpi-core/netcfg/pids"
 APPS_FILE = "/home/wlanpi/.local/share/wlanpi-core/netcfg/apps.json"
 WPA_LOG_FILE = "/tmp/wpa.log"
+CREATE_MONITOR_PAIRS_DEFAULT = True
+CREATE_MONITOR_PAIRS_UNINIT = True
 
 #### Paths below here are relative to script dir or /tmp fixed paths ###
 

wlanpi_core/core/system.py

@@ -10,8 +10,9 @@
 
 
 class SystemManager:
-    def __init__(self, iface_name: str = "wlanpi"):
+    def __init__(self, iface_name: str = "wlanpi", exclusions: list[str] = []):
         self.iface_name = iface_name
+        self.exclusions = exclusions
         self.sync_monitor_interfaces()
 
     def _run(self, cmd, capture_output=False, suppress_output=False):
@@ -66,8 +67,10 @@ def _get_interfaces_by_type(self):
                 current_iface = line.strip().split()[1]
             elif "type" in line and current_iface:
                 iface_type = line.strip().split()[1]
-                interfaces[current_iface] = iface_type
-                current_iface = None
+                if current_iface not in self.exclusions:
+                    interfaces[current_iface] = iface_type
+                    current_iface = None
+                    
         return interfaces
 
     def _create_monitor(self, name, index):
@@ -119,11 +122,12 @@ def sync_monitor_interfaces(self):
             expected_mon = f"{self.iface_name}{index}"
             if expected_mon not in monitor:
                 log.info(f"Creating monitor interface for {iface} → {expected_mon}")
+                self._iface_up(iface)
                 self._create_monitor(iface, index)
                 driver = self._get_driver(iface)
                 if driver == "iwlwifi":
+                    self._iface_up(expected_mon)
                     log.info(f"Bringing up and scanning on {iface}...")
-                    self._iface_up(iface)
                     def background_scan_with_timeout():
                         time.sleep(1)
                         try:
@@ -134,6 +138,7 @@ def background_scan_with_timeout():
                                 timeout=10
                             )
                             log.info(f"Scan on {iface} done")
+                            
                             self._iface_down(iface)
                         except subprocess.TimeoutExpired:
                             log.warning(f"Scan on {iface} timed out after 10s")

wlanpi_core/schemas/network/network.py

@@ -70,6 +70,8 @@ class NetworkModeEnum(str, Enum):
 class SecurityTypes(str, Enum):
     wpa2 = "WPA2-PSK"
     wpa3 = "WPA3-PSK"
+    open = "OPEN"
+    owe = "OWE"
 
 
 class NetSecurity(BaseModel):