configured start and stop to work correctly, also added timeout interval for sdk. intialize.

Author: thomaszurkan-optimizely

DemoSwiftApp/AppDelegate.swift

@@ -99,7 +99,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         })
 
         // initialize Optimizely Client from a datafile download
-        optimizely!.initializeSDK { result in
+        optimizely!.initializeSDK(resourceTimeout:0.001) { result in
             switch result {
             case .failure(let error):
                 print("Optimizely SDK initiliazation failed: \(error)")

OptimizelySDK/Implementation/DefaultDatafileHandler.swift

@@ -48,8 +48,13 @@ class DefaultDatafileHandler : OPTDatafileHandler {
         return datafile
     }
 
-    open func downloadDatafile(sdkKey: String, completionHandler: @escaping DatafileDownloadCompletionHandler) {
+    open func downloadDatafile(sdkKey: String,
+                               resourceTimeoutInterval:Double = -1,
+                               completionHandler: @escaping DatafileDownloadCompletionHandler) {
         let config = URLSessionConfiguration.ephemeral
+        if resourceTimeoutInterval > 0 {
+            config.timeoutIntervalForResource = TimeInterval(resourceTimeoutInterval)
+        }
         let session = URLSession(configuration: config)
         let str = String(format: DefaultDatafileHandler.endPointStringFormat, sdkKey)
         if let url = URL(string: str) {
@@ -100,19 +105,11 @@ class DefaultDatafileHandler : OPTDatafileHandler {
 
     func startPeriodicUpdates(sdkKey: String, updateInterval: Int, datafileChangeNotification:((Data)->Void)?) {
 
-        timers.performAtomic { (timers) in
-            if let timer = timers[sdkKey] {
-                logger?.log(level: .info, message: "Timer getting restarted for datafile updates \(sdkKey)")
-                timer.invalidate()
-                timers[sdkKey] = nil
-                //return
-            }
-        }
         if #available(iOS 10.0, tvOS 10.0, *) {
             DispatchQueue.main.async {
                 let timer = Timer.scheduledTimer(withTimeInterval: TimeInterval(updateInterval), repeats: false) { (timer) in
 
-                    self.downloadDatafile(sdkKey: sdkKey, completionHandler: { (result) in
+                    self.downloadDatafile(sdkKey: sdkKey) { (result) in
                         switch result {
                         case .success(let data):
                             if let data = data,
@@ -122,8 +119,13 @@ class DefaultDatafileHandler : OPTDatafileHandler {
                         case .failure(let error):
                             self.logger?.log(level: .error, message: error.localizedDescription)
                         }
-                        self.startPeriodicUpdates(sdkKey: sdkKey, updateInterval: updateInterval, datafileChangeNotification: datafileChangeNotification)
-                    })
+
+                        if self.hasPeriodUpdates(sdkKey: sdkKey) {
+                            self.startPeriodicUpdates(sdkKey: sdkKey, updateInterval: updateInterval, datafileChangeNotification: datafileChangeNotification)
+                        }
+                    }
+                    
+                    timer.invalidate()
                 }
                 self.timers.performAtomic(atomicOperation: { (timers) in
                     timers[sdkKey] = timer
@@ -134,6 +136,17 @@ class DefaultDatafileHandler : OPTDatafileHandler {
         }
     }
 
+    func hasPeriodUpdates(sdkKey: String) -> Bool {
+        var restart = true
+        self.timers.performAtomic(atomicOperation: { (timers) in
+            if !timers.contains(where: { $0.key == sdkKey} ) {
+                restart = false
+            }
+        })
+        
+        return restart
+    }
+    
     func stopPeriodicUpdates(sdkKey: String) {
         timers.performAtomic { (timers) in
             if let timer = timers[sdkKey] {

OptimizelySDK/Optimizely/OptimizelyManager.swift

@@ -79,8 +79,8 @@ open class OptimizelyManager: NSObject {
     ///
     /// - Parameters:
     ///   - completion: callback when initialization is completed
-    public func initializeSDK(completion: ((OptimizelyResult<Data>) -> Void)?=nil) {
-        fetchDatafileBackground { result in
+    public func initializeSDK(resourceTimeout:Double = -1,completion: ((OptimizelyResult<Data>) -> Void)?=nil) {
+        fetchDatafileBackground(resourceTimeout:resourceTimeout) { result in
             switch result {
             case .failure:
                 completion?(result)
@@ -176,12 +176,12 @@ open class OptimizelyManager: NSObject {
         }
     }
 
-    func fetchDatafileBackground(completion: ((OptimizelyResult<Data>) -> Void)?=nil) {
+    func fetchDatafileBackground(resourceTimeout:Double = -1, completion: ((OptimizelyResult<Data>) -> Void)?=nil) {
 
         // TODO: fix downloadDatafile to throw OptimizelyError
         //       those errors propagated instead of handling here
 
-        datafileHandler.downloadDatafile(sdkKey: self.sdkKey){ result in
+        datafileHandler.downloadDatafile(sdkKey: self.sdkKey, resourceTimeoutInterval:resourceTimeout){ result in
             var fetchResult: OptimizelyResult<Data>
 
             switch result {

OptimizelySDK/Protocols/OPTDatafileHandler.swift

@@ -43,9 +43,12 @@ public protocol OPTDatafileHandler {
     /**
      Asynchronous download data file.
      - Parameter sdkKey:   application context for download
+     - Parameter resourceTimeoutInterval: timeout in seconds to wait for resource.
      - Parameter completionHhandler:  listener to call when datafile download complete
      */
-    func downloadDatafile(sdkKey:String, completionHandler:@escaping DatafileDownloadCompletionHandler)
+    func downloadDatafile(sdkKey:String,
+                          resourceTimeoutInterval:Double,
+                          completionHandler:@escaping DatafileDownloadCompletionHandler)
 
     /**
       Start periodic updates to the project datafile .