Merge pull request #14 from growthbook/fix/sse-connection-and-prepare…

…-features sse connection and prepare features data fix
growthbook · May 10, 2024 · e76f5fe · e76f5fe
2 parents 162d04f + d345c90
commit e76f5fe
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 181 deletions.
diff --git a/lib/src/Features/features_view_model.dart b/lib/src/Features/features_view_model.dart
@@ -27,8 +27,10 @@ class FeatureViewModel {
   Future<void> connectBackgroundSync() async {
     await source.fetchFeatures(
       featureRefreshStrategy: FeatureRefreshStrategy.SERVER_SENT_EVENTS,
-      (data) => delegate.featuresFetchedSuccessfully(
-          gbFeatures: data.features, isRemote: false),
+      (data) {
+        delegate.featuresFetchedSuccessfully(gbFeatures: data.features!, isRemote: false);
+        prepareFeaturesData(data);
+      },
       (e, s) => delegate.featuresFetchFailed(
         error: GBError(
           error: e,
@@ -39,16 +41,14 @@ class FeatureViewModel {
     );
   }
 
-  Future<void> fetchFeatures(String? apiUrl,
-      {bool remoteEval = false, RemoteEvalModel? payload}) async {
-    final receivedData =
-        await manager.getContent(fileName: Constant.featureCache);
+  Future<void> fetchFeatures(String? apiUrl, {bool remoteEval = false, RemoteEvalModel? payload}) async {
+    final receivedData = await manager.getContent(fileName: Constant.featureCache);
 
     if (receivedData == null) {
       await source.fetchFeatures(
         (data) {
           delegate.featuresFetchedSuccessfully(
-            gbFeatures: data.features,
+            gbFeatures: data.features!,
             isRemote: false,
           );
           cacheFeatures(data);
@@ -63,10 +63,20 @@ class FeatureViewModel {
       );
     } else {
       String receivedDataJson = utf8Decoder.convert(receivedData);
-      final receivedDataJsonMap = json.decode(receivedDataJson);
-      final data = FeaturedDataModel.fromJson(receivedDataJsonMap);
-      delegate.featuresFetchedSuccessfully(
-          gbFeatures: data.features, isRemote: false);
+      final receiveFeatureJsonMap = json.decode(receivedDataJson);
+      Map<String, GBFeature> featureMap = {};
+
+      if (encryptionKey.isNotEmpty) {
+        receiveFeatureJsonMap.forEach((key, value) {
+          if (value is Map<String, dynamic>) {
+            featureMap[key] = GBFeature.fromJson(value);
+          }
+        });
+      } else {
+        featureMap = FeaturedDataModel.fromJson(receiveFeatureJsonMap).features ?? {};
+      }
+
+      delegate.featuresFetchedSuccessfully(gbFeatures: featureMap, isRemote: false);
     }
 
     if (apiUrl != null) {
@@ -105,7 +115,7 @@ class FeatureViewModel {
 
   void prepareFeaturesData(FeaturedDataModel data) {
     try {
-      if (data.features.isEmpty) {
+      if (data.features == null && data.encryptedFeatures == null) {
         log("JSON is null.");
       } else {
         handleValidFeatures(data);
@@ -116,23 +126,21 @@ class FeatureViewModel {
   }
 
   void handleValidFeatures(FeaturedDataModel data) {
-    if (data.features.isNotEmpty) {
+    if (data.features != null && data.features!.isNotEmpty) {
       delegate.featuresAPIModelSuccessfully(data);
-      // todo manager content save
-      //    manager.putData(fileName: Constant.featureCache, content: utf8.encode(data.features.toString()));
-      delegate.featuresFetchedSuccessfully(
-          gbFeatures: data.features, isRemote: true);
+      String jsonString = json.encode(data.toJson());
+      final bytes = utf8Encoder.convert(jsonString);
+      manager.putData(fileName: Constant.featureCache, content: bytes);
+      delegate.featuresFetchedSuccessfully(gbFeatures: data.features!, isRemote: true);
     } else {
-      handleInvalidFeatures(data.features);
+      if (data.encryptedFeatures != null) {
+        handleEncryptedFeatures(data.encryptedFeatures!);
+      }
     }
   }
 
-  void handleInvalidFeatures(Map<String, dynamic>? jsonPetitions) {
-    final encryptedString = jsonPetitions?["encryptedFeatures"];
-
-    if (encryptedString == null ||
-        encryptedString is! String ||
-        encryptedString.isEmpty) {
+  void handleEncryptedFeatures(String encryptedFeatures) {
+    if (encryptedFeatures.isEmpty) {
       logError("Failed to parse encrypted data.");
       return;
     }
@@ -145,13 +153,12 @@ class FeatureViewModel {
     try {
       final crypto = Crypto();
       final extractedFeatures = crypto.getFeaturesFromEncryptedFeatures(
-        encryptedString,
+        encryptedFeatures,
         encryptionKey,
       );
 
       if (extractedFeatures != null) {
-        delegate.featuresFetchedSuccessfully(
-            gbFeatures: extractedFeatures, isRemote: false);
+        delegate.featuresFetchedSuccessfully(gbFeatures: extractedFeatures, isRemote: false);
         final featureData = utf8Encoder.convert(jsonEncode(extractedFeatures));
         final featureDataOnUint8List = Uint8List.fromList(featureData);
         manager.putData(
@@ -187,7 +194,6 @@ class FeatureViewModel {
   }
 
   void cacheFeatures(FeaturedDataModel data) {
-    // final GBFeatures features = data.toJson(); //.features;
     String jsonString = json.encode(data.toJson());
     final bytes = utf8Encoder.convert(jsonString);
 

diff --git a/lib/src/Model/features_model.dart b/lib/src/Model/features_model.dart
@@ -6,14 +6,17 @@ part 'features_model.g.dart';
 
 @JsonSerializable()
 class FeaturedDataModel {
-  FeaturedDataModel({required this.features});
+  FeaturedDataModel({
+    required this.features,
+    required this.encryptedFeatures,
+  });
 
   @GBFeaturesConverter()
-  final GBFeatures features;
+  final GBFeatures? features;
 
-  factory FeaturedDataModel.fromJson(Map<String, dynamic> json) =>
-      _$FeaturedDataModelFromJson(json);
+  final String? encryptedFeatures;
 
-  Map<String, dynamic> toJson() =>
-   _$FeaturedDataModelToJson(this);     
+  factory FeaturedDataModel.fromJson(Map<String, dynamic> json) => _$FeaturedDataModelFromJson(json);
+
+  Map<String, dynamic> toJson() => _$FeaturedDataModelToJson(this);
 }
diff --git a/lib/src/Model/features_model.g.dart b/lib/src/Model/features_model.g.dart
diff --git a/lib/src/Network/network.dart b/lib/src/Network/network.dart
@@ -38,8 +38,6 @@ class DioClient extends BaseClient {
 
   Dio get client => _dio;
 
-  bool errorOccurred = false;
-
   Future<void> listenAndRetry({
     required Dio dio,
     required String path,
@@ -53,13 +51,10 @@ class DioClient extends BaseClient {
       );
 
       final data = resp.data;
+      final statusCode = resp.statusCode;
 
       if (data is ResponseBody) {
-        data.stream
-            .cast<List<int>>()
-            .transform(const Utf8Decoder())
-            .transform(const SseEventTransformer())
-            .listen(
+        data.stream.cast<List<int>>().transform(const Utf8Decoder()).transform(const SseEventTransformer()).listen(
           (sseModel) {
             if (sseModel.name == "features") {
               String jsonData = sseModel.data ?? "";
@@ -69,21 +64,9 @@ class DioClient extends BaseClient {
           },
           onError: (dynamic e, dynamic s) async {
             onError;
-
-            if (!errorOccurred) {
-              errorOccurred = true;
-              await Future.delayed(const Duration(seconds: 5));
-              await listenAndRetry(
-                dio: dio,
-                onError: onError,
-                onSuccess: onSuccess,
-                path: path,
-              );
-            }
           },
           onDone: () async {
-            if (!errorOccurred) {
-              await Future.delayed(const Duration(seconds: 5));
+            if (statusCode != null && shouldReconnect(statusCode)) {
               await listenAndRetry(
                 dio: dio,
                 onError: onError,
@@ -96,19 +79,13 @@ class DioClient extends BaseClient {
       }
     } catch (error) {
       onError;
-      if (!errorOccurred) {
-        errorOccurred = true;
-        await Future.delayed(const Duration(seconds: 5));
-        await listenAndRetry(
-          dio: dio,
-          onError: onError,
-          onSuccess: onSuccess,
-          path: path,
-        );
-      }
     }
   }
 
+  bool shouldReconnect(int statusCode) {
+    return statusCode >= 200 && statusCode < 300;
+  }
+
   @override
   Future<void> consumeGetRequest(
     String baseUrl,

diff --git a/lib/src/Network/see_client.dart b/lib/src/Network/see_client.dart