fix: remove timer fix implementation for session (#7)

* fix: remove timer fix implementation for session

* fix timing logic, remove sessionTimer

* remove background event and timer

---------

Co-authored-by: Alan Charles <[email protected]>

Author: alanjcharles

Example/BasicExample/BasicExample/BasicExampleApp.swift

@@ -18,12 +18,17 @@ struct BasicExampleApp: App {
     }
 }
 
+var instance: Analytics? = nil
+
 extension Analytics {
     static var main: Analytics {
-        let analytics = Analytics(configuration: Configuration(writeKey: "<YOUR WRITE KEY>")
-                    .flushAt(3)
-                    .trackApplicationLifecycleEvents(true))
-        analytics.add(plugin: AmplitudeSession())
-        return analytics
+        if instance == nil {
+            instance = Analytics(configuration: Configuration(writeKey: "<WRITE_KEY>")
+                        .flushAt(3)
+                        .trackApplicationLifecycleEvents(true))
+            instance?.add(plugin: AmplitudeSession())
+        }
+        
+        return instance!
     }
 }

Sources/SegmentAmplitude/AmplitudeSession.swift

@@ -42,11 +42,16 @@ public class AmplitudeSession: EventPlugin, iOSLifecycle {
 
     var active = false
 
-    private var sessionTimer: Timer?
     private var sessionID: TimeInterval?
-    private let fireTime = TimeInterval(300)
+    private var lastEventFiredTime = Date()
+    private var minSessionTime: TimeInterval = 5 * 60
 
-    public init() { }
+    public init() {
+        if (sessionID == nil || sessionID == -1)
+        {
+            sessionID = Date().timeIntervalSince1970
+        }
+    }
 
     public func update(settings: Settings, type: UpdateType) {
         if settings.hasIntegrationSettings(key: key) {
@@ -61,20 +66,22 @@ public class AmplitudeSession: EventPlugin, iOSLifecycle {
             return event
         }
 
+        lastEventFiredTime = Date()
+        
         var result: T? = event
         switch result {
-            case let r as IdentifyEvent:
-                result = self.identify(event: r) as? T
-            case let r as TrackEvent:
-                result = self.track(event: r) as? T
-            case let r as ScreenEvent:
-                result = self.screen(event: r) as? T
-            case let r as AliasEvent:
-                result = self.alias(event: r) as? T
-            case let r as GroupEvent:
-                result = self.group(event: r) as? T
-            default:
-                break
+        case let r as IdentifyEvent:
+            result = self.identify(event: r) as? T
+        case let r as TrackEvent:
+            result = self.track(event: r) as? T
+        case let r as ScreenEvent:
+            result = self.screen(event: r) as? T
+        case let r as AliasEvent:
+            result = self.alias(event: r) as? T
+        case let r as GroupEvent:
+            result = self.group(event: r) as? T
+        default:
+            break
         }
         return result
     }
@@ -115,21 +122,24 @@ public class AmplitudeSession: EventPlugin, iOSLifecycle {
     }
 
     public func applicationWillEnterForeground(application: UIApplication?) {
-        startTimer()
+        if Date().timeIntervalSince(lastEventFiredTime) >= minSessionTime {
+            sessionID = Date().timeIntervalSince1970
+        }
+        
         analytics?.log(message: "Amplitude Session ID: \(sessionID ?? -1)")
     }
-
+    
     public func applicationWillResignActive(application: UIApplication?) {
         // Exposed if reacting to lifecycle events is needed
     }
+    
 }
 
 
 // MARK: - AmplitudeSession Helper Methods
 extension AmplitudeSession {
     func insertSession(event: RawEvent) -> RawEvent {
         var returnEvent = event
-        refreshSessionID()
         if var integrations = event.integrations?.dictionaryValue,
            let sessionID = sessionID {
 
@@ -138,42 +148,6 @@ extension AmplitudeSession {
         }
         return returnEvent
     }
-    
-    @objc
-    func handleTimerFire(_ timer: Timer) {
-        stopTimer()
-    }
-    
-    func refreshSessionID() {
-        if (sessionID == nil || sessionID == -1)
-        {
-            sessionID = Date().timeIntervalSince1970
-        }
-        startTimer()
-    }
-    
-    func startTimer() {
-        // Starting and stopping the timer has to be done from the same thread; always dispatch to main queue
-        DispatchQueue.main.async {
-            self.sessionTimer?.invalidate()
-            self.sessionTimer = Timer(timeInterval: self.fireTime, target: self,
-                                      selector: #selector(self.handleTimerFire(_:)),
-                                      userInfo: nil, repeats: true)
-            self.sessionTimer?.tolerance = 0.3
-            if let sessionTimer = self.sessionTimer {
-                // Use the RunLoop current to avoid retaining self
-                RunLoop.current.add(sessionTimer, forMode: .common)
-            }
-        }
-    }
-    
-    func stopTimer() {
-        // Starting and stopping the timer has to be done from the same thread; always dispatch to main queue
-        DispatchQueue.main.async {
-            self.sessionTimer?.invalidate()
-            self.sessionID = -1
-        }
-    }
 }
 
 extension AmplitudeSession: VersionedPlugin {