refactor: Improve disposal checks and listener notifications in view models

Author: oldrev

client/lib/core/services/devices/device_manager.dart

@@ -25,11 +25,11 @@ abstract class IDeviceManager implements IDisposable {
   int get wotThingCount;
 
   // Abstract methods
-  Future<void> initialize();
+  Future<void> initialize({CancellationToken? cancelToken});
   bool isBound(String deviceID);
   BoundDevice getBoundDevice(String deviceID);
   Iterable<BoundDevice> getBoundDevicesInCurrentScene();
-  Future<void> reloadAllDevices();
+  Future<void> reloadAllDevices({CancellationToken? cancelToken});
   Future<bool> tryBind(DeviceEntity device);
   Future<void> bind(DeviceEntity device);
   Future<void> unbind(String deviceID);

client/lib/core/services/devices/device_manager_impl.dart

@@ -77,19 +77,19 @@ final class DeviceManagerImpl extends IDeviceManager {
   Iterable<BoundDevice> get boundDevices => _kernel.boundDevices;
 
   @override
-  Future<void> initialize() async {
+  Future<void> initialize({CancellationToken? cancelToken}) async {
     assert(!_isInitialized);
 
     logger?.i('Initializing DeviceManagerImpl...');
     try {
-      final devices = await fetchAllDevicesInScene();
+      final devices = await fetchAllDevicesInScene().asCancellable(cancelToken);
       _kernel.registerDevices(devices.map((x) => BoundDeviceDescriptor(device: x, driverID: x.driverID)));
       await _kernel.start();
 
       unawaited(() async {
         // Load WotThings for current scene alongside device load, regardless of online state.
-        await _loadWotThingsForCurrentScene();
-        await _rebindAll(devices);
+        await _loadWotThingsForCurrentScene(cancelToken: cancelToken);
+        await _rebindAll(devices, cancelToken: cancelToken);
 
         final currentScene = _sceneManager.current;
         _globalBus.fire(CurrentSceneDevicesReloadedEvent(currentScene));
@@ -126,24 +126,26 @@ final class DeviceManagerImpl extends IDeviceManager {
   }
 
   @override
-  Future<void> reloadAllDevices() async {
-    await _deviceOperLock.synchronized(() async {
-      await _kernel.unbindAll();
-      _kernel.unregisterAllDevices();
-      final devices = await fetchAllDevicesInScene();
-      _kernel.registerDevices(devices.map((x) => BoundDeviceDescriptor(device: x, driverID: x.driverID)));
-      await _reloadWotThingsForCurrentScene();
-      await _rebindAll(devices);
-    });
+  Future<void> reloadAllDevices({CancellationToken? cancelToken}) async {
+    await _deviceOperLock
+        .synchronized(() async {
+          await _kernel.unbindAll(cancelToken: cancelToken);
+          _kernel.unregisterAllDevices();
+          final devices = await fetchAllDevicesInScene().asCancellable(cancelToken);
+          _kernel.registerDevices(devices.map((x) => BoundDeviceDescriptor(device: x, driverID: x.driverID)));
+          await _reloadWotThingsForCurrentScene(cancelToken: cancelToken);
+          await _rebindAll(devices, cancelToken: cancelToken);
+        })
+        .asCancellable(cancelToken);
   }
 
-  Future<void> _rebindAll(Iterable<DeviceEntity> devices) async {
+  Future<void> _rebindAll(Iterable<DeviceEntity> devices, {CancellationToken? cancelToken}) async {
     await _kernel.unbindAll();
     final futures = <Future>[];
     for (var device in devices) {
       futures.add(tryBind(device));
     }
-    await Future.wait(futures);
+    await Future.wait(futures).asCancellable(cancelToken);
     _globalBus.fire(DeviceManagerReadyEvent());
   }
 
@@ -400,12 +402,12 @@ final class DeviceManagerImpl extends IDeviceManager {
   }
 
   /// Reload WotThings for current scene only
-  Future<void> _reloadWotThingsForCurrentScene() async {
+  Future<void> _reloadWotThingsForCurrentScene({CancellationToken? cancelToken}) async {
     // Dispose of all existing WotThings
     _disposeAllWotThings();
 
     // Load WotThings for devices in current scene
-    await _loadWotThingsForCurrentScene();
+    await _loadWotThingsForCurrentScene(cancelToken: cancelToken);
 
     // Fire event to notify that devices for current scene have been reloaded
     final currentScene = _sceneManager.current;
@@ -440,7 +442,7 @@ final class DeviceManagerImpl extends IDeviceManager {
   }
 
   /// Load WotThings for devices in current scene
-  Future<void> _loadWotThingsForCurrentScene() async {
+  Future<void> _loadWotThingsForCurrentScene({CancellationToken? cancelToken}) async {
     try {
       final devices = await fetchAllDevicesInScene();
       logger?.d('Loading WotThings for ${devices.length} devices in current scene');
@@ -449,7 +451,7 @@ final class DeviceManagerImpl extends IDeviceManager {
         try {
           final metaModule = _deviceModuleRegistry.metaModules[device.driverID];
           if (metaModule != null) {
-            final wotThing = await metaModule.createWotThing(device, this, logger: logger);
+            final wotThing = await metaModule.createWotThing(device, this, logger: logger, cancelToken: cancelToken);
             _wotThings[device.id] = wotThing;
 
             // If device is bound, sync WotThing with actual device state
@@ -469,11 +471,15 @@ final class DeviceManagerImpl extends IDeviceManager {
   }
 
   /// Load WotThing for a single device
-  Future<void> _loadWotThingForDevice(DeviceEntity device, {bool replaceExisting = true}) async {
+  Future<void> _loadWotThingForDevice(
+    DeviceEntity device, {
+    bool replaceExisting = true,
+    CancellationToken? cancelToken,
+  }) async {
     try {
       final metaModule = _deviceModuleRegistry.metaModules[device.driverID];
       if (metaModule != null) {
-        final wotThing = await metaModule.createWotThing(device, this, logger: logger);
+        final wotThing = await metaModule.createWotThing(device, this, logger: logger, cancelToken: cancelToken);
         if (!replaceExisting && _wotThings.containsKey(device.id)) {
           return;
         }
@@ -490,7 +496,7 @@ final class DeviceManagerImpl extends IDeviceManager {
 
         // If device is bound, sync WotThing with actual device state
         if (isBound(device.id)) {
-          await _syncWotThingWithBoundDevice(device.id, wotThing);
+          await _syncWotThingWithBoundDevice(device.id, wotThing, cancelToken: cancelToken);
         }
         logger?.d('Successfully loaded WotThing for device ${device.id}');
       }
@@ -500,10 +506,13 @@ final class DeviceManagerImpl extends IDeviceManager {
   }
 
   /// Sync WotThing properties with actual device state
-  Future<void> _syncWotThingWithBoundDevice(String deviceID, WotThing wotThing) async {
+  Future<void> _syncWotThingWithBoundDevice(
+    String deviceID,
+    WotThing wotThing, {
+    CancellationToken? cancelToken,
+  }) async {
     try {
-      // This is where we would sync WotThing properties with actual device state
-      // For now, we'll leave this as a placeholder for future implementation
+      wotThing.sync(cancelToken: cancelToken);
       logger?.d('WotThing synced for device $deviceID');
     } catch (e) {
       logger?.w('Failed to sync WotThing for device $deviceID: $e');

client/lib/devices/borneo/lyfi/manifest.dart

@@ -11,6 +11,7 @@ import 'package:borneo_app/core/services/devices/device_manager.dart';
 import 'package:borneo_app/core/services/app_notification_service.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:borneo_wot/borneo/lyfi/wot_thing.dart';
+import 'package:cancellation_token/cancellation_token.dart';
 import 'package:event_bus/event_bus.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
@@ -130,11 +131,12 @@ class LyfiDeviceModuleMetadata extends DeviceModuleMetadata {
     }
   }
 
-  static Future<WotThing> _createWotThing(DeviceEntity device, IDeviceManager deviceManager, {Logger? logger}) async {
-    final lyfiThing = LyfiThing(kernel: deviceManager.kernel, deviceId: device.id, title: device.name, logger: logger);
-    await lyfiThing.initialize();
-    return lyfiThing;
-  }
+  static Future<WotThing> _createWotThing(
+    DeviceEntity device,
+    IDeviceManager deviceManager, {
+    Logger? logger,
+    CancellationToken? cancelToken,
+  }) async => LyfiThing(kernel: deviceManager.kernel, deviceId: device.id, title: device.name, logger: logger);
 }
 
 /// A compact bar chart that displays Lyfi per-channel brightness.

client/lib/devices/borneo/lyfi/view_models/summary_device_view_model.dart

@@ -5,7 +5,6 @@ import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:lw_wot/wot.dart';
 
 class LyfiSummaryDeviceViewModel extends BaseBorneoSummaryDeviceViewModel {
-  bool _disposed = false;
   final ValueNotifier<LyfiState?> ledState = ValueNotifier(null);
   final ValueNotifier<LyfiMode?> ledMode = ValueNotifier(null);
   final ValueNotifier<List<int>?> channelBrightness = ValueNotifier(null);
@@ -17,17 +16,11 @@ class LyfiSummaryDeviceViewModel extends BaseBorneoSummaryDeviceViewModel {
     super.globalEventBus, {
     required super.gt,
     super.logger,
-  }) {
-    _syncFromThing();
-    wotThing?.addSubscriber(_onStateChanged);
-    wotThing?.addSubscriber(_onModeChanged);
-    wotThing?.addSubscriber(_onColorChanged);
-    wotThing?.addSubscriber(_onDeviceInfoChanged);
-  }
+  });
 
   @override
   void dispose() {
-    if (!_disposed) {
+    if (!isDisposed) {
       wotThing?.removeSubscriber(_onStateChanged);
       wotThing?.removeSubscriber(_onModeChanged);
       wotThing?.removeSubscriber(_onColorChanged);
@@ -37,7 +30,6 @@ class LyfiSummaryDeviceViewModel extends BaseBorneoSummaryDeviceViewModel {
       channelBrightness.dispose();
       lyfiDeviceInfo.dispose();
       super.dispose();
-      _disposed = true;
     }
   }
 

client/lib/devices/view_models/abstract_device_summary_view_model.dart

@@ -48,13 +48,13 @@ abstract class AbstractDeviceSummaryViewModel extends BaseViewModel with ViewMod
     _deviceUpdatedSub = deviceManager.allDeviceEvents.on<DeviceEntityUpdatedEvent>().listen(_onDeviceUpdated);
     _loadingFailedEventSub = deviceManager.allDeviceEvents.on<LoadingDriverFailedEvent>().listen(_onLoadingFailed);
     _sceneReloadedSub = globalEventBus.on<CurrentSceneDevicesReloadedEvent>().listen(_onSceneReloaded);
-    wotThing?.addSubscriber(_onPowerPropertyChanged);
 
     _refreshWotThing();
   }
 
   @override
   void dispose() {
+    if (isDisposed) return;
     _boundEventSub.cancel();
     _removedEventSub.cancel();
     _deviceUpdatedSub.cancel();

client/lib/features/devices/models/device_module_metadata.dart

@@ -2,6 +2,7 @@ import 'package:borneo_app/devices/view_models/abstract_device_summary_view_mode
 import 'package:borneo_app/features/devices/models/device_entity.dart';
 import 'package:borneo_app/core/services/devices/device_manager.dart';
 import 'package:borneo_app/features/devices/view_models/base_device_view_model.dart';
+import 'package:cancellation_token/cancellation_token.dart';
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gettext/flutter_gettext/gettext_localizations.dart';
@@ -22,7 +23,8 @@ abstract class DeviceModuleMetadata {
   final List<Widget> Function(BuildContext, AbstractDeviceSummaryViewModel) secondaryStatesBuilder;
   final AbstractDeviceSummaryViewModel Function(DeviceEntity, IDeviceManager, EventBus, GettextLocalizations)
   createSummaryVM;
-  final Future<WotThing> Function(DeviceEntity, IDeviceManager, {Logger? logger}) createWotThing;
+  final Future<WotThing> Function(DeviceEntity, IDeviceManager, {Logger? logger, CancellationToken? cancelToken})
+  createWotThing;
 
   /// Optional: supply a custom center widget for the device card.
   /// When null the card falls back to [deviceIconBuilder].

client/lib/features/devices/view_models/device_discovery_view_model.dart

@@ -47,9 +47,6 @@ class DeviceDiscoveryViewModel extends AbstractScreenViewModel {
   late final List<DeviceGroupEntity> _availableGroups = [];
   List<DeviceGroupEntity> get availableGroups => _availableGroups;
 
-  @override
-  late final Future<void> initFuture;
-
   bool get isDiscovering => _isRefreshing;
 
   // Platform check
@@ -76,10 +73,6 @@ class DeviceDiscoveryViewModel extends AbstractScreenViewModel {
 
   @override
   Future<void> onInitialize() async {
-    initFuture = _initialize();
-  }
-
-  Future<void> _initialize() async {
     try {
       _availableGroups.addAll(await _groupManager.fetchAllGroupsInCurrentScene());
       // 延迟到下一帧，确保 UI 完全初始化

client/lib/features/devices/view_models/group_view_model.dart

@@ -76,7 +76,7 @@ class GroupViewModel extends BaseViewModel with ViewModelEventBusMixin {
     }
     _devices = [];
     _updateModified();
-    notifyListeners();
+    if (!isDisposed) notifyListeners();
   }
 
   @override

client/lib/features/devices/view_models/grouped_devices_view_model.dart

@@ -133,7 +133,6 @@ class GroupedDevicesViewModel extends BaseViewModel with ViewModelEventBusMixin,
 
   void _clearAllItems() {
     for (final g in _groups) {
-      g.clearDevices();
       g.dispose();
     }
     _groups.clear();
@@ -242,8 +241,13 @@ class GroupedDevicesViewModel extends BaseViewModel with ViewModelEventBusMixin,
     // Remove the deleted device from UI
     if (changedGroupIndex != -1) {
       final changedGroup = _groups[changedGroupIndex];
-      final deviceToRemove = changedGroup.devices.firstWhere((d) => d.deviceEntity.id == event.id);
-      deviceToRemove.dispose();
+      final deviceIndex = changedGroup.devices.indexWhere((d) => d.deviceEntity.id == event.id);
+      if (deviceIndex != -1) {
+        final deviceToRemove = changedGroup.devices[deviceIndex];
+        if (!deviceToRemove.isDisposed) {
+          deviceToRemove.dispose();
+        }
+      }
       changedGroup.removeDeviceById(event.id);
       // Notify only when necessary
       if (!isDisposed) {