Fix channel sync and logging

2026-08-12 08:50:30 +00:00 · 2026-03-13 19:24:42 +01:00
parent ced39b6992
commit d5684c51c7
7 changed files with 335 additions and 117 deletions
--- a/lib/providers/app_provider.dart
+++ b/lib/providers/app_provider.dart
@@ -1849,11 +1849,11 @@ class AppProvider with ChangeNotifier {
      // Small delay to ensure contacts are fully loaded
      await Future.delayed(const Duration(milliseconds: 500));

-      // Sync channels to get channel names
-      // In simple mode: only sync first 5 channels for faster startup
-      // In normal mode: sync all channels (up to device max)
-      const channelsToSync = 5;
-      debugPrint('📻 [AppProvider] Syncing channels (simple mode: max 5)...');
+      // Sync all channels so slot assignment and channel state mirror the device.
+      final channelsToSync = connectionProvider.deviceInfo.maxChannels;
+      debugPrint(
+        '📻 [AppProvider] Syncing channels (max: ${channelsToSync ?? 40})...',
+      );
      await connectionProvider.syncChannels(maxChannels: channelsToSync);
      debugPrint('✅ [AppProvider] Channel sync complete');

@@ -2918,9 +2918,10 @@ class AppProvider with ChangeNotifier {
      // Sync contacts
      await connectionProvider.getContacts();

-      // Sync channels (respect simple mode settings)
-      const channelsToSync = 5;
-      await connectionProvider.syncChannels(maxChannels: channelsToSync);
+      // Sync all channels so refresh reflects the full device state.
+      await connectionProvider.syncChannels(
+        maxChannels: connectionProvider.deviceInfo.maxChannels,
+      );

      // Messages are automatically synced via PUSH_CODE_MSG_WAITING events
      notifyListeners();
--- a/lib/providers/connection_provider.dart
+++ b/lib/providers/connection_provider.dart
@@ -853,6 +853,19 @@ class ConnectionProvider with ChangeNotifier {
    return requestedName.startsWith('#') && existingName == requestedName;
  }

+  @visibleForTesting
+  static int? firstAvailableChannelSlot({
+    required Set<int> occupiedIndices,
+    required int maxChannels,
+  }) {
+    for (int i = 1; i < maxChannels; i++) {
+      if (!occupiedIndices.contains(i)) {
+        return i;
+      }
+    }
+    return null;
+  }
+
  bool _channelSlotIsOccupied(Object channel) {
    final channelName = (channel as dynamic).name as String?;
    final secret = (channel as dynamic).secret;
@@ -934,6 +947,21 @@ class ConnectionProvider with ChangeNotifier {
    return _pendingDeletedChannelIndices.remove(channelIdx);
  }

+  Set<int> _syncedOccupiedChannelIndices({required int maxChannels}) {
+    if (getChannelInfo == null) {
+      throw Exception('Channel state is unavailable');
+    }
+
+    final occupiedIndices = <int>{};
+    for (int i = 1; i < maxChannels; i++) {
+      final channel = getChannelInfo!(i);
+      if (channel != null && _channelSlotIsOccupied(channel)) {
+        occupiedIndices.add(i);
+      }
+    }
+    return occupiedIndices;
+  }
+
  Future<int?> findNextEmptyChannelSlot() async {
    if (!_activeService.isConnected) {
      throw Exception('Not connected to device');
@@ -946,30 +974,16 @@ class ConnectionProvider with ChangeNotifier {
      final maxChannels = _deviceInfo.maxChannels ?? 40;
      final maxCustomChannels = maxChannels > 0 ? maxChannels - 1 : 0;

-      // Match meshcore-open: choose the first missing slot from the synced
-      // channel set and avoid speculative per-slot probing that can overwrite
-      // an existing channel when device state is delayed or transient.
-      if (getChannelInfo == null) {
-        throw Exception('Channel state is unavailable');
-      }
-
-      final usedIndices = <int>{};
-      for (int i = 1; i < maxChannels; i++) {
-        final channel = getChannelInfo!(i);
-        if (channel == null) {
-          continue;
-        }
-
-        if (_channelSlotIsOccupied(channel)) {
-          usedIndices.add(i);
-        }
-      }
-
-      for (int i = 1; i < maxChannels; i++) {
-        if (!usedIndices.contains(i)) {
-          debugPrint('   ✅ Found empty slot from synced channels: $i');
-          return i;
-        }
+      final occupiedIndices = _syncedOccupiedChannelIndices(
+        maxChannels: maxChannels,
+      );
+      final emptySlot = firstAvailableChannelSlot(
+        occupiedIndices: occupiedIndices,
+        maxChannels: maxChannels,
+      );
+      if (emptySlot != null) {
+        debugPrint('   ✅ Found empty slot from synced channels: $emptySlot');
+        return emptySlot;
      }

      debugPrint(
@@ -1004,92 +1018,15 @@ class ConnectionProvider with ChangeNotifier {
      debugPrint('📻 [Provider] Creating new channel...');
      debugPrint('  Name: $channelName');

-      // Determine channel type
      final bool isHashChannel = channelName.startsWith('#');
-      final maxChannels = _deviceInfo.maxChannels ?? 40;
+      final secretBytes = isHashChannel
+          ? _generateHashChannelSecret(channelName)
+          : _convertSecretToBytes(channelSecret);

-      // Refresh channel state before choosing a slot so we match meshcore-open's
-      // "pick first missing slot from the synced list" behavior.
-      await syncChannels(maxChannels: maxChannels);
-
-      // Match meshcore-open behavior:
-      // - deterministic hash channels (#name) cannot be duplicated
-      // - private channels always use the next empty slot, even if the name matches
-      if (getChannelInfo != null) {
-        for (int i = 1; i < maxChannels; i++) {
-          final channel = getChannelInfo!(i);
-          if (channel != null) {
-            final existingName = (channel as dynamic).name as String?;
-            if (existingName != null && existingName.isNotEmpty) {
-              if (
-                isDuplicateChannelName(
-                  requestedName: channelName,
-                  existingName: existingName,
-                )
-              ) {
-                debugPrint(
-                  '  ⚠️  Hash channel "$channelName" already exists in slot $i',
-                );
-                throw Exception(
-                  'Channel "$channelName" already exists. Hash channels cannot be duplicated.',
-                );
-              }
-            }
-          }
-        }
-      }
-
-      // Find next empty slot for any new channel.
-      final maxCustomChannels = maxChannels > 0 ? maxChannels - 1 : 0;
-      final emptySlot = await findNextEmptyChannelSlot();
-      if (emptySlot == null) {
-        throw Exception(
-          'All channel slots are in use (maximum $maxCustomChannels custom channels)',
-        );
-      }
-      final slotIdx = emptySlot;
-      debugPrint('  Using empty slot: $slotIdx (new channel)');
-
-      // Generate secret
-      final List<int> secretBytes;
-      if (isHashChannel) {
-        // Hash channel: auto-generate secret from name using SHA256
-        debugPrint('  Channel type: Hash channel (#)');
-        secretBytes = _generateHashChannelSecret(channelName);
-        debugPrint('  Secret auto-generated from channel name using SHA256');
-      } else {
-        // Private channel: use explicit secret with MD5
-        debugPrint('  Channel type: Private channel');
-        secretBytes = _convertSecretToBytes(channelSecret);
-        debugPrint('  Secret converted to 16-byte key using MD5');
-      }
-
-      // Send CMD_SET_CHANNEL to radio. Some devices accept the write but do not
-      // reliably answer the follow-up CMD_GET_CHANNEL verification (0x1F).
-      try {
-        await _activeService.setChannel(
-          channelIdx: slotIdx,
-          channelName: channelName,
-          secret: secretBytes,
-        );
-      } catch (e) {
-        if (_isChannelRefreshTimeoutError(e)) {
-          debugPrint(
-            '⚠️ [Provider] CMD_GET_CHANNEL verification timed out after SET_CHANNEL; assuming the channel write succeeded',
-          );
-          onChannelInfoReceived?.call(
-            slotIdx,
-            channelName,
-            Uint8List.fromList(secretBytes),
-            null,
-          );
-        } else {
-          rethrow;
-        }
-      }
-
-      debugPrint(
-        '✅ [Provider] Channel created successfully in slot $slotIdx',
+      await _createChannelWithSecretBytes(
+        channelName: channelName,
+        secretBytes: secretBytes,
+        isHashChannel: isHashChannel,
      );
    } catch (e) {
      _error = 'Failed to create channel: $e';
@@ -1099,6 +1036,79 @@ class ConnectionProvider with ChangeNotifier {
    }
  }

+  Future<void> _createChannelWithSecretBytes({
+    required String channelName,
+    required List<int> secretBytes,
+    required bool isHashChannel,
+  }) async {
+    final maxChannels = _deviceInfo.maxChannels ?? 40;
+
+    await syncChannels(maxChannels: maxChannels);
+
+    if (getChannelInfo != null) {
+      for (int i = 1; i < maxChannels; i++) {
+        final channel = getChannelInfo!(i);
+        if (channel == null) {
+          continue;
+        }
+
+        final existingName = (channel as dynamic).name as String?;
+        if (existingName != null &&
+            existingName.isNotEmpty &&
+            isDuplicateChannelName(
+              requestedName: channelName,
+              existingName: existingName,
+            )) {
+          debugPrint(
+            '  ⚠️  Hash channel "$channelName" already exists in slot $i',
+          );
+          throw Exception(
+            'Channel "$channelName" already exists. Hash channels cannot be duplicated.',
+          );
+        }
+      }
+    }
+
+    final maxCustomChannels = maxChannels > 0 ? maxChannels - 1 : 0;
+    final slotIdx = await findNextEmptyChannelSlot();
+    if (slotIdx == null) {
+      throw Exception(
+        'All channel slots are in use (maximum $maxCustomChannels custom channels)',
+      );
+    }
+
+    debugPrint(
+      '  Channel type: ${isHashChannel ? "Hash channel (#)" : "Private channel"}',
+    );
+    debugPrint('  Using empty slot: $slotIdx');
+
+    try {
+      await _activeService.setChannel(
+        channelIdx: slotIdx,
+        channelName: channelName,
+        secret: secretBytes,
+      );
+    } catch (e) {
+      if (_isChannelRefreshTimeoutError(e)) {
+        debugPrint(
+          '⚠️ [Provider] CMD_GET_CHANNEL verification timed out after SET_CHANNEL; assuming the channel write succeeded',
+        );
+        onChannelInfoReceived?.call(
+          slotIdx,
+          channelName,
+          Uint8List.fromList(secretBytes),
+          null,
+        );
+      } else {
+        rethrow;
+      }
+    }
+
+    await syncChannels(maxChannels: maxChannels);
+
+    debugPrint('✅ [Provider] Channel created successfully in slot $slotIdx');
+  }
+
  /// Delete a channel and remove it from the UI
  ///
  /// Clears the channel slot on the device and removes it from both
--- a/lib/providers/messages_provider.dart
+++ b/lib/providers/messages_provider.dart
@@ -246,6 +246,17 @@ class MessagesProvider with ChangeNotifier {
      )
      .length;

+  int getUnreadCountForChannel(int channelIdx) => _messages
+      .where(
+        (message) =>
+            message.isChannelMessage &&
+            (message.channelIdx ?? 0) == channelIdx &&
+            !message.isRead &&
+            !message.isSentMessage &&
+            !message.isSystemMessage,
+      )
+      .length;
+
  bool _isMessageForDestination(Message message, Contact contact) {
    if (message.isSystemMessage) return false;