Discovery responses now match to the exact repeater based on full key

MrAlders0n · MrAlders0n · commit 02900cc5dbd7 · 2026-02-10T18:28:17.000-05:00
Removed error log that displayed dropped packets based on user filter
Added debug logs around distance measuring
Bluetooth timeout after 15 seconds now provides a clean, user-friendly message
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
@@ -33,7 +33,8 @@
       "Bash(flutter test:*)",
       "WebFetch(domain:raw.githubusercontent.com)",
       "Bash(file:*)",
-      "Bash(wc:*)"
+      "Bash(wc:*)",
+      "Bash(xargs cat:*)"
     ]
   }
 }
diff --git a/android/local.properties b/android/local.properties
@@ -2,4 +2,4 @@ sdk.dir=/opt/homebrew/share/android-commandlinetools
 flutter.sdk=/opt/homebrew/share/flutter
 flutter.buildMode=release
 flutter.versionName=1.0.0
-flutter.versionCode=1770694673
+flutter.versionCode=1770696177
diff --git a/debuglog/meshmapper-debug-1770323201.txt b/debuglog/meshmapper-debug-1770323201.txt
diff --git a/debuglog/meshmapper-debug-1770757854.txt b/debuglog/meshmapper-debug-1770757854.txt
diff --git a/ios/Flutter/Generated.xcconfig b/ios/Flutter/Generated.xcconfig
@@ -5,10 +5,10 @@ COCOAPODS_PARALLEL_CODE_SIGN=true
 FLUTTER_TARGET=lib/main.dart
 FLUTTER_BUILD_DIR=build
 FLUTTER_BUILD_NAME=1.0.0
-FLUTTER_BUILD_NUMBER=1770694673
+FLUTTER_BUILD_NUMBER=1770696177
 EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
 EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
-DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA2OTQ2NzM=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44
+DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA2OTYxNzc=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44
 DART_OBFUSCATION=false
 TRACK_WIDGET_CREATION=false
 TREE_SHAKE_ICONS=true
diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh
@@ -6,8 +6,8 @@ export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "FLUTTER_BUILD_NAME=1.0.0"
-export "FLUTTER_BUILD_NUMBER=1770694673"
-export "DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA2OTQ2NzM=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44"
+export "FLUTTER_BUILD_NUMBER=1770696177"
+export "DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA2OTYxNzc=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=false"
 export "TREE_SHAKE_ICONS=true"
diff --git a/lib/models/log_entry.dart b/lib/models/log_entry.dart
@@ -202,13 +202,15 @@ class DiscoveredNodeEntry {
   final double localSnr;        // SNR as seen by local device (dB)
   final int localRssi;          // RSSI as seen by local device (dBm)
   final double remoteSnr;       // SNR as seen by remote node (dB)
+  final String? pubkeyHex;      // Full public key hex (64 chars) for exact repeater matching
 
   DiscoveredNodeEntry({
     required this.repeaterId,
     required this.nodeType,
     required this.localSnr,
     required this.localRssi,
     required this.remoteSnr,
+    this.pubkeyHex,
   });
 
   /// Get short display label: "(R)" for REPEATER, "(RM)" for ROOM
diff --git a/lib/models/noise_floor_session.dart b/lib/models/noise_floor_session.dart
@@ -49,10 +49,16 @@ class MarkerRepeaterInfo extends HiveObject {
   @HiveField(2)
   final int rssi;
 
+  /// Full public key hex from DISC responses (64 chars) for exact repeater matching.
+  /// Null for TX/RX pings which only have 1-byte IDs.
+  @HiveField(3)
+  final String? pubkeyHex;
+
   MarkerRepeaterInfo({
     required this.repeaterId,
     required this.snr,
     required this.rssi,
+    this.pubkeyHex,
   });
 }
 
diff --git a/lib/models/noise_floor_session.g.dart b/lib/models/noise_floor_session.g.dart
diff --git a/lib/providers/app_state_provider.dart b/lib/providers/app_state_provider.dart
@@ -1223,6 +1223,7 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
               repeaterId: n.repeaterId,
               snr: n.localSnr,
               rssi: n.localRssi,
+              pubkeyHex: n.pubkeyHex,
             )).toList();
           }
         }
