Merge branch 'main' into dev-mapOverlap

lib/models/channel.dart

@@ -24,20 +24,23 @@ class Channel {
 
   bool get isPublicChannel => pskHex == publicChannelPsk;
 
-  static Channel? fromFrame(Uint8List data) {
+  static Channel? fromFrame(Uint8List frame) {
     // CHANNEL_INFO format:
     // [0] = RESP_CODE_CHANNEL_INFO (18)
     // [1] = channel_idx
     // [2-33] = name (32 bytes, null-terminated)
     // [34-49] = psk (16 bytes)
-    if (data.length < 50) return null;
-    if (data[0] != respCodeChannelInfo) return null;
-
-    final index = data[1];
-    final name = readCString(data, 2, 32);
-    final psk = Uint8List.fromList(data.sublist(34, 50));
-
-    return Channel(index: index, name: name, psk: psk);
+    if (frame.length < 50) return null;
+    final reader = BufferReader(frame);
+    try {
+      if (reader.readByte() != respCodeChannelInfo) return null;
+      final index = reader.readByte();
+      final name = reader.readCStringGreedy(32);
+      final psk = reader.readBytes(16);
+      return Channel(index: index, name: name, psk: psk);
+    } catch (e) {
+      return null;
+    }
   }
 
   static Channel empty(int index) {

lib/models/channel_message.dart

@@ -2,6 +2,7 @@ import 'dart:typed_data';
 import '../connector/meshcore_protocol.dart';
 import '../helpers/reaction_helper.dart';
 import '../helpers/smaz.dart';
+import '../utils/app_logger.dart';
 
 enum ChannelMessageStatus { pending, sent, failed }
 
@@ -109,89 +110,82 @@ class ChannelMessage {
     );
   }
 
-  static ChannelMessage? fromFrame(Uint8List data) {
+  static ChannelMessage? fromFrame(Uint8List frame) {
     // CHANNEL_MSG_RECV format varies by version:
     // V3: [0]=code [1]=SNR [2]=rsv1 [3]=rsv2 [4]=channel_idx [5]=path_len [path... optional] [txt_type] [timestamp x4] [text...]
     // Non-V3: [0]=code [1]=channel_idx [2]=path_len [3]=txt_type [4-7]=timestamp [8+]=text
-    if (data.length < 8) return null;
+    if (frame.length < 8) return null;
+    try {
+      final reader = BufferReader(frame);
+      final code = reader.readByte();
+      if (code != respCodeChannelMsgRecv && code != respCodeChannelMsgRecvV3) {
+        return null;
+      }
 
-    final code = data[0];
-    if (code != respCodeChannelMsgRecv && code != respCodeChannelMsgRecvV3) {
+      int pathLen;
+      int txtType;
+      Uint8List pathBytes = Uint8List(0);
+      int channelIdx;
+      if (code == respCodeChannelMsgRecvV3) {
+        reader.skipBytes(1); // Skip SNR
+        final flags = reader.readByte();
+        final hasPath = (flags & 0x01) != 0;
+        reader.skipBytes(1); // Skip reserved byte
+        channelIdx = reader.readByte();
+        pathLen = reader.readInt8();
+        txtType = reader.readByte();
+        if (hasPath && pathLen > 0) {
+          reader.rewind(); // Rewind to read path length again for pathBytes
+          pathBytes = reader.readBytes(pathLen);
+        }
+      } else {
+        channelIdx = reader.readByte();
+        pathLen = reader.readInt8();
+        txtType = reader.readByte();
+      }
+      final timestampRaw = reader.readUInt32LE();
+
+      if (txtType != txtTypePlain) {
+        return null;
+      }
+
+      final text = reader.readCString();
+
+      // Extract sender name and actual message from "name: msg" format
+      String senderName = 'Unknown';
+      String actualText = text;
+
+      final colonIndex = text.indexOf(':');
+      if (colonIndex > 0 && colonIndex < text.length - 1 && colonIndex < 50) {
+        final potentialSender = text.substring(0, colonIndex);
+        if (!RegExp(r'[:\[\]]').hasMatch(potentialSender)) {
+          senderName = potentialSender;
+          final offset =
+              (colonIndex + 1 < text.length && text[colonIndex + 1] == ' ')
+              ? colonIndex + 2
+              : colonIndex + 1;
+          actualText = text.substring(offset);
+        }
+      }
+
+      final decodedText = Smaz.tryDecodePrefixed(actualText) ?? actualText;
+
+      return ChannelMessage(
+        senderKey: null,
+        senderName: senderName,
+        text: decodedText,
+        timestamp: DateTime.fromMillisecondsSinceEpoch(timestampRaw * 1000),
+        isOutgoing: false,
+        status: ChannelMessageStatus.sent,
+        pathLength: pathLen,
+        pathBytes: pathBytes,
+        channelIndex: channelIdx,
+      );
+    } catch (e) {
+      appLogger.error('Error parsing channel message frame: $e');
+      // If parsing fails, return null to avoid crashes
       return null;
     }
-
-    int timestampOffset, textOffset, pathLenOffset, txtTypeOffset;
-    Uint8List pathBytes = Uint8List(0);
-    int channelIdx;
-
-    if (code == respCodeChannelMsgRecvV3) {
-      channelIdx = data[4];
-      pathLenOffset = 5;
-      final pathLen = data[pathLenOffset].toSigned(8);
-      var cursor = 6;
-      final hasPathBytesFlag = (data[2] & 0x01) != 0;
-      final canFitPath = pathLen > 0 && data.length >= cursor + pathLen + 5;
-      final hasValidTxtType =
-          cursor < data.length &&
-          (data[cursor] == txtTypePlain || data[cursor] == txtTypeCliData);
-      if ((hasPathBytesFlag || (canFitPath && !hasValidTxtType)) &&
-          canFitPath) {
-        pathBytes = Uint8List.fromList(data.sublist(cursor, cursor + pathLen));
-        cursor += pathLen;
-      }
-      txtTypeOffset = cursor;
-      cursor += 1; // txt_type
-      timestampOffset = cursor;
-      textOffset = cursor + 4;
-    } else {
-      channelIdx = data[1];
-      pathLenOffset = 2;
-      txtTypeOffset = 3;
-      timestampOffset = 4;
-      textOffset = 8;
-    }
-
-    if (data.length < textOffset + 1) return null;
-
-    final txtType = data[txtTypeOffset];
-    if (txtType != txtTypePlain) {
-      return null;
-    }
-
-    final pathLen = data[pathLenOffset].toSigned(8);
-    final timestampRaw = readUint32LE(data, timestampOffset);
-    final text = readCString(data, textOffset, data.length - textOffset);
-
-    // Extract sender name and actual message from "name: msg" format
-    String senderName = 'Unknown';
-    String actualText = text;
-
-    final colonIndex = text.indexOf(':');
-    if (colonIndex > 0 && colonIndex < text.length - 1 && colonIndex < 50) {
-      final potentialSender = text.substring(0, colonIndex);
-      if (!RegExp(r'[:\[\]]').hasMatch(potentialSender)) {
-        senderName = potentialSender;
-        final offset =
-            (colonIndex + 1 < text.length && text[colonIndex + 1] == ' ')
-            ? colonIndex + 2
-            : colonIndex + 1;
-        actualText = text.substring(offset);
-      }
-    }
-
-    final decodedText = Smaz.tryDecodePrefixed(actualText) ?? actualText;
-
-    return ChannelMessage(
-      senderKey: null,
-      senderName: senderName,
-      text: decodedText,
-      timestamp: DateTime.fromMillisecondsSinceEpoch(timestampRaw * 1000),
-      isOutgoing: false,
-      status: ChannelMessageStatus.sent,
-      pathLength: pathLen,
-      pathBytes: pathBytes,
-      channelIndex: channelIdx,
-    );
   }
 
   static ChannelMessage outgoing(

lib/models/contact.dart

@@ -18,6 +18,7 @@ class Contact {
   final DateTime lastSeen;
   final DateTime lastMessageAt;
   final bool isActive;
+  final bool wasPulled;
   final Uint8List? rawPacket;
 
   Contact({
@@ -34,6 +35,7 @@ class Contact {
     required this.lastSeen,
     DateTime? lastMessageAt,
     this.isActive = true,
+    this.wasPulled = false,
     this.rawPacket,
   }) : lastMessageAt = lastMessageAt ?? lastSeen;
 

lib/models/message.dart

@@ -16,7 +16,7 @@ class Message {
   final String? messageId;
   final int retryCount;
   final int? estimatedTimeoutMs;
-  final Uint8List? expectedAckHash;
+  final int? expectedAckHash;
   final DateTime? sentAt;
   final DateTime? deliveredAt;
   final int? tripTimeMs;
@@ -56,7 +56,7 @@ class Message {
     MessageStatus? status,
     int? retryCount,
     int? estimatedTimeoutMs,
-    Uint8List? expectedAckHash,
+    int? expectedAckHash,
     DateTime? sentAt,
     DateTime? deliveredAt,
     int? tripTimeMs,
@@ -90,33 +90,35 @@ class Message {
     );
   }
 
-  static Message? fromFrame(Uint8List data, Uint8List selfPubKey) {
-    if (data.length < msgTextOffset + 1) return null;
+  static Message? fromFrame(Uint8List frame, Uint8List selfPubKey) {
+    if (frame.length < msgTextOffset + 1) return null;
+    final reader = BufferReader(frame);
+    try {
+      final code = reader.readByte();
+      if (code != respCodeContactMsgRecv && code != respCodeContactMsgRecvV3) {
+        return null;
+      }
 
-    final code = data[0];
-    if (code != respCodeContactMsgRecv && code != respCodeContactMsgRecvV3) {
+      final senderKey = reader.readBytes(pubKeySize);
+      final timestampRaw = reader.readInt32LE();
+      final flags = reader.readByte();
+      if ((flags >> 2) != txtTypePlain) {
+        return null;
+      }
+      final text = reader.readCString();
+
+      return Message(
+        senderKey: senderKey,
+        text: text,
+        timestamp: DateTime.fromMillisecondsSinceEpoch(timestampRaw * 1000),
+        isOutgoing: false,
+        isCli: false,
+        status: MessageStatus.delivered,
+        pathBytes: Uint8List(0),
+      );
+    } catch (e) {
       return null;
     }
-
-    final senderKey = Uint8List.fromList(
-      data.sublist(msgPubKeyOffset, msgPubKeyOffset + pubKeySize),
-    );
-    final timestampRaw = readUint32LE(data, msgTimestampOffset);
-    final flags = data[msgFlagsOffset];
-    if ((flags >> 2) != txtTypePlain) {
-      return null;
-    }
-    final text = readCString(data, msgTextOffset, data.length - msgTextOffset);
-
-    return Message(
-      senderKey: senderKey,
-      text: text,
-      timestamp: DateTime.fromMillisecondsSinceEpoch(timestampRaw * 1000),
-      isOutgoing: false,
-      isCli: false,
-      status: MessageStatus.delivered,
-      pathBytes: Uint8List(0),
-    );
   }
 
   static Message outgoing(