Merge remote-tracking branch 'benma/bt'

benma · benma · commit d84159c7ea66 · 2025-03-13T09:06:40.000+01:00
diff --git a/backend/devices/bluetooth/bluetooth.go b/backend/devices/bluetooth/bluetooth.go
@@ -15,25 +15,63 @@
 package bluetooth
 
 import (
+	"encoding/json"
+	"fmt"
+
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/locker"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/observable"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/observable/action"
 	"github.com/sirupsen/logrus"
 )
 
+// ConnectionState represents the a peripheral's connection state.
+type ConnectionState string
+
+const (
+	// ConnectionStateDiscovered means the peripheral is discovered.
+	ConnectionStateDiscovered ConnectionState = "discovered"
+	// ConnectionStateConnecting means a connection & pairing attempt is in progress.
+	ConnectionStateConnecting ConnectionState = "connecting"
+	// ConnectionStateConnected means successfully connected and paired.
+	ConnectionStateConnected ConnectionState = "connected"
+	// ConnectionStateError means there was a connection error, see ConnectionError.
+	ConnectionStateError ConnectionState = "error"
+)
+
+// UnmarshalJSON verifies that only a valid state string can be deserialized.
+func (cs *ConnectionState) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+	switch ConnectionState(s) {
+	case ConnectionStateDiscovered,
+		ConnectionStateConnecting,
+		ConnectionStateConnected,
+		ConnectionStateError:
+		*cs = ConnectionState(s)
+		return nil
+	default:
+		return fmt.Errorf("invalid ConnectionState: %q", s)
+	}
+}
+
 // Peripheral is a bluetooth peripheral.
 type Peripheral struct {
-	Identifier      string  `json:"identifier"`
-	Name            string  `json:"name"`
-	ConnectionError *string `json:"connectionError,omitempty"`
+	Identifier string `json:"identifier"`
+	Name       string `json:"name"`
+	// ConnectionState shows the current connection phase
+	ConnectionState ConnectionState `json:"connectionState"`
+	ConnectionError *string         `json:"connectionError,omitempty"`
 }
 
 // State contains everything needed to render bluetooth peripherals and other data in the frontend.
 type State struct {
 	// BluetoothAvailable is false if bluetooth is powered off or otherwise unavailable.
-	BluetoothAvailable bool          `json:"bluetoothAvailable"`
-	Peripherals        []*Peripheral `json:"peripherals"`
-	Connecting         bool          `json:"connecting"`
+	BluetoothAvailable bool `json:"bluetoothAvailable"`
+	// Scanning is true if we are currently scanning for peripherals.
+	Scanning    bool          `json:"scanning"`
+	Peripherals []*Peripheral `json:"peripherals"`
 }
 
 // Bluetooth manages a list of peripherals.
diff --git a/frontends/ios/BitBoxApp/BitBoxApp/Bluetooth.swift b/frontends/ios/BitBoxApp/BitBoxApp/Bluetooth.swift
@@ -19,15 +19,25 @@ struct ProductInfo: Codable {
     }
 }
 
+enum ConnectionState: String, Codable {
+    case discovered
+    // from the moment we try to connect until after we are paired (or until either step fails).
+    case connecting
+    case connected
+    // something went wrong, see connectionError.
+    case error
+}
+
 struct State {
     var bluetoothAvailable: Bool
+    var scanning: Bool
     var discoveredPeripherals: [UUID: PeripheralMetadata]
-    var connecting: Bool
 }
 
 struct PeripheralMetadata {
     let peripheral: CBPeripheral
     let discoveredDate: Date
+    var connectionState: ConnectionState
     var connectionError: String? = nil
 }
 
@@ -42,14 +52,18 @@ var pairedDeviceIdentifiers: Set<String> {
 }
 
 class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeripheralDelegate {
-    private var state: State = State(bluetoothAvailable: false, discoveredPeripherals: [:], connecting: false)
+    private var state: State = State(
+        bluetoothAvailable: false,
+        scanning: false,
+        discoveredPeripherals: [:]
+    )
 
     var centralManager: CBCentralManager!
     var connectedPeripheral: CBPeripheral?
     var pWriter: CBCharacteristic?
     var pReader: CBCharacteristic?
     var pProduct: CBCharacteristic?
-    
+
     private var isPaired: Bool = false
 
     // Peripherals in this set will not be auto-connected even if previously paired.
@@ -72,10 +86,12 @@ class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CB
     }
 
     func connect(to peripheralID: UUID) {
-        guard let metadata = state.discoveredPeripherals[peripheralID] else { return }
+        guard var metadata = state.discoveredPeripherals[peripheralID] else { return }
         centralManager.stopScan()
-        state.discoveredPeripherals[peripheralID]?.connectionError = nil
-        state.connecting = true
+        metadata.connectionError = nil
+        metadata.connectionState = .connecting
+        state.discoveredPeripherals[peripheralID] = metadata
+        state.scanning = false
         updateBackendState()
         centralManager.connect(metadata.peripheral, options: nil)
     }
@@ -85,6 +101,7 @@ class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CB
               !centralManager.isScanning,
               connectedPeripheral == nil else { return }
         state.discoveredPeripherals.removeAll()
