Revert RealtimeClient breaking change

Author: Guilherme Souza

Sources/Realtime/Deprecated.swift

@@ -9,146 +9,3 @@ import Foundation
 
 @available(*, deprecated, renamed: "RealtimeMessage")
 public typealias Message = RealtimeMessage
-
-extension RealtimeChannelV2 {
-//  @available(
-//    *,
-//    deprecated,
-//    message: "Please use one of postgresChanges, presenceChange, or broadcast methods that returns an AsyncSequence instead."
-//  )
-//  @discardableResult
-//  public func on(
-//    _ event: String,
-//    filter: ChannelFilter,
-//    handler: @escaping (Message) -> Void
-//  ) -> RealtimeChannel {
-//    let stream: AsyncStream<HasRawMessage>
-//
-//    switch event.lowercased() {
-//    case "postgres_changes":
-//      switch filter.event?.uppercased() {
-//      case "UPDATE":
-//        stream = postgresChange(
-//          UpdateAction.self,
-//          schema: filter.schema ?? "public",
-//          table: filter.table!,
-//          filter: filter.filter
-//        )
-//        .map { $0 as HasRawMessage }
-//        .eraseToStream()
-//      case "INSERT":
-//        stream = postgresChange(
-//          InsertAction.self,
-//          schema: filter.schema ?? "public",
-//          table: filter.table!,
-//          filter: filter.filter
-//        )
-//        .map { $0 as HasRawMessage }
-//        .eraseToStream()
-//      case "DELETE":
-//        stream = postgresChange(
-//          DeleteAction.self,
-//          schema: filter.schema ?? "public",
-//          table: filter.table!,
-//          filter: filter.filter
-//        )
-//        .map { $0 as HasRawMessage }
-//        .eraseToStream()
-//      case "SELECT":
-//        stream = postgresChange(
-//          SelectAction.self,
-//          schema: filter.schema ?? "public",
-//          table: filter.table!,
-//          filter: filter.filter
-//        )
-//        .map { $0 as HasRawMessage }
-//        .eraseToStream()
-//      default:
-//        stream = postgresChange(
-//          AnyAction.self,
-//          schema: filter.schema ?? "public",
-//          table: filter.table!,
-//          filter: filter.filter
-//        )
-//        .map { $0 as HasRawMessage }
-//        .eraseToStream()
-//      }
-//
-//    case "presence":
-//      stream = presenceChange().map { $0 as HasRawMessage }.eraseToStream()
-//    case "broadcast":
-//      stream = broadcast(event: filter.event!).map { $0 as HasRawMessage }.eraseToStream()
-//    default:
-//      fatalError(
-//        "Unsupported event '\(event)'. Expected one of: postgres_changes, presence, or broadcast."
-//      )
-//    }
-//
-//    Task {
-//      for await action in stream {
-//        handler(action.rawMessage)
-//      }
-//    }
-//
-//    return self
-//  }
-}
-
-extension RealtimeClient {
-  @available(
-    *,
-    deprecated,
-    message: "Replace usages of this initializer with new init(_:headers:params:vsn:logger)"
-  )
-  @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
-  public convenience init(
-    _ endPoint: String,
-    headers: [String: String] = [:],
-    params: Payload? = nil,
-    vsn: String = Defaults.vsn
-  ) {
-    self.init(endPoint, headers: headers, params: params, vsn: vsn, logger: nil)
-  }
-
-  @available(
-    *,
-    deprecated,
-    message: "Replace usages of this initializer with new init(_:headers:paramsClosure:vsn:logger)"
-  )
-  @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
-  public convenience init(
-    _ endPoint: String,
-    headers: [String: String] = [:],
-    paramsClosure: PayloadClosure?,
-    vsn: String = Defaults.vsn
-  ) {
-    self.init(
-      endPoint,
-      headers: headers, paramsClosure: paramsClosure,
-      vsn: vsn,
-      logger: nil
-    )
-  }
-
-  @available(
-    *,
-    deprecated,
-    message: "Replace usages of this initializer with new init(endPoint:headers:transport:paramsClosure:vsn:logger)"
-  )
-  public convenience init(
-    endPoint: String,
-    headers: [String: String] = [:],
-    transport: @escaping ((URL) -> PhoenixTransport),
-    paramsClosure: PayloadClosure? = nil,
-    vsn: String = Defaults.vsn
-  ) {
-    self.init(
-      endPoint: endPoint,
-      headers: headers,
-      transport: transport,
-      paramsClosure: paramsClosure,
-      vsn: vsn,
-      logger: nil
-    )
-  }
-}

