Merge pull request #247 from f-io/dev

Dev -> Main

Author: f-io

package.json

@@ -1,6 +1,6 @@
 {
   "name": "LIVI",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "LIVI - Linux In-Vehicle Infotainment",
   "main": "./out/main/main.js",
   "author": "Lasse Heitgres",

src/main/services/projection/driver/aa/AaBtSockClient.ts

@@ -102,6 +102,19 @@ export class AaBtSockClient {
     return (await this.request(`remove ${mac}`, timeoutMs)) as ActionResponse
   }
 
+  /** Tell the BT reconnect worker to pause (true) or resume (false). */
+  async setSessionActive(active: boolean, timeoutMs = 5000): Promise<ActionResponse> {
+    return (await this.request(
+      `session-active ${active ? 'true' : 'false'}`,
+      timeoutMs
+    )) as ActionResponse
+  }
+
+  /** Kick every associated Wi-Fi station off the AP. */
+  async deauthApClients(timeoutMs = 5000): Promise<ActionResponse> {
+    return (await this.request('deauth-ap', timeoutMs)) as ActionResponse
+  }
+
   /** Open a event subscription. */
   subscribe(
     onEvent: (ev: { event: string; mac?: string; path?: string }) => void,

src/main/services/projection/driver/aa/bt/aa-bluetooth.py

@@ -29,7 +29,7 @@
 import dbus.mainloop.glib
 from gi.repository import GLib
 
-from wifi_ap import setup_ap, teardown_ap, get_wlan_mac, AP_IP
+from wifi_ap import setup_ap, teardown_ap, get_wlan_mac, deauth_all_clients, AP_IP
 from config import SSID, PASSPHRASE, CHANNEL, PORT as AA_PORT, BTNAME, WIFI_IFACE, BT_ADAPTER
 
 # ── Debug gate ────────────────────────────────────────────────────────────────
@@ -674,6 +674,10 @@ def _send_ok() -> None:
 # HFP Service Level Connection state
 hfp_slc_established: bool = False
 
+# Set True while an AA session is running (wired or wireless).
+_session_active: bool = False
+_session_active_lock = threading.Lock()
+
 # Set True only when HFP RegisterProfile succeeds.
 _hfp_profile_registered: bool = False
 
@@ -1003,7 +1007,9 @@ def _start_event_server() -> None:
            ]}
       connect <mac>     → {"ok": true} or {"ok": false, "error": "..."}
       disconnect <mac>  → {"ok": true} or {"ok": false, "error": "..."}
