fix conflicts

Author: jaeopt

OptimizelySDK/Customization/DefaultUserProfileService.swift

@@ -74,18 +74,21 @@ import Foundation
 open class DefaultUserProfileService: OPTUserProfileService {
     public typealias UserProfileData = [String: UPProfile]
 
-    var profiles: UserProfileData
+    var profiles: UserProfileData?
     let lock = DispatchQueue(label: "com.optimizely.UserProfileService")
     let kStorageName = "user-profile-service"
 
     public required init() {
-        profiles = UserDefaults.standard.dictionary(forKey: kStorageName) as? UserProfileData ?? UserProfileData()
+        lock.async {
+            self.profiles = UserDefaults.standard.dictionary(forKey: self.kStorageName) as? UserProfileData ?? UserProfileData()
+
+        }
     }
 
     open func lookup(userId: String) -> UPProfile? {
         var retVal: UPProfile?
         lock.sync {
-            retVal = profiles[userId]
+            retVal = profiles?[userId]
         }
         return retVal
     }
@@ -94,7 +97,7 @@ open class DefaultUserProfileService: OPTUserProfileService {
         guard let userId = userProfile[UserProfileKeys.kUserId] as? String else { return }
 
         lock.async {
-            self.profiles[userId] = userProfile
+            self.profiles?[userId] = userProfile
             let defaults = UserDefaults.standard
             defaults.set(self.profiles, forKey: self.kStorageName)
             defaults.synchronize()

OptimizelySDK/Data Model/ProjectConfig.swift

@@ -19,13 +19,46 @@ import Foundation
 class ProjectConfig {
 
     var project: Project!
+    
     lazy var logger = HandlerRegistryService.shared.injectLogger()
 
     // local runtime forcedVariations [UserId: [ExperimentId: VariationId]]
     // NOTE: experiment.forcedVariations use [ExperimentKey: VariationKey] instead of ids
 
     var whitelistUsers = [String: [String: String]]()
 
+    lazy var experimentKeyMap:[String:Experiment] = {
+        var map = [String:Experiment]()
+        allExperiments.forEach({map[$0.key] = $0})
+        return map
+    }()
+    
+    lazy var experimentFeatureMap:[String:[String]] = {
+        var experimentFeatureMap = [String:[String]]()
+        project.featureFlags.forEach({ (ff) in
+            ff.experimentIds.forEach({
+                if var arr = experimentFeatureMap[$0] {
+                    arr.append(ff.id)
+                    experimentFeatureMap[$0] = arr
+                }
+                else {
+                    experimentFeatureMap[$0] = [ff.id]
+                }
+            })
+        })
+        return experimentFeatureMap
+    }()
+    
+    lazy var eventKeyMap:[String:Event] =  {
+        var eventKeyMap = [String:Event]()
+        project.events.forEach({eventKeyMap[$0.key] = $0 })
+        return eventKeyMap
+    }()
+    
+    lazy var allExperiments:[Experiment] = {
+        return project.experiments + project.groups.map({$0.experiments}).flatMap({$0})
+    }()
+    
     init(datafile: Data) throws {
         do {
             self.project = try JSONDecoder().decode(Project.self, from: datafile)
@@ -35,6 +68,7 @@ class ProjectConfig {
         if !isValidVersion(version: self.project.version) {
             throw OptimizelyError.dataFileVersionInvalid(self.project.version)
         }
+        
     }
 
     convenience init(datafile: String) throws {
@@ -87,6 +121,7 @@ extension ProjectConfig {
         // old versions (< 4) of datafiles not supported
         return ["4"].contains(version)
     }
+
 }
 
 // MARK: - Project Access
@@ -97,7 +132,7 @@ extension ProjectConfig {
      * Get an Experiment object for a key.
      */
     func getExperiment(key: String) -> Experiment? {
-        return allExperiments.filter { $0.key == key }.first
+        return experimentKeyMap[key]
     }
 
     /**
@@ -139,7 +174,7 @@ extension ProjectConfig {
      * Gets an event for a corresponding event key
      */
     func getEvent(key: String) -> Event? {
-        return project.events.filter{ $0.key == key }.first
+        return eventKeyMap[key]
     }
 
     /**
@@ -175,12 +210,7 @@ extension ProjectConfig {
      *  Returns true if experiment belongs to any feature, false otherwise.
      */
     func isFeatureExperiment(id: String) -> Bool {
-        if let _ = project.featureFlags.map({ $0.experimentIds.contains(id)}).first {
-            return true
-        }
-        else {
-            return false
-        }
+        return !(experimentFeatureMap[id]?.isEmpty ?? true)
     }
 
     /**
@@ -236,8 +266,4 @@ extension ProjectConfig {
         return true
     }
 
-    var allExperiments:[Experiment] {
-        return  project.experiments + project.groups.map({$0.experiments}).flatMap({$0})
-    }
-
 }

OptimizelySDK/Implementation/DefaultDatafileHandler.swift

@@ -22,6 +22,8 @@ class DefaultDatafileHandler : OPTDatafileHandler {
     var timers:AtomicProperty<[String:(timer:Timer, interval:Int)]> = AtomicProperty(property: [String:(Timer,Int)]())
     let dataStore = DataStoreUserDefaults()
 
+    let downloadQueue = DispatchQueue(label: "DefaultDatafileHandlerQueue", qos: DispatchQoS.default, attributes: DispatchQueue.Attributes.concurrent, autoreleaseFrequency: DispatchQueue.AutoreleaseFrequency.inherit, target: nil)
+    
     required init() {
 
     }
@@ -48,23 +50,54 @@ class DefaultDatafileHandler : OPTDatafileHandler {
         return datafile
     }
 
-    open func downloadDatafile(sdkKey: String,
-                               resourceTimeoutInterval:Double? = nil,
-                               completionHandler: @escaping DatafileDownloadCompletionHandler) {
+    open func getSession(resourceTimeoutInterval:Double?) -> URLSession {
         let config = URLSessionConfiguration.ephemeral
         if let resourceTimeoutInterval = resourceTimeoutInterval,
             resourceTimeoutInterval > 0 {
             config.timeoutIntervalForResource = TimeInterval(resourceTimeoutInterval)
         }
-        let session = URLSession(configuration: config)
+        return URLSession(configuration: config)
+    }
+    
+    open func getRequest(sdkKey:String) -> URLRequest? {
         let str = String(format: DefaultDatafileHandler.endPointStringFormat, sdkKey)
-        if let url = URL(string: str) {
-            var request = URLRequest(url: url)
-            
-            if let lastModified = dataStore.getItem(forKey: "OPTLastModified-" + sdkKey) {
-                request.addValue(lastModified as! String, forHTTPHeaderField: "If-Modified-Since")
+        guard let url = URL(string: str) else { return nil }
+        
+        var request = URLRequest(url: url)
+        
+        if let lastModified = dataStore.getItem(forKey: "OPTLastModified-" + sdkKey) {
+            request.addValue(lastModified as! String, forHTTPHeaderField: "If-Modified-Since")
+        }
+        
+        return request
+
+    }
+    
+    open func getResponseData(sdkKey:String, response:HTTPURLResponse, url:URL?) -> Data? {
+        if let url = url, let data = try? Data(contentsOf: url) {
+            if let str = String(data: data, encoding: .utf8) {
+                self.logger?.log(level: .debug, message: str)
+            }
+            self.saveDatafile(sdkKey: sdkKey, dataFile: data)
+            if let lastModified = response.allHeaderFields["Last-Modified"] {
+                self.dataStore.saveItem(forKey: "OPTLastModified-" + sdkKey, value: lastModified)
             }
 
+            return data
+        }
+        
+        return nil
+    }
+    
+    open func downloadDatafile(sdkKey: String,
+                               resourceTimeoutInterval:Double? = nil,
+                               completionHandler: @escaping DatafileDownloadCompletionHandler) {
+        
+        downloadQueue.async {
+            let session = self.getSession(resourceTimeoutInterval: resourceTimeoutInterval)
+            
+            guard let request = self.getRequest(sdkKey: sdkKey) else { return }
+            
             let task = session.downloadTask(with: request) { (url, response, error) in
                 var result = OptimizelyResult<Data?>.failure(.datafileDownloadFailed("Failed to parse"))
 
@@ -73,31 +106,22 @@ class DefaultDatafileHandler : OPTDatafileHandler {
                     result = .failure(.datafileDownloadFailed(error.debugDescription))
                 } else if let response = response as? HTTPURLResponse {
                     if response.statusCode == 200 {
-                        if let url = url, let data = try? Data(contentsOf: url) {
-                            if let str = String(data: data, encoding: .utf8) {
-                                self.logger?.d(str)
-                            }
-                            self.saveDatafile(sdkKey: sdkKey, dataFile: data)
-                            if let lastModified = response.allHeaderFields["Last-Modified"] {
-                                self.dataStore.saveItem(forKey: "OPTLastModified-" + sdkKey, value: lastModified)
-                            }
-                            
-                            result = .success(data)
-                        }
-                    } else if response.statusCode == 304 {
-                        self.logger?.d("The datafile was not modified and won't be downloaded again")
+                        let data = self.getResponseData(sdkKey: sdkKey, response: response, url: url)
+                        result = Result.success(data)
+                    }
+                    else if response.statusCode == 304 {
+                        self.logger?.log(level: .debug, message: "The datafile was not modified and won't be downloaded again")
                         result = .success(nil)
                     }
                 }
-
+                
                 completionHandler(result)
 
                 //self.logger?.d(response.debugDescription)                
             }
 
             task.resume()
         }
-
     }
 
     func startPeriodicUpdates(sdkKey: String, updateInterval: Int, datafileChangeNotification:((Data)->Void)?) {

OptimizelySDK/Implementation/Events/BatchEventBuilder.swift

@@ -91,7 +91,7 @@ class BatchEventBuilder {
 
         let batchEvent = BatchEvent(revision: config.project.revision,
                                     accountID: config.project.accountId,
-                                    clientVersion: Utils.getSDKVersion(),
+                                    clientVersion: Utils.sdkVersion,
                                     visitors: [visitor],
                                     projectID: config.project.projectId,
                                     clientName: swiftSdkClientName,