Sources/Realtime/RealtimeClient.swift

@@ -122,7 +122,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
   public var rejoinAfter: (Int) -> TimeInterval = Defaults.rejoinSteppedBackOff
 
   /// The optional function to receive logs
-  public let logger: SupabaseLogger?
+  public var logger: ((String) -> Void)?
 
   /// Disables heartbeats from being sent. Default is false.
   public var skipHeartbeat: Bool = false
@@ -191,16 +191,14 @@ public class RealtimeClient: PhoenixTransportDelegate {
     _ endPoint: String,
     headers: [String: String] = [:],
     params: Payload? = nil,
-    vsn: String = Defaults.vsn,
-    logger: SupabaseLogger? = nil
+    vsn: String = Defaults.vsn
   ) {
     self.init(
       endPoint: endPoint,
       headers: headers,
       transport: { url in URLSessionTransport(url: url) },
       paramsClosure: { params },
-      vsn: vsn,
-      logger: logger
+      vsn: vsn
     )
   }
 
@@ -209,16 +207,14 @@ public class RealtimeClient: PhoenixTransportDelegate {
     _ endPoint: String,
     headers: [String: String] = [:],
     paramsClosure: PayloadClosure?,
-    vsn: String = Defaults.vsn,
-    logger: SupabaseLogger? = nil
+    vsn: String = Defaults.vsn
   ) {
     self.init(
       endPoint: endPoint,
       headers: headers,
       transport: { url in URLSessionTransport(url: url) },
       paramsClosure: paramsClosure,
-      vsn: vsn,
-      logger: logger
+      vsn: vsn
     )
   }
 
@@ -227,21 +223,19 @@ public class RealtimeClient: PhoenixTransportDelegate {
     headers: [String: String] = [:],
     transport: @escaping ((URL) -> PhoenixTransport),
     paramsClosure: PayloadClosure? = nil,
-    vsn: String = Defaults.vsn,
-    logger: SupabaseLogger? = nil
+    vsn: String = Defaults.vsn
   ) {
     self.transport = transport
     self.paramsClosure = paramsClosure
     self.endPoint = endPoint
     self.vsn = vsn
-    self.logger = logger
 
     var headers = headers
     if headers["X-Client-Info"] == nil {
       headers["X-Client-Info"] = "realtime-swift/\(version)"
     }
     self.headers = headers
-    http = HTTPClient(logger: logger, fetchHandler: { try await URLSession.shared.data(for: $0) })
+    http = HTTPClient(logger: nil, fetchHandler: { try await URLSession.shared.data(for: $0) })
 
     let params = paramsClosure?()
     if let jwt = (params?["Authorization"] as? String)?.split(separator: " ").last {
@@ -767,7 +761,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
   /// - parameter items: List of items to be logged. Behaves just like debugPrint()
   func logItems(_ items: Any...) {
     let msg = items.map { String(describing: $0) }.joined(separator: ", ")
-    logger?.debug("SwiftPhoenixClient: \(msg)")
+    logger?("SwiftPhoenixClient: \(msg)")
   }
 
   // ----------------------------------------------------------------------

Sources/Supabase/SupabaseClient.swift

@@ -114,8 +114,7 @@ public final class SupabaseClient: @unchecked Sendable {
     realtime = RealtimeClient(
       supabaseURL.appendingPathComponent("/realtime/v1").absoluteString,
       headers: defaultHeaders,
-      params: defaultHeaders,
-      logger: options.global.logger
+      params: defaultHeaders
     )
 
     realtimeV2 = RealtimeClientV2(