Remove OSLog as it doesn't support non-Apple platform

supabase · Jan 12, 2024 · 325d153 · 325d153
1 parent 0117196
commit 325d153
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 11 deletions.
diff --git a/Examples/Examples.xcodeproj/xcshareddata/xcschemes/SlackClone.xcscheme b/Examples/Examples.xcodeproj/xcshareddata/xcschemes/SlackClone.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1520"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Examples/SlackClone/Store.swift b/Examples/SlackClone/Store.swift
@@ -32,7 +32,7 @@ final class Store {
     channels = try await fetchChannels()
 
     Task {
-      for await status in await supabase.realtimeV2.status.values {
+      for await status in await supabase.realtimeV2.status {
         self.socketConnectionStatus = String(describing: status)
       }
     }
@@ -42,7 +42,7 @@ final class Store {
       messagesListener = channel
 
       Task {
-        for await status in await channel.status.values {
+        for await status in await channel.status {
           self.messagesListenerStatus = String(describing: status)
         }
       }
@@ -77,7 +77,7 @@ final class Store {
       usersListener = channel
 
       Task {
-        for await status in await channel.status.values {
+        for await status in await channel.status {
           self.usersListenerStatus = String(describing: status)
         }
       }
@@ -96,7 +96,7 @@ final class Store {
       channelsListener = channel
 
       Task {
-        for await status in await channel.status.values {
+        for await status in await channel.status {
           self.channelsListenerStatus = String(describing: status)
         }
       }

diff --git a/Examples/SlackClone/Supabase.swift b/Examples/SlackClone/Supabase.swift
@@ -23,5 +23,10 @@ let decoder: JSONDecoder = {
 let supabase = SupabaseClient(
   supabaseURL: URL(string: "https://xxpemjxnvjqnjjermerd.supabase.co")!,
   supabaseKey: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Inh4cGVtanhudmpxbmpqZXJtZXJkIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDE1MTc3OTEsImV4cCI6MjAxNzA5Mzc5MX0.SLcEdwQEwZkif49WylKfQQv5ZiWRQdpDm8d2JhvBdtk",
-  options: SupabaseClientOptions(db: .init(encoder: encoder, decoder: decoder))
+  options: SupabaseClientOptions(
+    db: .init(encoder: encoder, decoder: decoder),
+    auth: SupabaseClientOptions.AuthOptions(
+      storage: KeychainLocalStorage(service: "supabase", accessGroup: nil)
+    )
+  )
 )
diff --git a/Sources/Realtime/V2/RealtimeClientV2.swift b/Sources/Realtime/V2/RealtimeClientV2.swift
@@ -38,7 +38,7 @@ public actor RealtimeClientV2 {
     }
   }
 
-  public enum Status {
+  public enum Status: Sendable {
     case disconnected
     case connecting
     case connected

diff --git a/Sources/_Helpers/Logger.swift b/Sources/_Helpers/Logger.swift
@@ -7,15 +7,32 @@
 
 import ConcurrencyExtras
 import Foundation
-import OSLog
+
+private struct Logger {
+  var subsystem: String
+  var category: String
+
+  func debug(
+    _ message: @autoclosure () -> String,
+    function: String = #function,
+    file: String = #file,
+    line: UInt = #line
+  ) {
+    #if DEBUG
+      let logLine =
+        "[\(category)] [\(function) \(file.split(separator: "/").last!):\(line)] \(message())"
+      print(logLine)
+    #endif
+  }
+}
 
 private let _debugLoggingEnabled = LockIsolated(true)
 @_spi(Internal) public var debugLoggingEnabled: Bool {
   get { _debugLoggingEnabled.value }
   set { _debugLoggingEnabled.setValue(newValue) }
 }
 
-private let logger = OSLog(subsystem: "com.supabase", category: "supabase-swift")
+private let logger = Logger(subsystem: "com.supabase", category: "supabase-swift")
 @_spi(Internal) public func debug(
   _ message: @autoclosure () -> String,
   function: String = #function,
@@ -25,8 +42,7 @@ private let logger = OSLog(subsystem: "com.supabase", category: "supabase-swift"
   assert(
     {
       if debugLoggingEnabled {
-        let logLine = "[\(function) \(file.split(separator: "/").last!):\(line)] \(message())"
-        os_log(.debug, log: logger, "%@", logLine)
+        logger.debug(message(), function: function, file: file, line: line)
       }
 
       return true