Get PluginAPI from an external repo

As required by the accompanying ably-cocoa submodule bump (see the
ably-cocoa commit message for explanation of why we're making this
change).

Author: lawrence-forooghian

AblyLiveObjects.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -21,6 +21,11 @@ let package = Package(
         .package(
             path: "ably-cocoa",
         ),
+        .package(
+            // TODO: Unpin this before release
+            url: "https://github.com/ably/ably-cocoa-plugin-support",
+            revision: "5282886",
+        ),
         .package(
             url: "https://github.com/apple/swift-argument-parser",
             from: "1.5.0",
@@ -48,7 +53,7 @@ let package = Package(
                 ),
                 .product(
                     name: "_AblyPluginSupportPrivate",
-                    package: "ably-cocoa",
+                    package: "ably-cocoa-plugin-support",
                 ),
             ],
         ),
@@ -62,7 +67,7 @@ let package = Package(
                 ),
                 .product(
                     name: "_AblyPluginSupportPrivate",
-                    package: "ably-cocoa",
+                    package: "ably-cocoa-plugin-support",
                 ),
             ],
             resources: [

Package.resolved

@@ -1,4 +1,5 @@
 internal import _AblyPluginSupportPrivate
+import Ably
 
 internal extension ARTClientOptions {
     private class Box<T> {
@@ -16,7 +17,7 @@ internal extension ARTClientOptions {
         get {
             let optionsValue = Plugin.defaultPluginAPI.pluginOptionsValue(
                 forKey: Self.garbageCollectionOptionsKey,
-                clientOptions: self,
+                clientOptions: asPluginPublicClientOptions,
             )
 
             guard let optionsValue else {
@@ -38,7 +39,7 @@ internal extension ARTClientOptions {
             Plugin.defaultPluginAPI.setPluginOptionsValue(
                 Box<InternalDefaultRealtimeObjects.GarbageCollectionOptions>(boxed: newValue),
                 forKey: Self.garbageCollectionOptionsKey,
-                clientOptions: self,
+                clientOptions: asPluginPublicClientOptions,
             )
         }
     }

Package.swift

@@ -14,7 +14,7 @@ internal protocol CoreSDK: AnyObject, Sendable {
     func testsOnly_overridePublish(with newImplementation: @escaping ([OutboundObjectMessage]) async throws(InternalError) -> Void)
 
     /// Returns the current state of the Realtime channel that this wraps.
-    var channelState: ARTRealtimeChannelState { get }
+    var channelState: _AblyPluginSupportPrivate.RealtimeChannelState { get }
 }
 
 internal final class DefaultCoreSDK: CoreSDK {
@@ -24,7 +24,7 @@ internal final class DefaultCoreSDK: CoreSDK {
     private let channel: _AblyPluginSupportPrivate.RealtimeChannel
     private let client: _AblyPluginSupportPrivate.RealtimeClient
     private let pluginAPI: PluginAPIProtocol
-    private let logger: _AblyPluginSupportPrivate.Logger
+    private let logger: Logger
 
     /// If set to true, ``publish(objectMessages:)`` will behave like a no-op.
     ///
@@ -37,7 +37,7 @@ internal final class DefaultCoreSDK: CoreSDK {
         channel: _AblyPluginSupportPrivate.RealtimeChannel,
         client: _AblyPluginSupportPrivate.RealtimeClient,
         pluginAPI: PluginAPIProtocol,
-        logger: _AblyPluginSupportPrivate.Logger
+        logger: Logger
     ) {
         self.channel = channel
         self.client = client
@@ -81,8 +81,8 @@ internal final class DefaultCoreSDK: CoreSDK {
         }
     }
 
-    internal var channelState: ARTRealtimeChannelState {
-        channel.state
+    internal var channelState: _AblyPluginSupportPrivate.RealtimeChannelState {
+        pluginAPI.state(for: channel)
     }
 }
 
@@ -97,7 +97,7 @@ internal extension CoreSDK {
     ///   - operationDescription: A description of the operation being performed, used in error messages
     /// - Throws: `ARTErrorInfo` with code 90001 and statusCode 400 if the channel is in any of the invalid states
     func validateChannelState(
-        notIn invalidStates: [ARTRealtimeChannelState],
+        notIn invalidStates: [_AblyPluginSupportPrivate.RealtimeChannelState],
         operationDescription: String,
     ) throws(ARTErrorInfo) {
         let currentChannelState = channelState

Sources/AblyLiveObjects/Internal/ARTClientOptions+Objects.swift

@@ -1,4 +1,5 @@
 internal import _AblyPluginSupportPrivate
+import Ably
 
 // We explicitly import the NSObject class, else it seems to get transitively imported from  `internal import _AblyPluginSupportPrivate`, leading to the error "Class cannot be declared public because its superclass is internal".
 import ObjectiveC.NSObject
@@ -34,10 +35,11 @@ internal final class DefaultInternalPlugin: NSObject, _AblyPluginSupportPrivate.
 
     // Populates the channel's `objects` property.
     internal func prepare(_ channel: _AblyPluginSupportPrivate.RealtimeChannel, client: _AblyPluginSupportPrivate.RealtimeClient) {
-        let logger = pluginAPI.logger(for: channel)
+        let pluginLogger = pluginAPI.logger(for: channel)
         let callbackQueue = pluginAPI.callbackQueue(for: client)
-        let options = pluginAPI.options(for: client)
+        let options = ARTClientOptions.castPluginPublicClientOptions(pluginAPI.options(for: client))
 
+        let logger = DefaultLogger(pluginLogger: pluginLogger, pluginAPI: pluginAPI)
         logger.log("LiveObjects.DefaultInternalPlugin received prepare(_:)", level: .debug)
         let liveObjects = InternalDefaultRealtimeObjects(
             logger: logger,
@@ -68,9 +70,9 @@ internal final class DefaultInternalPlugin: NSObject, _AblyPluginSupportPrivate.
         _ serialized: [String: Any],
         context: DecodingContextProtocol,
         format: EncodingFormat,
-        error errorPtr: AutoreleasingUnsafeMutablePointer<ARTErrorInfo?>?,
+        error errorPtr: AutoreleasingUnsafeMutablePointer<_AblyPluginSupportPrivate.PublicErrorInfo?>?,
     ) -> (any ObjectMessageProtocol)? {
-        let wireObject = WireValue.objectFrom_AblyPluginSupportPrivateData(serialized)
+        let wireObject = WireValue.objectFromPluginSupportData(serialized)
 
         do {
             let wireObjectMessage = try InboundWireObjectMessage(
@@ -83,7 +85,7 @@ internal final class DefaultInternalPlugin: NSObject, _AblyPluginSupportPrivate.
             )
             return ObjectMessageBox(objectMessage: objectMessage)
         } catch {
-            errorPtr?.pointee = error.toARTErrorInfo()
+            errorPtr?.pointee = error.toARTErrorInfo().asPluginPublicErrorInfo
             return nil
         }
     }

Sources/AblyLiveObjects/Internal/CoreSDK.swift

@@ -21,7 +21,7 @@ internal final class InternalDefaultLiveCounter: Sendable {
         }
     }
 
-    private let logger: _AblyPluginSupportPrivate.Logger
+    private let logger: Logger
     private let userCallbackQueue: DispatchQueue
     private let clock: SimpleClock
 
@@ -30,7 +30,7 @@ internal final class InternalDefaultLiveCounter: Sendable {
     internal convenience init(
         testsOnly_data data: Double,
         objectID: String,
-        logger: _AblyPluginSupportPrivate.Logger,
+        logger: Logger,
         userCallbackQueue: DispatchQueue,
         clock: SimpleClock
     ) {
@@ -40,7 +40,7 @@ internal final class InternalDefaultLiveCounter: Sendable {
     private init(
         data: Double,
         objectID: String,
-        logger: _AblyPluginSupportPrivate.Logger,
+        logger: Logger,
         userCallbackQueue: DispatchQueue,
         clock: SimpleClock
     ) {
@@ -56,7 +56,7 @@ internal final class InternalDefaultLiveCounter: Sendable {
     ///   - objectID: The value for the "private objectId field" of RTO5c1b1a.
     internal static func createZeroValued(
         objectID: String,
-        logger: _AblyPluginSupportPrivate.Logger,
+        logger: Logger,
         userCallbackQueue: DispatchQueue,
         clock: SimpleClock,
     ) -> Self {

Sources/AblyLiveObjects/Internal/DefaultInternalPlugin.swift

@@ -38,7 +38,7 @@ internal final class InternalDefaultLiveMap: Sendable {
         }
     }
 
-    private let logger: _AblyPluginSupportPrivate.Logger
+    private let logger: Logger
     private let userCallbackQueue: DispatchQueue
     private let clock: SimpleClock
 
@@ -48,7 +48,7 @@ internal final class InternalDefaultLiveMap: Sendable {
         testsOnly_data data: [String: InternalObjectsMapEntry],
         objectID: String,
         testsOnly_semantics semantics: WireEnum<ObjectsMapSemantics>? = nil,
-        logger: _AblyPluginSupportPrivate.Logger,
+        logger: Logger,
         userCallbackQueue: DispatchQueue,
         clock: SimpleClock,
     ) {
@@ -66,7 +66,7 @@ internal final class InternalDefaultLiveMap: Sendable {
         data: [String: InternalObjectsMapEntry],
         objectID: String,
         semantics: WireEnum<ObjectsMapSemantics>?,
-        logger: _AblyPluginSupportPrivate.Logger,
+        logger: Logger,
         userCallbackQueue: DispatchQueue,
         clock: SimpleClock,
     ) {
@@ -84,7 +84,7 @@ internal final class InternalDefaultLiveMap: Sendable {
     internal static func createZeroValued(
         objectID: String,
         semantics: WireEnum<ObjectsMapSemantics>? = nil,
-        logger: _AblyPluginSupportPrivate.Logger,
+        logger: Logger,
         userCallbackQueue: DispatchQueue,
         clock: SimpleClock,
     ) -> Self {
@@ -398,7 +398,7 @@ internal final class InternalDefaultLiveMap: Sendable {
             using state: ObjectState,
             objectMessageSerialTimestamp: Date?,
             objectsPool: inout ObjectsPool,
-            logger: _AblyPluginSupportPrivate.Logger,
+            logger: Logger,
             clock: SimpleClock,
             userCallbackQueue: DispatchQueue,
         ) -> LiveObjectUpdate<DefaultLiveMapUpdate> {
@@ -467,7 +467,7 @@ internal final class InternalDefaultLiveMap: Sendable {
         internal mutating func mergeInitialValue(
             from operation: ObjectOperation,
             objectsPool: inout ObjectsPool,
-            logger: _AblyPluginSupportPrivate.Logger,
+            logger: Logger,
             userCallbackQueue: DispatchQueue,
             clock: SimpleClock,
         ) -> LiveObjectUpdate<DefaultLiveMapUpdate> {
@@ -621,7 +621,7 @@ internal final class InternalDefaultLiveMap: Sendable {
             operationTimeserial: String?,
             operationData: ObjectData?,
             objectsPool: inout ObjectsPool,
-            logger: _AblyPluginSupportPrivate.Logger,
+            logger: Logger,
             userCallbackQueue: DispatchQueue,
             clock: SimpleClock,
         ) -> LiveObjectUpdate<DefaultLiveMapUpdate> {
@@ -744,7 +744,7 @@ internal final class InternalDefaultLiveMap: Sendable {
         internal mutating func applyMapCreateOperation(
             _ operation: ObjectOperation,
             objectsPool: inout ObjectsPool,
-            logger: _AblyPluginSupportPrivate.Logger,
+            logger: Logger,
             userCallbackQueue: DispatchQueue,
             clock: SimpleClock,
         ) -> LiveObjectUpdate<DefaultLiveMapUpdate> {

Sources/AblyLiveObjects/Internal/InternalDefaultLiveCounter.swift

@@ -8,7 +8,7 @@ internal final class InternalDefaultRealtimeObjects: Sendable, LiveMapObjectPool
 
     private nonisolated(unsafe) var mutableState: MutableState!
 
-    private let logger: _AblyPluginSupportPrivate.Logger
+    private let logger: Logger
     private let userCallbackQueue: DispatchQueue
     private let clock: SimpleClock
 
@@ -91,7 +91,7 @@ internal final class InternalDefaultRealtimeObjects: Sendable, LiveMapObjectPool
         }
     }
 
-    internal init(logger: _AblyPluginSupportPrivate.Logger, userCallbackQueue: DispatchQueue, clock: SimpleClock, garbageCollectionOptions: GarbageCollectionOptions = .init()) {
+    internal init(logger: Logger, userCallbackQueue: DispatchQueue, clock: SimpleClock, garbageCollectionOptions: GarbageCollectionOptions = .init()) {
         self.logger = logger
         self.userCallbackQueue = userCallbackQueue
         self.clock = clock

Sources/AblyLiveObjects/Internal/InternalDefaultLiveMap.swift

@@ -1,4 +1,5 @@
 internal import _AblyPluginSupportPrivate
+import Ably
 
 /// This is the equivalent of the `LiveObject` abstract class described in RTLO.
 ///