optimizations

lib/chat/cubits/single_contact_messages_cubit.dart

@@ -10,8 +10,7 @@ import '../../account_manager/account_manager.dart';
 import '../../proto/proto.dart' as proto;
 
 class _SingleContactMessageQueueEntry {
-  _SingleContactMessageQueueEntry({this.localMessages, this.remoteMessages});
-  IList<proto.Message>? localMessages;
+  _SingleContactMessageQueueEntry({this.remoteMessages});
   IList<proto.Message>? remoteMessages;
 }
 
@@ -96,9 +95,6 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
             parent: _localConversationRecordKey,
             crypto: _messagesCrypto),
         decodeElement: proto.Message.fromBuffer);
-    _localSubscription =
-        _localMessagesCubit!.stream.listen(_updateLocalMessagesState);
-    _updateLocalMessagesState(_localMessagesCubit!.state);
   }
 
   // Open remote messages key
@@ -132,18 +128,6 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
     _updateReconciledChatState(_reconciledChatMessagesCubit!.state);
   }
 
-  // Called when the local messages list gets a change
-  void _updateLocalMessagesState(
-      BlocBusyState<AsyncValue<IList<proto.Message>>> avmessages) {
-    final localMessages = avmessages.state.asData?.value;
-    if (localMessages == null) {
-      return;
-    }
-    // Add local messages updates to queue to process asynchronously
-    _messagesUpdateQueue
-        .add(_SingleContactMessageQueueEntry(localMessages: localMessages));
-  }
-
   // Called when the remote messages list gets a change
   void _updateRemoteMessagesState(
       BlocBusyState<AsyncValue<IList<proto.Message>>> avmessages) {
@@ -232,12 +216,6 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
     // Merge remote and local messages into the reconciled chat log
     await reconciledChatMessagesCubit
         .operateWrite((reconciledMessagesWriter) async {
-      // xxx for now, keep two lists, but can probable simplify this out soon
-      if (entry.localMessages != null) {
-        await _mergeMessagesInner(
-            reconciledMessagesWriter: reconciledMessagesWriter,
-            messages: entry.localMessages!);
-      }
       if (entry.remoteMessages != null) {
         await _mergeMessagesInner(
             reconciledMessagesWriter: reconciledMessagesWriter,
@@ -246,24 +224,12 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
     });
   }
 
-  // Force refresh of messages
-  Future<void> refresh() async {
-    await _initWait();
-
-    final lcc = _localMessagesCubit;
-    final rcc = _remoteMessagesCubit;
-
-    if (lcc != null) {
-      await lcc.refresh();
-    }
-    if (rcc != null) {
-      await rcc.refresh();
-    }
-  }
-
   Future<void> addMessage({required proto.Message message}) async {
     await _initWait();
 
+    await _reconciledChatMessagesCubit!.operateWrite((writer) =>
+        _mergeMessagesInner(
+            reconciledMessagesWriter: writer, messages: [message].toIList()));
     await _localMessagesCubit!
         .operateWrite((writer) => writer.tryAddItem(message.writeToBuffer()));
   }

lib/theme/models/radix_generator.dart

@@ -528,6 +528,12 @@ ChatTheme makeChatTheme(ScaleScheme scale, TextTheme textTheme) =>
       inputPadding: const EdgeInsets.all(9),
       inputTextColor: scale.primaryScale.text,
       attachmentButtonIcon: const Icon(Icons.attach_file),
+      receivedMessageBodyTextStyle: const TextStyle(
+        color: neutral0,
+        fontSize: 16,
+        fontWeight: FontWeight.w500,
+        height: 1.5,
+      ),
     );
 
 ThemeData radixGenerator(Brightness brightness, RadixThemeColor themeColor) {

lib/veilid_processor/views/developer.dart

@@ -69,12 +69,23 @@ class _DeveloperPageState extends State<DeveloperPage> {
   }
 
   Future<void> _sendDebugCommand(String debugCommand) async {
+    if (debugCommand == 'pool allocations') {
+      DHTRecordPool.instance.debugPrintAllocations();
+      return;
+    }
+
+    if (debugCommand == 'pool opened') {
+      DHTRecordPool.instance.debugPrintOpened();
+      return;
+    }
+
     if (debugCommand == 'ellet') {
       setState(() {
         _showEllet = !_showEllet;
       });
       return;
     }
+
     _debugOut('DEBUG >>>\n$debugCommand\n');
     try {
       final out = await Veilid.instance.debug(debugCommand);

packages/veilid_support/lib/dht_support/src/dht_record/dht_record_pool.dart

@@ -98,6 +98,15 @@ class OpenedRecordInfo {
       ..sort((a, b) => a.key.toString().compareTo(b.key.toString()));
     return '[${r.map((x) => x.debugName).join(',')}]';
   }
+
+  String get details {
+    final r = records.toList()
+      ..sort((a, b) => a.key.toString().compareTo(b.key.toString()));
+    return '[${r.map((x) => "writer=${x._writer} "
+        "defaultSubkey=${x._defaultSubkey}").join(',')}]';
+  }
+
+  String get sharedDetails => shared.toString();
 }
 
 class DHTRecordPool with TableDBBacked<DHTRecordPoolAllocations> {
@@ -768,4 +777,29 @@ class DHTRecordPool with TableDBBacked<DHTRecordPoolAllocations> {
       _inTick = false;
     }
   }