+        state.scanning = true
         updateBackendState()
         centralManager.scanForPeripherals(
           withServices: [CBUUID(string: "e1511a45-f3db-44c0-82b8-6c880790d1f1")],
@@ -113,7 +130,8 @@ class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CB
         if state.discoveredPeripherals[identifier] == nil {
             state.discoveredPeripherals[identifier] = PeripheralMetadata(
                 peripheral: peripheral,
-                discoveredDate: Date()
+                discoveredDate: Date(),
+                connectionState: .discovered
             )
             print("BLE: discovered \(peripheral.name ?? "unknown device")")
             if let data = advertisementData["kCBAdvDataManufacturerData"] as? Data {
@@ -140,8 +158,6 @@ class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CB
         print("BLE: Connected to \(peripheral.name ?? "unknown device")")
 
         state.discoveredPeripherals[peripheral.identifier]?.connectionError = nil
-        state.connecting = false
-        updateBackendState()
 
         connectedPeripheral = peripheral
         peripheral.delegate = self
@@ -150,11 +166,12 @@ class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CB
 
     func centralManager(_ central: CBCentralManager, didFailToConnect peripheral: CBPeripheral, error: Error?) {
         let errorMessage = error?.localizedDescription ?? "unknown error"
+        state.discoveredPeripherals[peripheral.identifier]?.connectionState = .error
         state.discoveredPeripherals[peripheral.identifier]?.connectionError = errorMessage
-        state.connecting = false
-        dontAutoConnectSet.insert(peripheral.identifier)
         updateBackendState()
+        dontAutoConnectSet.insert(peripheral.identifier)
         print("BLE: connection failed to \(peripheral.name ?? "unknown device"): \(errorMessage)")
+        restartScan()
     }
 
     func peripheral(_ peripheral: CBPeripheral, didDiscoverServices error: Error?) {
@@ -241,27 +258,28 @@ class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CB
                 // Add to paired devices
                 pairedDeviceIdentifiers.insert(peripheral.identifier.uuidString)
             }
+            state.discoveredPeripherals[peripheral.identifier]?.connectionState = .connected
+            updateBackendState()
             // Invoke device manager to scan now, which will make it detect the device being connected
             // (or disconnected, in case the product string indicates that) now instead of waiting for
             // the next scan.
             MobileserverUsbUpdate()
         }
     }
-    
+
     func handleDisconnect() {
         connectedPeripheral = nil
         pReader = nil
         pWriter = nil
         pProduct = nil
         state.discoveredPeripherals.removeAll()
-        state.connecting = false
-        isPaired = false
+       isPaired = false
         updateBackendState()
-        
+
         // Have the backend scan right away, which will make it detect that we disconnected.
         // Otherwise there would be up to a second of delay (the backend device manager scan interval).
         MobileserverUsbUpdate()
-        
+
         restartScan()
     }
 
@@ -298,7 +316,7 @@ class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CB
               let value = pProduct.value else {
             return nil
         }
-        
+
         if value.isEmpty {
             return nil
         }
@@ -319,25 +337,31 @@ class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CB
         struct PeripheralJSON: Codable {
             let identifier: String
             let name: String
+            let connectionState: ConnectionState
             let connectionError: String?
         }
 
         struct StateJSON: Codable {
             let bluetoothAvailable: Bool
+            let scanning: Bool
             let peripherals: [PeripheralJSON]
-            let connecting: Bool
         }
 
         // Convert discoveredPeripherals to the JSON structure
         let peripherals = Array(state.discoveredPeripherals.values).map { metadata in
             PeripheralJSON(
                 identifier: metadata.peripheral.identifier.uuidString,
                 name: metadata.peripheral.name ?? "BitBox",
+                connectionState: metadata.connectionState,
                 connectionError: metadata.connectionError
             )
         }
 
-        let state = StateJSON(bluetoothAvailable: state.bluetoothAvailable, peripherals: peripherals, connecting: state.connecting)
+        let state = StateJSON(
+            bluetoothAvailable: state.bluetoothAvailable,
+            scanning: state.scanning,
+            peripherals: peripherals
+        )
 
         do {
             let encoder = JSONEncoder()
diff --git a/frontends/web/src/api/bluetooth.ts b/frontends/web/src/api/bluetooth.ts
@@ -20,13 +20,20 @@ import { subscribeEndpoint, TUnsubscribe } from './subscribe';
 export type TPeripheral = {
   identifier: string;
   name: string;
-  connectionError?: string;
-};
+} & (
+  | {
+      connectionState: 'discovered' | 'connecting' | 'connected';
+    }
+  | {
+      connectionState: 'error';
+      connectionError: string;
+    }
+);
 
 export type TState = {
   bluetoothAvailable: boolean;
+  scanning: boolean;
   peripherals: TPeripheral[];
-  connecting: boolean;
 };
 
 export const getState = (): Promise<TState> => {
diff --git a/frontends/web/src/components/bluetooth/bluetooth.tsx b/frontends/web/src/components/bluetooth/bluetooth.tsx
@@ -37,7 +37,7 @@ const _Bluetooth = () => {
         {t('bluetooth.select')}
       </div>
       <div className={styles.container}>
-        { state.connecting ? <p>connecting</p> : null }
+        { state.scanning ? 'scanning' : null }
         {state.peripherals.map(peripheral => {
           return (
             <ActionableItem
@@ -46,14 +46,14 @@ const _Bluetooth = () => {
               <span>
                 { peripheral.name !== '' ? peripheral.name : peripheral.identifier }
                 {' '}
-                { peripheral.connectionError ? (
+                { peripheral.connectionState === 'error' ? (
                   <Badge type="danger">
                     {t('bluetooth.connectionFailed')}
                   </Badge>
                 ) : null }
-                { peripheral.connectionError ? (
+                { peripheral.connectionState === 'error' ? (
                   <p>{ peripheral.connectionError }</p>
-                ) : null }
+                ) : peripheral.connectionState }
               </span>
 
             </ActionableItem>
