Merge branch 'main' into streaming-host-update

Volodymyr Nazarkevych · Volodymyr Nazarkevych · commit 0c92b2e0993f · 2025-07-28T14:21:00.000+03:00
# Conflicts:
#	Sources/CommonMain/GrowthBookSDK.swift
diff --git a/GrowthBookTests/FeaturesViewModelTests.swift b/GrowthBookTests/FeaturesViewModelTests.swift
@@ -8,7 +8,7 @@ class FeaturesViewModelTests: XCTestCase, FeaturesFlowDelegate {
     var isError: Bool = false
     var hasFeatures: Bool = false
     
-    let cachingManager = CachingManager()
+    let cachingManager: CachingLayer = CachingManager()
     
     override func setUp() {
         super.setUp()
@@ -87,7 +87,8 @@ class FeaturesViewModelTests: XCTestCase, FeaturesFlowDelegate {
         
         let viewModel = FeaturesViewModel(delegate: self, dataSource: FeaturesDataSource(dispatcher: MockNetworkClient(successResponse: MockResponse().successResponseEncryptedFeatures, error: nil)), cachingManager: cachingManager)
         
-        viewModel.encryptionKey = "3tfeoyW0wlo47bDnbWDkxg=="
+        let encryptionKey = "3tfeoyW0wlo47bDnbWDkxg=="
+        viewModel.encryptionKey = encryptionKey
         viewModel.fetchFeatures(apiUrl: "")
 
         let cachingManager: CachingLayer = CachingManager()
@@ -97,7 +98,10 @@ class FeaturesViewModelTests: XCTestCase, FeaturesFlowDelegate {
             return
         }
         
-        if let _ = try? JSONDecoder().decode(Features.self, from: featureData) {
+        let crypto: CryptoProtocol = Crypto()
+        if let encryptedString = String(data: featureData, encoding: .utf8), crypto.getFeaturesFromEncryptedFeatures(encryptedString: encryptedString, encryptionKey: encryptionKey) != nil {
+            XCTAssertTrue(true)
+        } else if let _ = try? JSONDecoder().decode(Features.self, from: featureData) {
             XCTAssertTrue(true)
         } else {
             XCTFail()
diff --git a/GrowthBookTests/GrowthBookSDKBuilderTests.swift b/GrowthBookTests/GrowthBookSDKBuilderTests.swift
@@ -12,7 +12,7 @@ class GrowthBookSDKBuilderTests: XCTestCase {
     let testAttributes: JSON = JSON()
     let testKeyString = "Ns04T5n9+59rl2x3SlNHtQ=="
     
-    let cachingManager = CachingManager(apiKey: "4r23r324f23")
+    let cachingManager: CachingLayer = CachingManager(apiKey: "4r23r324f23")
     
     final class RefreshFlag: @unchecked Sendable {
         private let lock = NSLock()
@@ -281,4 +281,37 @@ class GrowthBookSDKBuilderTests: XCTestCase {
         
         XCTAssertEqual(2, countTrackingCallback)
     }
+    
+    func testAppendAttributes() throws {
+        let sdkInstance = GrowthBookBuilder(apiHost: testApiHost,
+                                            clientKey: testClientKey,
+                                            attributes: [:],
+                                            trackingCallback: { _, _ in },
+                                            refreshHandler: nil,
+                                            backgroundSync: false).initializer()
+        
+        
+        sdkInstance.setAttributes(attributes: ["name": "Alice"])
+        try sdkInstance.appendAttributes(attributes: ["age": 30])
+        
+        let result = sdkInstance.gbContext.attributes
+        XCTAssertEqual(result["name"].stringValue, "Alice")
+        XCTAssertEqual(result["age"].intValue, 30)
+        
+        
+        sdkInstance.setAttributes(attributes: ["user": ["id": 1, "name": "Alice"]])
+        try sdkInstance.appendAttributes(attributes: ["user": ["name": "Bob", "age": 25]])
+        
+        let user = sdkInstance.gbContext.attributes["user"]
+        XCTAssertEqual(user["id"].intValue, 1)
+        XCTAssertEqual(user["name"].stringValue, "Bob")
+        XCTAssertEqual(user["age"].intValue, 25)
+        
+        
+        sdkInstance.setAttributes(attributes: ["user": ["roles": ["admin", "editor"]]])
+        try sdkInstance.appendAttributes(attributes: ["user": ["roles": ["viewer"]]])
+
+        let roles = sdkInstance.gbContext.attributes["user"]["roles"].arrayValue.map { $0.stringValue }
+        XCTAssertEqual(roles, ["admin", "editor", "viewer"])
+    }
 }
diff --git a/Sources/CommonMain/Caching/CachingManager.swift b/Sources/CommonMain/Caching/CachingManager.swift
@@ -2,10 +2,13 @@ import Foundation
 import CommonCrypto
 
 /// Interface for Caching Layer
-public protocol CachingLayer: AnyObject {
+@objc public protocol CachingLayer: AnyObject {
     func saveContent(fileName: String, content: Data)
     func getContent(fileName: String) -> Data?
     func setCacheKey(_ key: String)
+    func clearCache()
+    func setSystemCacheDirectory(_ directory: CacheDirectory)
+    func setCustomCachePath(_ path: String)
 }
 
 /// This is actual implementation of Caching Layer in iOS
@@ -35,14 +38,6 @@ public protocol CachingLayer: AnyObject {
         let key = hash.map { String(format: "%02x", $0) }.joined()
         return String(key.prefix(5))
     }
-    
-    @objc func getData(fileName: String) -> Data? {
-        return getContent(fileName: fileName)
-    }
-
-    @objc func putData(fileName: String, content: Data) {
-        saveContent(fileName: fileName, content: content)
-    }
 
     /// Set a custom cache saving directory
     @objc public func setCustomCachePath(_ path: String) {
diff --git a/Sources/CommonMain/Evaluators/FeatureEvaluator.swift b/Sources/CommonMain/Evaluators/FeatureEvaluator.swift
@@ -33,6 +33,10 @@ class FeatureEvaluator {
         context.stackContext.evaluatedFeatures.insert(featureKey)
         context.stackContext.id = featureKey
         
+        defer {
+            context.stackContext.evaluatedFeatures.remove(featureKey)
+        }
+        
         if context.userContext.forcedFeatureValues?.dictionaryValue[featureKey] != nil {
             let value = context.userContext.forcedFeatureValues?[featureKey] ?? "nil"
             logger.info("Global override for forced feature with key: \(featureKey) and value \(value)")
diff --git a/Sources/CommonMain/Features/FeaturesViewModel.swift b/Sources/CommonMain/Features/FeaturesViewModel.swift
@@ -15,9 +15,9 @@ class FeaturesViewModel {
     let dataSource: FeaturesDataSource
     var encryptionKey: String?
     /// Caching Manager
-    let manager: CachingManager
+    let manager: CachingLayer
         
-    init(delegate: FeaturesFlowDelegate, dataSource: FeaturesDataSource, cachingManager: CachingManager) {
+    init(delegate: FeaturesFlowDelegate, dataSource: FeaturesDataSource, cachingManager: CachingLayer) {
         self.delegate = delegate
         self.dataSource = dataSource
         self.manager = cachingManager
@@ -40,37 +40,35 @@ class FeaturesViewModel {
         }
     }
     
-    private func fetchCachedFeatures() {
+    private func fetchCachedFeatures(logging: Bool = false) {
         // Check for cache data
-        if let json = manager.getData(fileName: Constants.featureCache) {
+        if let data = manager.getContent(fileName: Constants.featureCache) {
             let decoder = JSONDecoder()
-            if let features = try? decoder.decode(Features.self, from: json) {
+            if let encryptedString = String(data: data, encoding: .utf8), let encryptionKey, !encryptionKey.isEmpty {
+                let crypto: CryptoProtocol = Crypto()
+                if let features = crypto.getFeaturesFromEncryptedFeatures(encryptedString: encryptedString, encryptionKey: encryptionKey) {
+                    delegate?.featuresFetchedSuccessfully(features: features, isRemote: false)
+                } else {
+                    delegate?.featuresFetchFailed(error: .failedParsedEncryptedData, isRemote: false)
+                    if logging { logger.error("Failed get features from cached encrypted features") }
+                }
+            } else if let features = try? decoder.decode(Features.self, from: data) {
                 // Call Success Delegate with mention of data available but its not remote
                 delegate?.featuresFetchedSuccessfully(features: features, isRemote: false)
             } else {
                 delegate?.featuresFetchFailed(error: .failedParsedData, isRemote: false)
+                if logging { logger.error("Failed parse local data") }
             }
         } else {
             delegate?.featuresFetchFailed(error: .failedToLoadData, isRemote: false)
+            if logging { logger.info("Cache directory is empty. Nothing to fetch.") }
         }
     }
 
     /// Fetch Features
     func fetchFeatures(apiUrl: String?, remoteEval: Bool = false, payload: RemoteEvalParams? = nil) {
         // Check for cache data
-        if let json = manager.getData(fileName: Constants.featureCache) {
-            let decoder = JSONDecoder()
-            if let features = try? decoder.decode(Features.self, from: json) {
-                // Call Success Delegate with mention of data available but its not remote
-                delegate?.featuresFetchedSuccessfully(features: features, isRemote: false)
-            } else {
-                delegate?.featuresFetchFailed(error: .failedParsedData, isRemote: false)
-                logger.error("Failed parse local data")
-            }
-        } else {
-            delegate?.featuresFetchFailed(error: .failedToLoadData, isRemote: false)
-            logger.info("Cache directory is empty. Nothing to fetch.")
-        }
+        fetchCachedFeatures(logging: true)
         
         if let apiUrl = apiUrl {
             if remoteEval {
@@ -111,8 +109,8 @@ class FeaturesViewModel {
                 if let encryptionKey = encryptionKey, !encryptionKey.isEmpty {
                     let crypto: CryptoProtocol = Crypto()
                     if let features = crypto.getFeaturesFromEncryptedFeatures(encryptedString: encryptedString, encryptionKey: encryptionKey) {
-                        if let featureData = try? JSONEncoder().encode(features) {
-                            manager.putData(fileName: Constants.featureCache, content: featureData)
+                        if let featureData = encryptedString.data(using: .utf8) {
+                            manager.saveContent(fileName: Constants.featureCache, content: featureData)
                         } else {
                             logger.error("Failed encode features")
                         }
@@ -129,7 +127,7 @@ class FeaturesViewModel {
                 }
             } else if let features = jsonPetitions.features {
                 if let featureData = try? JSONEncoder().encode(features) {
-                    manager.putData(fileName: Constants.featureCache, content: featureData)
+                    manager.saveContent(fileName: Constants.featureCache, content: featureData)
                 }
                 delegate?.featuresFetchedSuccessfully(features: features, isRemote: true)
             } else {
@@ -141,8 +139,8 @@ class FeaturesViewModel {
             if let encryptedSavedGroups = jsonPetitions.encryptedSavedGroups, !encryptedSavedGroups.isEmpty, let encryptionKey = encryptionKey, !encryptionKey.isEmpty {
                 let crypto = Crypto()
                 if let savedGroups = crypto.getSavedGroupsFromEncryptedFeatures(encryptedString: encryptedSavedGroups, encryptionKey: encryptionKey) {
-                    if let encryptedSavedGroups = try? JSONEncoder().encode(savedGroups) {
-                        manager.putData(fileName: Constants.savedGroupsCache, content: encryptedSavedGroups)
+                    if let encryptedSavedGroups = encryptedSavedGroups.data(using: .utf8) {
+                        manager.saveContent(fileName: Constants.savedGroupsCache, content: encryptedSavedGroups)
                     } else {
                         logger.error("Failed encode saved groups")
                     }
@@ -154,7 +152,7 @@ class FeaturesViewModel {
                 }
             } else if let savedGroups = jsonPetitions.savedGroups {
                 if let savedGroupsData = try? JSONEncoder().encode(savedGroups) {
-                    manager.putData(fileName: Constants.savedGroupsCache, content: savedGroupsData)
+                    manager.saveContent(fileName: Constants.savedGroupsCache, content: savedGroupsData)
                 }
                 delegate?.savedGroupsFetchedSuccessfully(savedGroups: savedGroups, isRemote: true)
             }
diff --git a/Sources/CommonMain/GrowthBookSDK.swift b/Sources/CommonMain/GrowthBookSDK.swift
@@ -26,6 +26,8 @@ public struct GrowthBookModel {
     var stickyBucketService: StickyBucketServiceProtocol?
     var backgroundSync: Bool
     var remoteEval: Bool
+    var apiRequestHeaders: [String: String]? = nil
+    var streamingHostRequestHeaders: [String: String]? = nil
 }
 
 /// GrowthBookBuilder - inItializer for GrowthBook SDK for Apps
@@ -39,23 +41,57 @@ public struct GrowthBookModel {
     private var refreshHandler: CacheRefreshHandler?
     private var networkDispatcher: NetworkProtocol = CoreNetworkClient()
     
-    private var cachingManager: CachingManager
+    private var cachingManager: CachingLayer
 
-    @objc public init(apiHost: String? = nil, clientKey: String? = nil, encryptionKey: String? = nil, attributes: [String: Any], features: Data? = nil, trackingCallback: @escaping TrackingCallback, refreshHandler: CacheRefreshHandler? = nil, backgroundSync: Bool = false, remoteEval: Bool = false) {
-        growthBookBuilderModel = GrowthBookModel(apiHost: apiHost, clientKey: clientKey, encryptionKey: encryptionKey, features: features, attributes: JSON(attributes), trackingClosure: trackingCallback, backgroundSync: backgroundSync, remoteEval: remoteEval)
+    @objc public init(
+        apiHost: String? = nil,
+        clientKey: String? = nil,
+        encryptionKey: String? = nil,
+        attributes: [String: Any],
+        features: Data? = nil,
+        trackingCallback: @escaping TrackingCallback,
+        refreshHandler: CacheRefreshHandler? = nil,
+        backgroundSync: Bool = false,
+        remoteEval: Bool = false,
+        apiRequestHeaders: [String: String]? = nil,
+        streamingHostRequestHeaders: [String: String]? = nil
+    ) {
+        growthBookBuilderModel = GrowthBookModel(
+            apiHost: apiHost,
+            clientKey: clientKey,
+            encryptionKey: encryptionKey,
+            features: features,
+            attributes: JSON(attributes),
+            trackingClosure: trackingCallback,
+            backgroundSync: backgroundSync,
+            remoteEval: remoteEval,
+            apiRequestHeaders: apiRequestHeaders,
+            streamingHostRequestHeaders: streamingHostRequestHeaders)
         self.refreshHandler = refreshHandler
+        self.networkDispatcher = CoreNetworkClient(
+                    apiRequestHeaders: apiRequestHeaders ?? [:],
+                    streamingHostRequestHeaders: streamingHostRequestHeaders ?? [:]
+                )
         self.cachingManager = CachingManager(apiKey: clientKey)
     }
 
-    @objc public init(features: Data, attributes: [String: Any], trackingCallback: @escaping TrackingCallback, refreshHandler: CacheRefreshHandler? = nil, backgroundSync: Bool, remoteEval: Bool = false) {
-        growthBookBuilderModel = GrowthBookModel(features: features, attributes: JSON(attributes), trackingClosure: trackingCallback, backgroundSync: backgroundSync, remoteEval: remoteEval)
+    @objc public init(features: Data, attributes: [String: Any], trackingCallback: @escaping TrackingCallback, refreshHandler: CacheRefreshHandler? = nil, backgroundSync: Bool, remoteEval: Bool = false, apiRequestHeaders: [String: String]? = nil, streamingHostRequestHeaders: [String: String]? = nil) {
+        growthBookBuilderModel = GrowthBookModel(features: features, attributes: JSON(attributes), trackingClosure: trackingCallback, backgroundSync: backgroundSync, remoteEval: remoteEval, apiRequestHeaders: apiRequestHeaders, streamingHostRequestHeaders: streamingHostRequestHeaders)
         self.refreshHandler = refreshHandler
+        self.networkDispatcher = CoreNetworkClient(
+                apiRequestHeaders: apiRequestHeaders ?? [:],
+                streamingHostRequestHeaders: streamingHostRequestHeaders ?? [:]
+            )
         self.cachingManager = CachingManager()
     }
 
-    init(apiHost: String, clientKey: String, encryptionKey: String? = nil, attributes: JSON, trackingCallback: @escaping TrackingCallback, refreshHandler: CacheRefreshHandler?, backgroundSync: Bool, remoteEval: Bool = false) {
-        growthBookBuilderModel = GrowthBookModel(apiHost: apiHost, clientKey: clientKey, encryptionKey: encryptionKey, attributes: JSON(attributes), trackingClosure: trackingCallback, backgroundSync: backgroundSync, remoteEval: remoteEval)
+    init(apiHost: String, clientKey: String, encryptionKey: String? = nil, attributes: JSON, trackingCallback: @escaping TrackingCallback, refreshHandler: CacheRefreshHandler?, backgroundSync: Bool, remoteEval: Bool = false, apiRequestHeaders: [String: String]? = nil, streamingHostRequestHeaders: [String: String]? = nil) {
+        growthBookBuilderModel = GrowthBookModel(apiHost: apiHost, clientKey: clientKey, encryptionKey: encryptionKey, attributes: JSON(attributes), trackingClosure: trackingCallback, backgroundSync: backgroundSync, remoteEval: remoteEval, apiRequestHeaders: apiRequestHeaders, streamingHostRequestHeaders: streamingHostRequestHeaders)
         self.refreshHandler = refreshHandler
+        self.networkDispatcher = CoreNetworkClient(
+                apiRequestHeaders: apiRequestHeaders ?? [:],
+                streamingHostRequestHeaders: streamingHostRequestHeaders ?? [:]
+            )
         self.cachingManager = CachingManager(apiKey: clientKey)
     }
 
@@ -71,6 +107,12 @@ public struct GrowthBookModel {
         return self
     }
     
+    /// Set Caching Manager - Caching Client for saving fetched features
+    @objc public func setCachingManager(cachingManager: CachingLayer) -> GrowthBookBuilder {
+        self.cachingManager = cachingManager
+        return self
+    }
+    
     @objc public func setStickyBucketService(stickyBucketService: StickyBucketServiceProtocol? = StickyBucketService()) -> GrowthBookBuilder {
         growthBookBuilderModel.stickyBucketService = stickyBucketService
         return self
@@ -155,15 +197,15 @@ public struct GrowthBookModel {
     private var attributeOverrides: JSON = JSON()
     private var savedGroupsValues: JSON?
     private var evalContext: EvalContext? = nil
-    var cachingManager: CachingManager
+    var cachingManager: CachingLayer
 
     init(context: Context,
          refreshHandler: CacheRefreshHandler? = nil,
          logLevel: Level = .info,
          networkDispatcher: NetworkProtocol = CoreNetworkClient(),
          features: Features? = nil,
          savedGroups: JSON? = nil,
-         cachingManager: CachingManager) {
+         cachingManager: CachingLayer) {
         gbContext = context
         self.refreshHandler = refreshHandler
         self.networkDispatcher = networkDispatcher
@@ -300,6 +342,14 @@ public struct GrowthBookModel {
         refreshStickyBucketService()
     }
     
+    /// Merges the provided user attributes with the existing ones.
+    /// - Throws: `SwiftyJSON.Error.wrongType` if the top-level JSON types differ
+    @objc public func appendAttributes(attributes: Any) throws {
+        let updatedAttributes = try gbContext.attributes.merged(with: JSON(attributes))
+        gbContext.attributes = updatedAttributes
+        refreshStickyBucketService()
+    }
+    
     @objc public func setAttributeOverrides(overrides: Any) {
         attributeOverrides = JSON(overrides)
         if gbContext.stickyBucketService != nil {
@@ -314,6 +364,20 @@ public struct GrowthBookModel {
         refreshForRemoteEval()
     }
     
+    /// Updates API request headers for dynamic header management
+    @objc public func updateApiRequestHeaders(_ headers: [String: String]) {
+        if let networkClient = networkDispatcher as? CoreNetworkClient {
+            networkClient.apiRequestHeaders = headers
+        }
+    }
+    
+    /// Updates streaming host request headers for SSE connections
+    @objc public func updateStreamingHostRequestHeaders(_ headers: [String: String]) {
+        if let networkClient = networkDispatcher as? CoreNetworkClient {
+            networkClient.streamingHostRequestHeaders = headers
+        }
+    }
+    
     @objc func featuresAPIModelSuccessfully(model: FeaturesDataModel) {
         refreshStickyBucketService(model)
     }
diff --git a/Sources/CommonMain/Network/NetworkClient.swift b/Sources/CommonMain/Network/NetworkClient.swift
diff --git a/Sources/CommonMain/Utils/Constants.swift b/Sources/CommonMain/Utils/Constants.swift
