move most device state providers into known devices notifier

Author: Codel1417

lib/Backend/Bluetooth/bluetooth_manager_plus.dart

@@ -25,7 +25,7 @@ import '../device_registry.dart';
 import '../firmware_update.dart';
 import '../logging_wrappers.dart';
 import '../sensors.dart';
-import 'bluetooth_manager.dart';
+import 'known_devices.dart';
 import 'bluetooth_message.dart';
 
 part 'bluetooth_manager_plus.g.dart';
@@ -505,15 +505,15 @@ class Scan extends _$Scan {
   ScanReason build() {
     isScanningStreamSubscription = FlutterBluePlus.isScanning.listen(onIsScanningChange);
 
-    ref.listen(isAllKnownGearConnectedProvider, isAllKnownGearConnectedProviderListener);
-
     Hive.box(settings).listenable(keys: [hasCompletedOnboarding])
       ..removeListener(isAllGearConnectedListener)
       ..addListener(isAllGearConnectedListener);
     isBluetoothEnabled
       ..removeListener(isAllGearConnectedListener)
       ..addListener(isAllGearConnectedListener);
-
+    KnownDevices.instance
+      ..removeListener(isAllGearConnectedListener)
+      ..addListener(isAllGearConnectedListener);
     // Has to be delayed so the provider initializes before calling the listener. Otherwise we can't call ref or set state in other methods
     Future.delayed(Duration(milliseconds: 1), () => isAllGearConnectedListener());
 
@@ -524,12 +524,6 @@ class Scan extends _$Scan {
     return ScanReason.notScanning;
   }
 
-  void isAllKnownGearConnectedProviderListener(bool? previous, bool next) {
-    if (ref.mounted) {
-      isAllGearConnectedListener();
-    }
-  }
-
   void onIsScanningChange(bool isScanning) {
     if (state != ScanReason.notScanning && !isScanning) {
       state = ScanReason.notScanning;
@@ -561,7 +555,7 @@ class Scan extends _$Scan {
   }
 
   void isAllGearConnectedListener() {
-    bool allConnected = ref.read(isAllKnownGearConnectedProvider);
+    bool allConnected = KnownDevices.instance.isAllGearConnected;
     bool isInOnboarding = HiveProxy.getOrDefault(settings, hasCompletedOnboarding, defaultValue: hasCompletedOnboardingDefault) < hasCompletedOnboardingVersionToAgree;
     if ((!allConnected || isInOnboarding) && isBluetoothEnabled.value) {
       beginScan(scanReason: ScanReason.background);
@@ -574,7 +568,7 @@ class Scan extends _$Scan {
 enum ScanReason { background, addGear, notScanning }
 
 Future<void> sendMessage(BaseStatefulDevice device, List<int> message, {bool withoutResponse = false}) async {
-  if (!_didInitFlutterBluePlus) {
+  if (!_didInitFlutterBluePlus || device.baseStoredDevice.btMACAddress.startsWith("DEV")) {
     return;
   }
   BluetoothDevice? bluetoothDevice = FlutterBluePlus.connectedDevices.firstWhereOrNull((element) => element.remoteId.str == device.baseStoredDevice.btMACAddress);

…Backend/Bluetooth/bluetooth_manager.dart lib/Backend/Bluetooth/known_devices.dartlib/Backend/Bluetooth/bluetooth_manager.dart renamed to lib/Backend/Bluetooth/known_devices.dart lib/Backend/Bluetooth/bluetooth_manager.dart renamed to lib/Backend/Bluetooth/known_devices.dart

@@ -51,11 +51,63 @@ class KnownDevices with ChangeNotifier {
   Future<void> store() async {
     await HiveProxy.clear<BaseStoredDevice>(devicesBox);
     await HiveProxy.addAll<BaseStoredDevice>(devicesBox, state.values.map((e) => e.baseStoredDevice));
-    notifyListeners();
+    _notify();
+
+    _onDevicePaired();
   }
 
   Future<void> removeDevGear() async {
     _state = _state.rebuild((p0) => p0.removeWhere((p0, p1) => p0.contains("DEV")));
     await store();
   }
+
+  // Helpers for gear connected
+
+  void _notify() {
+    notifyListeners();
+  }
+
+  BuiltList<BaseStatefulDevice> get connectedGear {
+    return KnownDevices.instance.state.values
+        .where((element) => element.deviceConnectionState.value == ConnectivityState.connected)
+        .where(
+          // don't consider gear connected until services have been discovered
+          (element) => element.bluetoothUartService.value != null,
+        )
+        .toBuiltList();
+  }
+
+  bool get isAllGearConnected {
+    return connectedGear.length == state.length;
+  }
+BuiltSet<DeviceType> get connectedGearTypes {
+  return connectedGear.map((e) => e.baseDeviceDefinition.deviceType).toBuiltSet();
+}
+
+  BuiltList<BaseStatefulDevice> getKnownGearForType(BuiltSet<DeviceType> deviceTypes) {
+    return state.values.where((element) => deviceTypes.contains(element.baseDeviceDefinition.deviceType)).toBuiltList();
+  }
+
+  BuiltList<BaseStatefulDevice> getConnectedGearForType(BuiltSet<DeviceType> deviceTypes) {
+    return connectedGear.where((element) => deviceTypes.contains(element.baseDeviceDefinition.deviceType)).toBuiltList();
+  }
+
+  BuiltList<BaseStatefulDevice> get connectedIdleGear {
+    return connectedGear.where((element) => element.deviceState.value == DeviceState.standby).toBuiltList();
+  }
+
+  BuiltList<BaseStatefulDevice> getConnectedIdleGearForType(BuiltSet<DeviceType> deviceTypes) {
+    return connectedIdleGear.where((element) => deviceTypes.contains(element.baseDeviceDefinition.deviceType)).toBuiltList();
+  }
+
+  void _onDevicePaired() {
+    for (BaseStatefulDevice baseStatefulDevice in KnownDevices.instance.state.values) {
+      baseStatefulDevice.deviceConnectionState
+        ..removeListener(_notify)
+        ..addListener(_notify);
+      baseStatefulDevice.bluetoothUartService
+        ..removeListener(_notify)
+        ..addListener(_notify);
+    }
+  }
 }

lib/Backend/Definitions/Action/base_action.dart

@@ -17,7 +17,7 @@ enum ActionCategory {
   @HiveField(5)
   glowtip,
   @HiveField(7)
-  hidden,
+  hidden, // used as a sub-action for legacy ear moves
   @HiveField(8)
   audio,
   @HiveField(9)

lib/Backend/Definitions/Device/device_definition.dart

@@ -12,7 +12,7 @@ import 'package:tail_app/Backend/dynamic_config.dart';
 
 import '../../../Frontend/translation_string_definitions.dart';
 import '../../../constants.dart';
-import '../../Bluetooth/bluetooth_manager.dart';
+import '../../Bluetooth/known_devices.dart';
 import '../../firmware_update.dart';
 import '../../logging_wrappers.dart';
 import '../../version.dart';

lib/Backend/action_registry.dart

@@ -5,11 +5,10 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:tail_app/Frontend/utils.dart';
 
-import 'Bluetooth/bluetooth_manager.dart';
+import 'Bluetooth/known_devices.dart';
 import 'Definitions/Action/base_action.dart';
 import 'Definitions/Device/device_definition.dart';
 import 'audio.dart';
-import 'device_registry.dart';
 import 'move_lists.dart';
 
 part 'action_registry.g.dart';
@@ -218,7 +217,7 @@ class GetAvailableActions extends _$GetAvailableActions {
   BuiltMap<String, BuiltSet<BaseAction>> getState() {
     Map<String, Set<BaseAction>> sortedActions = {};
     final BuiltMap<String, BuiltSet<BaseAction>> allActions = ref.watch(getAllActionsProvider);
-    final BuiltList<BaseStatefulDevice> availableGear = ref.watch(getAvailableGearProvider);
+    final BuiltList<BaseStatefulDevice> availableGear = KnownDevices.instance.connectedGear;
     for (BaseAction baseAction in allActions.values.flattened) {
       Set<BaseAction>? baseActions = {};
       for (BaseStatefulDevice baseStatefulDevice in availableGear) {

lib/Backend/app_shortcuts.dart

@@ -1,13 +1,13 @@
 import 'package:built_collection/built_collection.dart';
 import 'package:quick_actions/quick_actions.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:tail_app/Backend/Bluetooth/known_devices.dart';
 import 'package:tail_app/Backend/analytics.dart';
 import 'package:tail_app/Backend/command_runner.dart';
 
 import 'Definitions/Action/base_action.dart';
 import 'Definitions/Device/device_definition.dart';
 import 'action_registry.dart';
-import 'device_registry.dart';
 import 'favorite_actions.dart';
 
 part 'app_shortcuts.g.dart';
@@ -20,7 +20,7 @@ Future<void> appShortcuts(Ref ref) async {
   quickActions.initialize((shortcutType) {
     BaseAction? action = ref.read(getActionFromUUIDProvider(shortcutType));
     if (action != null) {
-      Iterable<BaseStatefulDevice> knownDevices = ref.read(getAvailableIdleGearProvider);
+      Iterable<BaseStatefulDevice> knownDevices = KnownDevices.instance.connectedIdleGear;
       for (BaseStatefulDevice device in knownDevices) {
         ref.read(runActionProvider(device).notifier).runAction(action, triggeredBy: "App Shortcut");
       }
@@ -31,17 +31,7 @@ Future<void> appShortcuts(Ref ref) async {
 }
 
 Future<void> updateShortcuts(BuiltList<FavoriteAction> favoriteActions, Ref ref) async {
-  Iterable<BaseAction> allActions = favoriteActions
-      .map(
-        (e) => ref.read(getActionFromUUIDProvider(e.actionUUID)),
-      )
-      .nonNulls;
+  Iterable<BaseAction> allActions = favoriteActions.map((e) => ref.read(getActionFromUUIDProvider(e.actionUUID))).nonNulls;
 
-  quickActions.setShortcutItems(
-    allActions
-        .map(
-          (e) => ShortcutItem(type: e.uuid, localizedTitle: e.name),
-        )
-        .toList(),
-  );
+  quickActions.setShortcutItems(allActions.map((e) => ShortcutItem(type: e.uuid, localizedTitle: e.name)).toList());
 }

lib/Backend/command_queue.dart

@@ -3,7 +3,7 @@ import 'dart:convert';
 
 import 'package:collection/collection.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:tail_app/Backend/Bluetooth/bluetooth_manager.dart';
+import 'package:tail_app/Backend/Bluetooth/known_devices.dart';
 import 'package:tail_app/Backend/Bluetooth/bluetooth_manager_plus.dart';
 import 'package:tail_app/Backend/command_history.dart';
 
@@ -20,7 +20,7 @@ enum CommandQueueState {
   delay, // The queue is momentarily paused
   blocked, // the queue is stopped
   idle, // inbetween moves
-  empty // the queue is empty
+  empty, // the queue is empty
 }
 
 @Riverpod(keepAlive: true)
@@ -133,7 +133,7 @@ class CommandQueue extends _$CommandQueue {
         if (_internalCommandQueue.isEmpty) {
           _setState(CommandQueueState.empty);
         } else {
-          runCommand(_internalCommandQueue.removeFirst());
+          Future(() => runCommand(_internalCommandQueue.removeFirst()));
         }
         break;
       case CommandQueueState.empty:
@@ -163,7 +163,9 @@ class CommandQueue extends _$CommandQueue {
     } else {
       bluetoothLog.fine("Sending command to ${_device.baseStoredDevice.name}:${bluetoothMessage.message}");
       ref.read(commandHistoryProvider(_device).notifier).add(type: MessageHistoryType.send, message: bluetoothMessage.message);
-      if (bluetoothMessage.responseMSG != null) {
+
+      // skip delay for dev gear but still add the command to the queue
+      if (bluetoothMessage.responseMSG != null && !_device.baseStoredDevice.btMACAddress.startsWith("DEV")) {
         _setState(CommandQueueState.waitingForResponse);
         _runningCommandTimer = Timer(timeoutDuration, _onTimeout);
       }
@@ -176,7 +178,7 @@ class CommandQueue extends _$CommandQueue {
 
   void addCommand(BluetoothMessage bluetoothMessage) {
     // Don't add commands to disconnected or dev gear.
-    if (_device.deviceConnectionState.value != ConnectivityState.connected || _device.baseStoredDevice.btMACAddress.startsWith("DEV") || state == CommandQueueState.blocked) {
+    if (_device.deviceConnectionState.value != ConnectivityState.connected || state == CommandQueueState.blocked) {
       return;
     }
     bluetoothLog.info("Adding command to queue $bluetoothMessage");