mirror of
https://github.com/dz0ny/meshcore-sar.git
synced 2026-08-11 16:30:28 +00:00
feat: Finish discovery flow
ref:
This commit is contained in:
Janez T
@@ -1,6 +1,8 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:math' as math;
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:meshcore_client/meshcore_client.dart' show BufferReader;
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'connection_provider.dart';
|
||||
import 'contacts_provider.dart';
|
||||
@@ -57,12 +59,65 @@ class _DirectMessageRouteSession {
|
||||
}
|
||||
}
|
||||
|
||||
class _ParsedRawAdvert {
|
||||
final Uint8List publicKey;
|
||||
final String? advName;
|
||||
final int typeValue;
|
||||
final int flags;
|
||||
final int lastAdvert;
|
||||
final int? advLat;
|
||||
final int? advLon;
|
||||
final int? signedEncodedPathLen;
|
||||
final Uint8List? paddedPathBytes;
|
||||
|
||||
const _ParsedRawAdvert({
|
||||
required this.publicKey,
|
||||
required this.advName,
|
||||
required this.typeValue,
|
||||
required this.flags,
|
||||
required this.lastAdvert,
|
||||
required this.advLat,
|
||||
required this.advLon,
|
||||
required this.signedEncodedPathLen,
|
||||
required this.paddedPathBytes,
|
||||
});
|
||||
}
|
||||
|
||||
class _ParsedRepeaterStatus {
|
||||
final int batteryMv;
|
||||
final int queueLen;
|
||||
final int lastRssi;
|
||||
final int lastSnrRaw;
|
||||
final int uptimeSecs;
|
||||
|
||||
const _ParsedRepeaterStatus({
|
||||
required this.batteryMv,
|
||||
required this.queueLen,
|
||||
required this.lastRssi,
|
||||
required this.lastSnrRaw,
|
||||
required this.uptimeSecs,
|
||||
});
|
||||
}
|
||||
|
||||
class _PendingRepeaterOwnerRequest {
|
||||
final Uint8List publicKey;
|
||||
|
||||
const _PendingRepeaterOwnerRequest({required this.publicKey});
|
||||
}
|
||||
|
||||
/// Main App Provider - coordinates all other providers
|
||||
class AppProvider with ChangeNotifier {
|
||||
static const int _maxDirectPayloadHops = 3;
|
||||
static const int _rawPayloadTypeAdvert = 0x04;
|
||||
static const int _routeTransportFlood = 0x00;
|
||||
static const int _routeTransportDirect = 0x03;
|
||||
static const int _anonReqTypeOwner = 0x02;
|
||||
static const double _lowBatteryThresholdPercent = 30.0;
|
||||
static const double _lowBatteryResetThresholdPercent = 35.0;
|
||||
static const Duration _lowBatteryCheckInterval = Duration(minutes: 5);
|
||||
static const Duration _repeaterOwnerInfoRequestCooldown = Duration(
|
||||
minutes: 10,
|
||||
);
|
||||
@visibleForTesting
|
||||
static bool isDeletedChannelInfo(
|
||||
int channelIdx,
|
||||
@@ -151,6 +206,10 @@ class AppProvider with ChangeNotifier {
|
||||
final Map<String, Future<bool>> _pendingMediaSwarmFetches = {};
|
||||
final Map<String, Map<String, MediaSwarmAvailability>>
|
||||
_pendingMediaSwarmResponses = {};
|
||||
final Map<String, DateTime> _recentRepeaterStatusRequests = {};
|
||||
final Map<String, DateTime> _recentRepeaterOwnerInfoRequests = {};
|
||||
final Map<int, _PendingRepeaterOwnerRequest> _pendingRepeaterOwnerRequests =
|
||||
{};
|
||||
bool _fastLocationScreenActive = false;
|
||||
Timer? _packetCaptureFlushTimer;
|
||||
Timer? _lowBatteryCheckTimer;
|
||||
@@ -864,11 +923,47 @@ class AppProvider with ChangeNotifier {
|
||||
);
|
||||
};
|
||||
// When a contact is received from BLE
|
||||
connectionProvider.onContactReceived = (contact) {
|
||||
connectionProvider.onContactReceivedDetailed = (contact, source) {
|
||||
final devicePublicKey = connectionProvider.deviceInfo.publicKey;
|
||||
final existingContact = contactsProvider.findContactByKey(
|
||||
contact.publicKey,
|
||||
);
|
||||
final isAdvertSource =
|
||||
source == ContactReceiveSource.advert ||
|
||||
source == ContactReceiveSource.preview;
|
||||
|
||||
if (isAdvertSource) {
|
||||
final isNewPendingAdvert = contactsProvider
|
||||
.addOrUpdatePendingAdvertContact(
|
||||
contact,
|
||||
devicePublicKey: devicePublicKey,
|
||||
);
|
||||
if (isNewPendingAdvert) {
|
||||
unawaited(
|
||||
_notificationService.showContactDiscoveredNotification(
|
||||
contactKey: contact.publicKey
|
||||
.take(6)
|
||||
.map((b) => b.toRadixString(16).padLeft(2, '0'))
|
||||
.join(),
|
||||
contactName: contact.advName.trim().isEmpty
|
||||
? null
|
||||
: contact.advName,
|
||||
),
|
||||
);
|
||||
}
|
||||
if (contact.type == ContactType.repeater &&
|
||||
contact.advName.trim().isEmpty) {
|
||||
unawaited(_maybeRequestRepeaterOwnerInfo(contact.publicKey));
|
||||
}
|
||||
if (existingContact == null) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Pass device public key to filter out our own contact
|
||||
contactsProvider.addOrUpdateContact(
|
||||
contact,
|
||||
devicePublicKey: connectionProvider.deviceInfo.publicKey,
|
||||
devicePublicKey: devicePublicKey,
|
||||
);
|
||||
unawaited(_pathHistoryService.recordLearnedPath(contact));
|
||||
|
||||
@@ -1240,6 +1335,9 @@ class AppProvider with ChangeNotifier {
|
||||
// Used by newer firmware versions for telemetry and other binary data
|
||||
// BOTH callbacks (0x8B and 0x8C) must be handled for device compatibility
|
||||
connectionProvider.onBinaryResponse = (publicKeyPrefix, tag, responseData) {
|
||||
if (_handlePendingRepeaterOwnerResponse(tag, responseData)) {
|
||||
return;
|
||||
}
|
||||
debugPrint(
|
||||
'📊 [AppProvider] Binary response (0x8C) received - updating contact telemetry',
|
||||
);
|
||||
@@ -1253,6 +1351,43 @@ class AppProvider with ChangeNotifier {
|
||||
// Magic 0x69 'i' = image fetch request; 0x56 'V' = voice packet.
|
||||
// Magic 0x49 'I' = image packet.
|
||||
connectionProvider.onRawDataReceived = (payload, snrRaw, rssiDbm) {
|
||||
final parsedAdvert = _tryParseRawAdvert(payload);
|
||||
if (parsedAdvert != null) {
|
||||
final isNewPendingAdvert = contactsProvider.addOrUpdatePendingAdvertMetadata(
|
||||
publicKey: parsedAdvert.publicKey,
|
||||
typeValue: parsedAdvert.typeValue,
|
||||
devicePublicKey: connectionProvider.deviceInfo.publicKey,
|
||||
flags: parsedAdvert.flags,
|
||||
advName: parsedAdvert.advName,
|
||||
lastAdvert: parsedAdvert.lastAdvert,
|
||||
advLat: parsedAdvert.advLat,
|
||||
advLon: parsedAdvert.advLon,
|
||||
signedEncodedPathLen: parsedAdvert.signedEncodedPathLen,
|
||||
paddedPathBytes: parsedAdvert.paddedPathBytes,
|
||||
rxRssiDbm: rssiDbm,
|
||||
rxSnrRaw: snrRaw,
|
||||
);
|
||||
if (isNewPendingAdvert) {
|
||||
final contactKey = parsedAdvert.publicKey
|
||||
.map((b) => b.toRadixString(16).padLeft(2, '0'))
|
||||
.join();
|
||||
unawaited(
|
||||
_notificationService.showContactDiscoveredNotification(
|
||||
contactKey: contactKey,
|
||||
contactName: parsedAdvert.advName,
|
||||
),
|
||||
);
|
||||
}
|
||||
if (parsedAdvert.typeValue == ContactType.repeater.value) {
|
||||
unawaited(_requestRepeaterStatus(parsedAdvert.publicKey));
|
||||
unawaited(_maybeRequestRepeaterOwnerInfo(parsedAdvert.publicKey));
|
||||
}
|
||||
if (contactsProvider.shouldEnrichPendingAdvert(parsedAdvert.publicKey)) {
|
||||
unawaited(connectionProvider.previewContact(parsedAdvert.publicKey));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
final fastGpsPacket = FastGpsPacket.tryParseBinary(payload);
|
||||
if (fastGpsPacket != null) {
|
||||
final sender = _resolveContactByPrefixHex(fastGpsPacket.senderKey6);
|
||||
@@ -1458,6 +1593,31 @@ class AppProvider with ChangeNotifier {
|
||||
_handleIncomingVoicePacket(pkt, justComplete: justComplete);
|
||||
};
|
||||
|
||||
connectionProvider.onControlDataReceived =
|
||||
(payload, snrRaw, rssiDbm, pathLen) {
|
||||
_handleControlDataDiscovery(
|
||||
payload: payload,
|
||||
snrRaw: snrRaw,
|
||||
rssiDbm: rssiDbm,
|
||||
pathLen: pathLen,
|
||||
);
|
||||
};
|
||||
|
||||
connectionProvider.onStatusResponse = (publicKeyPrefix, statusData) {
|
||||
final parsed = _tryParseRepeaterStatus(statusData);
|
||||
if (parsed == null) {
|
||||
return;
|
||||
}
|
||||
contactsProvider.updatePendingAdvertStatusByPrefix(
|
||||
publicKeyPrefix,
|
||||
batteryMv: parsed.batteryMv,
|
||||
queueLen: parsed.queueLen,
|
||||
lastRssi: parsed.lastRssi,
|
||||
lastSnrRaw: parsed.lastSnrRaw,
|
||||
uptimeSecs: parsed.uptimeSecs,
|
||||
);
|
||||
};
|
||||
|
||||
// When a contact's routing path is updated in the mesh network
|
||||
connectionProvider.onPathUpdated = (publicKey) {
|
||||
debugPrint(
|
||||
@@ -1509,9 +1669,13 @@ class AppProvider with ChangeNotifier {
|
||||
unawaited(
|
||||
_notificationService.showContactDiscoveredNotification(
|
||||
contactKey: keyHex,
|
||||
contactName: contactsProvider.pendingAdvertByKey(publicKey)?.advName,
|
||||
),
|
||||
);
|
||||
}
|
||||
if (contactsProvider.shouldEnrichPendingAdvert(publicKey)) {
|
||||
unawaited(connectionProvider.previewContact(publicKey));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1923,6 +2087,314 @@ class AppProvider with ChangeNotifier {
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _requestRepeaterStatus(Uint8List publicKey) async {
|
||||
if (!connectionProvider.deviceInfo.isConnected) {
|
||||
return;
|
||||
}
|
||||
final keyHex = publicKey
|
||||
.map((byte) => byte.toRadixString(16).padLeft(2, '0'))
|
||||
.join();
|
||||
final now = DateTime.now();
|
||||
final lastRequestAt = _recentRepeaterStatusRequests[keyHex];
|
||||
if (lastRequestAt != null &&
|
||||
now.difference(lastRequestAt) < const Duration(minutes: 2)) {
|
||||
return;
|
||||
}
|
||||
_recentRepeaterStatusRequests[keyHex] = now;
|
||||
try {
|
||||
await connectionProvider.requestStatus(publicKey);
|
||||
} catch (_) {
|
||||
// Ignore unsupported or unreachable repeaters.
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _maybeRequestRepeaterOwnerInfo(Uint8List publicKey) async {
|
||||
final pendingAdvert = contactsProvider.pendingAdvertByKey(publicKey);
|
||||
if (pendingAdvert == null ||
|
||||
pendingAdvert.typeValue != ContactType.repeater.value ||
|
||||
pendingAdvert.advName?.trim().isNotEmpty == true ||
|
||||
!connectionProvider.deviceInfo.isConnected) {
|
||||
return;
|
||||
}
|
||||
|
||||
final keyHex = pendingAdvert.publicKeyHex;
|
||||
final now = DateTime.now();
|
||||
final lastRequestAt = _recentRepeaterOwnerInfoRequests[keyHex];
|
||||
if (lastRequestAt != null &&
|
||||
now.difference(lastRequestAt) < _repeaterOwnerInfoRequestCooldown) {
|
||||
return;
|
||||
}
|
||||
|
||||
Contact? existingContact;
|
||||
for (final contact in contactsProvider.contacts) {
|
||||
if (contact.publicKeyHex == keyHex) {
|
||||
existingContact = contact;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
var temporaryContactAdded = false;
|
||||
final requestContact =
|
||||
existingContact ?? _temporaryRepeaterContactForOwnerInfo(pendingAdvert);
|
||||
if (requestContact == null || !requestContact.routeHasPath) {
|
||||
return;
|
||||
}
|
||||
|
||||
_recentRepeaterOwnerInfoRequests[keyHex] = now;
|
||||
|
||||
if (existingContact == null) {
|
||||
connectionProvider.clearError();
|
||||
await connectionProvider.addOrUpdateContact(requestContact);
|
||||
if (connectionProvider.error != null) {
|
||||
return;
|
||||
}
|
||||
connectionProvider.clearError();
|
||||
temporaryContactAdded = true;
|
||||
}
|
||||
|
||||
try {
|
||||
final ticket = await connectionProvider.sendAnonRequest(
|
||||
contactPublicKey: publicKey,
|
||||
requestData: _buildRepeaterOwnerRequest(requestContact),
|
||||
);
|
||||
if (ticket == null) {
|
||||
return;
|
||||
}
|
||||
_pendingRepeaterOwnerRequests[ticket.tag] = _PendingRepeaterOwnerRequest(
|
||||
publicKey: Uint8List.fromList(publicKey),
|
||||
);
|
||||
Future.delayed(
|
||||
Duration(milliseconds: ticket.suggestedTimeoutMs + 1500),
|
||||
() => _pendingRepeaterOwnerRequests.remove(ticket.tag),
|
||||
);
|
||||
} catch (_) {
|
||||
// Ignore unsupported or unreachable repeaters.
|
||||
} finally {
|
||||
if (temporaryContactAdded) {
|
||||
Future.delayed(const Duration(milliseconds: 250), () async {
|
||||
await connectionProvider.removeContact(publicKey);
|
||||
connectionProvider.clearError();
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Contact? _temporaryRepeaterContactForOwnerInfo(PendingAdvert advert) {
|
||||
final signedEncodedPathLen = advert.signedEncodedPathLen;
|
||||
if (signedEncodedPathLen == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final advName = advert.advName?.trim();
|
||||
final lastAdvert =
|
||||
advert.lastAdvert ?? (advert.receivedAt.millisecondsSinceEpoch ~/ 1000);
|
||||
return Contact(
|
||||
publicKey: Uint8List.fromList(advert.publicKey),
|
||||
type: ContactType.repeater,
|
||||
flags: advert.flags ?? 0,
|
||||
outPathLen: signedEncodedPathLen,
|
||||
outPath: advert.paddedPathBytes == null
|
||||
? Uint8List(ContactRouteCodec.maxPathBytes)
|
||||
: Uint8List.fromList(advert.paddedPathBytes!),
|
||||
advName: advName?.isNotEmpty == true ? advName! : advert.shortDisplayKey,
|
||||
lastAdvert: lastAdvert,
|
||||
advLat: advert.advLat ?? 0,
|
||||
advLon: advert.advLon ?? 0,
|
||||
lastMod: lastAdvert,
|
||||
);
|
||||
}
|
||||
|
||||
Uint8List _buildRepeaterOwnerRequest(Contact contact) {
|
||||
final replyPathDescriptor = contact.routeEncodedPathLen;
|
||||
final replyPathBytes = contact.routeHopCount > 0
|
||||
? Uint8List.fromList(
|
||||
LogRxRouteDecoder.reverseHopBytes(
|
||||
contact.routePathBytes,
|
||||
hashSize: contact.routeHashSize,
|
||||
),
|
||||
)
|
||||
: Uint8List(0);
|
||||
return Uint8List.fromList([
|
||||
_anonReqTypeOwner,
|
||||
replyPathDescriptor,
|
||||
...replyPathBytes,
|
||||
]);
|
||||
}
|
||||
|
||||
bool _handlePendingRepeaterOwnerResponse(int tag, Uint8List responseData) {
|
||||
final request = _pendingRepeaterOwnerRequests.remove(tag);
|
||||
if (request == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
final ownerName = _tryParseRepeaterOwnerName(responseData);
|
||||
if (ownerName == null || ownerName.isEmpty) {
|
||||
return true;
|
||||
}
|
||||
|
||||
final existing = contactsProvider.pendingAdvertByKey(request.publicKey);
|
||||
contactsProvider.addOrUpdatePendingAdvertMetadata(
|
||||
publicKey: request.publicKey,
|
||||
typeValue: existing?.typeValue ?? ContactType.repeater.value,
|
||||
devicePublicKey: connectionProvider.deviceInfo.publicKey,
|
||||
advName: ownerName,
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
String? _tryParseRepeaterOwnerName(Uint8List responseData) {
|
||||
if (responseData.length <= 4) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
final payload = utf8.decode(
|
||||
responseData.sublist(4),
|
||||
allowMalformed: true,
|
||||
).trim();
|
||||
if (payload.isEmpty) {
|
||||
return null;
|
||||
}
|
||||
final firstLine = payload.split(RegExp(r'[\r\n]+')).first.trim();
|
||||
return firstLine.isEmpty ? null : firstLine;
|
||||
} catch (_) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
_ParsedRepeaterStatus? _tryParseRepeaterStatus(Uint8List statusData) {
|
||||
if (statusData.length < 52) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
final data = ByteData.sublistView(statusData);
|
||||
var offset = 0;
|
||||
final batteryMv = data.getUint16(offset, Endian.little);
|
||||
offset += 2;
|
||||
final queueLen = data.getUint16(offset, Endian.little);
|
||||
offset += 2;
|
||||
offset += 2; // noiseFloor
|
||||
final lastRssi = data.getInt16(offset, Endian.little);
|
||||
offset += 2;
|
||||
offset += 4; // packetsRecv
|
||||
offset += 4; // packetsSent
|
||||
offset += 4; // txAirSecs
|
||||
final uptimeSecs = data.getUint32(offset, Endian.little);
|
||||
offset += 4;
|
||||
offset += 4; // floodTx
|
||||
offset += 4; // directTx
|
||||
offset += 4; // floodRx
|
||||
offset += 4; // directRx
|
||||
offset += 2; // errEvents
|
||||
final lastSnrRaw = data.getInt16(offset, Endian.little);
|
||||
|
||||
return _ParsedRepeaterStatus(
|
||||
batteryMv: batteryMv,
|
||||
queueLen: queueLen,
|
||||
lastRssi: lastRssi,
|
||||
lastSnrRaw: lastSnrRaw,
|
||||
uptimeSecs: uptimeSecs,
|
||||
);
|
||||
} catch (_) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
_ParsedRawAdvert? _tryParseRawAdvert(Uint8List rawPayload) {
|
||||
if (rawPayload.length < 103) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
final reader = BufferReader(rawPayload);
|
||||
final header = reader.readByte();
|
||||
final routeType = header & 0x03;
|
||||
final payloadType = (header >> 2) & 0x0F;
|
||||
if (payloadType != _rawPayloadTypeAdvert) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (routeType == _routeTransportFlood ||
|
||||
routeType == _routeTransportDirect) {
|
||||
if (reader.remainingBytesCount < 4) {
|
||||
return null;
|
||||
}
|
||||
reader.skip(4);
|
||||
}
|
||||
|
||||
if (reader.remainingBytesCount < 1) {
|
||||
return null;
|
||||
}
|
||||
final pathByteLen = reader.readByte();
|
||||
if (reader.remainingBytesCount < pathByteLen + 101) {
|
||||
return null;
|
||||
}
|
||||
final pathBytes = reader.readBytes(pathByteLen);
|
||||
final publicKey = reader.readBytes(32);
|
||||
final timestamp = reader.readInt32LE();
|
||||
reader.skip(64);
|
||||
final flags = reader.readByte();
|
||||
final typeValue = flags & 0x0F;
|
||||
final hasLocation = (flags & 0x10) != 0;
|
||||
final hasName = (flags & 0x80) != 0;
|
||||
|
||||
int? advLat;
|
||||
int? advLon;
|
||||
if (hasLocation) {
|
||||
if (reader.remainingBytesCount < 8) {
|
||||
return null;
|
||||
}
|
||||
advLat = reader.readInt32LE();
|
||||
advLon = reader.readInt32LE();
|
||||
}
|
||||
|
||||
String? advName;
|
||||
if (hasName && reader.remainingBytesCount > 0) {
|
||||
final decodedName = utf8.decode(
|
||||
reader.readRemainingBytes(),
|
||||
allowMalformed: true,
|
||||
).trim();
|
||||
if (decodedName.isNotEmpty) {
|
||||
advName = decodedName;
|
||||
}
|
||||
}
|
||||
|
||||
int? signedEncodedPathLen;
|
||||
Uint8List? paddedPathBytes;
|
||||
if (pathBytes.isNotEmpty) {
|
||||
final hashSize = LogRxRouteDecoder.inferHashSize(pathBytes);
|
||||
final reversedPathBytes = LogRxRouteDecoder.reverseHopBytes(
|
||||
pathBytes,
|
||||
hashSize: hashSize,
|
||||
);
|
||||
final padded = Uint8List(ContactRouteCodec.maxPathBytes)
|
||||
..setRange(0, reversedPathBytes.length, reversedPathBytes);
|
||||
final encodedPathLen =
|
||||
((hashSize - 1) << 6) |
|
||||
((reversedPathBytes.length ~/ hashSize) & 0x3F);
|
||||
signedEncodedPathLen = ContactRouteCodec.toSignedDescriptor(
|
||||
encodedPathLen,
|
||||
);
|
||||
paddedPathBytes = padded;
|
||||
}
|
||||
|
||||
return _ParsedRawAdvert(
|
||||
publicKey: publicKey,
|
||||
advName: advName,
|
||||
typeValue: typeValue,
|
||||
flags: flags,
|
||||
lastAdvert: timestamp,
|
||||
advLat: advLat,
|
||||
advLon: advLon,
|
||||
signedEncodedPathLen: signedEncodedPathLen,
|
||||
paddedPathBytes: paddedPathBytes,
|
||||
);
|
||||
} catch (_) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
int _inferReceivedPathHashSize(
|
||||
List<int> pathBytes, {
|
||||
required int preferredHashSize,
|
||||
@@ -3142,6 +3614,68 @@ class AppProvider with ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _handleControlDataDiscovery({
|
||||
required Uint8List payload,
|
||||
required int snrRaw,
|
||||
required int rssiDbm,
|
||||
required int pathLen,
|
||||
}) {
|
||||
const int controlTypeMask = 0xF0;
|
||||
const int controlTypeNodeDiscoverResp = 0x90;
|
||||
const int minFullDiscoverResponseLength = 6 + 32;
|
||||
|
||||
if (payload.length < minFullDiscoverResponseLength) {
|
||||
return;
|
||||
}
|
||||
|
||||
final controlType = payload[0] & controlTypeMask;
|
||||
if (controlType != controlTypeNodeDiscoverResp) {
|
||||
return;
|
||||
}
|
||||
|
||||
final nodeType = payload[0] & 0x0F;
|
||||
final publicKey = Uint8List.fromList(payload.sublist(6, 38));
|
||||
final isNewPendingAdvert = contactsProvider
|
||||
.addOrUpdatePendingAdvertMetadata(
|
||||
publicKey: publicKey,
|
||||
typeValue: nodeType,
|
||||
devicePublicKey: connectionProvider.deviceInfo.publicKey,
|
||||
rxRssiDbm: rssiDbm,
|
||||
rxSnrRaw: snrRaw,
|
||||
signedEncodedPathLen: pathLen == 0 ? 0 : null,
|
||||
paddedPathBytes: pathLen == 0
|
||||
? Uint8List(ContactRouteCodec.maxPathBytes)
|
||||
: null,
|
||||
);
|
||||
|
||||
debugPrint(
|
||||
'🛰️ [AppProvider] Control discovery response: type=$nodeType '
|
||||
'pathLen=$pathLen snr=$snrRaw rssi=$rssiDbm new=$isNewPendingAdvert',
|
||||
);
|
||||
|
||||
if (isNewPendingAdvert) {
|
||||
final keyHex = publicKey
|
||||
.take(6)
|
||||
.map((b) => b.toRadixString(16).padLeft(2, '0'))
|
||||
.join();
|
||||
unawaited(
|
||||
_notificationService.showContactDiscoveredNotification(
|
||||
contactKey: keyHex,
|
||||
contactName: contactsProvider.pendingAdvertByKey(publicKey)?.advName,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
if (nodeType == ContactType.repeater.value) {
|
||||
unawaited(_requestRepeaterStatus(publicKey));
|
||||
unawaited(_maybeRequestRepeaterOwnerInfo(publicKey));
|
||||
}
|
||||
|
||||
if (contactsProvider.shouldEnrichPendingAdvert(publicKey)) {
|
||||
unawaited(connectionProvider.previewContact(publicKey));
|
||||
}
|
||||
}
|
||||
|
||||
/// Get app statistics
|
||||
Map<String, dynamic> get statistics {
|
||||
return {
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:math';
|
||||
import 'dart:typed_data';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/scheduler.dart';
|
||||
import 'package:flutter_blue_plus/flutter_blue_plus.dart';
|
||||
@@ -55,8 +57,21 @@ class ScannedDevice {
|
||||
ScannedDevice({required this.device, required this.rssi});
|
||||
}
|
||||
|
||||
enum ContactReceiveSource { sync, requestedSingle, preview, advert }
|
||||
|
||||
class _PendingContactRequest {
|
||||
final ContactReceiveSource source;
|
||||
final DateTime requestedAt;
|
||||
|
||||
const _PendingContactRequest({
|
||||
required this.source,
|
||||
required this.requestedAt,
|
||||
});
|
||||
}
|
||||
|
||||
/// Connection Provider - manages MeshCore device connection (BLE or TCP/WiFi)
|
||||
class ConnectionProvider with ChangeNotifier {
|
||||
static const int _controlTypeNodeDiscoverReq = 0x80;
|
||||
final MeshCoreBleService _bleService = MeshCoreBleService();
|
||||
final SseServerService _sseServer = SseServerService();
|
||||
MeshCoreTcpService? _tcpService;
|
||||
@@ -145,6 +160,13 @@ class ConnectionProvider with ChangeNotifier {
|
||||
bool _isAdvertInProgress = false;
|
||||
DateTime? _lastAdvertRequestedAt;
|
||||
static const Duration _minAdvertInterval = Duration(milliseconds: 500);
|
||||
bool _isContactsSyncInProgress = false;
|
||||
final Map<String, _PendingContactRequest> _pendingSingleContactRequests = {};
|
||||
final Map<String, DateTime> _previewContactMisses = {};
|
||||
static const Duration _singleContactRequestWindow = Duration(seconds: 10);
|
||||
static const Duration _previewContactMissTtl = Duration(minutes: 10);
|
||||
bool _suppressNextPreviewNotFoundError = false;
|
||||
bool? _supportsAutoaddConfig;
|
||||
|
||||
// Helper instances
|
||||
final RoomLoginManager _roomLoginManager = RoomLoginManager();
|
||||
@@ -162,6 +184,7 @@ class ConnectionProvider with ChangeNotifier {
|
||||
|
||||
// Callbacks for other providers
|
||||
Function(Contact)? onContactReceived;
|
||||
Function(Contact, ContactReceiveSource)? onContactReceivedDetailed;
|
||||
Function(List<Contact>)? onContactsComplete;
|
||||
Function(Message)? onMessageReceived;
|
||||
Function(Uint8List publicKey, Uint8List lppData)? onTelemetryReceived;
|
||||
@@ -189,6 +212,8 @@ class ConnectionProvider with ChangeNotifier {
|
||||
onMessageEchoDetected;
|
||||
Function(Uint8List publicKeyPrefix, Uint8List statusData)? onStatusResponse;
|
||||
Function(Uint8List payload, int snrRaw, int rssiDbm)? onRawDataReceived;
|
||||
Function(Uint8List payload, int snrRaw, int rssiDbm, int pathLen)?
|
||||
onControlDataReceived;
|
||||
Contact? Function(Uint8List contactPublicKey)? resolveContactForDmCallback;
|
||||
bool Function()? canStartAutomaticMessageSyncCallback;
|
||||
|
||||
@@ -241,6 +266,10 @@ class ConnectionProvider with ChangeNotifier {
|
||||
};
|
||||
|
||||
service.onError = (error, {int? errorCode}) {
|
||||
if (errorCode == 2 && _suppressNextPreviewNotFoundError) {
|
||||
_suppressNextPreviewNotFoundError = false;
|
||||
return;
|
||||
}
|
||||
debugPrint('⚠️ [Provider] Error received: $error');
|
||||
_error = error;
|
||||
if (_deviceInfo.connectionState != ConnectionState.connected) {
|
||||
@@ -252,9 +281,21 @@ class ConnectionProvider with ChangeNotifier {
|
||||
};
|
||||
|
||||
service.onContactNotFound = (contactPublicKey) async {
|
||||
debugPrint('🔧 [Provider] Contact not found - initiating auto-recovery');
|
||||
if (contactPublicKey == null) return;
|
||||
|
||||
final keyHex = _publicKeyToHex(contactPublicKey);
|
||||
final request = _pendingSingleContactRequests.remove(keyHex);
|
||||
if (request?.source == ContactReceiveSource.preview) {
|
||||
_previewContactMisses[keyHex] = DateTime.now();
|
||||
_suppressNextPreviewNotFoundError = true;
|
||||
debugPrint(
|
||||
'🔧 [Provider] Preview contact not found, suppressing retries for $keyHex',
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
debugPrint('🔧 [Provider] Contact not found - initiating auto-recovery');
|
||||
|
||||
final operationId = contactPublicKey
|
||||
.sublist(0, 6)
|
||||
.map((b) => b.toRadixString(16).padLeft(2, '0'))
|
||||
@@ -288,11 +329,14 @@ class ConnectionProvider with ChangeNotifier {
|
||||
|
||||
service.onContactReceived = (contact) {
|
||||
debugPrint('📥 [Provider] Contact received: "${contact.advName}"');
|
||||
final source = _classifyContactReceiveSource(contact.publicKey);
|
||||
onContactReceivedDetailed?.call(contact, source);
|
||||
onContactReceived?.call(contact);
|
||||
};
|
||||
|
||||
service.onContactsComplete = (contacts) {
|
||||
debugPrint('📥 [Provider] Contacts sync complete: ${contacts.length}');
|
||||
_isContactsSyncInProgress = false;
|
||||
if (_contactsSyncCompleter != null &&
|
||||
!_contactsSyncCompleter!.isCompleted) {
|
||||
_contactsSyncCompleter!.complete();
|
||||
@@ -408,6 +452,8 @@ class ConnectionProvider with ChangeNotifier {
|
||||
|
||||
service.onRawDataReceived = (payload, snrRaw, rssiDbm) =>
|
||||
onRawDataReceived?.call(payload, snrRaw, rssiDbm);
|
||||
service.onControlDataReceived = (payload, snrRaw, rssiDbm, pathLen) =>
|
||||
onControlDataReceived?.call(payload, snrRaw, rssiDbm, pathLen);
|
||||
|
||||
service.onDeviceInfoReceived = (deviceInfo) {
|
||||
debugPrint('📥 [Provider] DeviceInfo received');
|
||||
@@ -481,6 +527,17 @@ class ConnectionProvider with ChangeNotifier {
|
||||
notifyListeners();
|
||||
};
|
||||
|
||||
service.onAutoaddConfigReceived = (config) {
|
||||
_deviceInfo = _deviceInfo.copyWith(
|
||||
autoAddUsers: config['autoAddUsers'] as bool?,
|
||||
autoAddRepeaters: config['autoAddRepeaters'] as bool?,
|
||||
autoAddRoomServers: config['autoAddRoomServers'] as bool?,
|
||||
autoAddSensors: config['autoAddSensors'] as bool?,
|
||||
autoAddOverwriteOldest: config['autoAddOverwriteOldest'] as bool?,
|
||||
);
|
||||
notifyListeners();
|
||||
};
|
||||
|
||||
service.onTxActivity = () {
|
||||
_txActivity = true;
|
||||
notifyListeners();
|
||||
@@ -600,6 +657,7 @@ class ConnectionProvider with ChangeNotifier {
|
||||
connectionState: ConnectionState.connecting,
|
||||
);
|
||||
_error = null;
|
||||
_supportsAutoaddConfig = null;
|
||||
_resetSyncState();
|
||||
debugPrint('✅ [Provider] Device info updated to connecting state');
|
||||
notifyListeners();
|
||||
@@ -630,6 +688,7 @@ class ConnectionProvider with ChangeNotifier {
|
||||
connectionState: ConnectionState.connecting,
|
||||
);
|
||||
_error = null;
|
||||
_supportsAutoaddConfig = null;
|
||||
notifyListeners();
|
||||
|
||||
// Create fresh TCP service and wire its callbacks
|
||||
@@ -658,6 +717,7 @@ class ConnectionProvider with ChangeNotifier {
|
||||
}
|
||||
_tcpHost = null;
|
||||
_connectionMode = ConnectionMode.ble;
|
||||
_supportsAutoaddConfig = null;
|
||||
_resetSyncState();
|
||||
_deviceInfo = DeviceInfo(connectionState: ConnectionState.disconnected);
|
||||
_roomLoginManager.clearRoomLoginStates();
|
||||
@@ -681,6 +741,7 @@ class ConnectionProvider with ChangeNotifier {
|
||||
|
||||
await _bleService.disconnect();
|
||||
|
||||
_supportsAutoaddConfig = null;
|
||||
_resetSyncState();
|
||||
_deviceInfo = DeviceInfo(connectionState: ConnectionState.disconnected);
|
||||
_roomLoginManager.clearRoomLoginStates();
|
||||
@@ -761,6 +822,7 @@ class ConnectionProvider with ChangeNotifier {
|
||||
}
|
||||
|
||||
try {
|
||||
_isContactsSyncInProgress = true;
|
||||
_contactsSyncCompleter = Completer<void>();
|
||||
await _activeService.getContacts();
|
||||
await _contactsSyncCompleter!.future.timeout(
|
||||
@@ -772,9 +834,11 @@ class ConnectionProvider with ChangeNotifier {
|
||||
},
|
||||
);
|
||||
} catch (e) {
|
||||
_isContactsSyncInProgress = false;
|
||||
_error = 'Failed to get contacts: $e';
|
||||
notifyListeners();
|
||||
} finally {
|
||||
_isContactsSyncInProgress = false;
|
||||
_contactsSyncCompleter = null;
|
||||
}
|
||||
}
|
||||
@@ -793,6 +857,10 @@ class ConnectionProvider with ChangeNotifier {
|
||||
}
|
||||
|
||||
try {
|
||||
_markSingleContactRequested(
|
||||
publicKey,
|
||||
source: ContactReceiveSource.requestedSingle,
|
||||
);
|
||||
await _activeService.getContactByKey(publicKey);
|
||||
} catch (e) {
|
||||
_error = 'Failed to get contact: $e';
|
||||
@@ -800,11 +868,81 @@ class ConnectionProvider with ChangeNotifier {
|
||||
'⚠️ [Provider] Failed to get contact by key, falling back to full contact sync',
|
||||
);
|
||||
// Fallback to full contact sync if command not supported
|
||||
_isContactsSyncInProgress = true;
|
||||
await _activeService.getContacts();
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> previewContact(Uint8List publicKey) async {
|
||||
if (!_activeService.isConnected) {
|
||||
return;
|
||||
}
|
||||
_prunePreviewContactMisses();
|
||||
final keyHex = _publicKeyToHex(publicKey);
|
||||
if (_previewContactMisses.containsKey(keyHex)) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
_markSingleContactRequested(
|
||||
publicKey,
|
||||
source: ContactReceiveSource.preview,
|
||||
);
|
||||
await _activeService.getContactByKey(publicKey);
|
||||
} catch (e) {
|
||||
debugPrint(
|
||||
'⚠️ [Provider] Preview contact fetch failed for ${_publicKeyToHex(publicKey)}: $e',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
ContactReceiveSource _classifyContactReceiveSource(Uint8List publicKey) {
|
||||
_prunePendingSingleContactRequests();
|
||||
final keyHex = _publicKeyToHex(publicKey);
|
||||
if (_isContactsSyncInProgress) {
|
||||
return ContactReceiveSource.sync;
|
||||
}
|
||||
final request = _pendingSingleContactRequests.remove(keyHex);
|
||||
if (request != null &&
|
||||
DateTime.now().difference(request.requestedAt) <=
|
||||
_singleContactRequestWindow) {
|
||||
return request.source;
|
||||
}
|
||||
return ContactReceiveSource.advert;
|
||||
}
|
||||
|
||||
void _markSingleContactRequested(
|
||||
Uint8List publicKey, {
|
||||
required ContactReceiveSource source,
|
||||
}) {
|
||||
_prunePendingSingleContactRequests();
|
||||
_pendingSingleContactRequests[_publicKeyToHex(publicKey)] =
|
||||
_PendingContactRequest(source: source, requestedAt: DateTime.now());
|
||||
}
|
||||
|
||||
void _prunePendingSingleContactRequests() {
|
||||
if (_pendingSingleContactRequests.isEmpty) {
|
||||
return;
|
||||
}
|
||||
|
||||
final now = DateTime.now();
|
||||
_pendingSingleContactRequests.removeWhere(
|
||||
(_, request) =>
|
||||
now.difference(request.requestedAt) > _singleContactRequestWindow,
|
||||
);
|
||||
}
|
||||
|
||||
void _prunePreviewContactMisses() {
|
||||
if (_previewContactMisses.isEmpty) {
|
||||
return;
|
||||
}
|
||||
final now = DateTime.now();
|
||||
_previewContactMisses.removeWhere(
|
||||
(_, timestamp) => now.difference(timestamp) > _previewContactMissTtl,
|
||||
);
|
||||
}
|
||||
|
||||
/// Sync all channels from device
|
||||
Future<void> syncChannels({int? maxChannels}) async {
|
||||
if (!_activeService.isConnected) {
|
||||
@@ -1656,6 +1794,40 @@ class ConnectionProvider with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> discoverNodeType({
|
||||
required int advertType,
|
||||
bool prefixOnly = false,
|
||||
int since = 0,
|
||||
}) async {
|
||||
if (!_activeService.isConnected) {
|
||||
_error = 'Not connected to device';
|
||||
notifyListeners();
|
||||
return;
|
||||
}
|
||||
|
||||
final random = Random.secure();
|
||||
final tagBytes = Uint8List.fromList(
|
||||
List<int>.generate(4, (_) => random.nextInt(256)),
|
||||
);
|
||||
final payload = BytesBuilder(copy: false)
|
||||
..addByte(_controlTypeNodeDiscoverReq | (prefixOnly ? 0x01 : 0x00))
|
||||
..addByte(1 << advertType)
|
||||
..add(tagBytes)
|
||||
..add([
|
||||
since & 0xFF,
|
||||
(since >> 8) & 0xFF,
|
||||
(since >> 16) & 0xFF,
|
||||
(since >> 24) & 0xFF,
|
||||
]);
|
||||
|
||||
try {
|
||||
await _activeService.sendControlData(payload.toBytes());
|
||||
} catch (e) {
|
||||
_error = 'Failed to send node discovery request: $e';
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
/// Get device time from companion radio to detect clock drift
|
||||
Future<void> getDeviceTime() async {
|
||||
if (!_activeService.isConnected) {
|
||||
@@ -1892,6 +2064,80 @@ class ConnectionProvider with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> getAutoaddConfig() async {
|
||||
if (_supportsAutoaddConfig == false) {
|
||||
return;
|
||||
}
|
||||
if (!_activeService.isConnected) {
|
||||
_error = 'Not connected to device';
|
||||
notifyListeners();
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
final config = await _activeService.getAutoaddConfig();
|
||||
_supportsAutoaddConfig = true;
|
||||
_deviceInfo = _deviceInfo.copyWith(
|
||||
autoAddUsers: config['autoAddUsers'] as bool?,
|
||||
autoAddRepeaters: config['autoAddRepeaters'] as bool?,
|
||||
autoAddRoomServers: config['autoAddRoomServers'] as bool?,
|
||||
autoAddSensors: config['autoAddSensors'] as bool?,
|
||||
autoAddOverwriteOldest: config['autoAddOverwriteOldest'] as bool?,
|
||||
);
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
if (_isUnsupportedAutoaddConfigError(e)) {
|
||||
_supportsAutoaddConfig = false;
|
||||
_deviceInfo = _deviceInfo.copyWith(
|
||||
autoAddUsers: null,
|
||||
autoAddRepeaters: null,
|
||||
autoAddRoomServers: null,
|
||||
autoAddSensors: null,
|
||||
autoAddOverwriteOldest: null,
|
||||
);
|
||||
notifyListeners();
|
||||
return;
|
||||
}
|
||||
_error = 'Failed to get auto-add config: $e';
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> setAutoaddConfig({
|
||||
required bool autoAddUsers,
|
||||
required bool autoAddRepeaters,
|
||||
required bool autoAddRoomServers,
|
||||
required bool autoAddSensors,
|
||||
required bool overwriteOldest,
|
||||
}) async {
|
||||
if (!_activeService.isConnected) {
|
||||
_error = 'Not connected to device';
|
||||
notifyListeners();
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await _activeService.setAutoaddConfig(
|
||||
autoAddUsers: autoAddUsers,
|
||||
autoAddRepeaters: autoAddRepeaters,
|
||||
autoAddRoomServers: autoAddRoomServers,
|
||||
autoAddSensors: autoAddSensors,
|
||||
overwriteOldest: overwriteOldest,
|
||||
);
|
||||
_deviceInfo = _deviceInfo.copyWith(
|
||||
autoAddUsers: autoAddUsers,
|
||||
autoAddRepeaters: autoAddRepeaters,
|
||||
autoAddRoomServers: autoAddRoomServers,
|
||||
autoAddSensors: autoAddSensors,
|
||||
autoAddOverwriteOldest: overwriteOldest,
|
||||
);
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
_error = 'Failed to set auto-add config: $e';
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
/// Request fresh device info (triggers SelfInfo response)
|
||||
Future<void> refreshDeviceInfo() async {
|
||||
if (_isSpectrumScanActive) return;
|
||||
@@ -1904,14 +2150,35 @@ class ConnectionProvider with ChangeNotifier {
|
||||
try {
|
||||
// The device query command triggers a SelfInfo response
|
||||
await _activeService.refreshDeviceInfo();
|
||||
// Also request allowed repeat frequencies (firmware v9+, no-op on older firmware)
|
||||
await _activeService.getAllowedRepeatFreq();
|
||||
if (_supportsAutoaddConfig != false) {
|
||||
try {
|
||||
await _activeService.getAutoaddConfig();
|
||||
_supportsAutoaddConfig = true;
|
||||
} catch (e) {
|
||||
if (_isUnsupportedAutoaddConfigError(e)) {
|
||||
_supportsAutoaddConfig = false;
|
||||
} else {
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
}
|
||||
try {
|
||||
await _activeService.getAllowedRepeatFreq();
|
||||
} catch (_) {
|
||||
// Older firmware may not expose repeat frequency ranges.
|
||||
}
|
||||
} catch (e) {
|
||||
_error = 'Failed to refresh device info: $e';
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
bool _isUnsupportedAutoaddConfigError(Object error) {
|
||||
final message = error.toString().toLowerCase();
|
||||
return message.contains('illegal argument') ||
|
||||
message.contains('unsupported');
|
||||
}
|
||||
|
||||
/// Request battery and storage information
|
||||
///
|
||||
/// Queries the companion radio for:
|
||||
@@ -2195,6 +2462,28 @@ class ConnectionProvider with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
Future<({int tag, int suggestedTimeoutMs})?> sendAnonRequest({
|
||||
required Uint8List contactPublicKey,
|
||||
required Uint8List requestData,
|
||||
}) async {
|
||||
if (!_activeService.isConnected) {
|
||||
_error = 'Not connected to device';
|
||||
notifyListeners();
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
return await _activeService.sendAnonRequest(
|
||||
contactPublicKey: contactPublicKey,
|
||||
requestData: requestData,
|
||||
);
|
||||
} catch (e) {
|
||||
_error = 'Failed to send anonymous request: $e';
|
||||
notifyListeners();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Reset routing path for a contact
|
||||
///
|
||||
/// Clears the learned path to a contact, forcing the next message to use
|
||||
|
||||
@@ -13,14 +13,40 @@ import '../utils/key_comparison.dart';
|
||||
class PendingAdvert {
|
||||
final Uint8List publicKey;
|
||||
final DateTime receivedAt;
|
||||
final String? advName;
|
||||
final int? typeValue;
|
||||
final int? flags;
|
||||
final int? lastAdvert;
|
||||
final int? advLat;
|
||||
final int? advLon;
|
||||
final int? signedEncodedPathLen;
|
||||
final Uint8List? paddedPathBytes;
|
||||
final int? rxRssiDbm;
|
||||
final int? rxSnrRaw;
|
||||
final int? repeaterBatteryMv;
|
||||
final int? repeaterQueueLen;
|
||||
final int? repeaterLastRssi;
|
||||
final int? repeaterLastSnrRaw;
|
||||
final int? repeaterUptimeSecs;
|
||||
|
||||
const PendingAdvert({
|
||||
required this.publicKey,
|
||||
required this.receivedAt,
|
||||
this.advName,
|
||||
this.typeValue,
|
||||
this.flags,
|
||||
this.lastAdvert,
|
||||
this.advLat,
|
||||
this.advLon,
|
||||
this.signedEncodedPathLen,
|
||||
this.paddedPathBytes,
|
||||
this.rxRssiDbm,
|
||||
this.rxSnrRaw,
|
||||
this.repeaterBatteryMv,
|
||||
this.repeaterQueueLen,
|
||||
this.repeaterLastRssi,
|
||||
this.repeaterLastSnrRaw,
|
||||
this.repeaterUptimeSecs,
|
||||
});
|
||||
|
||||
String get publicKeyHex =>
|
||||
@@ -34,16 +60,55 @@ class PendingAdvert {
|
||||
PendingAdvert copyWith({
|
||||
Uint8List? publicKey,
|
||||
DateTime? receivedAt,
|
||||
String? advName,
|
||||
int? typeValue,
|
||||
int? flags,
|
||||
int? lastAdvert,
|
||||
int? advLat,
|
||||
int? advLon,
|
||||
int? signedEncodedPathLen,
|
||||
Uint8List? paddedPathBytes,
|
||||
int? rxRssiDbm,
|
||||
int? rxSnrRaw,
|
||||
int? repeaterBatteryMv,
|
||||
int? repeaterQueueLen,
|
||||
int? repeaterLastRssi,
|
||||
int? repeaterLastSnrRaw,
|
||||
int? repeaterUptimeSecs,
|
||||
}) {
|
||||
return PendingAdvert(
|
||||
publicKey: publicKey ?? this.publicKey,
|
||||
receivedAt: receivedAt ?? this.receivedAt,
|
||||
advName: advName ?? this.advName,
|
||||
typeValue: typeValue ?? this.typeValue,
|
||||
flags: flags ?? this.flags,
|
||||
lastAdvert: lastAdvert ?? this.lastAdvert,
|
||||
advLat: advLat ?? this.advLat,
|
||||
advLon: advLon ?? this.advLon,
|
||||
signedEncodedPathLen: signedEncodedPathLen ?? this.signedEncodedPathLen,
|
||||
paddedPathBytes: paddedPathBytes ?? this.paddedPathBytes,
|
||||
rxRssiDbm: rxRssiDbm ?? this.rxRssiDbm,
|
||||
rxSnrRaw: rxSnrRaw ?? this.rxSnrRaw,
|
||||
repeaterBatteryMv: repeaterBatteryMv ?? this.repeaterBatteryMv,
|
||||
repeaterQueueLen: repeaterQueueLen ?? this.repeaterQueueLen,
|
||||
repeaterLastRssi: repeaterLastRssi ?? this.repeaterLastRssi,
|
||||
repeaterLastSnrRaw: repeaterLastSnrRaw ?? this.repeaterLastSnrRaw,
|
||||
repeaterUptimeSecs: repeaterUptimeSecs ?? this.repeaterUptimeSecs,
|
||||
);
|
||||
}
|
||||
|
||||
double? get repeaterBatteryPercent {
|
||||
if (repeaterBatteryMv == null) return null;
|
||||
final voltage = repeaterBatteryMv! / 1000.0;
|
||||
if (voltage <= 3.0) return 0.0;
|
||||
if (voltage >= 4.2) return 100.0;
|
||||
return ((voltage - 3.0) / 1.2) * 100.0;
|
||||
}
|
||||
|
||||
double? get repeaterLastSnr =>
|
||||
repeaterLastSnrRaw == null ? null : repeaterLastSnrRaw! / 4.0;
|
||||
|
||||
double? get rxSnr => rxSnrRaw == null ? null : rxSnrRaw! / 4.0;
|
||||
}
|
||||
|
||||
class _RetainedRoute {
|
||||
@@ -257,6 +322,28 @@ class ContactsProvider with ChangeNotifier {
|
||||
_pendingAdverts.values.toList()
|
||||
..sort((a, b) => b.receivedAt.compareTo(a.receivedAt));
|
||||
|
||||
PendingAdvert? pendingAdvertByKey(Uint8List publicKey) {
|
||||
final keyHex = publicKey
|
||||
.map((b) => b.toRadixString(16).padLeft(2, '0'))
|
||||
.join('');
|
||||
return _pendingAdverts[keyHex];
|
||||
}
|
||||
|
||||
bool shouldEnrichPendingAdvert(Uint8List publicKey) {
|
||||
final advert = pendingAdvertByKey(publicKey);
|
||||
if (advert == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
final hasName = advert.advName?.trim().isNotEmpty ?? false;
|
||||
final hasType = advert.typeValue != null && advert.typeValue != 0;
|
||||
final hasLocation =
|
||||
advert.advLat != null &&
|
||||
advert.advLon != null &&
|
||||
(advert.advLat != 0 || advert.advLon != 0);
|
||||
return !(hasName && hasType && hasLocation);
|
||||
}
|
||||
|
||||
List<SavedContactGroup> savedGroupsForSection(String sectionKey) {
|
||||
return savedContactGroups
|
||||
.where((group) => group.sectionKey == sectionKey)
|
||||
@@ -466,7 +553,6 @@ class ContactsProvider with ChangeNotifier {
|
||||
);
|
||||
|
||||
_contacts[contact.publicKeyHex] = updatedContact;
|
||||
_pendingAdverts.remove(contact.publicKeyHex);
|
||||
debugPrint(
|
||||
' ✅ Contact added/updated. Total contacts: ${_contacts.length}, channels: ${channels.length}',
|
||||
);
|
||||
@@ -495,7 +581,6 @@ class ContactsProvider with ChangeNotifier {
|
||||
incomingContact: contact,
|
||||
existingContact: existingContact,
|
||||
);
|
||||
_pendingAdverts.remove(contact.publicKeyHex);
|
||||
}
|
||||
if (excluded > 0) {
|
||||
debugPrint(
|
||||
@@ -1095,7 +1180,7 @@ class ContactsProvider with ChangeNotifier {
|
||||
}
|
||||
|
||||
/// Add or refresh a pending advert entry from PUSH_CODE_ADVERT (0x80).
|
||||
/// Excludes self key and existing contacts.
|
||||
/// Excludes only self key; known contacts still keep a discovery entry.
|
||||
bool addPendingAdvert(Uint8List publicKey, {Uint8List? devicePublicKey}) {
|
||||
if (devicePublicKey != null && publicKey.matches(devicePublicKey)) {
|
||||
return false;
|
||||
@@ -1104,12 +1189,6 @@ class ContactsProvider with ChangeNotifier {
|
||||
final keyHex = publicKey
|
||||
.map((b) => b.toRadixString(16).padLeft(2, '0'))
|
||||
.join('');
|
||||
if (_contacts.containsKey(keyHex)) {
|
||||
_pendingAdverts.remove(keyHex);
|
||||
_persistPendingAdverts();
|
||||
return false;
|
||||
}
|
||||
|
||||
final existing = _pendingAdverts[keyHex];
|
||||
final now = DateTime.now();
|
||||
if (existing != null) {
|
||||
@@ -1128,6 +1207,99 @@ class ContactsProvider with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
bool addOrUpdatePendingAdvertContact(
|
||||
Contact contact, {
|
||||
Uint8List? devicePublicKey,
|
||||
}) {
|
||||
if (devicePublicKey != null && contact.publicKey.matches(devicePublicKey)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
final keyHex = contact.publicKeyHex;
|
||||
final route = ContactRouteCodec.fromContact(contact);
|
||||
final existing = _pendingAdverts[keyHex];
|
||||
final now = DateTime.now();
|
||||
final updated =
|
||||
(existing ??
|
||||
PendingAdvert(
|
||||
publicKey: Uint8List.fromList(contact.publicKey),
|
||||
receivedAt: now,
|
||||
))
|
||||
.copyWith(
|
||||
receivedAt: now,
|
||||
advName: contact.advName.trim().isEmpty ? null : contact.advName,
|
||||
typeValue: contact.type.value,
|
||||
flags: contact.flags,
|
||||
lastAdvert: contact.lastAdvert,
|
||||
advLat: contact.advLat,
|
||||
advLon: contact.advLon,
|
||||
signedEncodedPathLen:
|
||||
route?.signedEncodedPathLen ?? existing?.signedEncodedPathLen,
|
||||
paddedPathBytes: route?.paddedPathBytes == null
|
||||
? existing?.paddedPathBytes
|
||||
: Uint8List.fromList(route!.paddedPathBytes),
|
||||
);
|
||||
|
||||
_pendingAdverts[keyHex] = updated;
|
||||
_persistPendingAdverts();
|
||||
notifyListeners();
|
||||
return existing == null;
|
||||
}
|
||||
|
||||
bool addOrUpdatePendingAdvertMetadata({
|
||||
required Uint8List publicKey,
|
||||
required int typeValue,
|
||||
Uint8List? devicePublicKey,
|
||||
int? flags,
|
||||
String? advName,
|
||||
int? lastAdvert,
|
||||
int? advLat,
|
||||
int? advLon,
|
||||
int? signedEncodedPathLen,
|
||||
Uint8List? paddedPathBytes,
|
||||
int? rxRssiDbm,
|
||||
int? rxSnrRaw,
|
||||
DateTime? receivedAt,
|
||||
}) {
|
||||
if (devicePublicKey != null && publicKey.matches(devicePublicKey)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
final keyHex = publicKey
|
||||
.map((b) => b.toRadixString(16).padLeft(2, '0'))
|
||||
.join('');
|
||||
final existing = _pendingAdverts[keyHex];
|
||||
final nextReceivedAt = receivedAt ?? DateTime.now();
|
||||
_pendingAdverts[keyHex] =
|
||||
(existing ??
|
||||
PendingAdvert(
|
||||
publicKey: Uint8List.fromList(publicKey),
|
||||
receivedAt: nextReceivedAt,
|
||||
))
|
||||
.copyWith(
|
||||
receivedAt: nextReceivedAt,
|
||||
typeValue: typeValue,
|
||||
advName: advName?.trim().isNotEmpty == true
|
||||
? advName!.trim()
|
||||
: existing?.advName,
|
||||
flags: flags ?? existing?.flags,
|
||||
lastAdvert: lastAdvert ?? existing?.lastAdvert,
|
||||
advLat: advLat ?? existing?.advLat,
|
||||
advLon: advLon ?? existing?.advLon,
|
||||
signedEncodedPathLen:
|
||||
signedEncodedPathLen ?? existing?.signedEncodedPathLen,
|
||||
paddedPathBytes: paddedPathBytes == null
|
||||
? existing?.paddedPathBytes
|
||||
: Uint8List.fromList(paddedPathBytes),
|
||||
rxRssiDbm: rxRssiDbm ?? existing?.rxRssiDbm,
|
||||
rxSnrRaw: rxSnrRaw ?? existing?.rxSnrRaw,
|
||||
);
|
||||
|
||||
_persistPendingAdverts();
|
||||
notifyListeners();
|
||||
return existing == null;
|
||||
}
|
||||
|
||||
/// Find contact by name
|
||||
Contact? findContactByName(String name) {
|
||||
for (final contact in _contacts.values) {
|
||||
@@ -1220,6 +1392,45 @@ class ContactsProvider with ChangeNotifier {
|
||||
await _storageService.saveContacts(_contactsForStorage());
|
||||
}
|
||||
|
||||
Future<void> clearPendingAdverts() async {
|
||||
if (_pendingAdverts.isEmpty) {
|
||||
return;
|
||||
}
|
||||
_pendingAdverts.clear();
|
||||
await _storageService.clearPendingAdverts();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void updatePendingAdvertStatusByPrefix(
|
||||
Uint8List publicKeyPrefix, {
|
||||
int? batteryMv,
|
||||
int? queueLen,
|
||||
int? lastRssi,
|
||||
int? lastSnrRaw,
|
||||
int? uptimeSecs,
|
||||
}) {
|
||||
final prefixHex = publicKeyPrefix
|
||||
.map((b) => b.toRadixString(16).padLeft(2, '0'))
|
||||
.join('');
|
||||
final match = _pendingAdverts.entries.where(
|
||||
(entry) => entry.key.startsWith(prefixHex),
|
||||
);
|
||||
if (match.isEmpty) {
|
||||
return;
|
||||
}
|
||||
final key = match.first.key;
|
||||
final existing = _pendingAdverts[key]!;
|
||||
_pendingAdverts[key] = existing.copyWith(
|
||||
repeaterBatteryMv: batteryMv,
|
||||
repeaterQueueLen: queueLen,
|
||||
repeaterLastRssi: lastRssi,
|
||||
repeaterLastSnrRaw: lastSnrRaw,
|
||||
repeaterUptimeSecs: uptimeSecs,
|
||||
);
|
||||
_persistPendingAdverts();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
List<Contact> _contactsForStorage() {
|
||||
// Don't persist the public channel pseudo-contact (all zeros key)
|
||||
const publicChannelKey =
|
||||
@@ -1253,10 +1464,23 @@ class ContactsProvider with ChangeNotifier {
|
||||
return {
|
||||
'publicKey': base64Encode(advert.publicKey),
|
||||
'receivedAtMillis': advert.receivedAt.millisecondsSinceEpoch,
|
||||
'advName': advert.advName,
|
||||
'typeValue': advert.typeValue,
|
||||
'flags': advert.flags,
|
||||
'lastAdvert': advert.lastAdvert,
|
||||
'advLat': advert.advLat,
|
||||
'advLon': advert.advLon,
|
||||
'signedEncodedPathLen': advert.signedEncodedPathLen,
|
||||
'paddedPathBytes': advert.paddedPathBytes == null
|
||||
? null
|
||||
: base64Encode(advert.paddedPathBytes!),
|
||||
'rxRssiDbm': advert.rxRssiDbm,
|
||||
'rxSnrRaw': advert.rxSnrRaw,
|
||||
'repeaterBatteryMv': advert.repeaterBatteryMv,
|
||||
'repeaterQueueLen': advert.repeaterQueueLen,
|
||||
'repeaterLastRssi': advert.repeaterLastRssi,
|
||||
'repeaterLastSnrRaw': advert.repeaterLastSnrRaw,
|
||||
'repeaterUptimeSecs': advert.repeaterUptimeSecs,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1269,12 +1493,25 @@ class ContactsProvider with ChangeNotifier {
|
||||
receivedAt: DateTime.fromMillisecondsSinceEpoch(
|
||||
json['receivedAtMillis'] as int,
|
||||
),
|
||||
advName: json['advName'] as String?,
|
||||
typeValue: json['typeValue'] as int?,
|
||||
flags: json['flags'] as int?,
|
||||
lastAdvert: json['lastAdvert'] as int?,
|
||||
advLat: json['advLat'] as int?,
|
||||
advLon: json['advLon'] as int?,
|
||||
signedEncodedPathLen: json['signedEncodedPathLen'] as int?,
|
||||
paddedPathBytes: json['paddedPathBytes'] == null
|
||||
? null
|
||||
: Uint8List.fromList(
|
||||
base64Decode(json['paddedPathBytes'] as String),
|
||||
),
|
||||
rxRssiDbm: json['rxRssiDbm'] as int?,
|
||||
rxSnrRaw: json['rxSnrRaw'] as int?,
|
||||
repeaterBatteryMv: json['repeaterBatteryMv'] as int?,
|
||||
repeaterQueueLen: json['repeaterQueueLen'] as int?,
|
||||
repeaterLastRssi: json['repeaterLastRssi'] as int?,
|
||||
repeaterLastSnrRaw: json['repeaterLastSnrRaw'] as int?,
|
||||
repeaterUptimeSecs: json['repeaterUptimeSecs'] as int?,
|
||||
);
|
||||
} catch (e) {
|
||||
debugPrint(
|
||||
|
||||
Reference in New Issue
Block a user