Git-Mirrors/veilidchat
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilidchat.git synced 2024-10-01 06:55:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix DHTRecordCubit open() retry bug

Browse Source 
improve error state reporting for cubits
This commit is contained in:
Christien Rioux 2024-08-03 19:12:25 -05:00
parent ab9838f375
commit 83880d79ba
14 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/chat/cubits/chat_component_cubit.dart
View File

@ -358,6 +358,7 @@ class ChatComponentCubit extends Cubit<ChatComponentState> {
final asError = avMessagesState.asError;
if (asError != null) {
addError(asError.error, asError.stackTrace);
return currentState.copyWith(
unknownUsers: const IMap.empty(),
messageWindow: AsyncValue.error(asError.error, asError.stackTrace));

1
lib/chat/cubits/single_contact_messages_cubit.dart
View File

@ -180,6 +180,7 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
_reconciliation = MessageReconciliation(
output: _reconciledMessagesCubit!,
onError: (e, st) {
addError(e, st);
emit(AsyncValue.error(e, st));
});

1
lib/chat/views/empty_chat_widget.dart
View File

@ -7,7 +7,6 @@ class EmptyChatWidget extends StatelessWidget {
const EmptyChatWidget({super.key});
@override
// ignore: prefer_expression_function_bodies
Widget build(
BuildContext context,
) {

1
lib/conversation/cubits/active_single_contact_chat_bloc_map_cubit.dart
View File

@ -105,6 +105,7 @@ class ActiveSingleContactChatBlocMapCubit extends BlocMapCubit<TypedKey,
} else {
final (error, stackTrace) =
(newValue.asError!.error, newValue.asError!.stackTrace);
addError(error, stackTrace);
await addState(key, AsyncValue.error(error, stackTrace));
}
}

1
packages/veilid_support/lib/dht_support/src/dht_log/dht_log_cubit.dart
View File

@ -58,6 +58,7 @@ class DHTLogCubit<T> extends Cubit<DHTLogBusyState<T>>
}
}
} on Exception catch (e, st) {
addError(e, st);
emit(DHTLogBusyState(AsyncValue.error(e, st)));
return;
}

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

@ -35,6 +35,7 @@ abstract class DHTRecordCubit<T> extends Cubit<AsyncValue<T>> {
}
}
} on Exception catch (e, st) {
addError(e, st);
emit(AsyncValue.error(e, st));
return;
}
@ -53,8 +54,9 @@ abstract class DHTRecordCubit<T> extends Cubit<AsyncValue<T>> {
if (initialState != null) {
emit(AsyncValue.data(initialState));
}
} on Exception catch (e) {
emit(AsyncValue.error(e));
} on Exception catch (e, st) {
addError(e, st);
emit(AsyncValue.error(e, st));
}
_subscription = await record!.listen((record, data, subkeys) async {
@ -63,8 +65,9 @@ abstract class DHTRecordCubit<T> extends Cubit<AsyncValue<T>> {
if (newState != null) {
emit(AsyncValue.data(newState));
}
} on Exception catch (e) {
emit(AsyncValue.error(e));
} on Exception catch (e, st) {
addError(e, st);
emit(AsyncValue.error(e, st));
}
});

4
packages/veilid_support/lib/dht_support/src/dht_record/dht_record_pool.dart
View File

@ -402,11 +402,13 @@ class DHTRecordPool with TableDBBackedJson<DHTRecordPoolAllocations> {
recordDescriptor =
await dhtctx.openDHTRecord(recordKey, writer: writer);
break;
} on VeilidAPIExceptionTryAgain {
throw const DHTExceptionNotAvailable();
} on VeilidAPIExceptionKeyNotFound {
await asyncSleep();
retry--;
if (retry == 0) {
throw DHTExceptionNotAvailable();
throw const DHTExceptionNotAvailable();
}
}
}

6
packages/veilid_support/lib/dht_support/src/dht_short_array/dht_short_array_cubit.dart
View File

@ -46,6 +46,7 @@ class DHTShortArrayCubit<T> extends Cubit<DHTShortArrayBusyState<T>>
}
}
} on Exception catch (e, st) {
addError(e, st);
emit(DHTShortArrayBusyState<T>(AsyncValue.error(e, st)));
return;
}
@ -96,8 +97,9 @@ class DHTShortArrayCubit<T> extends Cubit<DHTShortArrayBusyState<T>>
}
emit(AsyncValue.data(newState));
setRefreshed();
} on Exception catch (e) {
emit(AsyncValue.error(e));
} on Exception catch (e, st) {
addError(e, st);
emit(AsyncValue.error(e, st));
}
}

