Git-Mirrors/veilidchat
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilidchat.git synced 2025-01-13 00:29:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

xfer

Browse Source
This commit is contained in:
Christien Rioux 2024-02-01 09:41:58 -05:00
parent cd5d10ec1f
commit d3fb4b5b6a
3 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/veilid_support/lib/dht_support/src/dht_record.dart
View File

@ -282,7 +282,9 @@ class DHTRecord {
}
Future<StreamSubscription<VeilidUpdateValueChange>> listen(
Future<void> Function(VeilidUpdateValueChange update) onUpdate,
Future<void> Function(
DHTRecord record, Uint8List data, List<ValueSubkeyRange> subkeys)
onUpdate,
) async {
// Set up watch requirements
watchController ??=
@ -293,7 +295,12 @@ class DHTRecord {
return watchController!.stream.listen(
(update) {
Future.delayed(Duration.zero, () => onUpdate(update));
Future.delayed(Duration.zero, () async {
final out = await _crypto.decrypt(
update.valueData.data, update.subkeys.first.low);
await onUpdate(this, out, update.subkeys);
});
},
cancelOnError: true,
onError: (e) async {

31
packages/veilid_support/lib/dht_support/src/dht_record_cubit.dart
View File

@ -9,7 +9,7 @@ class DHTRecordCubit<T> extends Cubit<AsyncValue<T>> {
DHTRecordCubit({
required Future<DHTRecord> Function() open,
required Future<T?> Function(DHTRecord) initialStateFunction,
required Future<T?> Function(DHTRecord, List<ValueSubkeyRange>, ValueData)
required Future<T?> Function(DHTRecord, List<ValueSubkeyRange>, Uint8List)
stateFunction,
}) : _wantsCloseRecord = false,
super(const AsyncValue.loading()) {
@ -24,7 +24,7 @@ class DHTRecordCubit<T> extends Cubit<AsyncValue<T>> {
DHTRecordCubit.value({
required DHTRecord record,
required Future<T?> Function(DHTRecord) initialStateFunction,
required Future<T?> Function(DHTRecord, List<ValueSubkeyRange>, ValueData)
required Future<T?> Function(DHTRecord, List<ValueSubkeyRange>, Uint8List)
stateFunction,
}) : _record = record,
_wantsCloseRecord = false,
@ -36,7 +36,7 @@ class DHTRecordCubit<T> extends Cubit<AsyncValue<T>> {
Future<void> _init(
Future<T?> Function(DHTRecord) initialStateFunction,
Future<T?> Function(DHTRecord, List<ValueSubkeyRange>, ValueData)
Future<T?> Function(DHTRecord, List<ValueSubkeyRange>, Uint8List)
stateFunction,
) async {
// Make initial state update
@ -49,10 +49,9 @@ class DHTRecordCubit<T> extends Cubit<AsyncValue<T>> {
emit(AsyncValue.error(e));
}
_subscription = await _record.listen((update) async {
_subscription = await _record.listen((record, data, subkeys) async {
try {
final newState =
await stateFunction(_record, update.subkeys, update.valueData);
final newState = await stateFunction(record, subkeys, data);
if (newState != null) {
emit(AsyncValue.data(newState));
}
@ -73,6 +72,16 @@ class DHTRecordCubit<T> extends Cubit<AsyncValue<T>> {
await super.close();
}
Future<void> refresh(List<ValueSubkeyRange> subkeys) async {
for (final skr in subkeys) {
for (var sk = skr.low; sk <= skr.high; sk++) {
final data = await _record.get(subkey: sk, forceRefresh: true);
final newState = await stateFunction(_record, subkeys, data);
xxx continue here
}
}
}
StreamSubscription<VeilidUpdateValueChange>? _subscription;
late DHTRecord _record;
bool _wantsCloseRecord;
@ -105,9 +114,9 @@ class DefaultDHTRecordCubit<T> extends DHTRecordCubit<T> {
return decodeState(initialData);
};
static Future<T?> Function(DHTRecord, List<ValueSubkeyRange>, ValueData)
static Future<T?> Function(DHTRecord, List<ValueSubkeyRange>, Uint8List)
_makeStateFunction<T>(T Function(List<int> data) decodeState) =>
(record, subkeys, valueData) async {
(record, subkeys, updatedata) async {
final defaultSubkey = record.subkeyOrDefault(-1);
if (subkeys.containsSubkey(defaultSubkey)) {
final Uint8List data;
@ -119,7 +128,7 @@ class DefaultDHTRecordCubit<T> extends DHTRecordCubit<T> {
}
data = maybeData;
} else {
data = valueData.data;
data = updatedata;
}
final newState = decodeState(data);
return newState;
@ -127,6 +136,6 @@ class DefaultDHTRecordCubit<T> extends DHTRecordCubit<T> {
return null;
};
xxx add refresh/get mechanism to DHTRecordCubit and here too, then propagage to conversation_cubit
xxx should just be a 'get' like in dht_short_array_cubit
// xxx add refresh/get mechanism to DHTRecordCubit and here too, then propagage to conversation_cubit
// xxx should just be a 'get' like in dht_short_array_cubit
}

11
packages/veilid_support/lib/dht_support/src/dht_short_array.dart
View File

@ -721,21 +721,18 @@ class DHTShortArray {
}
// Called when a head or linked record changes
Future<void> _onUpdateRecord(VeilidUpdateValueChange update) async {
final record = _head.linkedRecords.firstWhere(
(element) => element.key == update.key,
orElse: () => _headRecord);
Future<void> _onUpdateRecord(
DHTRecord record, Uint8List data, List<ValueSubkeyRange> subkeys) async {
// If head record subkey zero changes, then the layout
// of the dhtshortarray has changed
var updateHead = false;
if (record == _headRecord && update.subkeys.containsSubkey(0)) {
if (record == _headRecord && subkeys.containsSubkey(0)) {
updateHead = true;
}
// If we have any other subkeys to update, do them first
final unord = List<Future<Uint8List?>>.empty(growable: true);
for (final skr in update.subkeys) {
for (final skr in subkeys) {
for (var subkey = skr.low; subkey <= skr.high; subkey++) {
// Skip head subkey
if (subkey == 0) {