fix concurrency warning

Demo.swiftpm/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -36,8 +36,8 @@ let package = Package(
         .executableTarget(
             name: "AppModule",
             dependencies: [
-                .productItem(name: "Parchment", package: "Parchment", condition: nil),
-                .productItem(name: "ParchmentDefault", package: "Parchment", condition: nil),
+                .product(name: "Parchment", package: "Parchment"),
+                .product(name: "ParchmentDefault", package: "Parchment"),
             ]
         )
     ]

Demo.swiftpm/Sources/AppModule/Demo.swift

@@ -7,10 +7,11 @@ extension LoggerComponentID {
 }
 
 struct MyLogger: LoggerComponent {
-    static var id: LoggerComponentID = .my
+    static let id: LoggerComponentID = .my
 
     func send(_ log: [LoggerSendable]) async -> Bool {
         print("send \(log)")
+        try? await Task.sleep(nanoseconds: 1000_000)
         return true
     }
 }
@@ -36,14 +37,12 @@ struct ExampleAppApp: App {
         WindowGroup {
             Button("send event") {
                 Task {
-                    await logger.send(.tap, with: .init(policy: .bufferingFirst))
+                    await logger.send(event: .tap, with: .init(policy: .bufferingFirst))
                 }
             }
-            .onAppear {
-                logger.startLogging()
-                Task {
-                    await logger.send(.impletion("home"))
-                }
+            .task {
+                await logger.startLogging()
+                await logger.send(event: .impletion("home"))
             }
         }
     }

Package.swift

@@ -16,20 +16,13 @@ let package = Package(
             targets: ["ParchmentDefault"]
         ),
     ],
