Merge pull request #102 from vazarkevych/streaming-host-update

vazarkevych · web-flow · commit 0851da8e09f5 · 2025-07-30T11:54:46.000+03:00
streamingHost variable &amp;&amp; add init feature property
diff --git a/GrowthBookTests/ExperimentRunTests.swift b/GrowthBookTests/ExperimentRunTests.swift
@@ -18,6 +18,7 @@ class ExperimentRunTests: XCTestCase {
             let experiment = Experiment(json: item[2].dictionaryValue)
 
             let gbContext = Context(apiHost: nil,
+                                    streamingHost: nil,
                                     clientKey: nil,
                                     encryptionKey: nil,
                                     isEnabled: testContext.isEnabled,
diff --git a/GrowthBookTests/FeatureValueTests.swift b/GrowthBookTests/FeatureValueTests.swift
@@ -18,6 +18,7 @@ class FeatureValueTests: XCTestCase {
             let testData = FeaturesTest(json: item[1].dictionaryValue)
 
             let gbContext = Context(apiHost: nil,
+                                    streamingHost: nil,
                                     clientKey: nil,
                                     encryptionKey: nil,
                                     isEnabled: true,
diff --git a/GrowthBookTests/GrowthBookSDKBuilderTests.swift b/GrowthBookTests/GrowthBookSDKBuilderTests.swift
@@ -4,8 +4,11 @@ import XCTest
 
 class GrowthBookSDKBuilderTests: XCTestCase {
     let testApiHost = "https://host.com"
+    let testStreamingHost = "https://streaming.host.com"
     let testClientKey = "4r23r324f23"
     let expectedURL = "https://host.com/api/features/4r23r324f23"
+    let expectedStreamingHostURL = "https://streaming.host.com/sub/4r23r324f23"
+    let expectedDefaultStreamingURL = "https://host.com/sub/4r23r324f23"
     let testAttributes: JSON = JSON()
     let testKeyString = "Ns04T5n9+59rl2x3SlNHtQ=="
     
@@ -33,6 +36,30 @@ class GrowthBookSDKBuilderTests: XCTestCase {
         }
     }
     
+    func testApiURL() throws {
+        var gbContext = Context(apiHost: testApiHost,
+                                streamingHost: testStreamingHost,
+                                clientKey: testClientKey,
+                                encryptionKey: nil,
+                                isEnabled: true,
+                                attributes: JSON(),
+                                forcedVariations: JSON(),
+                                isQaMode: false,
+                                trackingClosure: { _, _ in },
+                                backgroundSync: false,
+                                savedGroups: JSON())
+        
+        let streamingHostURL = gbContext.getSSEUrl()
+        
+        gbContext.streamingHost = nil
+        
+        let defaultURL = gbContext.getSSEUrl()
+        
+        XCTAssertTrue(gbContext.getFeaturesURL() == expectedURL)
+        XCTAssertTrue(streamingHostURL == expectedStreamingHostURL)
+        XCTAssertTrue(defaultURL == expectedDefaultStreamingURL)
+    }
+    
     func testSDKInitializationDefault() throws {
         let sdkInstance = GrowthBookBuilder(apiHost: testApiHost,
                                             clientKey: testClientKey,
diff --git a/GrowthBookTests/StickyBucketingTests.swift b/GrowthBookTests/StickyBucketingTests.swift
@@ -31,6 +31,7 @@ class StickyBucketingFeatureTests: XCTestCase {
             }
             
             let gbContext = Context(apiHost: nil,
+                                    streamingHost: nil,
                                     clientKey: nil,
                                     encryptionKey: nil,
                                     isEnabled: true,
diff --git a/Sources/CommonMain/Evaluators/ConditionEvaluator.swift b/Sources/CommonMain/Evaluators/ConditionEvaluator.swift
@@ -249,7 +249,7 @@ class ConditionEvaluator {
     /// This function is just a case statement that handles all the possible operators
     ///
     /// There are basic comparison operators in the form attributeValue {op} conditionValue
-    func isEvalOperatorCondition(operatorKey: String, attributeValue: JSON?, conditionValue: JSON, savedGroups: JSON? = nil) -> Bool {
+    func isEvalOperatorCondition(operatorKey: String, attributeValue: JSON, conditionValue: JSON, savedGroups: JSON? = nil) -> Bool {
         let conditionJson = JSON(conditionValue)
         // Evaluate TYPE operator - whether both are of same type
         if operatorKey == "$type" {
@@ -264,9 +264,9 @@ class ConditionEvaluator {
         // Evaluate EXISTS operator - whether condition contains attribute
         if operatorKey == "$exists" {
             let targetPrimitiveValue = conditionJson.stringValue
-            if targetPrimitiveValue == "false" && attributeValue == nil {
+            if targetPrimitiveValue == "false" && attributeValue == .null {
                 return true
-            } else if targetPrimitiveValue == "true" && attributeValue != nil {
+            } else if targetPrimitiveValue == "true" && attributeValue != .null {
                 return true
             }
         }
@@ -280,16 +280,16 @@ class ConditionEvaluator {
             }
         case "$exists":
             let targetPrimitiveValue = conditionJson.stringValue
-            if targetPrimitiveValue == "false" && attributeValue == nil {
+            if targetPrimitiveValue == "false" && attributeValue == .null {
                 return true
-            } else if targetPrimitiveValue == "true" && attributeValue != nil {
+            } else if targetPrimitiveValue == "true" && attributeValue != .null {
                 return true
             }
         default: break
         }
 
         /// There are three operators where conditionValue is an array
-        if let conditionValue = conditionJson.array, let attributeValue = attributeValue {
+        if let conditionValue = conditionJson.array, attributeValue != .null {
             switch operatorKey {
             case "$in":
                 return Common.isIn(actual: attributeValue, expected: conditionValue)
@@ -317,7 +317,7 @@ class ConditionEvaluator {
                 }
             default: break
             }
-        } else if let attribute = attributeValue?.array {
+        } else if let attribute = attributeValue.array {
             switch operatorKey {
             // Evaluate ELEMMATCH operator - whether condition matches attribute
             case "$elemMatch":
@@ -332,36 +332,36 @@ class ConditionEvaluator {
             let sourcePrimitiveValue = attributeValue
             switch operatorKey {
             case "$veq":
-                if let attributeString = attributeValue?.string, let conditionString = conditionValue.string {
+                if let attributeString = attributeValue.string, let conditionString = conditionValue.string {
                     return Utils.paddedVersionString(input: attributeString) == Utils.paddedVersionString(input: conditionString)
                 }
             case "$vne":
-                if let attributeString = attributeValue?.string, let conditionString = conditionValue.string {
+                if let attributeString = attributeValue.string, let conditionString = conditionValue.string {
                     return Utils.paddedVersionString(input: attributeString) != Utils.paddedVersionString(input: conditionString)
                 }
             case "$vgt":
-                if let attributeString = attributeValue?.string, let conditionString = conditionValue.string {
+                if let attributeString = attributeValue.string, let conditionString = conditionValue.string {
                     return Utils.paddedVersionString(input: attributeString) > Utils.paddedVersionString(input: conditionString)
                 }
             case "$vgte":
-                if let attributeString = attributeValue?.string, let conditionString = conditionValue.string {
+                if let attributeString = attributeValue.string, let conditionString = conditionValue.string {
                     return Utils.paddedVersionString(input: attributeString) >= Utils.paddedVersionString(input: conditionString)
                 }
             case "$vlt":
-                if let attributeString = attributeValue?.string, let conditionString = conditionValue.string {
+                if let attributeString = attributeValue.string, let conditionString = conditionValue.string {
                     return Utils.paddedVersionString(input: attributeString) < Utils.paddedVersionString(input: conditionString)
                 }
             case "$vlte":
-                if let attributeString = attributeValue?.string, let conditionString = conditionValue.string {
+                if let attributeString = attributeValue.string, let conditionString = conditionValue.string {
                     return Utils.paddedVersionString(input: attributeString) <= Utils.paddedVersionString(input: conditionString)
                 }
             case "$inGroup":
-                if let attributeString = attributeValue, let conditionString = conditionValue.string {
-                    return Common.isIn(actual: attributeString, expected: savedGroups?[conditionString].array ?? [] )
+                if attributeValue != .null, let conditionString = conditionValue.string {
+                    return Common.isIn(actual: attributeValue, expected: savedGroups?[conditionString].array ?? [] )
                 }
             case "$notInGroup": 
-                if let attributeString = attributeValue, let conditionString = conditionValue.string {
-                    return !Common.isIn(actual: attributeString, expected: savedGroups?[conditionString].array ?? [])
+                if attributeValue != .null, let conditionString = conditionValue.string {
+                    return !Common.isIn(actual: attributeValue, expected: savedGroups?[conditionString].array ?? [])
                 }
             // Evaluate EQ operator - whether condition equals to attribute
             case "$eq":
@@ -375,36 +375,36 @@ class ConditionEvaluator {
                        let conditionDoubleOrNull = Utils.convertJsonToDouble(from: conditionValue) {
                     return attributeDoubleOrNull < conditionDoubleOrNull
                 }
-                return sourcePrimitiveValue ?? 0.0 < targetPrimitiveValue
+                return sourcePrimitiveValue < targetPrimitiveValue
             // Evaluate LTE operator - whether attribute less than or equal to condition
             case "$lte":
                 if let attributeDoubleOrNull = Utils.convertJsonToDouble(from: attributeValue),
                        let conditionDoubleOrNull = Utils.convertJsonToDouble(from: conditionValue) {
                     return attributeDoubleOrNull <= conditionDoubleOrNull
                 }
-                return  sourcePrimitiveValue ?? 0.0 <= targetPrimitiveValue
+                return  sourcePrimitiveValue <= targetPrimitiveValue
             // Evaluate GT operator - whether attribute greater than to condition
             case "$gt":
                 if let attributeDoubleOrNull = Utils.convertJsonToDouble(from: attributeValue),
                        let conditionDoubleOrNull = Utils.convertJsonToDouble(from: conditionValue) {
                     return attributeDoubleOrNull > conditionDoubleOrNull
                 }
-                return  sourcePrimitiveValue ?? 0.0 > targetPrimitiveValue
+                return  sourcePrimitiveValue > targetPrimitiveValue
             // Evaluate GTE operator - whether attribute greater than or equal to condition
             case "$gte":
                 if let attributeDoubleOrNull = Utils.convertJsonToDouble(from: attributeValue),
                        let conditionDoubleOrNull = Utils.convertJsonToDouble(from: conditionValue) {
                     return attributeDoubleOrNull >= conditionDoubleOrNull
                 }
-                return  sourcePrimitiveValue ?? 0.0 >= targetPrimitiveValue
+                return  sourcePrimitiveValue >= targetPrimitiveValue
             // Evaluate REGEX operator - whether attribute contains condition regex
             case "$regex":
                 let targetPrimitiveValueString = conditionValue.stringValue
-                let sourcePrimitiveValueString = attributeValue?.stringValue
-                if isContains(source: sourcePrimitiveValueString ?? "", target: targetPrimitiveValueString) {
+                let sourcePrimitiveValueString = attributeValue.stringValue
+                if isContains(source: sourcePrimitiveValueString, target: targetPrimitiveValueString) {
                     return true
                 }
-                return sourcePrimitiveValueString?.contains(targetPrimitiveValueString) ?? false
+                return sourcePrimitiveValueString.contains(targetPrimitiveValueString)
 
             default: break
             }
diff --git a/Sources/CommonMain/Evaluators/ExperimentEvaluator.swift b/Sources/CommonMain/Evaluators/ExperimentEvaluator.swift
@@ -16,6 +16,7 @@ class ExperimentEvaluator {
         
         // If context.forcedVariations[experiment.trackingKey] is defined, return immediately (not in experiment, forced variation)
         if let forcedVariation = context.userContext.forcedVariations?.dictionaryValue[experiment.key] {
+            logger.trace("Forced variation found for experiment \(experiment.key). \nForced variation: \(forcedVariation)")
             return getExperimentResult(gbContext: context, experiment: experiment, variationIndex: forcedVariation.intValue, hashUsed: false, featureId: featureId)
         }
         
diff --git a/Sources/CommonMain/GrowthBookSDK.swift b/Sources/CommonMain/GrowthBookSDK.swift
@@ -12,6 +12,7 @@ protocol GrowthBookProtocol: AnyObject {
 
 public struct GrowthBookModel {
     var apiHost: String?
+    var streamingHost: String?
     var clientKey: String?
     var encryptionKey: String?
     var features: Data?
@@ -42,8 +43,30 @@ public struct GrowthBookModel {
     
     private var cachingManager: CachingLayer
 
-    @objc public init(apiHost: String? = nil, clientKey: String? = nil, encryptionKey: String? = nil, attributes: [String: Any], 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, attributes: JSON(attributes), trackingClosure: trackingCallback, backgroundSync: backgroundSync, remoteEval: remoteEval, apiRequestHeaders: apiRequestHeaders, streamingHostRequestHeaders: streamingHostRequestHeaders)
+    @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 ?? [:],
@@ -127,10 +150,16 @@ public struct GrowthBookModel {
         cachingManager.setCustomCachePath(customDirectory)
         return self
     }
+    
+    @objc public func setStreamingHost(streamingHost: String) -> GrowthBookBuilder {
+        growthBookBuilderModel.streamingHost = streamingHost
+        return self
+    }
 
     @objc public func initializer() -> GrowthBookSDK {
         let gbContext = Context(
             apiHost: growthBookBuilderModel.apiHost,
+            streamingHost : growthBookBuilderModel.streamingHost,
             clientKey: growthBookBuilderModel.clientKey,
             encryptionKey: growthBookBuilderModel.encryptionKey,
             isEnabled: growthBookBuilderModel.isEnabled,
diff --git a/Sources/CommonMain/Model/Context.swift b/Sources/CommonMain/Model/Context.swift
@@ -2,9 +2,11 @@ import Foundation
 
 /// Defines the GrowthBook context.
 @objc public class Context: NSObject {
-    /// your api host
+    /// Your api host
     public let apiHost: String?
-    /// unique client key
+    /// Your streaming host
+    public var streamingHost: String?
+    /// Unique client key
     public let clientKey: String?
     /// Encryption key for encrypted features.
     public let encryptionKey: String?
@@ -28,13 +30,14 @@ import Foundation
     public var stickyBucketIdentifierAttributes: [String]?
     /// Enable to use remote evaluation
     public let remoteEval: Bool
-    // Keys are unique identifiers for the features and the values are Feature objects.
-    // Feature definitions - To be pulled from API / Cache
+    /// Keys are unique identifiers for the features and the values are Feature objects.
+    /// Feature definitions - To be pulled from API / Cache
     var features: Features
-    
+    /// Target the same group of users across multiple features and experiments with Saved Groups
     public var savedGroups: JSON?
 
     init(apiHost: String?,
+         streamingHost: String?,
          clientKey: String?,
          encryptionKey: String?,
          isEnabled: Bool,
@@ -50,6 +53,7 @@ import Foundation
          remoteEval: Bool = false,
          savedGroups: JSON? = nil) {
         self.apiHost = apiHost
+        self.streamingHost = streamingHost
         self.clientKey = clientKey
         self.encryptionKey = encryptionKey
         self.isEnabled = isEnabled
@@ -83,8 +87,8 @@ import Foundation
     }
     
     @objc public func getSSEUrl() -> String? {
-        if let apiHost = apiHost, let clientKey = clientKey {
-            return "\(apiHost)/sub/\(clientKey)"
+        if let host = streamingHost ?? apiHost, let clientKey = clientKey {
+            return "\(host)/sub/\(clientKey)"
         } else {
             return nil
         }
diff --git a/Sources/CommonMain/Model/GlobalContext.swift b/Sources/CommonMain/Model/GlobalContext.swift
diff --git a/Sources/CommonMain/Utils/Utils.swift b/Sources/CommonMain/Utils/Utils.swift

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ class StickyBucketingFeatureTests: XCTestCase {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`let gbContext = Context(apiHost: nil,`
	`34`	`+ streamingHost: nil,`
`34`	`35`	`clientKey: nil,`
`35`	`36`	`encryptionKey: nil,`
`36`	`37`	`isEnabled: true,`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ class ExperimentEvaluator {`
`16`	`16`
`17`	`17`	`// If context.forcedVariations[experiment.trackingKey] is defined, return immediately (not in experiment, forced variation)`
`18`	`18`	`if let forcedVariation = context.userContext.forcedVariations?.dictionaryValue[experiment.key] {`
	`19`	`+ logger.trace("Forced variation found for experiment \(experiment.key). \nForced variation: \(forcedVariation)")`
`19`	`20`	`return getExperimentResult(gbContext: context, experiment: experiment, variationIndex: forcedVariation.intValue, hashUsed: false, featureId: featureId)`
`20`	`21`	`}`
`21`	`22`