Smaller refactoring

Sources/Common/Http/HttpClient.swift

@@ -34,14 +34,12 @@ public enum HttpClientError: Error {
 }
 
 extension HTTPURLResponse {
-    public func mapStatusToError(error: HttpError?, flag: String = "unknown") -> Error {
+    public func mapStatusToError(error: HttpError?) -> Error {
         let defaultError = ConfidenceError.internalError(
             message: "General error: \(error?.message ?? "Unknown error")")
 
         switch self.status {
-        case .notFound:
-            return ConfidenceError.badRequest(message: flag) // TODO
-        case .badRequest:
+        case .notFound, .badRequest:
             return ConfidenceError.badRequest(message: error?.message ?? "")
         default:
             return defaultError

Sources/Common/Http/NetworkClient.swift

@@ -130,7 +130,6 @@ extension NetworkClient {
             let decoder = JSONDecoder()
             decoder.dateDecodingStrategy = .iso8601
             if response.response.status == .ok {
-                // TODO: Inspect and log errors
                 response.decodedData = try decoder.decode(T.self, from: responseData)
             } else {
                 do {

Sources/Common/Http/Sdk.swift

@@ -0,0 +1,11 @@
+import Foundation
+
+public struct Sdk: Codable {
+    public init(id: String?, version: String?) {
+        self.id = id ?? "SDK_ID_SWIFT_PROVIDER"
+        self.version = version ?? "unknown"
+    }
+
+    var id: String
+    var version: String
+}

Sources/Confidence/Confidence.swift

@@ -28,11 +28,13 @@ public class Confidence: ConfidenceEventSender {
         self.parent = parent
     }
 
-    // TODO: Implement actual event uploading to the backend
     public func send(definition: String, payload: ConfidenceStruct) {
         print("Sending: \"\(definition)\".\nMessage: \(payload)\nContext: \(context)")
         Task {
-            try? await client.send(definition: definition, payload: payload)
+            // TODO: This will be called inside the EventSenderEngine once implemented
+            try? await client.upload(batch: [
+                ConfidenceClientEvent(definition: definition, payload: payload)
+            ])
         }
     }
 
@@ -105,6 +107,7 @@ extension Confidence {
                 client: RemoteConfidenceClient(
                     options: ConfidenceClientOptions(
                         credentials: ConfidenceClientCredentials.clientSecret(secret: clientSecret),
+                        timeout: timeout,
                         region: region),
                     metadata: ConfidenceMetadata(
                         name: "SDK_ID_SWIFT_CONFIDENCE",

Sources/Confidence/ConfidenceClient/ConfidenceClient.swift

@@ -1,5 +1,10 @@
 import Foundation
 
 public protocol ConfidenceClient {
-    func send(definition: String, payload: ConfidenceStruct) async throws
+    func upload(batch: [ConfidenceClientEvent]) async throws
+}
+
+public struct ConfidenceClientEvent {
+    var definition: String
+    var payload: ConfidenceStruct
 }

Sources/Confidence/ConfidenceClient/RemoteConfidenceClient.swift

@@ -26,16 +26,16 @@ public class RemoteConfidenceClient: ConfidenceClient {
         self.metadata = metadata
     }
 
-    public func send(definition: String, payload: ConfidenceStruct) async throws {
+    public func upload(batch: [ConfidenceClientEvent]) async throws {
         let timeString = Date.backport.nowISOString
         let request = PublishEventRequest(
-            events: [
+            events: batch.map { event in
                 Event(
-                    eventDefinition: "eventDefinitions/\(definition)",
-                    payload: payload,
+                    eventDefinition: "eventDefinitions/\(event.definition)",
+                    payload: event.payload,
                     eventTime: timeString
                 )
-            ],
+            },
             clientSecret: options.credentials.getSecret(),
             sendTime: timeString,
             sdk: Sdk(id: metadata.name, version: metadata.version)
@@ -99,14 +99,3 @@ struct EventError: Decodable {
         case unknown
     }
 }
-
-
-struct Sdk: Encodable {
-    init(id: String?, version: String?) {
-        self.id = id ?? "SDK_ID_SWIFT_PROVIDER"
-        self.version = version ?? "unknown"
-    }
-
-    var id: String
-    var version: String
-}

Sources/ConfidenceProvider/ConfidenceClient/RemoteConfidenceClient.swift

@@ -172,16 +172,6 @@ struct ApplyFlagsRequest: Codable {
 struct ApplyFlagsResponse: Codable {
 }
 
-struct Sdk: Codable {
-    init(id: String?, version: String?) {
-        self.id = id ?? "SDK_ID_SWIFT_PROVIDER"
-        self.version = version ?? "unknown"
-    }
-
-    var id: String
-    var version: String
-}
-
 private func displayName(resolvedFlag: ResolvedFlag) throws -> String {
     let flagNameComponents = resolvedFlag.flag.components(separatedBy: "/")
     if flagNameComponents.count <= 1 || flagNameComponents[0] != "flags" {

Tests/ConfidenceTests/Helpers/ConfidenceClientMock.swift

@@ -3,7 +3,7 @@ import Foundation
 @testable import Confidence
 
 class ConfidenceClientMock: ConfidenceClient {
-    func send(definition: String, payload: ConfidenceStruct) async throws {
+    func upload(batch: [ConfidenceClientEvent]) async throws {
         // NO-OP
     }
 }