-    dependencies: [
-        // TODO: versioning
-        .package(url: "https://github.com/realm/SwiftLint", branch: "main"),
-    ],
     targets: [
         .target(
             name: "Parchment",
             swiftSettings: [
                 .unsafeFlags([
                     "-strict-concurrency=complete"
                 ])
-            ],
-            plugins: [
-                .plugin(name: "SwiftLintPlugin", package: "SwiftLint")
             ]
         ),
         .target(
@@ -39,9 +32,6 @@ let package = Package(
                 .unsafeFlags([
                     "-strict-concurrency=complete"
                 ])
-            ],
-            plugins: [
-                .plugin(name: "SwiftLintPlugin", package: "SwiftLint")
             ]
         ),
         .testTarget(

Sources/Parchment/BufferRecord.swift

@@ -11,7 +11,7 @@ public struct BufferRecord: Loggable, LoggerSendable, Equatable {
     public let id: String
     public let destination: String
     public let eventName: String
-    public let parameters: [String: Any]
+    public let parameters: [String: Sendable]
     public let timestamp: Date
 
     public init(id: String = UUID().uuidString, destination: String, event: Loggable, timestamp: Date) {
@@ -26,7 +26,7 @@ public struct BufferRecord: Loggable, LoggerSendable, Equatable {
         id: String = UUID().uuidString,
         destination: String,
         eventName: String,
-        parameters: [String: Any],
+        parameters: [String: Sendable],
         timestamp: Date
     ) {
         self.id = id

Sources/Parchment/BufferedEventFlushScheduler.swift

@@ -6,7 +6,6 @@
 //
 import Foundation
 
-public protocol BufferedEventFlushScheduler {
-    func schedule(with buffer: TrackingEventBufferAdapter) async -> AsyncThrowingStream<[BufferRecord], Error>
-    func cancel()
+public protocol BufferedEventFlushScheduler: Sendable {
+    func schedule(with buffer: TrackingEventBuffer) async -> AsyncThrowingStream<[BufferRecord], Error>
 }

Sources/Parchment/Configuration.swift

@@ -5,6 +5,7 @@
 //  Created by k-kohey on 2021/10/26.
 //
 
+@MainActor
 public enum Configuration {
     public static var debugMode = false
 }
@@ -28,5 +29,7 @@ enum ConsoleLoggerCategory: String {
 // }
 
 func assertionIfDebugMode(_ msg: String) {
-    assert(Configuration.debugMode, msg)
+    Task { @MainActor in
+        assert(Configuration.debugMode, msg)
+    }
 }

Sources/Parchment/Loggable.swift

@@ -7,16 +7,16 @@
 
 import Foundation
 
-public protocol Loggable {
+public protocol Loggable: Sendable {
     var eventName: String { get }
-    var parameters: [String: Any] { get }
+    var parameters: [String: Sendable] { get }
 }
 
 public struct TrackingEvent: Loggable {
     public let eventName: String
-    public let parameters: [String: Any]
+    public let parameters: [String: Sendable]
 
-    public init(eventName: String, parameters: [String: Any]) {
+    public init(eventName: String, parameters: [String: Sendable]) {
         self.eventName = eventName
         self.parameters = parameters
     }

Sources/Parchment/LoggableDictonary.swift

@@ -9,14 +9,16 @@ import Foundation
 
 /// Experimental API
 
-public typealias LoggableDictonary = [PartialKeyPath<Loggable>: Any]
+public typealias LoggableDictonary = [PartialKeyPath<Loggable>: Sendable]
+
+extension PartialKeyPath<Loggable>: @unchecked Sendable {}
 
 extension LoggableDictonary: Loggable {
     public var eventName: String {
         self[\.eventName] as? String ?? ""
     }
 
-    public var parameters: [String: Any] {
-        self[\.parameters] as? [String: Any] ?? [:]
+    public var parameters: [String: Sendable] {
+        self[\.parameters] as? [String: Sendable] ?? [:]
     }
 }

Sources/Parchment/LoggerBundler.swift

@@ -6,17 +6,9 @@
 //
 import Foundation
 
-struct DateProvider {
-    static var mock: Date?
-
-    static func current() -> Date {
-        Self.mock ?? .init()
-    }
-}
-
-public final class LoggerBundler {
+public final actor LoggerBundler {
     private var components: [any LoggerComponent]
-    private let buffer: TrackingEventBufferAdapter
+    private let buffer: TrackingEventBuffer
     private let flushStrategy: BufferedEventFlushScheduler
 
     public var configMap: [LoggerComponentID: Configuration] = [:]
@@ -30,7 +22,7 @@ public final class LoggerBundler {
         loggingStrategy: some BufferedEventFlushScheduler
     ) {
         self.components = components
-        self.buffer = .init(buffer)
+        self.buffer = buffer
         flushStrategy = loggingStrategy
     }
 
@@ -52,7 +44,7 @@ public final class LoggerBundler {
             let record = BufferRecord(
                 destination: logger.id.value,
                 event: mutations.transform(event, id: logger.id),
-                timestamp: DateProvider.current()
+                timestamp: .init()
             )
             await dispatch([record], for: logger, with: option)
         }
@@ -91,28 +83,15 @@ public final class LoggerBundler {
         }
     }
 
-    public func startLogging() {
-        loggingTask = Task { [weak self] in
-            guard let self = self else {
-                assertionIfDebugMode(
-                    "LoggerBundler instance should been retained by any object due to log events definitely"
-                )
-                return
-            }
-            do {
-                for try await records in await self.flushStrategy.schedule(with: self.buffer) {
-                    await self.bloadcast(records)
-                }
-            } catch {
-//                console()?.log("\(error.localizedDescription)")
+    @discardableResult
+    public func startLogging() -> Task<Void, Error> {
+        Task {
+            for try await records in await flushStrategy.schedule(with: buffer) {
+                await self.bloadcast(records)
             }
         }
     }
 
-    func cancell() {
-        loggingTask?.cancel()
-    }
-
     private func bloadcast(_ records: [BufferRecord]) async {
         let recordEachLogger = Dictionary(grouping: records) { record in
             record.destination
@@ -164,7 +143,7 @@ public extension LoggerBundler {
         await send(event, with: option)
     }
 
-    func send(event: [PartialKeyPath<Loggable>: Any], with option: LoggingOption = .init()) async {
+    func send(event: [PartialKeyPath<Loggable>: Sendable], with option: LoggingOption = .init()) async {
         await send(event, with: option)
     }
 }

Sources/Parchment/LoggerComponent.swift

@@ -14,14 +14,14 @@ public struct LoggerComponentID: Hashable {
     }
 }
 
-public protocol LoggerSendable {
+public protocol LoggerSendable: Sendable {
     var event: Loggable { get }
     var timestamp: Date { get }
 }
 
-public protocol LoggerComponent {
+public protocol LoggerComponent: Sendable {
     static var id: LoggerComponentID { get }
-    func send(_: [LoggerSendable]) async -> Bool
+    func send(_: [any LoggerSendable]) async -> Bool
 }
 
 extension LoggerComponent {

Sources/Parchment/TrackingEventBuffer.swift

@@ -7,34 +7,14 @@
 
 import Foundation
 
-public protocol TrackingEventBuffer {
-    func save(_ event: [BufferRecord])
-    func load(limit: Int64) -> [BufferRecord]
-    func count() -> Int
+public protocol TrackingEventBuffer: Sendable {
+    func save(_ event: [BufferRecord]) async
+    func load(limit: Int64) async -> [BufferRecord]
+    func count() async -> Int
 }
 
-extension TrackingEventBuffer {
-    func load() -> [BufferRecord] {
-        load(limit: -1)
-    }
-}
-
-public final actor TrackingEventBufferAdapter {
-    private let buffer: any TrackingEventBuffer
-
-    init(_ buffer: some TrackingEventBuffer) {
-        self.buffer = buffer
-    }
-
-    public func save(_ event: [BufferRecord]) {
-        buffer.save(event)
-    }
-
-    public func load(limit: Int64 = -1) -> [BufferRecord] {
-        buffer.load(limit: limit)
-    }
-
-    public func count() -> Int {
-        buffer.count()
+public extension TrackingEventBuffer {
+    func load() async -> [BufferRecord] {
+        await load(limit: -1)
     }
 }

Sources/ParchmentDefault/DeviceDataMutation.swift

@@ -11,7 +11,7 @@
     import UIKit
 
     public struct DeviceDataMutation: Mutation {
-        private let deviceParams: [String: Any]
+        private let deviceParams: [String: Sendable]
 
         @MainActor
         public init(device: UIDevice) {

Sources/ParchmentDefault/LoggerBundler+.swift

@@ -11,7 +11,7 @@ public extension LoggerBundler {
     static func make(
         components: [any LoggerComponent],
         buffer: some TrackingEventBuffer = try! SQLiteBuffer(),
-        loggingStrategy: some BufferedEventFlushScheduler = RegularlyPollingScheduler.default
+        loggingStrategy: some BufferedEventFlushScheduler = RegularlyPollingScheduler(timeInterval: 60)
     ) -> LoggerBundler {
         Self(components: components, buffer: buffer, loggingStrategy: loggingStrategy)
     }