feat: optimize reaction message format to reduce airtime

- Reduce reaction payload from ~44 bytes to 9 bytes (5x smaller) - Use 4-char hex hash (timestamp + sender + first 5 chars) for message ID - Use 2-char hex emoji index instead of multi-byte UTF-8 emoji - Format: r:HASH:INDEX (e.g., r:a1b2:00) - For 1:1 chats, sender is implicit (null) for shorter hash - Prevent users from reacting to their own messages - Add room server reaction support with sender identification - Make emoji lists public in EmojiPicker for shared indexing - Add 💪 and 🚀 emojis to picker - Add comprehensive unit tests for reaction helpers - Update minor dependencies
2026-06-23 02:44:30 +10:00 · 2026-01-28 23:21:04 -07:00
parent d61ec217fc
commit 90ce46392a
8 changed files with 639 additions and 130 deletions
@@ -67,9 +67,9 @@ class MeshCoreConnector extends ChangeNotifier {
  final Map<int, List<ChannelMessage>> _channelMessages = {};
  final Set<String> _loadedConversationKeys = {};
  final Map<int, Set<String>> _processedChannelReactions =
-      {}; // channelIndex -> Set of "reactionKey_emoji"
+      {}; // channelIndex -> Set of "targetHash_emoji"
  final Map<String, Set<String>> _processedContactReactions =
-      {}; // contactPubKeyHex -> Set of "reactionKey_emoji"
+      {}; // contactPubKeyHex -> Set of "targetHash_emoji"

  StreamSubscription<List<ScanResult>>? _scanSubscription;
  StreamSubscription<BluetoothConnectionState>? _connectionSubscription;
@@ -1288,15 +1288,9 @@ class MeshCoreConnector extends ChangeNotifier {
    if (reactionInfo != null) {
      // Check if we've already processed this reaction
      _processedChannelReactions.putIfAbsent(channel.index, () => {});
-      final reactionKey = reactionInfo.reactionKey;
-      final reactionIdentifier = reactionKey != null
-          ? '${reactionKey}_${reactionInfo.emoji}'
-          : null;
+      final reactionIdentifier = '${reactionInfo.targetHash}_${reactionInfo.emoji}';

-      if (reactionIdentifier != null &&
-          _processedChannelReactions[channel.index]!.contains(
-            reactionIdentifier,
-          )) {
+      if (_processedChannelReactions[channel.index]!.contains(reactionIdentifier)) {
        // Already processed, don't process again
        return;
      }
@@ -1310,9 +1304,7 @@ class MeshCoreConnector extends ChangeNotifier {
      await _channelMessageStore.saveChannelMessages(channel.index, messages);

      // Mark this reaction as processed
-      if (reactionIdentifier != null) {
-        _processedChannelReactions[channel.index]!.add(reactionIdentifier);
-      }
+      _processedChannelReactions[channel.index]!.add(reactionIdentifier);

      notifyListeners();

@@ -2688,26 +2680,20 @@ class MeshCoreConnector extends ChangeNotifier {
    // Parse reaction info
    final reactionInfo = Message.parseReaction(message.text);
    if (reactionInfo != null) {
-      // Check if we've already processed this exact reaction using lightweight key
+      // Check if we've already processed this exact reaction
      _processedContactReactions.putIfAbsent(pubKeyHex, () => {});
-      final reactionKey = reactionInfo.reactionKey;
-      final reactionIdentifier = reactionKey != null
-          ? '${reactionKey}_${reactionInfo.emoji}'
-          : null;
+      final reactionIdentifier = '${reactionInfo.targetHash}_${reactionInfo.emoji}';

      final isDuplicate =
-          reactionIdentifier != null &&
          _processedContactReactions[pubKeyHex]!.contains(reactionIdentifier);

      if (!isDuplicate) {
        // New reaction - process it
-        _processContactReaction(messages, reactionInfo);
+        _processContactReaction(messages, reactionInfo, pubKeyHex);
        _messageStore.saveMessages(pubKeyHex, messages);

        // Mark as processed
-        if (reactionIdentifier != null) {
-          _processedContactReactions[pubKeyHex]!.add(reactionIdentifier);
-        }
+        _processedContactReactions[pubKeyHex]!.add(reactionIdentifier);

        notifyListeners();
      }
@@ -2722,15 +2708,51 @@ class MeshCoreConnector extends ChangeNotifier {
  void _processContactReaction(
    List<Message> messages,
    ReactionInfo reactionInfo,
+    String contactPubKeyHex,
  ) {
-    // Find target message by messageId
-    for (int i = 0; i < messages.length; i++) {
-      if (messages[i].messageId == reactionInfo.targetMessageId) {
-        final currentReactions = Map<String, int>.from(messages[i].reactions);
+    // Find target message by computing hash and comparing
+    final targetHash = reactionInfo.targetHash;
+    final contact = _contacts.cast<Contact?>().firstWhere(
+      (c) => c?.publicKeyHex == contactPubKeyHex,
+      orElse: () => null,
+    );
+    final isRoomServer = contact?.type == advTypeRoom;
+
+    for (int i = messages.length - 1; i >= 0; i--) {
+      final msg = messages[i];
+      
+      // For 1:1 chats: contact reacts to my outgoing messages only
+      // For room servers: any message can be reacted to (multi-user)
+      if (!isRoomServer && !msg.isOutgoing) continue;
+      
+      final timestampSecs = msg.timestamp.millisecondsSinceEpoch ~/ 1000;
+      
+      // For room servers, include sender name (resolve from fourByteRoomContactKey)
+      // For 1:1 chats, sender is implicit (null)
+      String? senderName;
+      if (isRoomServer && !msg.isOutgoing) {
+        // Resolve sender from the message's fourByteRoomContactKey
+        final senderContact = _contacts.cast<Contact?>().firstWhere(
+          (c) => c != null && _matchesPrefix(c.publicKey, msg.fourByteRoomContactKey),
+          orElse: () => null,
+        );
+        senderName = senderContact?.name;
+      } else if (isRoomServer && msg.isOutgoing) {
+        senderName = selfName;
+      }
+      // For 1:1, senderName stays null
+      
+      final msgHash = ReactionHelper.computeReactionHash(
+        timestampSecs,
+        senderName,
+        msg.text,
+      );
+      if (msgHash == targetHash) {
+        final currentReactions = Map<String, int>.from(msg.reactions);
        currentReactions[reactionInfo.emoji] =
            (currentReactions[reactionInfo.emoji] ?? 0) + 1;

-        messages[i] = messages[i].copyWith(reactions: currentReactions);
+        messages[i] = msg.copyWith(reactions: currentReactions);
        break;
      }
    }
@@ -2881,18 +2903,12 @@ class MeshCoreConnector extends ChangeNotifier {
    // Parse reaction info
    final reactionInfo = ChannelMessage.parseReaction(message.text);
    if (reactionInfo != null) {
-      // Check if we've already processed this exact reaction using lightweight key
+      // Check if we've already processed this exact reaction
      _processedChannelReactions.putIfAbsent(channelIndex, () => {});
-      final reactionKey = reactionInfo.reactionKey;
-      final reactionIdentifier = reactionKey != null
-          ? '${reactionKey}_${reactionInfo.emoji}'
-          : null;
+      final reactionIdentifier = '${reactionInfo.targetHash}_${reactionInfo.emoji}';

      final isDuplicate =
-          reactionIdentifier != null &&
-          _processedChannelReactions[channelIndex]!.contains(
-            reactionIdentifier,
-          );
+          _processedChannelReactions[channelIndex]!.contains(reactionIdentifier);

      if (!isDuplicate) {
        // New reaction - process it
@@ -2901,9 +2917,7 @@ class MeshCoreConnector extends ChangeNotifier {
        _channelMessageStore.saveChannelMessages(channelIndex, messages);

        // Mark as processed
-        if (reactionIdentifier != null) {
-          _processedChannelReactions[channelIndex]!.add(reactionIdentifier);
-        }
+        _processedChannelReactions[channelIndex]!.add(reactionIdentifier);
      }
      return false; // Don't add reaction as a visible message
    }
@@ -2999,14 +3013,22 @@ class MeshCoreConnector extends ChangeNotifier {
    List<ChannelMessage> messages,
    ReactionInfo reactionInfo,
  ) {
-    // Find target message by messageId
-    for (int i = 0; i < messages.length; i++) {
-      if (messages[i].messageId == reactionInfo.targetMessageId) {
-        final currentReactions = Map<String, int>.from(messages[i].reactions);
+    // Find target message by computing hash and comparing
+    final targetHash = reactionInfo.targetHash;
+    for (int i = messages.length - 1; i >= 0; i--) {
+      final msg = messages[i];
+      final timestampSecs = msg.timestamp.millisecondsSinceEpoch ~/ 1000;
+      final msgHash = ReactionHelper.computeReactionHash(
+        timestampSecs,
+        msg.senderName,
+        msg.text,
+      );
+      if (msgHash == targetHash) {
+        final currentReactions = Map<String, int>.from(msg.reactions);
        currentReactions[reactionInfo.emoji] =
            (currentReactions[reactionInfo.emoji] ?? 0) + 1;

-        messages[i] = messages[i].copyWith(reactions: currentReactions);
+        messages[i] = msg.copyWith(reactions: currentReactions);
        notifyListeners();
        break;
      }
@@ -1,53 +1,70 @@
+import '../widgets/emoji_picker.dart';
+
 class ReactionInfo {
-  final String targetMessageId;
+  final String targetHash;
  final String emoji;
-  final String? reactionKey; // Lightweight key for deduplication: timestamp_senderPrefix

  ReactionInfo({
-    required this.targetMessageId,
+    required this.targetHash,
    required this.emoji,
-    this.reactionKey,
  });
 }

 class ReactionHelper {
-  /// Parse reaction format: r:[messageId]:[emoji]
-  /// Supports both old format (full messageId) and new format (timestamp_senderPrefix)
+  static List<String>? _cachedEmojis;
+
+  /// Combined list of all reaction emojis in fixed order.
+  /// Order must stay stable for index compatibility.
+  static List<String> get reactionEmojis {
+    return _cachedEmojis ??= [
+      ...EmojiPicker.quickEmojis,
+      ...EmojiPicker.smileys,
+      ...EmojiPicker.gestures,
+      ...EmojiPicker.hearts,
+      ...EmojiPicker.objects,
+    ];
+  }
+
+  /// Convert emoji to 2-char hex index. Returns null if emoji not in list.
+  static String? emojiToIndex(String emoji) {
+    final idx = reactionEmojis.indexOf(emoji);
+    if (idx < 0) return null;
+    return idx.toRadixString(16).padLeft(2, '0');
+  }
+
+  /// Convert 2-char hex index to emoji. Returns null if invalid index.
+  static String? indexToEmoji(String hexIndex) {
+    final idx = int.tryParse(hexIndex, radix: 16);
+    if (idx == null || idx < 0 || idx >= reactionEmojis.length) return null;
+    return reactionEmojis[idx];
+  }
+
+  /// Compute a 4-char hex hash for a message reaction.
+  /// Hash input: timestampSeconds + [senderName] + first 5 chars of text
+  /// For 1:1 chats, senderName can be null (sender is implicit).
+  static String computeReactionHash(int timestampSeconds, String? senderName, String text) {
+    final first5 = text.length >= 5 ? text.substring(0, 5) : text;
+    final input = senderName != null
+        ? '$timestampSeconds$senderName$first5'
+        : '$timestampSeconds$first5';
+    // Use hashCode and take lower 16 bits, format as 4 hex chars
+    final hash = input.hashCode & 0xFFFF;
+    return hash.toRadixString(16).padLeft(4, '0');
+  }
+
+  /// Parse reaction format: r:HASH:INDEX (where INDEX is 2-char hex emoji index)
+  /// Returns null if text is not a valid reaction format
  static ReactionInfo? parseReaction(String text) {
-    final regex = RegExp(r'^r:([^:]+):(.+)$');
+    final regex = RegExp(r'^r:([0-9a-f]{4}):([0-9a-f]{2})$');
    final match = regex.firstMatch(text);
    if (match == null) return null;

-    final targetId = match.group(1)!;
-    final emoji = match.group(2)!;
-
-    // Extract reaction key for deduplication
-    // If targetId is in new format (timestamp_senderPrefix), use it directly
-    // Otherwise, extract timestamp from old format (timestamp_nameHash_textHash)
-    String? reactionKey;
-    if (targetId.contains('_')) {
-      final parts = targetId.split('_');
-      if (parts.length >= 2) {
-        // New format: timestamp_senderPrefix, or old format with at least timestamp
-        reactionKey = '${parts[0]}_${parts[1]}';
-      }
-    }
+    final emoji = indexToEmoji(match.group(2)!);
+    if (emoji == null) return null;

    return ReactionInfo(
-      targetMessageId: targetId,
+      targetHash: match.group(1)!,
      emoji: emoji,
-      reactionKey: reactionKey,
    );
  }
-
-  /// Generate a lightweight reaction key for a message
-  /// Format: r:[timestamp]_[senderPrefix]:[emoji]
-  static String buildReactionText(String timestamp, String senderPrefix, String emoji) {
-    return 'r:${timestamp}_$senderPrefix:$emoji';
-  }
-
-  /// Extract sender prefix from public key hex (first 8 chars)
-  static String getSenderPrefix(String senderKeyHex) {
-    return senderKeyHex.substring(0, 8);
-  }
 }
@@ -11,6 +11,7 @@ import '../connector/meshcore_connector.dart';
 import '../helpers/chat_scroll_controller.dart';
 import '../connector/meshcore_protocol.dart';
 import '../helpers/link_handler.dart';
+import '../helpers/reaction_helper.dart';
 import '../helpers/utf8_length_limiter.dart';
 import '../l10n/l10n.dart';
 import '../models/channel.dart';
@@ -877,14 +878,16 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                _setReplyingTo(message);
              },
            ),
-            ListTile(
-              leading: const Icon(Icons.add_reaction_outlined),
-              title: Text(context.l10n.chat_addReaction),
-              onTap: () {
-                Navigator.pop(sheetContext);
-                _showEmojiPicker(message);
-              },
-            ),
+            // Can't react to your own messages
+            if (!message.isOutgoing)
+              ListTile(
+                leading: const Icon(Icons.add_reaction_outlined),
+                title: Text(context.l10n.chat_addReaction),
+                onTap: () {
+                  Navigator.pop(sheetContext);
+                  _showEmojiPicker(message);
+                },
+              ),
            ListTile(
              leading: const Icon(Icons.copy),
              title: Text(context.l10n.common_copy),
@@ -926,9 +929,11 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {

  void _sendReaction(ChannelMessage message, String emoji) {
    final connector = context.read<MeshCoreConnector>();
-    // Send reaction with full messageId to find target, but parser will extract
-    // lightweight reactionKey (timestamp_senderPrefix) for deduplication
-    final reactionText = 'r:${message.messageId}:$emoji';
+    final emojiIndex = ReactionHelper.emojiToIndex(emoji);
+    if (emojiIndex == null) return; // Unknown emoji, skip
+    final timestampSecs = message.timestamp.millisecondsSinceEpoch ~/ 1000;
+    final hash = ReactionHelper.computeReactionHash(timestampSecs, message.senderName, message.text);
+    final reactionText = 'r:$hash:$emojiIndex';
    connector.sendChannelMessage(widget.channel, reactionText);
  }

@@ -11,6 +11,7 @@ import 'package:latlong2/latlong.dart';

 import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
+import '../helpers/reaction_helper.dart';
 import '../helpers/chat_scroll_controller.dart';
 import '../helpers/link_handler.dart';
 import '../helpers/utf8_length_limiter.dart';
@@ -850,14 +851,16 @@ class _ChatScreenState extends State<ChatScreen> {
        child: Column(
          mainAxisSize: MainAxisSize.min,
          children: [
-            ListTile(
-              leading: const Icon(Icons.add_reaction_outlined),
-              title: Text(context.l10n.chat_addReaction),
-              onTap: () {
-                Navigator.pop(sheetContext);
-                _showEmojiPicker(message);
-              },
-            ),
+            // Can't react to your own messages
+            if (!message.isOutgoing)
+              ListTile(
+                leading: const Icon(Icons.add_reaction_outlined),
+                title: Text(context.l10n.chat_addReaction),
+                onTap: () {
+                  Navigator.pop(sheetContext);
+                  _showEmojiPicker(message, contact);
+                },
+              ),
            ListTile(
              leading: const Icon(Icons.copy),
              title: Text(context.l10n.common_copy),
@@ -931,25 +934,29 @@ class _ChatScreenState extends State<ChatScreen> {
    );
  }

-  void _showEmojiPicker(Message message) {
+  void _showEmojiPicker(Message message, Contact senderContact) {
    showModalBottomSheet(
      context: context,
      isScrollControlled: true,
      builder: (context) => EmojiPicker(
        onEmojiSelected: (emoji) {
-          _sendReaction(message, emoji);
+          _sendReaction(message, senderContact, emoji);
        },
      ),
    );
  }

-  void _sendReaction(Message message, String emoji) {
+  void _sendReaction(Message message, Contact senderContact, String emoji) {
    final connector = context.read<MeshCoreConnector>();
-    // Send reaction with messageId if available, otherwise use lightweight format
-    // Parser will extract reactionKey (timestamp_senderPrefix) for deduplication
-    final messageId = message.messageId ??
-        '${message.timestamp.millisecondsSinceEpoch}_${message.senderKeyHex.substring(0, 8)}';
-    final reactionText = 'r:$messageId:$emoji';
+    final emojiIndex = ReactionHelper.emojiToIndex(emoji);
+    if (emojiIndex == null) return; // Unknown emoji, skip
+    final timestampSecs = message.timestamp.millisecondsSinceEpoch ~/ 1000;
+    
+    // For room servers, include sender name (like channels) since multiple users
+    // For 1:1 chats, sender is implicit (null)
+    final senderName = widget.contact.type == advTypeRoom ? senderContact.name : null;
+    final hash = ReactionHelper.computeReactionHash(timestampSecs, senderName, message.text);
+    final reactionText = 'r:$hash:$emojiIndex';
    connector.sendMessage(widget.contact, reactionText);
  }
 }
@@ -12,32 +12,32 @@ class EmojiPicker extends StatelessWidget {

  static const List<String> quickEmojis = ['👍', '❤️', '😂', '🎉', '👏', '🔥'];

-  static const List<String> _smileys = [
+  static const List<String> smileys = [
      '😀', '😃', '😄', '😁', '😅', '😂', '🤣', '😊', '😇', '🙂', '🙃', '😉', '😌', '😍', '🥰', '😘',
      '😗', '😙', '😚', '😋', '😛', '😝', '😜', '🤪', '🤨', '🧐', '🤓', '😎', '🥸', '🤩', '🥳', '😏',
      '😒', '😞', '😔', '😟', '😕', '🙁', '😣', '😖', '😫', '😩', '🥺', '😢', '😭', '😤', '😠', '😡',
      '🤬', '🤯', '😳', '🥵', '🥶', '😱', '😨', '😰', '😥', '😓', '🤗', '🤔', '🤭', '🤫', '🤥', '😶',
    ];
-  static const List<String> _gestures = [
+  static const List<String> gestures = [
      '👍', '👎', '👊', '✊', '🤛', '🤜', '🤞', '✌️', '🤟', '🤘', '👌', '🤌', '🤏', '👈', '👉', '👆',
-      '👇', '☝️', '👋', '🤚', '🖐️', '✋', '🖖', '👏', '🙌', '👐', '🤲', '🤝', '🙏', '✍️', '💅', '🤳',
+      '👇', '☝️', '👋', '🤚', '🖐️', '✋', '🖖', '👏', '🙌', '👐', '🤲', '🤝', '🙏', '✍️', '💅', '🤳', '💪',
    ];
-  static const List<String> _hearts = [
+  static const List<String> hearts = [
      '❤️', '🧡', '💛', '💚', '💙', '💜', '🖤', '🤍', '🤎', '💔', '❤️‍🔥', '❤️‍🩹', '💕', '💞', '💓', '💗',
      '💖', '💘', '💝', '💟', '💌', '💢', '💥', '💫', '💦', '💨', '🕳️', '💬', '👁️‍🗨️', '🗨️', '🗯️', '💭',
    ];
-  static const List<String> _objects = [
+  static const List<String> objects = [
      '🎉', '🎊', '🎈', '🎁', '🎀', '🪅', '🪆', '🏆', '🥇', '🥈', '🥉', '⚽', '⚾', '🥎', '🏀', '🏐',
      '🏈', '🏉', '🎾', '🥏', '🎳', '🏏', '🏑', '🏒', '🥍', '🏓', '🏸', '🥊', '🥋', '🥅', '⛳', '🔥',
-      '⭐', '🌟', '✨', '⚡', '💡', '🔦', '🏮', '🪔', '📱', '💻', '⌚', '📷', '📺', '📻', '🎵', '🎶',
+      '⭐', '🌟', '✨', '⚡', '💡', '🔦', '🏮', '🪔', '📱', '💻', '⌚', '📷', '📺', '📻', '🎵', '🎶', '🚀',
    ];

  Map<String, List<String>> _emojiCategories(AppLocalizations l10n) {
    return {
-      l10n.emojiCategorySmileys: _smileys,
-      l10n.emojiCategoryGestures: _gestures,
-      l10n.emojiCategoryHearts: _hearts,
-      l10n.emojiCategoryObjects: _objects,
+      l10n.emojiCategorySmileys: smileys,
+      l10n.emojiCategoryGestures: gestures,
+      l10n.emojiCategoryHearts: hearts,
+      l10n.emojiCategoryObjects: objects,
    };
  }