fix deserialize and http client

Author: frank06

lib/src/adapter/remote_adapter.dart

@@ -296,7 +296,7 @@ mixin _RemoteAdapter<T extends DataModelMixin<T>> on _SerializationAdapter<T> {
   /// as by default they are used once and then closed.
   @protected
   @visibleForTesting
-  http.Client get httpClient => ref.read(httpClientProvider);
+  http.Client get httpClient => ref.read(httpClientFactoryProvider).call();
 
   /// The function used to perform an HTTP request and return an [R].
   ///
@@ -498,8 +498,8 @@ mixin _RemoteAdapter<T extends DataModelMixin<T>> on _SerializationAdapter<T> {
         return label.model as R?;
       }
 
-      final data = await deserialize(body as Map<String, dynamic>,
-          key: label.model!._key);
+      final data =
+          deserialize(body as Map<String, dynamic>, key: label.model!._key);
       final model = data.model!;
 
       // if there has been a migration to a new key, delete the old one
@@ -530,8 +530,17 @@ mixin _RemoteAdapter<T extends DataModelMixin<T>> on _SerializationAdapter<T> {
       return response.body as R?;
     }
 
-    final deserialized = await deserializeAndSave(body);
-    deserialized._log(adapter, label);
+    final deserialized = await deserializeAsync(body, save: true);
+
+    adapter.log(
+        label, '${deserialized.models.toShortLog()} fetched from remote');
+    final groupedIncluded =
+        deserialized.included.groupListsBy((m) => m._adapter.type);
+    for (final e in groupedIncluded.entries) {
+      if (e.value.isNotEmpty) {
+        adapter.log(label, '  - with ${e.key} ${e.value.toShortLog()} ');
+      }
+    }
 
     if (isFindAll || (isCustom && deserialized.model == null)) {
       late R? models;
@@ -647,4 +656,5 @@ mixin _RemoteAdapter<T extends DataModelMixin<T>> on _SerializationAdapter<T> {
       {'Content-Type': 'application/json'};
 }
 
-final httpClientProvider = Provider<http.Client>((_) => http.Client());
+final httpClientFactoryProvider =
+    Provider<http.Client Function()>((_) => () => http.Client());

lib/src/adapter/serialization_adapter.dart

@@ -97,37 +97,31 @@ mixin _SerializationAdapter<T extends DataModelMixin<T>> on _BaseAdapter<T> {
 
   /// Returns a [DeserializedData] object when deserializing a given [data].
   ///
-  Future<DeserializedData<T>> deserialize(Object? data,
-      {String? key, bool async = true}) async {
-    final record = async
-        ? await runInIsolate(
-            (adapter) => adapter._deserialize(adapter, data, key: key))
-        : _deserialize(this as Adapter, data, key: key);
+  DeserializedData<T> deserialize(Object? data, {String? key}) {
+    final record = _deserialize(this as Adapter, data, key: key);
     return DeserializedData<T>(record.$1.cast<T>(), included: record.$2);
   }
 
-  Future<DeserializedData<T>> deserializeAndSave(Object? data,
-      {String? key, bool notify = true, bool ignoreReturn = false}) async {
-    final record = await runInIsolate<
-        (
-          List<DataModelMixin>,
-          List<DataModelMixin>,
-          List<String>
-        )>((adapter) async {
-      final emptyDm = <DataModelMixin>[];
-      final r = adapter._deserialize(adapter, data, key: key);
-      final models = [...r.$1, ...r.$2];
-      if (models.isEmpty) return (emptyDm, emptyDm, <String>[]);
-      final savedKeys = await adapter.saveManyLocal(models, async: false);
-      return ignoreReturn
-          ? (emptyDm, emptyDm, savedKeys!)
-          : (r.$1, r.$2, savedKeys!);
+  Future<DeserializedData<T>> deserializeAsync(Object? data,
+      {String? key,
+      bool save = false,
+      bool ignoreReturn = false,
+      bool notify = true}) async {
+    final record =
+        await runInIsolate<(DeserializedData?, List<String>)>((adapter) async {
+      final deserialized = adapter.deserialize(data, key: key);
+      if (deserialized.models.isEmpty || save == false)
+        return (deserialized, <String>[]);
+      final savedKeys = await adapter.saveManyLocal(
+          [...deserialized.models.cast(), ...deserialized.included],
+          async: false);
+      return ignoreReturn ? (null, savedKeys!) : (deserialized, savedKeys!);
     });
-    final (models, included, savedKeys) = record;
+    final (deserialized, savedKeys) = record;
     if (notify && savedKeys.isNotEmpty) {
       core._notify(savedKeys, type: DataGraphEventType.updateNode);
     }
-    return DeserializedData<T>(models.cast<T>(), included: included);
+    return (deserialized as DeserializedData<T>?) ?? DeserializedData<T>([]);
   }
 }
 
@@ -137,14 +131,4 @@ class DeserializedData<T extends DataModelMixin<T>> {
   final List<T> models;
   final List<DataModelMixin> included;
   T? get model => models.singleOrNull;
-
-  void _log(Adapter adapter, DataRequestLabel label) {
-    adapter.log(label, '${models.toShortLog()} fetched from remote');
-    final groupedIncluded = included.groupListsBy((m) => m._adapter.type);
-    for (final e in groupedIncluded.entries) {
-      if (e.value.isNotEmpty) {
-        adapter.log(label, '  - with ${e.key} ${e.value.toShortLog()} ');
-      }
-    }
-  }
 }

lib/src/model/relationship/has_many.dart

@@ -67,6 +67,8 @@ class HasMany<E extends DataModelMixin<E>> extends Relationship<E, Set<E>> {
 
   E get first => _iterable.first;
 
+  E? get safeFirst => isNotEmpty ? first : null;
+
   bool get isEmpty => length == 0;
 
   bool get isNotEmpty => length > 0;

test/_support/setup.dart

@@ -33,17 +33,17 @@ final logging = [];
 Future<void> setUpFn() async {
   container = ProviderContainer(
     overrides: [
-      httpClientProvider.overrideWith((ref) {
-        return MockClient((req) async {
-          final response = ref.watch(responseProvider);
-          final text = await response.callback(req);
-          if (text is String) {
-            return http.Response(text, response.statusCode,
-                headers: response.headers);
-          }
-          return http.Response.bytes(text as Uint8List, response.statusCode,
-              headers: response.headers);
-        });
+      httpClientFactoryProvider.overrideWith((ref) {
+        return () => MockClient((req) async {
+              final response = ref.watch(responseProvider);
+              final text = await response.callback(req);
+              if (text is String) {
+                return http.Response(text, response.statusCode,
+                    headers: response.headers);
+              }
+              return http.Response.bytes(text as Uint8List, response.statusCode,
+                  headers: response.headers);
+            });
       }),
       coreNotifierThrottleDurationProvider.overrideWithValue(Duration.zero),
       // NOTE: Can't enable in-memory sqlite as it can't be shared across isolates

test/model/relationship/relationship_test.dart

@@ -192,14 +192,13 @@ void main() async {
     expect(familia2.persons.toSet(), {brian});
 
     // new familia comes in from API (simulate) with no persons relationship information
-    final familia3 =
-        (await container.familia.deserialize({'id': '229', 'surname': 'Rose'}))
-            .model!;
+    final familia3 = (container.familia
+        .deserialize({'id': '229', 'surname': 'Rose'})).model!;
     // it should keep the relationships unaltered
     expect(familia3.persons.toSet(), {brian});
 
     // new familia comes in from API (simulate) with empty persons relationship
-    final familia4 = (await container.familia
+    final familia4 = (container.familia
             .deserialize({'id': '229', 'surname': 'Rose', 'persons': []}))
         .model!
         .saveLocal();

test/repository/remote_adapter_serialization_test.dart

@@ -71,14 +71,14 @@ void main() async {
   });
 
   test('serialize empty', () async {
-    final data = await container.people.deserialize(null);
+    final data = container.people.deserialize(null);
     expect(data.model, isNull);
-    final data2 = await container.people.deserialize('');
+    final data2 = container.people.deserialize('');
     expect(data2.model, isNull);
   });
 
   test('deserialize multiple', () async {
-    final data = await container.people.deserialize([
+    final data = container.people.deserialize([
       {'_id': '23', 'name': 'Ko', 'age': 24},
       {'_id': '26', 'name': 'Ze', 'age': 58}
     ]);
@@ -90,17 +90,15 @@ void main() async {
   });
 
   test('deserialize with BelongsTo id', () async {
-    final p = (await container.people.deserialize([
+    final p = (container.people.deserialize([
       {'_id': '1', 'name': 'Na', 'age': 88, 'familia': null}
-    ]))
-        .model!
-        .saveLocal();
+    ])).model!.saveLocal();
 
     Familia(id: '1', surname: 'Kong').saveLocal();
 
     expect(p.familia.key, isNull);
 
-    final p1d = await container.people.deserialize([
+    final p1d = container.people.deserialize([
       {'_id': '27', 'name': 'Ko', 'age': 24, 'familia': '332'}
     ]);
     final p1 = p1d.model!.saveLocal();
@@ -124,14 +122,14 @@ void main() async {
   });
 
   test('deserialize returns even if no ID is present', () async {
-    final data = await container.familia.deserialize([
+    final data = container.familia.deserialize([
       {'surname': 'Ko'}
     ]);
     expect(data.model, isNotNull);
   });
 
   test('deserialize with HasMany ids (including nulls)', () async {
-    final data = await container.familia.deserialize([
+    final data = container.familia.deserialize([
       {
         'id': '1',
         'surname': 'Ko',
@@ -150,7 +148,7 @@ void main() async {
   });
 
   test('deserialize with complex-named relationship', () async {
-    final data = await container.books.deserialize([
+    final data = container.books.deserialize([
       {
         'id': 1,
         'name': 'Ludwig',
@@ -160,7 +158,7 @@ void main() async {
   });
 
   test('deserialize with embedded relationships', () async {
-    final data = await container.familia.deserialize(
+    final data = container.familia.deserialize(
       [
         {
           'id': '1',
@@ -196,7 +194,7 @@ void main() async {
   });
 
   test('deserialize with nested embedded relationships', () async {
-    final data = await container.people.deserialize(
+    final data = container.people.deserialize(
       [
         {
           '_id': '1',
@@ -223,7 +221,7 @@ void main() async {
       () async {
     BookAuthor(id: 332, name: 'Zhung', books: HasMany()).saveLocal();
 
-    final deserialized = await container.books.deserialize([
+    final deserialized = container.books.deserialize([
       {'id': 27, 'title': 'Ko', 'original_author_id': 332}
     ]);
     final book = deserialized.model!.saveLocal();