+
+  void debugPrintAllocations() {
+    final sortedAllocations = _state.debugNames.entries.asList()
+      ..sort((a, b) => a.key.compareTo(b.key));
+
+    log('DHTRecordPool Allocations: (count=${sortedAllocations.length})');
+
+    for (final entry in sortedAllocations) {
+      log('  ${entry.key}: ${entry.value}');
+    }
+  }
+
+  void debugPrintOpened() {
+    final sortedOpened = _opened.entries.asList()
+      ..sort((a, b) => a.key.toString().compareTo(b.key.toString()));
+
+    log('DHTRecordPool Opened Records: (count=${sortedOpened.length})');
+
+    for (final entry in sortedOpened) {
+      log('  ${entry.key}: \n'
+          '     debugNames=${entry.value.debugNames}\n'
+          '     details=${entry.value.details}\n'
+          '     sharedDetails=${entry.value.sharedDetails}\n');
+    }
+  }
 }

packages/veilid_support/lib/dht_support/src/dht_short_array/dht_short_array_head.dart

@@ -1,5 +1,13 @@
 part of 'dht_short_array.dart';
 
+class DHTShortArrayHeadLookup {
+  DHTShortArrayHeadLookup(
+      {required this.record, required this.recordSubkey, required this.seq});
+  final DHTRecord record;
+  final int recordSubkey;
+  final int seq;
+}
+
 class _DHTShortArrayHead {
   _DHTShortArrayHead({required DHTRecord headRecord})
       : _headRecord = headRecord,
@@ -299,16 +307,18 @@ class _DHTShortArrayHead {
           );
   }
 
-  Future<(DHTRecord, int)> lookupPosition(int pos) async {
+  Future<DHTShortArrayHeadLookup> lookupPosition(int pos) async {
     final idx = _index[pos];
     return lookupIndex(idx);
   }
 
-  Future<(DHTRecord, int)> lookupIndex(int idx) async {
+  Future<DHTShortArrayHeadLookup> lookupIndex(int idx) async {
+    final seq = idx < _seqs.length ? _seqs[idx] : 0xFFFFFFFF;
     final recordNumber = idx ~/ _stride;
     final record = await _getOrCreateLinkedRecord(recordNumber);
     final recordSubkey = (idx % _stride) + ((recordNumber == 0) ? 1 : 0);
-    return (record, recordSubkey);
+    return DHTShortArrayHeadLookup(
+        record: record, recordSubkey: recordSubkey, seq: seq);
   }
 
   /////////////////////////////////////////////////////////////////////////////
@@ -416,9 +426,9 @@ class _DHTShortArrayHead {
   /// If a write is happening, update the network copy as well.
   Future<void> updatePositionSeq(int pos, bool write) async {
     final idx = _index[pos];
-    final (record, recordSubkey) = await lookupIndex(idx);
-    final report =
-        await record.inspect(subkeys: [ValueSubkeyRange.single(recordSubkey)]);
+    final lookup = await lookupIndex(idx);
+    final report = await lookup.record
+        .inspect(subkeys: [ValueSubkeyRange.single(lookup.recordSubkey)]);
 
     while (_localSeqs.length <= idx) {
       _localSeqs.add(0xFFFFFFFF);

packages/veilid_support/lib/dht_support/src/dht_short_array/dht_short_array_read.dart

@@ -68,10 +68,11 @@ class _DHTShortArrayRead implements DHTShortArrayRead {
       throw IndexError.withLength(pos, length);
     }
 
-    final (record, recordSubkey) = await _head.lookupPosition(pos);
+    final lookup = await _head.lookupPosition(pos);
 
     final refresh = forceRefresh || _head.positionNeedsRefresh(pos);
-    final out = record.get(subkey: recordSubkey, forceRefresh: refresh);
+    final out =
+        lookup.record.get(subkey: lookup.recordSubkey, forceRefresh: refresh);
     await _head.updatePositionSeq(pos, false);
 
     return out;

packages/veilid_support/lib/dht_support/src/dht_short_array/dht_short_array_write.dart

@@ -136,6 +136,12 @@ class _DHTShortArrayWrite implements DHTShortArrayWrite {
 
   @override
   Future<bool> trySwapItem(int aPos, int bPos) async {
+    if (aPos < 0 || aPos >= _head.length) {
+      throw IndexError.withLength(aPos, _head.length);
+    }
+    if (bPos < 0 || bPos >= _head.length) {
+      throw IndexError.withLength(bPos, _head.length);
+    }
     // Swap indices
     _head.swapIndex(aPos, bPos);
 
@@ -144,8 +150,13 @@ class _DHTShortArrayWrite implements DHTShortArrayWrite {
 
   @override
   Future<Uint8List> tryRemoveItem(int pos) async {
-    final (record, recordSubkey) = await _head.lookupPosition(pos);
-    final result = await record.get(subkey: recordSubkey);
+    if (pos < 0 || pos >= _head.length) {
+      throw IndexError.withLength(pos, _head.length);
+    }
+    final lookup = await _head.lookupPosition(pos);
+    final result = lookup.seq == 0xFFFFFFFF
+        ? null
+        : await lookup.record.get(subkey: lookup.recordSubkey);
     if (result == null) {
       throw StateError('Element does not exist');
     }
@@ -164,9 +175,12 @@ class _DHTShortArrayWrite implements DHTShortArrayWrite {
     if (pos < 0 || pos >= _head.length) {
       throw IndexError.withLength(pos, _head.length);
     }
-    final (record, recordSubkey) = await _head.lookupPosition(pos);
-    final oldValue = await record.get(subkey: recordSubkey);
-    final result = await record.tryWriteBytes(newValue, subkey: recordSubkey);
+    final lookup = await _head.lookupPosition(pos);
+    final oldValue = lookup.seq == 0xFFFFFFFF
+        ? null
+        : await lookup.record.get(subkey: lookup.recordSubkey);
+    final result = await lookup.record
+        .tryWriteBytes(newValue, subkey: lookup.recordSubkey);
     if (result != null) {
       // A result coming back means the element was overwritten already
       return (result, false);