Message refactor and cleanup (#457)

* remove decoded message * clean up decoded messages * get all the tests passing
xmtp · Jan 8, 2025 · 21d9032 · 21d9032
1 parent f0acecc
commit 21d9032
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 161 deletions.
diff --git a/Sources/XMTPiOS/Client.swift b/Sources/XMTPiOS/Client.swift
@@ -531,7 +531,7 @@ public final class Client {
 
 	public func findMessage(messageId: String) throws -> Message? {
 		do {
-			return Message(
+			return Message.create(
 				client: self,
 				ffiMessage: try ffiClient.message(
 					messageId: messageId.hexToData))

diff --git a/Sources/XMTPiOS/Conversation.swift b/Sources/XMTPiOS/Conversation.swift
@@ -26,7 +26,7 @@ public enum Conversation: Identifiable, Equatable, Hashable {
 		}
 	}
 
-	public func lastMessage() async throws -> DecodedMessage? {
+	public func lastMessage() async throws -> Message? {
 		switch self {
 		case let .group(group):
 			return try await group.lastMessage()
@@ -80,7 +80,7 @@ public enum Conversation: Identifiable, Equatable, Hashable {
 		}
 	}
 
-	public func processMessage(messageBytes: Data) async throws -> Message {
+	public func processMessage(messageBytes: Data) async throws -> Message? {
 		switch self {
 		case let .group(group):
 			return try await group.processMessage(messageBytes: messageBytes)
@@ -188,7 +188,7 @@ public enum Conversation: Identifiable, Equatable, Hashable {
 		}
 	}
 
-	public func streamMessages() -> AsyncThrowingStream<DecodedMessage, Error> {
+	public func streamMessages() -> AsyncThrowingStream<Message, Error> {
 		switch self {
 		case let .group(group):
 			return group.streamMessages()
@@ -203,7 +203,7 @@ public enum Conversation: Identifiable, Equatable, Hashable {
 		afterNs: Int64? = nil,
 		direction: SortDirection? = .descending,
 		deliveryStatus: MessageDeliveryStatus = .all
-	) async throws -> [DecodedMessage] {
+	) async throws -> [Message] {
 		switch self {
 		case let .group(group):
 			return try await group.messages(

diff --git a/Sources/XMTPiOS/Conversations.swift b/Sources/XMTPiOS/Conversations.swift
@@ -329,7 +329,7 @@ public actor Conversations {
 	}
 
 	public func streamAllMessages(type: ConversationType = .all)
-		-> AsyncThrowingStream<DecodedMessage, Error>
+		-> AsyncThrowingStream<Message, Error>
 	{
 		AsyncThrowingStream { continuation in
 			let ffiStreamActor = FfiStreamActor()
@@ -343,13 +343,10 @@ public actor Conversations {
 					}
 					return
 				}
-				do {
-					continuation.yield(
-						try Message(client: self.client, ffiMessage: message)
-							.decode()
-					)
-				} catch {
-					print("Error onMessage \(error)")
+				if let message = Message.create(
+					client: self.client, ffiMessage: message)
+				{
+					continuation.yield(message)
 				}
 			}
 

diff --git a/Sources/XMTPiOS/DecodedMessage.swift b/Sources/XMTPiOS/DecodedMessage.swift
diff --git a/Sources/XMTPiOS/Dm.swift b/Sources/XMTPiOS/Dm.swift
@@ -70,11 +70,11 @@ public struct Dm: Identifiable, Equatable, Hashable {
 		return try ffiConversation.consentState().fromFFI
 	}
 
-	public func processMessage(messageBytes: Data) async throws -> Message {
+	public func processMessage(messageBytes: Data) async throws -> Message? {
 		let message =
 			try await ffiConversation.processStreamedConversationMessage(
 				envelopeBytes: messageBytes)
-		return Message(client: client, ffiMessage: message)
+		return Message.create(client: client, ffiMessage: message)
 	}
 
 	public func send<T>(content: T, options: SendOptions? = nil) async throws
@@ -167,7 +167,7 @@ public struct Dm: Identifiable, Equatable, Hashable {
 		self.streamHolder.stream?.end()
 	}
 
-	public func streamMessages() -> AsyncThrowingStream<DecodedMessage, Error> {
+	public func streamMessages() -> AsyncThrowingStream<Message, Error> {
 		AsyncThrowingStream { continuation in
 			let task = Task.detached {
 				self.streamHolder.stream = await self.ffiConversation.stream(
@@ -177,14 +177,10 @@ public struct Dm: Identifiable, Equatable, Hashable {
 							continuation.finish()
 							return
 						}
-						do {
-							continuation.yield(
-								try Message(
-									client: self.client, ffiMessage: message
-								).decode())
-						} catch {
-							print("Error onMessage \(error)")
-							continuation.finish(throwing: error)
+						if let message = Message.create(
+							client: self.client, ffiMessage: message)
+						{
+							continuation.yield(message)
 						}
 					}
 				)
@@ -201,10 +197,9 @@ public struct Dm: Identifiable, Equatable, Hashable {
 		}
 	}
 
-	public func lastMessage() async throws -> DecodedMessage? {
+	public func lastMessage() async throws -> Message? {
 		if let ffiMessage = ffiLastMessage {
-			return Message(client: self.client, ffiMessage: ffiMessage)
-				.decodeOrNull()
+			return Message.create(client: self.client, ffiMessage: ffiMessage)
 		} else {
 			return try await messages(limit: 1).first
 		}
@@ -216,7 +211,7 @@ public struct Dm: Identifiable, Equatable, Hashable {
 		limit: Int? = nil,
 		direction: SortDirection? = .descending,
 		deliveryStatus: MessageDeliveryStatus = .all
-	) async throws -> [DecodedMessage] {
+	) async throws -> [Message] {
 		var options = FfiListMessagesOptions(
 			sentBeforeNs: nil,
 			sentAfterNs: nil,
@@ -267,8 +262,7 @@ public struct Dm: Identifiable, Equatable, Hashable {
 		return try await ffiConversation.findMessages(opts: options).compactMap
 		{
 			ffiMessage in
-			return Message(client: self.client, ffiMessage: ffiMessage)
-				.decodeOrNull()
+			return Message.create(client: self.client, ffiMessage: ffiMessage)
 		}
 	}
 }
diff --git a/Sources/XMTPiOS/Group.swift b/Sources/XMTPiOS/Group.swift
@@ -269,10 +269,10 @@ public struct Group: Identifiable, Equatable, Hashable {
 		return try ffiGroup.consentState().fromFFI
 	}
 
-	public func processMessage(messageBytes: Data) async throws -> Message {
+	public func processMessage(messageBytes: Data) async throws -> Message? {
 		let message = try await ffiGroup.processStreamedConversationMessage(
 			envelopeBytes: messageBytes)
-		return Message(client: client, ffiMessage: message)
+		return Message.create(client: client, ffiMessage: message)
 	}
 
 	public func send<T>(content: T, options: SendOptions? = nil) async throws
@@ -365,7 +365,7 @@ public struct Group: Identifiable, Equatable, Hashable {
 		self.streamHolder.stream?.end()
 	}
 
-	public func streamMessages() -> AsyncThrowingStream<DecodedMessage, Error> {
+	public func streamMessages() -> AsyncThrowingStream<Message, Error> {
 		AsyncThrowingStream { continuation in
 			let task = Task.detached {
 				self.streamHolder.stream = await self.ffiGroup.stream(
@@ -375,14 +375,10 @@ public struct Group: Identifiable, Equatable, Hashable {
 							continuation.finish()
 							return
 						}
-						do {
-							continuation.yield(
-								try Message(
-									client: self.client, ffiMessage: message
-								).decode())
-						} catch {
-							print("Error onMessage \(error)")
-							continuation.finish(throwing: error)
+						if let message = Message.create(
+							client: self.client, ffiMessage: message)
+						{
+							continuation.yield(message)
 						}
 					}
 				)
@@ -399,10 +395,9 @@ public struct Group: Identifiable, Equatable, Hashable {
 		}
 	}
 
-	public func lastMessage() async throws -> DecodedMessage? {
+	public func lastMessage() async throws -> Message? {
 		if let ffiMessage = ffiLastMessage {
-			return Message(client: self.client, ffiMessage: ffiMessage)
-				.decodeOrNull()
+			return Message.create(client: self.client, ffiMessage: ffiMessage)
 		} else {
 			return try await messages(limit: 1).first
 		}
@@ -414,7 +409,7 @@ public struct Group: Identifiable, Equatable, Hashable {
 		limit: Int? = nil,
 		direction: SortDirection? = .descending,
 		deliveryStatus: MessageDeliveryStatus = .all
-	) async throws -> [DecodedMessage] {
+	) async throws -> [Message] {
 		var options = FfiListMessagesOptions(
 			sentBeforeNs: nil,
 			sentAfterNs: nil,
@@ -464,8 +459,7 @@ public struct Group: Identifiable, Equatable, Hashable {
 
 		return try await ffiGroup.findMessages(opts: options).compactMap {
 			ffiMessage in
-			return Message(client: self.client, ffiMessage: ffiMessage)
-				.decodeOrNull()
+			return Message.create(client: self.client, ffiMessage: ffiMessage)
 		}
 	}
 }