Share version value with sub packages

Author: grdsdev

Package.swift

@@ -31,7 +31,7 @@ let package = Package(
   ],
   targets: [
     .target(name: "_Helpers"),
-    .target(name: "Functions"),
+    .target(name: "Functions", dependencies: ["_Helpers"]),
     .testTarget(name: "FunctionsTests", dependencies: ["Functions"]),
     .target(
       name: "GoTrue",
@@ -49,7 +49,7 @@ let package = Package(
       ],
       resources: [.process("Resources")]
     ),
-    .target(name: "PostgREST"),
+    .target(name: "PostgREST", dependencies: ["_Helpers"]),
     .testTarget(
       name: "PostgRESTTests",
       dependencies: [

Sources/Functions/FunctionsClient.swift

@@ -1,4 +1,7 @@
 import Foundation
+@_spi(Internal) import _Helpers
+
+let version = _Helpers.version
 
 /// An actor representing a client for invoking functions.
 public actor FunctionsClient {
@@ -27,7 +30,9 @@ public actor FunctionsClient {
   ) {
     self.url = url
     self.headers = headers
-    self.headers["X-Client-Info"] = "functions-swift/\(version)"
+    if headers["X-Client-Info"] == nil {
+      self.headers["X-Client-Info"] = "functions-swift/\(version)"
+    }
     self.fetch = fetch
   }
 

Sources/Functions/Version.swift

@@ -1,4 +1,7 @@
 import Foundation
+@_spi(Internal) import _Helpers
+
+let version = _Helpers.version
 
 /// PostgREST client.
 public actor PostgrestClient {
@@ -46,7 +49,9 @@ public actor PostgrestClient {
   /// - Parameter configuration: The configuration for the client.
   public init(configuration: Configuration) {
     var configuration = configuration
-    configuration.headers["X-Client-Info"] = "postgrest-swift/\(version)"
+    if configuration.headers["X-Client-Info"] == nil {
+      configuration.headers["X-Client-Info"] = "postgrest-swift/\(version)"
+    }
     self.configuration = configuration
   }
 

Sources/GoTrue/Version.swift

@@ -42,7 +42,7 @@ public protocol PhoenixTransport {
    - Parameters:
    - headers: Headers to include in the URLRequests when opening the Websocket connection. Can be empty [:]
    */
-  func connect(with headers: [String: Any])
+  func connect(with headers: [String: String])
 
   /**
    Disconnect from the server.
@@ -188,7 +188,7 @@ open class URLSessionTransport: NSObject, PhoenixTransport, URLSessionWebSocketD
   public var readyState: PhoenixTransportReadyState = .closed
   public var delegate: PhoenixTransportDelegate? = nil
 
-  public func connect(with headers: [String: Any]) {
+  public func connect(with headers: [String: String]) {
     // Set the transport state as connecting
     readyState = .connecting
 

Sources/PostgREST/PostgrestClient.swift

@@ -96,7 +96,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
   public var timeout: TimeInterval = Defaults.timeoutInterval
 
   /// Custom headers to be added to the socket connection request
-  public var headers: [String: Any] = [:]
+  public var headers: [String: String] = [:]
 
   /// Interval between sending a heartbeat
   public var heartbeatInterval: TimeInterval = Defaults.heartbeatInterval
@@ -176,11 +176,13 @@ public class RealtimeClient: PhoenixTransportDelegate {
   @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: endPoint,
+      headers: headers,
       transport: { url in URLSessionTransport(url: url) },
       paramsClosure: { params },
       vsn: vsn
@@ -190,11 +192,13 @@ public class RealtimeClient: PhoenixTransportDelegate {
   @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: endPoint,
+      headers: headers,
       transport: { url in URLSessionTransport(url: url) },
       paramsClosure: paramsClosure,
       vsn: vsn
@@ -203,6 +207,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
 
   public init(
     endPoint: String,
+    headers: [String: String] = [:],
     transport: @escaping ((URL) -> PhoenixTransport),
     paramsClosure: PayloadClosure? = nil,
     vsn: String = Defaults.vsn
@@ -211,6 +216,13 @@ public class RealtimeClient: PhoenixTransportDelegate {
     self.paramsClosure = paramsClosure
     self.endPoint = endPoint
     self.vsn = vsn
+
+    var headers = headers
+    if headers["X-Client-Info"] == nil {
+      headers["X-Client-Info"] = "realtime-swift/\(version)"
+    }
+    self.headers = headers
+
     let params = paramsClosure?()
     if let jwt = (params?["Authorization"] as? String)?.split(separator: " ").last {
       accessToken = String(jwt)

Sources/PostgREST/Version.swift

@@ -9,6 +9,10 @@ public class StorageApi {
   public let configuration: StorageClientConfiguration
 
   public init(configuration: StorageClientConfiguration) {
+    var configuration = configuration
+    if configuration.headers["X-Client-Info"] == nil {
+      configuration.headers["X-Client-Info"] = "storage-swift/\(version)"
+    }
     self.configuration = configuration
   }
 

Sources/Realtime/PhoenixTransport.swift

@@ -1,10 +1,13 @@
 import Foundation
+@_spi(Internal) import _Helpers
 @_exported import Functions
 @_exported import GoTrue
 @_exported import PostgREST
 @_exported import Realtime
 @_exported import Storage
 
+let version = _Helpers.version
+
 /// Supabase Client.
 public class SupabaseClient {
   let options: SupabaseClientOptions
@@ -39,6 +42,7 @@ public class SupabaseClient {
   /// Realtime client for Supabase
   public private(set) lazy var realtime = RealtimeClient(
     realtimeURL.absoluteString,
+    headers: defaultHeaders,
     params: defaultHeaders
   )