wip switch to using proxy client

Sources/AblyChat/AblyCocoaExtensions/Ably+Dependencies.swift

@@ -1,10 +1,14 @@
 import Ably
 
-extension ARTRealtime: RealtimeClientProtocol {}
+extension ARTRealtime: SuppliedRealtimeClientProtocol {}
+
+extension ARTRealtimeWrapperSDKProxy: RealtimeClientProtocol {}
 
 extension ARTRealtimeChannels: RealtimeChannelsProtocol {}
+extension ARTRealtimeWrapperSDKChannelsProxy: RealtimeChannelsProtocol {}
 
 extension ARTRealtimeChannel: RealtimeChannelProtocol {}
+extension ARTRealtimeWrapperSDKChannelProxy: RealtimeChannelProtocol {}
 
 extension ARTRealtimePresence: RealtimePresenceProtocol {}
 

Sources/AblyChat/ChatClient.swift

@@ -60,9 +60,12 @@ public actor DefaultChatClient: ChatClient {
      *   - realtime: The Ably Realtime client.
      *   - clientOptions: The client options.
      */
-    public init(realtime: RealtimeClient, clientOptions: ClientOptions?) {
-        self.realtime = realtime
+    public init(realtime suppliedRealtime: any SuppliedRealtimeClientProtocol, clientOptions: ClientOptions?) {
+        self.realtime = suppliedRealtime
         self.clientOptions = clientOptions ?? .init()
+
+        let realtime = suppliedRealtime.createWrapperSDKProxy(with: .init(agents: agents))
+
         logger = DefaultInternalLogger(logHandler: self.clientOptions.logHandler, logLevel: self.clientOptions.logLevel)
         let roomFactory = DefaultRoomFactory()
         rooms = DefaultRooms(realtime: realtime, clientOptions: self.clientOptions, logger: logger, roomFactory: roomFactory)

Sources/AblyChat/Dependencies.swift

@@ -3,6 +3,13 @@ import Ably
 /// Expresses the requirements of the Ably realtime client that is supplied to the Chat SDK.
 ///
 /// The `ARTRealtime` class from the ably-cocoa SDK implements this protocol.
+public protocol SuppliedRealtimeClientProtocol: Sendable, RealtimeClientProtocol {
+    associatedtype ProxyClient: RealtimeClientProtocol
+
+    func createWrapperSDKProxy(with options:ARTWrapperProxyOptions) -> ProxyClient
+}
+
+/// Expresses the requirements of the object returned by ``SuppliedRealtimeClientProtocol/createWrapperSDKProxy(with:)``.
 public protocol RealtimeClientProtocol: ARTRealtimeProtocol, Sendable {
     associatedtype Channels: RealtimeChannelsProtocol
     associatedtype Connection: ConnectionProtocol
@@ -55,17 +62,10 @@ internal struct RealtimeChannelOptions {
 }
 
 internal extension RealtimeClientProtocol {
-    // Function to get the channel with merged options
+    // Function to get the channel with Chat's default options
     func getChannel(_ name: String, opts: RealtimeChannelOptions? = nil) -> any RealtimeChannelProtocol {
         var resolvedOptions = opts ?? .init()
 
-        // Add in the default params
-        resolvedOptions.params = (resolvedOptions.params ?? [:]).merging(
-            defaultChannelParams
-        ) { _, new
-            in new
-        }
-
         // CHA-GP2a
         resolvedOptions.attachOnSubscribe = false
 

Sources/AblyChat/Version.swift

@@ -6,6 +6,4 @@ import Ably
 // Version information
 internal let version = "0.1.1"
 
-internal let channelOptionsAgentString = "chat-swift/\(version)"
-
-internal let defaultChannelParams = ["agent": channelOptionsAgentString]
+internal let agents = ["chat-swift": version]

Tests/AblyChatTests/Mocks/MockRealtime.swift

@@ -3,7 +3,7 @@ import AblyChat
 import Foundation
 
 /// A mock implementation of `ARTRealtimeProtocol`. We’ll figure out how to do mocking in tests properly in https://github.com/ably-labs/ably-chat-swift/issues/5.
-final class MockRealtime: NSObject, RealtimeClientProtocol, @unchecked Sendable {
+final class MockRealtime: NSObject, SuppliedRealtimeClientProtocol, @unchecked Sendable {
     let connection: MockConnection
     let channels: MockChannels
     let paginatedCallback: (@Sendable () -> (ARTHTTPPaginatedResponse?, ARTErrorInfo?))?
@@ -103,4 +103,8 @@ final class MockRealtime: NSObject, RealtimeClientProtocol, @unchecked Sendable
         mutex.unlock()
         return result
     }
+
+    func createWrapperSDKProxy(with options: ARTWrapperProxyOptions) -> some RealtimeClientProtocol {
+        return self
+    }
 }