Merge pull request #20 from at-internet/develop

v3.0.8

PianoAnalytics-AppExtension.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = 'PianoAnalytics-AppExtension'
-    s.version = '3.0.7'
+    s.version = '3.0.8'
     s.summary = 'Piano Analytics solution for extension Apple devices'
     s.homepage = 'https://github.com/at-internet/piano-analytics-apple'
     s.documentation_url = 'https://developers.atinternet-solutions.com/piano-analytics'

PianoAnalytics.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = 'PianoAnalytics'
-    s.version = '3.0.7'
+    s.version = '3.0.8'
     s.summary = 'Piano Analytics library for Apple devices'
     s.homepage = 'https://github.com/at-internet/piano-analytics-apple'
     s.documentation_url = 'https://developers.atinternet-solutions.com/piano-analytics'

Sources/PianoAnalytics/Model.swift

@@ -65,11 +65,13 @@ public final class BuiltModel {
 
     public final let uri: String?
     public final let body: String?
+    public final let chunks: [String]?
     final let mustBeSaved: Bool
 
-    init(uri: String?, body: String?, mustBeSaved: Bool) {
+    init(uri: String?, body: String?, chunks: [String]?, mustBeSaved: Bool) {
         self.uri = uri
         self.body = body
+        self.chunks = chunks
         self.mustBeSaved = mustBeSaved
     }
 }

Sources/PianoAnalytics/PianoAnalytics.swift

@@ -47,7 +47,7 @@ public final class PianoAnalytics {
     // MARK: PUBLIC SECTION
 
     /// SDK version
-    public static let sdkVersion = "3.0.7"
+    public static let sdkVersion = "3.0.8"
 
     /// Send event
     ///

Sources/PianoAnalytics/Steps/BuildStep.swift

@@ -38,6 +38,7 @@ final class BuildStep: Step {
 
     private static let RequestUriFormat = "https://%@%@?s=%@&idclient=%@"
     private static let EventsField = "events"
+    private static let ChunkSize = 50
 
     // MARK: Step Implementation
 
@@ -55,12 +56,15 @@ final class BuildStep: Step {
             contextProperties[InternalContextPropertiesStep.ConnectionTypeProperty] = ContextProperty(value: ConnectionType.Offline.rawValue)
             mustBeSaved = true
         }
-
-        /// BODY
-        let body = PianoAnalyticsUtils.toJSONData([
-            // TODO
-            BuildStep.EventsField: events.map {$0.toMap(context: [:])}
-        ]) ?? Data()
+
+        var chunks: [String] = []
+        stride(from: 0, to: m.events.count, by: BuildStep.ChunkSize).forEach { i in
+            if let chunk = PianoAnalyticsUtils.toJSONData([
+                BuildStep.EventsField: events[i..<min(i + BuildStep.ChunkSize, m.events.count)].map {$0.toMap(context: [:])}
+            ]) {
+                chunks.append(String(decoding: chunk, as: UTF8.self))
+            }
+        }
 
         /// URI
         let visitorId = conf.get(ConfigurationKey.VisitorId)
@@ -70,7 +74,12 @@ final class BuildStep: Step {
                          conf.get(ConfigurationKey.Site),
                          visitorId)
 
-        m.builtModel = BuiltModel(uri: uri, body: String(decoding: body, as: UTF8.self), mustBeSaved: mustBeSaved)
+        m.builtModel = BuiltModel(
+            uri: uri,
+            body: nil,
+            chunks: chunks,
+            mustBeSaved: mustBeSaved
+        )
         return true
 
     }

Sources/PianoAnalytics/Steps/CrashHandlingStep.swift

@@ -144,6 +144,10 @@ final class CrashHandlingStep: Step {
     // MARK: Step Implementation
 
     func processSetConfig(m: inout Model) {
+        if #available(watchOS 1.0, *) {
+            return
+        }
+
         /// REQUIREMENTS
         let conf = m.configuration
 

Sources/PianoAnalytics/Steps/SendStep.swift

@@ -133,19 +133,6 @@ final class SendStep: Step {
     }
 
     func processSendEvents(m: inout Model, p: PianoAnalyticsWorkProtocol?) -> Bool {
-        /// REQUIREMENTS
-        let conf = m.configuration
-        let stored = m.storage
-
-        guard let buildModel = m.builtModel else {
-            return false
-        }
-
-        let userAgent = conf.get(ConfigurationKey.CustomUserAgent)
-        let offlineSendInterval = Double(conf.get(ConfigurationKey.OfflineSendInterval).toInt())
-        self.sendStoredData(stored, userAgent: userAgent, intervalInMs: offlineSendInterval)
-        self.send(buildModel, userAgent: userAgent)
-
-        return true
+        return processSendOfflineData(m: &m, p: p)
     }
 }

Sources/PianoAnalytics/Steps/StorageStep.swift

@@ -94,7 +94,12 @@ final class StorageStep: Step {
                 let content = try String(contentsOf: f)
                 if let data = Crypt.decrypt(data: content) {
                     if let map = PianoAnalyticsUtils.fromJSONData(Data(data.utf8)) {
-                        storedData[f.absoluteString] = BuiltModel(uri: map[StorageStep.UriField], body: map[StorageStep.BodyField], mustBeSaved: false)
+                        storedData[f.absoluteString] = BuiltModel(
+                            uri: map[StorageStep.UriField],
+                            body: map[StorageStep.BodyField],
+                            chunks: nil,
+                            mustBeSaved: false
+                        )
                     }
                 }
             }
@@ -148,20 +153,26 @@ final class StorageStep: Step {
         let conf = m.configuration
         let encryptionMode = EncryptionMode.init(rawValue: conf.get(ConfigurationKey.OfflineEncryptionMode)) ?? EncryptionMode.IfCompatible
 
-        if let builtModel = m.builtModel, builtModel.mustBeSaved {
-            guard let jsonData = PianoAnalyticsUtils.toJSONData([
-                StorageStep.UriField: builtModel.uri,
-                StorageStep.BodyField: builtModel.body
-            ]) else {
+        if let builtModel = m.builtModel {
+            if let chunks = builtModel.chunks {
+                chunks.forEach { chunk in
+                    guard let jsonData = PianoAnalyticsUtils.toJSONData([
+                        StorageStep.UriField: builtModel.uri,
+                        StorageStep.BodyField: chunk
+                    ]) else {
+                        return
+                    }
+                    self.storeData(String(decoding: jsonData, as: UTF8.self), encryptionMode: encryptionMode)
+                }
+            }
+
+            if builtModel.mustBeSaved {
                 return false
             }
-            self.storeData(String(decoding: jsonData, as: UTF8.self), encryptionMode: encryptionMode)
-            return false
         }
 
         /// Retrieve stored data
         m.storage = self.readData()
         return true
-
     }
 }

Tests/PianoAnalyticsTests/PropertiesTests.swift

@@ -41,8 +41,17 @@ class TestProtocol: PianoAnalyticsWorkProtocol {
     }
 
     func onBeforeSend(built: BuiltModel?, stored: [String: BuiltModel]?) -> Bool {
-        builtModel = built
-        completionHandler(built, stored)
+        do {
+            try stored?.forEach { key, _ in
+                if let url = URL(string: key), FileManager.default.fileExists(atPath: key.replacingOccurrences(of: "file://", with: "")) {
+                    try FileManager.default.removeItem(at: url)
+                }
+            }
+        } catch {}
+
+        builtModel = stored?.first?.value
+        completionHandler(builtModel, stored)
+
         return false
     }
 }
@@ -55,10 +64,12 @@ class PropertiesTests: XCTestCase {
         // Put setup code here. This method is called before the invocation of each test method in the class.
         clearStorage()
         self.pa = PianoAnalytics(configFileLocation: "default-test.json")
+        pa.deleteOfflineData()
     }
 
     override func tearDownWithError() throws {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
+        pa.deleteOfflineData()
     }
 
     func clearStorage() {
@@ -156,9 +167,11 @@ class PropertiesTests: XCTestCase {
         self.pa.sendEvent(Event("another", data: [:]), config: nil, p: TestProtocol { built, _ in
             localBuilt1 = built
         })
+        self.pa.deleteOfflineData()
         self.pa.sendEvent(Event("toto", data: [:]), config: nil, p: TestProtocol { built, _ in
             localBuilt2 = built
         })
+        self.pa.deleteOfflineData()
         self.pa.sendEvent(Event("tata", data: [:]), config: nil, p: TestProtocol { built, _ in
             localBuilt3 = built
             expectation.fulfill()

Tests/PianoAnalyticsTests/UsersTests.swift

@@ -35,10 +35,12 @@ class UsersTests: XCTestCase {
         // Put setup code here. This method is called before the invocation of each test method in the class.
         clearStorage()
         self.pa = PianoAnalytics(configFileLocation: "default-test.json")
+        pa.deleteOfflineData()
     }
 
     override func tearDownWithError() throws {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
+        pa.deleteOfflineData()
     }
 
     func clearStorage() {