fix: update cmab retry configuration

- Update max retries from 3 to 1 in CmabRetryConfig struct

feat: add default values for cmab cache in DefaultCmabService

- Add constants for DEFAULT_CMAB_CACHE_TIMEOUT and DEFAULT_CMAB_CACHE_SIZE
- Assign DEFAULT_CMAB_CACHE_SIZE as 100 and DEFAULT_CMAB_CACHE_TIMEOUT as 600
- Change access control of cmabCache property to 'let' in DefaultCmabService

feat: allow custom cache size and timeout for cmab cache in DefaultCmabService

- Add new static function createDefault with parameters for cache size and timeout
- Implement creation of DefaultCmabService with custom cache size and timeout

feat: add cmab cache settings to OptimizelySdkSettings

- Add cmabCacheSize and cmabCacheTitmeoutInSecs properties to OptimizelySdkSettings struct
- Initialize properties with default values and update init method

fix: update cmab cache settings initialization in OptimizelyClient

- Update initialization of cmabService with size and timeout values from sdkSettings

chore: refactor tests for cmab cache settings in OptimizelyClientTests_ODP

- Modify test cases to check the cmabCacheSize and cmabCacheTitmeoutInSecs values

build: remove unnecessary code from FakeDecisionService

- Remove empty lines for cleanliness

refactor: improve parameter passing in FakeDecisionService constructor

- Modify the constructor to pass cmabService parameter explicitly in super.init

Author: muzahidul-opti

Sources/CMAB/CmabClient.swift

@@ -32,7 +32,7 @@ enum CmabClientError: Error, Equatable {
 }
 
 struct CmabRetryConfig {
-    var maxRetries: Int = 3
+    var maxRetries: Int = 1
     var initialBackoff: TimeInterval = 0.1 // seconds
     var maxBackoff: TimeInterval = 10.0 // seconds
     var backoffMultiplier: Double = 2.0

Sources/CMAB/CmabService.swift

@@ -41,11 +41,14 @@ protocol CmabService {
                      completion: @escaping CmabDecisionCompletionHandler)
 }
 
