Re-read WiFi conf at first request

At the time of container start, it is assumed that the WiFi conf
available might not be the “correct” one: it can be changed
once the containers have started, when `ap` step is ran.
This thus re-reads the conf upon first /wifi/ request so it's using
the correct one.
Given requests only come via WiFi, it's not possible that this
would happen before the WiFi conf is applied.

Fixes #1

Author: rgaudin

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- WiFi profile not representative on Pi3B (#1)
+
 ### Changed
 
 - Defaulting to INFO log leve unless `DEBUG` ENV is present

src/adminui/context.py

@@ -27,6 +27,7 @@ class Context:
     wifi_ssid: str = "Kiwix Hotspot"
     wifi_passphrase: str | None = None
     wifi_profile: str = "perf"
+    wifi_conf_read: bool = False
 
     sshd_enabled: bool = False
     kiosk_enabled: bool = False

src/adminui/setup.py

@@ -149,18 +149,27 @@ def complete_wifi_conf_from_hostapd(conf: WifiConf) -> WifiConf:
     return conf
 
 
+def get_wifi_conf() -> WifiConf:
+    # read wifi conf from offspot.yaml if present
+    wifi_conf = get_wifi_conf_from_offspot_yaml()
+    if not wifi_conf.is_complete:
+        # otherwise read from hostapd.conf
+        wifi_conf = complete_wifi_conf_from_hostapd(wifi_conf)
+    return wifi_conf
+
+
 def prepare_context():
     # read tld, domain, prefixes from compose
     compose_data = get_from_compose()
 
     # read capabilities
     capabilities = get_capabilities_from_config()
 
-    # read wifi conf from offspot.yaml if present
-    wifi_conf = get_wifi_conf_from_offspot_yaml()
-    if not wifi_conf.is_complete:
-        # otherwise read from hostapd.conf
-        wifi_conf = complete_wifi_conf_from_hostapd(wifi_conf)
+    # read wifi conf
+    # /!\ at this stage, hostapd.conf might not exists
+    # and thus conf might be composed of ap: in offspot.yamll or defaults
+    # /!\ it's possible ap: references perf profile but ap.py will switch to coverage
+    wifi_conf = get_wifi_conf()
 
     # request sshd service status from bridge
     try:

src/adminui/wifi.py

@@ -13,6 +13,7 @@
 from adminui.auth.views import login_required
 from adminui.constants import TEMPLATES_DIR, logger
 from adminui.context import Context
+from adminui.setup import get_wifi_conf
 from adminui.utils import (
     ValidateResult,
     read_latest_conf,
@@ -69,8 +70,23 @@ def update_wifi_config(data: WifiFormData):
     save_offspot_conf(config)
 
 
+def ensure_wifi_conf_read():
+    if context.wifi_conf_read:
+        return
+    wifi_conf = get_wifi_conf()
+    if not wifi_conf.is_complete:
+        logger.error(f"Incomplete WiFiConf at runtime: {wifi_conf!s}")
+    context.wifi_profile = str(wifi_conf.profile)
+    context.wifi_ssid = str(wifi_conf.ssid)
+    context.wifi_passphrase = (
+        str(wifi_conf.passphrase) if wifi_conf.passphrase else None
+    )
+    context.wifi_conf_read = True
+
+
 @router.get("/", name="wifi_config")
 def config(request: Request, session: Session = Depends(login_required)) -> Response:
+    ensure_wifi_conf_read()
     return templates.TemplateResponse(
         request=request,
         name="wifi/config.html",
@@ -84,6 +100,7 @@ def config_update(
     data: Annotated[WifiFormData, Form()],
     session: Session = Depends(login_required),
 ) -> Response:
+    ensure_wifi_conf_read()
     is_valid, errors = data.validate()
     if is_valid:
         try: