Partial transition to v2 chat.

Example/AblyChatExample/ContentView.swift

@@ -171,13 +171,13 @@ struct ContentView: View {
 
         for message in previousMessages.items {
             withAnimation {
-                messages.append(BasicListItem(id: message.timeserial, title: message.clientID, text: message.text))
+                messages.append(BasicListItem(id: message.serial, title: message.clientID, text: message.text))
             }
         }
 
         for await message in messagesSubscription {
             withAnimation {
-                messages.insert(BasicListItem(id: message.timeserial, title: message.clientID, text: message.text), at: 0)
+                messages.insert(BasicListItem(id: message.serial, title: message.clientID, text: message.text), at: 0)
             }
         }
     }

Example/AblyChatExample/Mocks/Misc.swift

@@ -11,7 +11,8 @@ final class MockMessagesPaginatedResult: PaginatedResult {
     var items: [T] {
         Array(repeating: 0, count: numberOfMockMessages).map { _ in
             Message(
-                timeserial: "\(Date().timeIntervalSince1970)",
+                serial: "\(Date().timeIntervalSince1970)",
+                latestAction: .new,
                 clientID: self.clientID,
                 roomID: self.roomID,
                 text: MockStrings.randomPhrase(),

Example/AblyChatExample/Mocks/MockClients.swift

@@ -105,7 +105,8 @@ actor MockMessages: Messages {
     private func createSubscription() -> MockSubscription<Message> {
         let subscription = MockSubscription<Message>(randomElement: {
             Message(
-                timeserial: "\(Date().timeIntervalSince1970)",
+                serial: "\(Date().timeIntervalSince1970)",
+                latestAction: .new,
                 clientID: MockStrings.names.randomElement()!,
                 roomID: self.roomID,
                 text: MockStrings.randomPhrase(),
@@ -130,7 +131,8 @@ actor MockMessages: Messages {
 
     func send(params: SendMessageParams) async throws -> Message {
         let message = Message(
-            timeserial: "\(Date().timeIntervalSince1970)",
+            serial: "\(Date().timeIntervalSince1970)",
+            latestAction: .new,
             clientID: clientID,
             roomID: roomID,
             text: params.text,

Sources/AblyChat/ChatAPI.swift

@@ -3,19 +3,20 @@ import Ably
 internal final class ChatAPI: Sendable {
     private let realtime: RealtimeClient
     private let apiVersion = "/chat/v1"
+    private let apiVersionV2 = "/chat/v2" // TODO: remove v1 after full transition to v2
 
     public init(realtime: RealtimeClient) {
         self.realtime = realtime
     }
 
     // (CHA-M6) Messages should be queryable from a paginated REST API.
     internal func getMessages(roomId: String, params: QueryOptions) async throws -> any PaginatedResult<Message> {
-        let endpoint = "\(apiVersion)/rooms/\(roomId)/messages"
+        let endpoint = "\(apiVersionV2)/rooms/\(roomId)/messages"
         return try await makePaginatedRequest(endpoint, params: params.asQueryItems())
     }
 
     internal struct SendMessageResponse: Codable {
-        internal let timeserial: String
+        internal let serial: String
         internal let createdAt: Int64
     }
 
@@ -26,7 +27,7 @@ internal final class ChatAPI: Sendable {
             throw ARTErrorInfo.create(withCode: 40000, message: "Ensure your Realtime instance is initialized with a clientId.")
         }
 
-        let endpoint = "\(apiVersion)/rooms/\(roomId)/messages"
+        let endpoint = "\(apiVersionV2)/rooms/\(roomId)/messages"
         var body: [String: Any] = ["text": params.text]
 
         // (CHA-M3b) A message may be sent without metadata or headers. When these are not specified by the user, they must be omitted from the REST payload.
@@ -44,7 +45,8 @@ internal final class ChatAPI: Sendable {
         let createdAtInSeconds = TimeInterval(Double(response.createdAt) / 1000)
 
         let message = Message(
-            timeserial: response.timeserial,
+            serial: response.serial,
+            latestAction: .new,
             clientID: clientId,
             roomID: roomId,
             text: params.text,

Sources/AblyChat/DefaultMessages.swift

@@ -1,18 +1,15 @@
 import Ably
 
-// Typealias for the timeserial used to sync message subscriptions with. This is a string representation of a timestamp.
-private typealias TimeserialString = String
-
-// Wraps the MessageSubscription with the timeserial of when the subscription was attached or resumed.
+// Wraps the MessageSubscription with the message serial of when the subscription was attached or resumed.
 private struct MessageSubscriptionWrapper {
     let subscription: MessageSubscription
-    var timeserial: TimeserialString
+    var serial: String
 }
 
 // Temp extension to showcase changes in the chat sdk
-extension ARTMessage {
-    var action: String? { fatalError() }
-    var serial: String? { fatalError() }
+private extension ARTMessage {
+    var action: String? { fatalError("Not implemented") }
+    var serial: String? { fatalError("Not implemented") }
 }
 
 // TODO: Don't have a strong understanding of why @MainActor is needed here. Revisit as part of https://github.com/ably-labs/ably-chat-swift/issues/83
@@ -45,7 +42,7 @@ internal final class DefaultMessages: Messages, EmitsDiscontinuities {
     // (CHA-M4) Messages can be received via a subscription in realtime.
     internal func subscribe(bufferingPolicy: BufferingPolicy) async throws -> MessageSubscription {
         let uuid = UUID()
-        let timeserial = try await resolveSubscriptionStart()
+        let serial = try await resolveSubscriptionStart()
         let messageSubscription = MessageSubscription(
             bufferingPolicy: bufferingPolicy
         ) { [weak self] queryOptions in
@@ -54,12 +51,12 @@ internal final class DefaultMessages: Messages, EmitsDiscontinuities {
         }
 
         // (CHA-M4a) A subscription can be registered to receive incoming messages. Adding a subscription has no side effects on the status of the room or the underlying realtime channel.
-        subscriptionPoints[uuid] = .init(subscription: messageSubscription, timeserial: timeserial)
+        subscriptionPoints[uuid] = .init(subscription: messageSubscription, serial: serial)
 
         // (CHA-M4c) When a realtime message with name set to message.created is received, it is translated into a message event, which contains a type field with the event type as well as a message field containing the Message Struct. This event is then broadcast to all subscribers.
         // (CHA-M4d) If a realtime message with an unknown name is received, the SDK shall silently discard the message, though it may log at DEBUG or TRACE level.
         // (CHA-M5k) Incoming realtime events that are malformed (unknown field should be ignored) shall not be emitted to subscribers.
-        channel.subscribe(MessageEvent.created.rawValue) { message in
+        channel.subscribe(MessageEvent.new.rawValue) { message in
             Task {
                 // TODO: Revisit errors thrown as part of https://github.com/ably-labs/ably-chat-swift/issues/32
                 guard let data = message.data as? [String: Any],
@@ -72,8 +69,8 @@ internal final class DefaultMessages: Messages, EmitsDiscontinuities {
                     throw ARTErrorInfo.create(withCode: 50000, status: 500, message: "Received incoming message without extras")
                 }
 
-                guard let timeserial = extras["timeserial"] as? String else {
-                    throw ARTErrorInfo.create(withCode: 50000, status: 500, message: "Received incoming message without timeserial")
+                guard let serial = message.serial else {
+                    throw ARTErrorInfo.create(withCode: 50000, status: 500, message: "Received incoming message without serial")
                 }
 
                 guard let clientID = message.clientId else {
@@ -83,8 +80,13 @@ internal final class DefaultMessages: Messages, EmitsDiscontinuities {
                 let metadata = data["metadata"] as? Metadata
                 let headers = extras["headers"] as? Headers
 
+                guard let rawAction = message.action, let action = MessageEvent(rawValue: rawAction), action == .new else {
+                    return // ignore any other actions except `chat.message` for now
+                }
+
                 let message = Message(
-                    timeserial: timeserial,
+                    serial: serial,
+                    latestAction: action,
                     clientID: clientID,
                     roomID: self.roomID,
                     text: text,
@@ -115,24 +117,14 @@ internal final class DefaultMessages: Messages, EmitsDiscontinuities {
     }
 
     private func getBeforeSubscriptionStart(_ uuid: UUID, params: QueryOptions) async throws -> any PaginatedResult<Message> {
-        guard let subscriptionPoint = subscriptionPoints[uuid]?.timeserial else {
+        guard let subscriptionPoint = subscriptionPoints[uuid]?.serial else {
             throw ARTErrorInfo.create(
                 withCode: 40000,
                 status: 400,
                 message: "cannot query history; listener has not been subscribed yet"
             )
         }
 
-        // (CHA-M5j) If the end parameter is specified and is more recent than the subscription point timeserial, the method must throw an ErrorInfo with code 40000.
-        let parseSerial = try? DefaultTimeserial.calculateTimeserial(from: subscriptionPoint)
-        if let end = params.end, dateToMilliseconds(end) > parseSerial?.timestamp ?? 0 {
-            throw ARTErrorInfo.create(
-                withCode: 40000,
-                status: 400,
-                message: "cannot query history; end time is after the subscription point of the listener"
-            )
-        }
-
         // (CHA-M5f) This method must accept any of the standard history query options, except for direction, which must always be backwards.
         var queryOptions = params
         queryOptions.orderBy = .newestFirst // newestFirst is equivalent to backwards
@@ -174,17 +166,17 @@ internal final class DefaultMessages: Messages, EmitsDiscontinuities {
         }
 
         do {
-            let timeserialOnChannelAttach = try await timeserialOnChannelAttach()
+            let serialOnChannelAttach = try await serialOnChannelAttach()
 
             for uuid in subscriptionPoints.keys {
-                subscriptionPoints[uuid]?.timeserial = timeserialOnChannelAttach
+                subscriptionPoints[uuid]?.serial = serialOnChannelAttach
             }
         } catch {
             throw ARTErrorInfo.create(from: error)
         }
     }
 
-    private func resolveSubscriptionStart() async throws -> TimeserialString {
+    private func resolveSubscriptionStart() async throws -> String {
         // (CHA-M5a) If a subscription is added when the underlying realtime channel is ATTACHED, then the subscription point is the current channelSerial of the realtime channel.
         if channel.state == .attached {
             if let channelSerial = channel.properties.channelSerial {
@@ -195,11 +187,11 @@ internal final class DefaultMessages: Messages, EmitsDiscontinuities {
         }
 
         // (CHA-M5b) If a subscription is added when the underlying realtime channel is in any other state, then its subscription point becomes the attachSerial at the the point of channel attachment.
-        return try await timeserialOnChannelAttach()
+        return try await serialOnChannelAttach()
     }
 
     // Always returns the attachSerial and not the channelSerial to also serve (CHA-M5c) - If a channel leaves the ATTACHED state and then re-enters ATTACHED with resumed=false, then it must be assumed that messages have been missed. The subscription point of any subscribers must be reset to the attachSerial.
-    private func timeserialOnChannelAttach() async throws -> TimeserialString {
+    private func serialOnChannelAttach() async throws -> String {
         // If the state is already 'attached', return the attachSerial immediately
         if channel.state == .attached {
             if let attachSerial = channel.properties.attachSerial {
@@ -212,7 +204,7 @@ internal final class DefaultMessages: Messages, EmitsDiscontinuities {
         // (CHA-M5b) If a subscription is added when the underlying realtime channel is in any other state, then its subscription point becomes the attachSerial at the the point of channel attachment.
         return try await withCheckedThrowingContinuation { continuation in
             // avoids multiple invocations of the continuation
-            var nillableContinuation: CheckedContinuation<TimeserialString, any Error>? = continuation
+            var nillableContinuation: CheckedContinuation<String, any Error>? = continuation
 
             channel.on { [weak self] stateChange in
                 guard let self else {

Sources/AblyChat/Events.swift

@@ -1,5 +1,5 @@
-internal enum MessageEvent: String {
-    case created = "message.created"
+public enum MessageEvent: String, Codable, Sendable {
+    case new = "chat.message"
 }
 
 internal enum RoomReactionEvents: String {

Sources/AblyChat/Message.swift

@@ -6,18 +6,20 @@ public typealias MessageMetadata = Metadata
 // (CHA-M2) A Message corresponds to a single message in a chat room. This is analogous to a single user-specified message on an Ably channel (NOTE: not a ProtocolMessage).
 public struct Message: Sendable, Codable, Identifiable, Equatable {
     // id to meet Identifiable conformance. 2 messages in the same channel cannot have the same timeserial.
-    public var id: String { timeserial }
+    public var id: String { serial }
 
-    public var timeserial: String
+    public var serial: String
+    public var latestAction: MessageEvent
     public var clientID: String
     public var roomID: String
     public var text: String
     public var createdAt: Date?
     public var metadata: MessageMetadata
     public var headers: MessageHeaders
 
-    public init(timeserial: String, clientID: String, roomID: String, text: String, createdAt: Date?, metadata: MessageMetadata, headers: MessageHeaders) {
-        self.timeserial = timeserial
+    public init(serial: String, latestAction: MessageEvent, clientID: String, roomID: String, text: String, createdAt: Date?, metadata: MessageMetadata, headers: MessageHeaders) {
+        self.serial = serial
+        self.latestAction = latestAction
         self.clientID = clientID
         self.roomID = roomID
         self.text = text
@@ -27,30 +29,13 @@ public struct Message: Sendable, Codable, Identifiable, Equatable {
     }
 
     internal enum CodingKeys: String, CodingKey {
-        case timeserial
+        case serial
+        case latestAction
         case clientID = "clientId"
         case roomID = "roomId"
         case text
         case createdAt
         case metadata
         case headers
     }
-
-    // (CHA-M2a) A Message is considered before another Message in the global order if the timeserial of the corresponding realtime channel message comes first.
-    public func isBefore(_ otherMessage: Message) throws -> Bool {
-        let otherMessageTimeserial = try DefaultTimeserial.calculateTimeserial(from: otherMessage.timeserial)
-        return try DefaultTimeserial.calculateTimeserial(from: timeserial).before(otherMessageTimeserial)
-    }
-
-    // CHA-M2b) A Message is considered after another Message in the global order if the timeserial of the corresponding realtime channel message comes second.
-    public func isAfter(_ otherMessage: Message) throws -> Bool {
-        let otherMessageTimeserial = try DefaultTimeserial.calculateTimeserial(from: otherMessage.timeserial)
-        return try DefaultTimeserial.calculateTimeserial(from: timeserial).after(otherMessageTimeserial)
-    }
-
-    // (CHA-M2c) A Message is considered to be equal to another Message if they have the same timeserial.
-    public func isEqual(_ otherMessage: Message) throws -> Bool {
-        let otherMessageTimeserial = try DefaultTimeserial.calculateTimeserial(from: otherMessage.timeserial)
-        return try DefaultTimeserial.calculateTimeserial(from: timeserial).equal(otherMessageTimeserial)
-    }
 }