-      remove <mac>      → {"ok": true} or {"ok": false, "error": "..."}
+      remove <mac>            → {"ok": true} or {"ok": false, "error": "..."}
+      session-active <bool>   → {"ok": true, "active": true|false}
+      deauth-ap               → {"ok": true, "count": N}  (kicks Wi-Fi clients)
     """
     try:
         os.unlink(_AA_EVENT_SOCK)
@@ -1042,6 +1048,20 @@ def _dispatch_command(cmd: str, arg: str) -> dict:
                     return {"ok": False, "error": "remove requires a MAC argument"}
                 ok, err = _device_remove(arg)
                 return {"ok": ok} if ok else {"ok": False, "error": err}
+            if cmd == "session-active":
+                value = arg.strip().lower()
+                if value not in ("true", "false"):
+                    return {"ok": False, "error": "session-active expects true|false"}
+                global _session_active
+                with _session_active_lock:
+                    _session_active = (value == "true")
+                    new_value = _session_active
+                dprint(f"[aa-bt] session active: {new_value}", flush=True)
+                return {"ok": True, "active": new_value}
+            if cmd == "deauth-ap":
+                count = deauth_all_clients()
+                dprint(f"[aa-bt] deauth-ap: kicked {count} client(s)", flush=True)
+                return {"ok": True, "count": count}
             return {"ok": False, "error": f"unknown command: {cmd!r}"}
         except Exception as e:
             traceback.print_exc()
@@ -1128,6 +1148,12 @@ def _bt_reconnect_worker() -> None:
     while True:
         time.sleep(interval_s)
 
+        # Skip while an AA session is active — AA carries call audio itself,
+        # and BT probes interfere with Wi-Fi on shared-radio platforms.
+        with _session_active_lock:
+            if _session_active:
+                continue
+
         mac = _last_phone_mac
         path = _last_device_path
         if not mac or not path:

src/main/services/projection/driver/aa/bt/wifi_ap.py

@@ -230,6 +230,29 @@ def _is_dhcp_listening() -> bool:
     return False
 
 
+def deauth_all_clients() -> int:
+    """Force every associated station off the AP. Returns the number of
+    stations deauthenticated (0 if hostapd isn't running)."""
+    try:
+        out = subprocess.run(
+            ["sudo", "hostapd_cli", "-p", "/var/run/hostapd", "-i", WIFI_IFACE, "list_sta"],
+            capture_output=True, text=True, timeout=3,
+        )
+    except (FileNotFoundError, subprocess.TimeoutExpired):
+        return 0
+    macs = [m.strip() for m in (out.stdout or "").splitlines() if m.strip()]
+    for mac in macs:
+        try:
+            subprocess.run(
+                ["sudo", "hostapd_cli", "-p", "/var/run/hostapd", "-i", WIFI_IFACE,
+                 "deauthenticate", mac],
+                capture_output=True, text=True, timeout=3,
+            )
+        except Exception:
+            pass
+    return len(macs)
+
+
 def _hostapd_state() -> str:
     """Query hostapd's actual state via ctrl-interface. Returns the `state=`
     value (DISABLED / COUNTRY_UPDATE / HT_SCAN / ENABLED / …) or "" on error."""

src/main/services/projection/driver/aa/stack/system/__tests__/hwaddr.test.ts

@@ -45,15 +45,24 @@ describe('detectBtMac', () => {
     expect(detectBtMac()).toBe('11:22:33:44:55:66')
   })
 
-  test('falls back to hciconfig when sysfs has nothing', () => {
+  test('falls back to busctl when sysfs has nothing', () => {
     mockReaddirSync.mockReturnValueOnce([])
+    mockExecSync.mockReturnValueOnce('s "AA:BB:CC:DD:EE:FF"\n')
+    expect(detectBtMac()).toBe('AA:BB:CC:DD:EE:FF')
+  })
+
+  test('falls back to hciconfig when sysfs and busctl have nothing', () => {
+    mockReaddirSync.mockReturnValueOnce([])
+    mockExecSync.mockImplementationOnce(() => {
+      throw new Error('busctl missing')
+    })
     mockExecSync.mockReturnValueOnce('BD Address: AA:BB:CC:DD:EE:FF  ACL MTU: ...\n')
     expect(detectBtMac()).toBe('AA:BB:CC:DD:EE:FF')
   })
 
   test('returns undefined when nothing is detected', () => {
     mockReaddirSync.mockReturnValueOnce([])
-    mockExecSync.mockImplementationOnce(() => {
+    mockExecSync.mockImplementation(() => {
       throw new Error('not found')
     })
     expect(detectBtMac()).toBeUndefined()

src/main/services/projection/driver/aa/stack/system/hwaddr.ts

@@ -39,6 +39,20 @@ function readBtMacFromHciconfig(iface = 'hci0'): string | null {
   }
 }
 
+function readBtMacFromBusctl(iface = 'hci0'): string | null {
+  try {
+    const out = execSync(
+      `busctl --system get-property org.bluez /org/bluez/${iface} org.bluez.Adapter1 Address 2>/dev/null`,
+      { encoding: 'utf8', timeout: 2000 }
+    )
+    // Output format: s "AA:BB:CC:DD:EE:FF"
+    const m = out.match(/"([0-9A-Fa-f]{2}(?::[0-9A-Fa-f]{2}){5})"/)
+    return m ? m[1]!.toUpperCase() : null
+  } catch {
+    return null
+  }
+}
+
 export function detectBtMac(iface?: string): string | undefined {
   if (process.env['AA_BT_MAC']) return process.env['AA_BT_MAC']
 
@@ -52,12 +66,19 @@ export function detectBtMac(iface?: string): string | undefined {
     }
   }
 
-  // Fallback: hciconfig (covers kernels that don't expose sysfs address)
+  // Pi OS / newer kernels don't expose hci0/address in sysfs — go via BlueZ D-Bus.
   const hciFace = iface ?? 'hci0'
-  const mac = readBtMacFromHciconfig(hciFace)
-  if (mac) {
-    console.log(`[hwaddr] BT MAC detected from hciconfig: ${mac} (${hciFace})`)
-    return mac
+  const macBusctl = readBtMacFromBusctl(hciFace)
+  if (macBusctl) {
+    console.log(`[hwaddr] BT MAC detected from busctl: ${macBusctl} (${hciFace})`)
+    return macBusctl
+  }
+
+  // Last resort: hciconfig (often not installed on modern distros).
+  const macHci = readBtMacFromHciconfig(hciFace)
+  if (macHci) {
+    console.log(`[hwaddr] BT MAC detected from hciconfig: ${macHci} (${hciFace})`)
+    return macHci
   }
 
   console.warn('[hwaddr] Could not detect BT MAC. Set AA_BT_MAC env var if needed.')

src/main/services/projection/services/ProjectionService.ts

@@ -133,6 +133,7 @@ export class ProjectionService {
   private wirelessPhoneInRange = false
   private btInitialQueryDone = false
   private isSwitching = false
+  private sessionActiveSent: boolean | null = null
 
   private readonly onAaConnected = (): void => {
     this.refreshAaBtPairedList().catch(() => {})
@@ -241,11 +242,15 @@ export class ProjectionService {
       sup.on('stderr', (line) => console.warn(`[aa-bt!] ${line}`))
       sup.on('error', (err) => console.warn(`[aa-bt] supervisor error: ${err.message}`))
       this.aaBtSupervisor = sup
+      this.sessionActiveSent = null
       console.log('[ProjectionService] starting AA BT/Wi-Fi supervisor')
       sup.start(this.config)
       this.openAaBtSubscription()
       this.populateAaBtPairedListInitial()
-        .then(() => this.tryAutoConnect())
+        .then(() => {
+          this.emitTransportState()
+          return this.tryAutoConnect()
+        })
         .catch(() => {})
       return
     }
@@ -257,6 +262,7 @@ export class ProjectionService {
       this.closeAaBtSubscription()
       this.setWirelessPhoneInRange(false)
       this.btInitialQueryDone = false
+      this.sessionActiveSent = null
     }
   }
 
@@ -989,6 +995,22 @@ export class ProjectionService {
       type: 'transportState',
       payload: this.arbiter.getSnapshot()
     })
+    if (this.aaBtSupervisor) {
+      const aaActive = this.started && this.drivers.getAa() !== null
+      void this.setSessionActive(aaActive)
+    }
+  }
+
+  /** Tell the BT reconnect worker to pause while an AA session is active. */
+  private async setSessionActive(active: boolean): Promise<void> {
+    if (!this.aaBtSupervisor || this.sessionActiveSent === active) return
+    this.sessionActiveSent = active
+    try {
+      await this.aaBtSock.setSessionActive(active)
+    } catch (e) {
+      this.sessionActiveSent = null
+      console.warn(`[ProjectionService] setSessionActive(${active}) failed`, e)
+    }
   }
 
   public async switchTransport(): Promise<{ ok: boolean; active: Transport | null }> {
@@ -1005,6 +1027,11 @@ export class ProjectionService {
         const desired = this.arbiter.getOverride()
         if (!desired) break
 
+        const wasWireless =
+          this.started &&
+          this.drivers.getAa() !== null &&
+          this.drivers.getAa()?.isWiredMode() === false
+
         if (this.started) {
           try {
             await this.stop()
@@ -1013,8 +1040,16 @@ export class ProjectionService {
           }
         }
 
+        if (wasWireless) {
+          // Leaving wireless: kick the phone off the AP
+          await this.aaBtSock.deauthApClients().catch(() => {})
+        }
+
         if (desired.transport === 'aa' && desired.mode === 'wireless') {
           await this.bounceAaBtConnections()
+          // Give BlueZ a moment to commit the disconnect before we re-wake.
+          await new Promise((r) => setTimeout(r, 500))
+          await this.tryAutoConnect()
         }
 
         await this.autoStartIfNeeded()
@@ -1064,7 +1099,11 @@ export class ProjectionService {
     const connected = devices.find((d) => d.connected)?.mac ?? ''
     const wasSettled = this.btInitialQueryDone
     this.btInitialQueryDone = true
-    this.setWirelessPhoneInRange(connected !== '')
+    // During wired AA we deliberately don't auto-wake the phone, so it won't
+    // show as BT-connected. Treat any paired device as in-range.
+    const wiredAaActive = this.started && this.drivers.getAa()?.isWiredMode() === true
+    const offerable = connected !== '' || (wiredAaActive && devices.length > 0)
+    this.setWirelessPhoneInRange(offerable)
     if (!wasSettled) this.autoStartIfNeeded().catch(console.error)
 
     if (this.aaDriver) {
@@ -1126,6 +1165,11 @@ export class ProjectionService {
   // Pick a target from the paired list and fire a single Connect
   private async tryAutoConnect(): Promise<void> {
     if (!this.aaBtSupervisor) return
+    // Don't poke the phone over BT while a wired session is already running
+    if (this.started && this.drivers.getAa()?.isWiredMode() === true) {
+      console.log('[ProjectionService] autoconnect: skipped (wired AA session active)')
+      return
+    }
 
     let devices
     try {

src/main/services/projection/transport/TransportArbiter.ts

@@ -163,7 +163,10 @@ export class TransportArbiter {
     const list: Candidate[] = []
     if (this.dongleConnected) list.push(DONGLE)
     if (this.phoneConnected) list.push(AA_WIRED)
-    if (this.deps.isWirelessEnabled() && this.deps.isWirelessPhoneInRange()) list.push(AA_WIRELESS)
+    const offerWireless =
+      this.deps.isWirelessEnabled() &&
+      (this.deps.isWirelessPhoneInRange() || this.deps.isWiredAaSessionActive())
+    if (offerWireless) list.push(AA_WIRELESS)
     return list
   }
 
@@ -271,7 +274,10 @@ export class TransportArbiter {
       dongleDetected: this.dongleConnected,
       wiredPhoneDetected: this.phoneConnected,
       wirelessPhoneDetected:
-        this.deps.isWirelessEnabled() && (this.deps.isWirelessPhoneInRange() || wirelessActiveNow),
+        this.deps.isWirelessEnabled() &&
+        (this.deps.isWirelessPhoneInRange() ||
+          wirelessActiveNow ||
+          this.deps.isWiredAaSessionActive()),
       wiredPhoneActive: isPhoneActive && wired,
       wirelessPhoneActive: wirelessActiveNow,
       preference: this.deps.getPreference()