@@ -1338,7 +1339,12 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
         }
       } else {
         _isAuthError = false;
-        _connectionError = errorStr.replaceFirst('Exception: ', '');
+        // Provide clean user-facing messages for common BLE errors
+        if (errorStr.contains('timeout') || errorStr.contains('Timeout') || errorStr.contains('timed out')) {
+          _connectionError = 'Bluetooth connection scan timed out';
+        } else {
+          _connectionError = errorStr.replaceFirst('Exception: ', '');
+        }
       }
       _connectionStep = ConnectionStep.error;
       notifyListeners();
diff --git a/lib/screens/log_screen.dart b/lib/screens/log_screen.dart
@@ -987,7 +987,7 @@ class _DiscLogTab extends StatelessWidget {
     }
 
     return InkWell(
-      onTap: () => RepeaterIdChip.showRepeaterPopup(context, node.repeaterId),
+      onTap: () => RepeaterIdChip.showRepeaterPopup(context, node.repeaterId, fullHexId: node.pubkeyHex),
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
         child: Row(
diff --git a/lib/services/meshcore/tx_tracker.dart b/lib/services/meshcore/tx_tracker.dart
@@ -126,7 +126,6 @@ class TxTracker {
       // VALIDATION STEP 2.5: Check user carpeater filter
       if (shouldIgnoreRepeater != null && shouldIgnoreRepeater!(pathHex.toUpperCase())) {
         debugLog('[TX LOG] ❌ DROPPED: Repeater $pathHex ignored by user carpeater filter');
-        onCarpeaterDrop?.call(pathHex, 'User carpeater filter');
         return false;
       }
 
diff --git a/lib/services/ping_service.dart b/lib/services/ping_service.dart
@@ -927,6 +927,7 @@ class PingService {
           localSnr: node.localSnr,
           localRssi: node.localRssi,
           remoteSnr: node.remoteSnr,
+          pubkeyHex: node.pubkeyFull,
         );
         if (isNew) {
           _lastDiscPing!.discoveredNodes.add(nodeEntry);
diff --git a/lib/widgets/map_widget.dart b/lib/widgets/map_widget.dart
@@ -2291,7 +2291,7 @@ class _MapWidgetState extends State<MapWidget> with TickerProviderStateMixin {
                       }
 
                       return InkWell(
-                        onTap: () => RepeaterIdChip.showRepeaterPopup(context, node.repeaterId),
+                        onTap: () => RepeaterIdChip.showRepeaterPopup(context, node.repeaterId, fullHexId: node.pubkeyHex),
                         child: Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
                           child: Row(
diff --git a/lib/widgets/noise_floor_chart.dart b/lib/widgets/noise_floor_chart.dart
@@ -499,7 +499,7 @@ class InteractiveNoiseFloorChartState extends State<InteractiveNoiseFloorChart>
     }
 
     return InkWell(
-      onTap: () => RepeaterIdChip.showRepeaterPopup(context, repeater.repeaterId),
+      onTap: () => RepeaterIdChip.showRepeaterPopup(context, repeater.repeaterId, fullHexId: repeater.pubkeyHex),
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
         child: Row(
diff --git a/lib/widgets/repeater_id_chip.dart b/lib/widgets/repeater_id_chip.dart
@@ -5,6 +5,7 @@ import 'package:provider/provider.dart';
 import '../models/repeater.dart';
 import '../providers/app_state_provider.dart';
 import '../services/gps_service.dart';
+import '../utils/debug_logger_io.dart';
 import '../utils/distance_formatter.dart';
 
 /// A styled repeater ID text with a dotted underline hint that it's tappable.
@@ -62,7 +63,11 @@ class RepeaterIdChip extends StatelessWidget {
   ///
   /// Call this from the parent row's `InkWell.onTap` so the entire row is
   /// tappable, not just the tiny ID text.
-  static void showRepeaterPopup(BuildContext context, String repeaterId) {
+  ///
+  /// For DISC pings, pass [fullHexId] (the full public key hex) to enable
+  /// exact 4-byte matching against the repeater database instead of the
+  /// ambiguous 1-byte prefix match used for TX/RX pings.
+  static void showRepeaterPopup(BuildContext context, String repeaterId, {String? fullHexId}) {
     final appState = Provider.of<AppStateProvider>(context, listen: false);
     final repeaters = appState.repeaters;
 
@@ -81,8 +86,14 @@ class RepeaterIdChip extends StatelessWidget {
         ),
       );
     } else {
+      // DISC pings provide the full public key — match first 8 hex chars
+      // (4 bytes) against repeater hexId for exact identification.
+      // TX/RX pings only have 1-byte IDs so fall back to prefix matching.
+      final matchKey = fullHexId != null && fullHexId.length >= 8
+          ? fullHexId.substring(0, 8)
+          : repeaterId;
       final matches = repeaters
-          .where((r) => r.hexId.toLowerCase().startsWith(repeaterId.toLowerCase()))
+          .where((r) => r.hexId.toLowerCase().startsWith(matchKey.toLowerCase()))
           .toList();
 
       if (matches.isEmpty) {
@@ -188,6 +199,10 @@ class RepeaterIdChip extends StatelessWidget {
       final meters = GpsService.distanceBetween(
         position.latitude, position.longitude, repeater.lat, repeater.lon,
       );
+      debugLog('[UI] Distance to ${repeater.name}: '
+          'from (${position.latitude.toStringAsFixed(5)}, ${position.longitude.toStringAsFixed(5)}) '
+          'to (${repeater.lat.toStringAsFixed(5)}, ${repeater.lon.toStringAsFixed(5)}) '
+          '= ${meters.toStringAsFixed(0)}m');
       final isImperial = Provider.of<AppStateProvider>(context, listen: false)
           .preferences
           .isImperial;

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@`
`33`	`33`	`"Bash(flutter test:*)",`
`34`	`34`	`"WebFetch(domain:raw.githubusercontent.com)",`
`35`	`35`	`"Bash(file:*)",`
`36`		`- "Bash(wc:*)"`
	`36`	`+ "Bash(wc:*)",`
	`37`	`+ "Bash(xargs cat:*)"`
`37`	`38`	`]`
`38`	`39`	`}`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1223,6 +1223,7 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {`
`1223`	`1223`	`repeaterId: n.repeaterId,`
`1224`	`1224`	`snr: n.localSnr,`
`1225`	`1225`	`rssi: n.localRssi,`
	`1226`	`+ pubkeyHex: n.pubkeyHex,`
`1226`	`1227`	`)).toList();`
`1227`	`1228`	`}`
`1228`	`1229`	`}`
`@@ -1338,7 +1339,12 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {`
`1338`	`1339`	`}`
`1339`	`1340`	`} else {`
`1340`	`1341`	`_isAuthError = false;`
`1341`		`- _connectionError = errorStr.replaceFirst('Exception: ', '');`
	`1342`	`+ // Provide clean user-facing messages for common BLE errors`
	`1343`	`+ if (errorStr.contains('timeout') \|\| errorStr.contains('Timeout') \|\| errorStr.contains('timed out')) {`
	`1344`	`+ _connectionError = 'Bluetooth connection scan timed out';`
	`1345`	`+ } else {`
	`1346`	`+ _connectionError = errorStr.replaceFirst('Exception: ', '');`
	`1347`	`+ }`
`1342`	`1348`	`}`
`1343`	`1349`	`_connectionStep = ConnectionStep.error;`
`1344`	`1350`	`notifyListeners();`