Use DispatchQueue instead of actor

Author: Guilherme Souza

Package.swift

@@ -5,7 +5,6 @@ import PackageDescription
 
 let package = Package(
   name: "swift-log-supabase",
-  platforms: [.iOS(.v15), .macOS(.v12)],
   products: [
     .library(
       name: "SupabaseLogger",

Sources/SupabaseLogger/LogsCache.swift

@@ -1,33 +1,40 @@
 import Foundation
 
-actor LogsCache {
+final class LogsCache {
 
   private let maximumNumberOfLogsToPopAtOnce = 100
 
+  private let queue = DispatchQueue(
+    label: "co.binaryscraping.supabase-log-cache", attributes: .concurrent)
   private var cachedLogs: [[String: Any]] = []
 
   func push(_ log: [String: Any]) {
-    cachedLogs.append(log)
+    queue.sync { self.cachedLogs.append(log) }
   }
 
   func push(_ logs: [[String: Any]]) {
-    cachedLogs.append(contentsOf: logs)
+    queue.sync { self.cachedLogs.append(contentsOf: logs) }
   }
 
   func pop() -> [[String: Any]] {
-    let sliceSize = min(maximumNumberOfLogsToPopAtOnce, cachedLogs.count)
-    let poppedLogs = Array(cachedLogs[..<sliceSize])
-    cachedLogs.removeFirst(sliceSize)
+    var poppedLogs: [[String: Any]] = []
+    queue.sync(flags: .barrier) {
+      let sliceSize = min(maximumNumberOfLogsToPopAtOnce, cachedLogs.count)
+      poppedLogs = Array(cachedLogs[..<sliceSize])
+      cachedLogs.removeFirst(sliceSize)
+    }
     return poppedLogs
   }
 
   func backupCache() {
-    do {
-      let data = try JSONSerialization.data(withJSONObject: cachedLogs)
-      try data.write(to: LogsCache.fileURL())
-      self.cachedLogs = []
-    } catch {
-      print("Error saving Logs cache.")
+    queue.sync(flags: .barrier) {
+      do {
+        let data = try JSONSerialization.data(withJSONObject: cachedLogs)
+        try data.write(to: LogsCache.fileURL())
+        self.cachedLogs = []
+      } catch {
+        print("Error saving Logs cache.")
+      }
     }
   }
 
@@ -38,9 +45,7 @@ actor LogsCache {
     .appendingPathComponent("supabase-log-cache")
   }
 
-  static let shared = LogsCache()
-
-  private init() {
+  init() {
     do {
       let data = try Data(contentsOf: LogsCache.fileURL())
       try FileManager.default.removeItem(at: LogsCache.fileURL())

Sources/SupabaseLogger/SupabaseLogHandler.swift

@@ -7,7 +7,7 @@ import Logging
   import AppKit
 #endif
 
-public struct SupabaseLogConfig {
+public struct SupabaseLogConfig: Hashable {
   let supabaseURL: String
   let supabaseAnonKey: String
 
@@ -38,7 +38,7 @@ public struct SupabaseLogHandler: LogHandler {
   private let logManager: SupabaseLogManager
 
   public init(config: SupabaseLogConfig) {
-    logManager = SupabaseLogManager(config: config)
+    logManager = SupabaseLogManager.shared(config)
   }
 
   public func log(
@@ -68,9 +68,25 @@ final class SupabaseLogManager {
   let cache: LogsCache
   let config: SupabaseLogConfig
 
-  init(config: SupabaseLogConfig) {
+  private static let queue = DispatchQueue(
+    label: "co.binaryscraping.supabase-log-manager.instances")
+  private static var instances: [SupabaseLogConfig: SupabaseLogManager] = [:]
+
+  static func shared(_ config: SupabaseLogConfig) -> SupabaseLogManager {
+    queue.sync {
+      if let manager = instances[config] {
+        return manager
+      }
+
+      let manager = SupabaseLogManager(config: config)
+      instances[config] = manager
+      return manager
+    }
+  }
+
+  private init(config: SupabaseLogConfig) {
     self.config = config
-    self.cache = LogsCache.shared
+    self.cache = LogsCache()
 
     #if os(macOS)
       NotificationCenter.default.addObserver(
@@ -90,54 +106,56 @@ final class SupabaseLogManager {
   }
 
   func log(_ payload: [String: Any]) {
-    Task { await cache.push(payload) }
+    cache.push(payload)
   }
 
   private func checkForLogsAndSend() {
-    Task {
-      let logs = await cache.pop()
-      if logs.isEmpty { return }
-
-      let data = try! JSONSerialization.data(withJSONObject: logs)
-      guard
-        let url = URL(string: self.config.supabaseURL)?.appendingPathComponent(self.config.table)
-      else {
-        return
-      }
+    let logs = cache.pop()
+    if logs.isEmpty { return }
+
+    let data = try! JSONSerialization.data(withJSONObject: logs)
+    guard
+      let url = URL(string: self.config.supabaseURL)?.appendingPathComponent(self.config.table)
+    else {
+      return
+    }
 
-      var request = URLRequest(url: url)
-      request.httpMethod = "POST"
-      request.httpBody = data
+    var request = URLRequest(url: url)
+    request.httpMethod = "POST"
+    request.httpBody = data
 
+    URLSession.shared.dataTask(with: request) { _, response, error in
       do {
-        let (_, response) = try await URLSession.shared.data(for: request)
-        if let httpResponse = response as? HTTPURLResponse {
-          if 200..<300 ~= httpResponse.statusCode {
-            return
-          }
+        if let error = error {
+          throw error
+        }
 
-          await cache.push(logs)
+        guard
+          let httpResponse = response as? HTTPURLResponse,
+          200..<300 ~= httpResponse.statusCode
+        else {
+          throw URLError(.badServerResponse)
         }
       } catch {
-        await cache.push(logs)
+        print(error)
+        self.cache.push(logs)
       }
     }
+    .resume()
   }
 }
 
 extension SupabaseLogManager {
   @objc func appWillTerminate() {
-    Task { await cache.backupCache() }
+    cache.backupCache()
   }
 
   #if os(iOS)
     @objc func didEnterForeground() {
     }
 
     @objc func didEnterBackground() {
-      Task {
-        await cache.backupCache()
-      }
+      cache.backupCache()
     }
   #endif
 }