+let DEFAULT_CMAB_CACHE_TIMEOUT = 600 // secs
+let DEFAULT_CMAB_CACHE_SIZE = 100
+
 class DefaultCmabService: CmabService {
     typealias UserAttributes = [String : Any?]
 
     private let cmabClient: CmabClient
-    private let cmabCache: LruCache<String, CmabCacheValue>
+    let cmabCache: LruCache<String, CmabCacheValue>
     private let logger = OPTLoggerFactory.getLogger()
 
     init(cmabClient: CmabClient, cmabCache: LruCache<String, CmabCacheValue>) {
@@ -178,9 +181,12 @@ class DefaultCmabService: CmabService {
 
 extension DefaultCmabService {
     static func createDefault() -> DefaultCmabService {
-        let DEFAULT_CMAB_CACHE_TIMEOUT = 30 * 60 * 1000  // 30 minutes in milliseconds
-        let DEFAULT_CMAB_CACHE_SIZE = 1000
         let cache = LruCache<String, CmabCacheValue>(size: DEFAULT_CMAB_CACHE_SIZE, timeoutInSecs: DEFAULT_CMAB_CACHE_TIMEOUT)
         return DefaultCmabService(cmabClient: DefaultCmabClient(), cmabCache: cache)
     }
+    
+    static func createDefault(cacheSize: Int, cacheTimeout: Int) -> DefaultCmabService {
+        let cache = LruCache<String, CmabCacheValue>(size: cacheSize, timeoutInSecs: cacheTimeout)
+        return DefaultCmabService(cmabClient: DefaultCmabClient(), cmabCache: cache)
+    }
 }

Sources/ODP/OptimizelySdkSettings.swift

@@ -25,18 +25,25 @@ public struct OptimizelySdkSettings {
     let timeoutForSegmentFetchInSecs: Int
     /// The timeout in seconds of odp event dispatch - OS default timeout will be used if this is set to zero.
     let timeoutForOdpEventInSecs: Int
+    /// The maximum size of cmab  cache
+    let cmabCacheSize: Int
+    /// The timeout in seconds of cmab cache
+    let cmabCacheTitmeoutInSecs: Int
     /// ODP features are disabled if this is set to true.
     let disableOdp: Bool
     /// VUID is enabled if this is set to true.
     let enableVuid: Bool
 
+    
     /// Optimizely SDK Settings
     ///
     /// - Parameters:
     ///   - segmentsCacheSize: The maximum size of audience segments cache (optional. default = 100). Set to zero to disable caching.
     ///   - segmentsCacheTimeoutInSecs: The timeout in seconds of audience segments cache (optional. default = 600). Set to zero to disable timeout.
     ///   - timeoutForSegmentFetchInSecs: The timeout in seconds of odp segment fetch (optional. default = 10) - OS default timeout will be used if this is set to zero.
     ///   - timeoutForOdpEventInSecs: The timeout in seconds of odp event dispatch (optional. default = 10) - OS default timeout will be used if this is set to zero.
+    ///   - cmabCacheSize: The maximum size of cmab cache (optional. default = 100). Set to zero to disable caching.
+    ///   - cmabCacheTitmeoutInSecs: The timeout in seconds of amb cache (optional. default = 600). Set to zero to disable timeout.
     ///   - disableOdp: Set this flag to true (default = false) to disable ODP features
     ///   - enableVuid: Set this flag to true (default = false) to enable vuid.
     ///   - sdkName: Set this flag to override sdkName included in events
@@ -45,12 +52,16 @@ public struct OptimizelySdkSettings {
                 segmentsCacheTimeoutInSecs: Int = 600,
                 timeoutForSegmentFetchInSecs: Int = 10,
                 timeoutForOdpEventInSecs: Int = 10,
+                cmabCacheSize: Int = 100,
+                cmabCacheTitmeoutInSecs: Int = 600,
                 disableOdp: Bool = false,
                 enableVuid: Bool = false,
                 sdkName: String? = nil,
                 sdkVersion: String? = nil) {
         self.segmentsCacheSize = segmentsCacheSize
         self.segmentsCacheTimeoutInSecs = segmentsCacheTimeoutInSecs
+        self.cmabCacheSize = cmabCacheSize
+        self.cmabCacheTitmeoutInSecs = cmabCacheTitmeoutInSecs
         self.timeoutForSegmentFetchInSecs = timeoutForSegmentFetchInSecs
         self.timeoutForOdpEventInSecs = timeoutForOdpEventInSecs
         self.disableOdp = disableOdp

Sources/Optimizely/OptimizelyClient.swift

@@ -108,7 +108,7 @@ open class OptimizelyClient: NSObject {
         let logger = logger ?? DefaultLogger()
         type(of: logger).logLevel = defaultLogLevel ?? .info
 
-        let cmabService = DefaultCmabService.createDefault()
+        let cmabService = DefaultCmabService.createDefault(cacheSize: self.sdkSettings.cmabCacheSize, cacheTimeout: self.sdkSettings.cmabCacheTitmeoutInSecs)
 
         self.registerServices(sdkKey: sdkKey,
                               logger: logger,

Tests/OptimizelyTests-APIs/OptimizelyClientTests_ODP.swift

@@ -37,7 +37,9 @@ class OptimizelyClientTests_ODP: XCTestCase {
 
     func testSdkSettings_default()  {
         let optimizely = OptimizelyClient(sdkKey: OTUtils.randomSdkKey)
-
+        let cmabCache = ((optimizely.decisionService as! DefaultDecisionService).cmabService as! DefaultCmabService).cmabCache
+        XCTAssertEqual(100, cmabCache.maxSize)
+        XCTAssertEqual(600, cmabCache.timeoutInSecs)
         XCTAssertEqual(100, optimizely.odpManager.segmentManager?.segmentsCache.maxSize)
         XCTAssertEqual(600, optimizely.odpManager.segmentManager?.segmentsCache.timeoutInSecs)
         XCTAssertEqual(10, optimizely.odpManager.segmentManager?.apiMgr.resourceTimeoutInSecs)
@@ -47,8 +49,13 @@ class OptimizelyClientTests_ODP: XCTestCase {
 
     func testSdkSettings_custom()  {
         var sdkSettings = OptimizelySdkSettings(segmentsCacheSize: 12,
-                                                segmentsCacheTimeoutInSecs: 345)
+                                                segmentsCacheTimeoutInSecs: 345,
+                                                cmabCacheSize: 50,
+                                                cmabCacheTitmeoutInSecs: 120)
         var optimizely = OptimizelyClient(sdkKey: OTUtils.randomSdkKey, settings: sdkSettings)
+        let cmabCache = ((optimizely.decisionService as! DefaultDecisionService).cmabService as! DefaultCmabService).cmabCache
+        XCTAssertEqual(50, cmabCache.maxSize)
+        XCTAssertEqual(120, cmabCache.timeoutInSecs)
         XCTAssertEqual(12, optimizely.odpManager.segmentManager?.segmentsCache.maxSize)
         XCTAssertEqual(345, optimizely.odpManager.segmentManager?.segmentsCache.timeoutInSecs)
 

Tests/OptimizelyTests-Common/DecisionListenerTests.swift

@@ -1246,13 +1246,12 @@ class FakeManager: OptimizelyClient {
 }
 
 class FakeDecisionService: DefaultDecisionService {
-    
     var experiment: Experiment?
     var variation: Variation?
     var source: String!
 
     override init(userProfileService: OPTUserProfileService, cmabService: CmabService = DefaultCmabService.createDefault()) {
-        super.init(userProfileService: DefaultUserProfileService())
+        super.init(userProfileService: DefaultUserProfileService(), cmabService: cmabService)
     }
 
     override func getVariationForFeature(config: ProjectConfig,