10
packages/veilid_support/lib/src/async_table_db_backed_cubit.dart
View File

@ -27,8 +27,9 @@ abstract class AsyncTableDBBackedCubit<T> extends Cubit<AsyncValue<T?>>
await _mutex.protect(() async {
emit(AsyncValue.data(await load()));
});
} on Exception catch (e, stackTrace) {
emit(AsyncValue.error(e, stackTrace));
} on Exception catch (e, st) {
addError(e, st);
emit(AsyncValue.error(e, st));
}
}
@ -37,8 +38,9 @@ abstract class AsyncTableDBBackedCubit<T> extends Cubit<AsyncValue<T?>>
await _initWait();
try {
emit(AsyncValue.data(await store(newState)));
} on Exception catch (e, stackTrace) {
emit(AsyncValue.error(e, stackTrace));
} on Exception catch (e, st) {
addError(e, st);
emit(AsyncValue.error(e, st));
}
}

2
packages/veilid_support/lib/src/table_db_array_protobuf_cubit.dart
View File

@ -92,6 +92,7 @@ class TableDBArrayProtobufCubit<T extends GeneratedMessage>
final avElements = await _loadElements(_tail, _count);
final err = avElements.asError;
if (err != null) {
addError(err.error, err.stackTrace);
emit(AsyncValue.error(err.error, err.stackTrace));
return;
}
@ -123,6 +124,7 @@ class TableDBArrayProtobufCubit<T extends GeneratedMessage>
final allItems = (await _array.getRange(start, end)).toIList();
return AsyncValue.data(allItems);
} on Exception catch (e, st) {
addError(e, st);
return AsyncValue.error(e, st);
}
}

6
packages/veilid_support/pubspec.lock
View File

@ -53,10 +53,10 @@ packages:
dependency: "direct main"
description:
name: bloc_advanced_tools
sha256: "2b2dd492a350e7192a933d09f15ea04d5d00e7bd3fe2a906fe629cd461ddbf94"
sha256: "2ad82be752ab5e983ad9097ed9f334e47a4472c04d5c6b61c99a1bb14a039053"
url: "https://pub.dev"
source: hosted
version: "0.1.5"
version: "0.1.6"
boolean_selector:
dependency: transitive
description:
@ -718,7 +718,7 @@ packages:
path: "../../../veilid/veilid-flutter"
relative: true
source: path
version: "0.3.3"
version: "0.3.4"
vm_service:
dependency: transitive
description:

8
packages/veilid_support/pubspec.yaml
View File

@ -9,7 +9,7 @@ environment:
dependencies:
async_tools: ^0.1.5
bloc: ^8.1.4
bloc_advanced_tools: ^0.1.5
bloc_advanced_tools: ^0.1.6
charcode: ^1.3.1
collection: ^1.18.0
equatable: ^2.0.5
@ -26,11 +26,11 @@ dependencies:
# veilid: ^0.0.1
path: ../../../veilid/veilid-flutter
# dependency_overrides:
#dependency_overrides:
# async_tools:
# path: ../../../dart_async_tools
# bloc_advanced_tools:
# path: ../../../bloc_advanced_tools
# bloc_advanced_tools:
# path: ../../../bloc_advanced_tools
dev_dependencies:
build_runner: ^2.4.10

4
pubspec.lock
View File

@ -141,10 +141,10 @@ packages:
dependency: "direct main"
description:
name: bloc_advanced_tools
sha256: "2b2dd492a350e7192a933d09f15ea04d5d00e7bd3fe2a906fe629cd461ddbf94"
sha256: "2ad82be752ab5e983ad9097ed9f334e47a4472c04d5c6b61c99a1bb14a039053"
url: "https://pub.dev"
source: hosted
version: "0.1.5"
version: "0.1.6"
blurry_modal_progress_hud:
dependency: "direct main"
description:

6
pubspec.yaml
View File

@ -19,7 +19,7 @@ dependencies:
badges: ^3.1.2
basic_utils: ^5.7.0
bloc: ^8.1.4
bloc_advanced_tools: ^0.1.5
bloc_advanced_tools: ^0.1.6
blurry_modal_progress_hud: ^1.1.1
change_case: ^2.1.0
charcode: ^1.3.1
@ -114,8 +114,8 @@ dependencies:
# dependency_overrides:
# async_tools:
# path: ../dart_async_tools
# bloc_advanced_tools:
# path: ../bloc_advanced_tools
# bloc_advanced_tools:
# path: ../bloc_advanced_tools
# searchable_listview:
# path: ../Searchable-Listview
# flutter_chat_ui: