fix: session start crash issue (#29)

Co-authored-by: xiaoweii <xiaoweii@amazom.com>

Author: zhu-xiaowei

Sources/Clickstream/AWSClickstreamPlugin+Configure.swift

@@ -50,7 +50,7 @@ extension AWSClickstreamPlugin {
         clickstream.analyticsClient = analyticsClient
         let networkMonitor = NWPathMonitor()
         clickstream.networkMonitor = networkMonitor
-
+        sessionClient.initialSession()
         var autoFlushEventsTimer: DispatchSourceTimer?
         if configuration.sendEventsInterval != 0 {
             let timeInterval = TimeInterval(Double(configuration.sendEventsInterval) / 1_000)

Sources/Clickstream/Dependency/Clickstream/Session/SessionClient.swift

@@ -10,7 +10,7 @@ import Foundation
 
 protocol SessionClientBehaviour: AnyObject {
     func startActivityTracking()
-    func initialSession() -> Bool
+    func initialSession()
     func storeSession()
 }
 
@@ -38,17 +38,19 @@ class SessionClient: SessionClientBehaviour {
         }
     }
 
-    func initialSession() -> Bool {
+    func initialSession() {
         session = Session.getCurrentSession(clickstream: clickstream)
         if session!.isNewSession {
             autoRecordClient.recordSessionStartEvent()
+            autoRecordClient.setIsEntrances()
         }
-        return session!.isNewSession
     }
 
     func storeSession() {
-        session?.pause()
-        UserDefaultsUtil.saveSession(storage: clickstream.storage, session: session!)
+        if session != nil {
+            session?.pause()
+            UserDefaultsUtil.saveSession(storage: clickstream.storage, session: session!)
+        }
     }
 
     func getCurrentSession() -> Session? {
@@ -59,10 +61,7 @@ class SessionClient: SessionClientBehaviour {
         log.debug("Application entered the foreground.")
         autoRecordClient.handleAppStart()
         autoRecordClient.updateLastScreenStartTimestamp()
-        let isNewSession = initialSession()
-        if isNewSession {
-            autoRecordClient.setIsEntrances()
-        }
+        initialSession()
     }
 
     private func handleAppEnterBackground() {

Tests/ClickstreamTests/Clickstream/SessionClientTests.swift

@@ -198,8 +198,9 @@ class SessionClientTests: XCTestCase {
         activityTracker.callback?(.runningInForeground)
         Thread.sleep(forTimeInterval: 1)
         activityTracker.callback?(.runningInBackground)
+        Thread.sleep(forTimeInterval: 0.1)
         let events = eventRecorder.savedEvents
-        XCTAssertEqual(7, events.count)
+        XCTAssertEqual(8, events.count)
         let userEngagementEvent = events[6]
         XCTAssertEqual(Event.PresetEvent.USER_ENGAGEMENT, userEngagementEvent.eventType)
         XCTAssertTrue((userEngagementEvent.attributes[Event.ReservedAttribute.ENGAGEMENT_TIMESTAMP] as! Int64) < 1_200)

Tests/ClickstreamTests/IntegrationTest.swift

@@ -68,14 +68,14 @@ class IntegrationTest: XCTestCase {
         ])
         Thread.sleep(forTimeInterval: 0.2)
         let eventCount = try eventRecorder.dbUtil.getEventCount()
-        XCTAssertEqual(1, eventCount)
+        XCTAssertEqual(2, eventCount)
     }
 
     func testRecordOneEventWithNameSuccess() throws {
         ClickstreamAnalytics.recordEvent("testEvent")
         Thread.sleep(forTimeInterval: 0.2)
         let eventCount = try eventRecorder.dbUtil.getEventCount()
-        XCTAssertEqual(1, eventCount)
+        XCTAssertEqual(2, eventCount)
     }
 
     func testFlushEvents() throws {
@@ -220,7 +220,7 @@ class IntegrationTest: XCTestCase {
         ClickstreamAnalytics.recordEvent("testEvent")
         Thread.sleep(forTimeInterval: 0.2)
         let eventCount = try eventRecorder.dbUtil.getEventCount()
-        XCTAssertEqual(1, eventCount)
+        XCTAssertEqual(2, eventCount)
     }
 
     func testModifyConfiguration() throws {
@@ -233,7 +233,7 @@ class IntegrationTest: XCTestCase {
         ])
         Thread.sleep(forTimeInterval: 0.2)
         let eventCount = try eventRecorder.dbUtil.getEventCount()
-        XCTAssertEqual(1, eventCount)
+        XCTAssertEqual(2, eventCount)
     }
 
     // MARK: - Objc test
@@ -249,7 +249,7 @@ class IntegrationTest: XCTestCase {
         ClickstreamObjc.recordEvent("testEvent", attribute)
         Thread.sleep(forTimeInterval: 0.2)
         let eventCount = try eventRecorder.dbUtil.getEventCount()
-        XCTAssertEqual(2, eventCount)
+        XCTAssertEqual(3, eventCount)
     }
 
     func testGlobalAttributeForObjc() throws {
@@ -298,14 +298,14 @@ class IntegrationTest: XCTestCase {
         ClickstreamAnalytics.recordEvent("testEvent")
         Thread.sleep(forTimeInterval: 0.2)
         let eventCount = try eventRecorder.dbUtil.getEventCount()
-        XCTAssertEqual(1, eventCount)
+        XCTAssertEqual(2, eventCount)
     }
 
     func testAppException() throws {
         let exception = NSException(name: NSExceptionName("TestException"), reason: "Testing", userInfo: nil)
         AutoRecordEventClient.handleException(exception)
         Thread.sleep(forTimeInterval: 0.5)
-        let event = try eventRecorder.getBatchEvent().eventsJson.jsonArray()[0]
+        let event = try eventRecorder.getBatchEvent().eventsJson.jsonArray()[1]
         XCTAssertTrue(event["event_type"] as! String == Event.PresetEvent.APP_EXCEPTION)
         let attributes = event["attributes"] as! [String: Any]
         XCTAssertTrue(attributes[Event.ReservedAttribute.EXCEPTION_NAME] as! String == exception.name.rawValue)