Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions lib/src/flagsmith_client.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import 'dart:async';
import 'dart:convert';

import 'package:collection/collection.dart' show IterableExtension;
import 'package:dio/dio.dart';
import 'package:flutter_client_sse/constants/sse_request_type_enum.dart';
import 'package:flutter_client_sse/flutter_client_sse.dart';
import 'package:rxdart/subjects.dart';
import 'package:dio/dio.dart';

import '../flagsmith.dart';

Expand Down Expand Up @@ -35,10 +36,10 @@ class FlagsmithClient {
late StorageProvider storageProvider;
CoreStorage? storage;
late Dio _api;
final Set<Flag> _flags = {};
final Map<String, Flag> _flags = {};
final List<Flag> seeds;

Set<Flag> get cachedFlags => _flags;
Map<String, Flag> get cachedFlags => _flags;

//A map of flag names to the amount of times they have been evaluated in the last 10 seconds
final Map<String, int> flagAnalytics = {};
Expand Down Expand Up @@ -290,9 +291,8 @@ class FlagsmithClient {
throw FlagsmithConfigException(Exception('caches are NOT enabled!'));
}

var feature = _flags.firstWhereOrNull((element) =>
element.feature.name == featureName && element.enabled == true);
return feature != null;
final feature = cachedFlags[featureName];
return feature?.enabled == true;
}

/// Check if Feature flag exist and is enabled
Expand Down Expand Up @@ -336,8 +336,7 @@ class FlagsmithClient {
log('Exception: caches are NOT enabled!');
throw FlagsmithConfigException(Exception('caches are NOT enabled!'));
}
var feature = cachedFlags
.firstWhereOrNull((element) => element.feature.name == featureId);
final feature = cachedFlags[featureId];
_incrementFlagAnalytics(feature);
return feature?.stateValue;
}
Expand All @@ -357,7 +356,7 @@ class FlagsmithClient {
Future<bool> removeFeatureFlag(String featureName) async {
var result = await storageProvider.delete(featureName);
if (config.caches) {
_flags.removeWhere((element) => element.feature.name == featureName);
_flags.remove(featureName);
}
return result;
}
Expand Down Expand Up @@ -539,11 +538,11 @@ class FlagsmithClient {

/// Internal updadte caches from list of featurs
void _updateCaches({List<Flag> list = const <Flag>[]}) {
if (config.caches) {
_flags
..clear()
..addAll(list.toSet());
if (!config.caches) {
return;
}
_flags.clear();
_flags.addEntries(list.map((flag) => MapEntry(flag.feature.name, flag)));
}

/// clear all data from storage
Expand Down Expand Up @@ -573,11 +572,10 @@ class FlagsmithClient {
///
Future<bool> testToggle(String featureName) async {
final result = await storageProvider.togggleFeature(featureName);
final value = await storageProvider.read(featureName);
if (config.caches) {
_flags.removeWhere((element) => element.feature.name == featureName);
final value = await storageProvider.read(featureName);
if (value != null) {
_flags.add(value);
_flags[featureName] = value;
}
}
return result;
Expand Down
1 change: 1 addition & 0 deletions test/fg/flagsmith_caches_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ void main() {

var result = await fs.removeFeatureFlag(featureName);
expect(result, true);
expect(fs.cachedFlags.containsKey(featureName), false);

final removed = await fs.hasFeatureFlag(featureName);
expect(removed, false);
Expand Down