Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing group streams #406

Merged
merged 4 commits into from
Sep 26, 2024
Merged

Fixing group streams #406

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bac37d6
Fixing group streams
nmalzieu Sep 26, 2024
9bd68aa
Merge branch 'main' of https://github.com/xmtp/xmtp-ios into noe/fix-…
nplasterer Sep 26, 2024
9bae265
bump the pod
nplasterer Sep 26, 2024
f537f97
get all the tests passing
nplasterer Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 62 additions & 35 deletions Sources/XMTPiOS/Conversations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,22 @@ class StreamManager {
}
}

actor FfiStreamActor {
private var ffiStream: FfiStreamCloser?

func setFfiStream(_ stream: FfiStreamCloser?) {
ffiStream = stream
}

func endStream() {
ffiStream?.end()
}
}

/// Handles listing and creating Conversations.
public actor Conversations {
var client: Client
var conversationsByTopic: [String: Conversation] = [:]
let streamHolder = StreamHolder()

init(client: Client) {
self.client = client
Expand Down Expand Up @@ -130,7 +141,8 @@ public actor Conversations {

public func streamGroups() async throws -> AsyncThrowingStream<Group, Error> {
AsyncThrowingStream { continuation in
let task = Task {
let ffiStreamActor = FfiStreamActor()
let task = Task {
let groupCallback = GroupStreamCallback(client: self.client) { group in
guard !Task.isCancelled else {
continuation.finish()
Expand All @@ -142,24 +154,28 @@ public actor Conversations {
continuation.finish(throwing: GroupError.streamingFailure)
return
}

self.streamHolder.stream = stream
await ffiStreamActor.setFfiStream(stream)
continuation.onTermination = { @Sendable reason in
stream.end()
Task {
await ffiStreamActor.endStream()
}
}
}

continuation.onTermination = { @Sendable reason in
task.cancel()
self.streamHolder.stream?.end()
Task {
await ffiStreamActor.endStream()
}
}
}
}

private func streamGroupConversations() -> AsyncThrowingStream<Conversation, Error> {
AsyncThrowingStream { continuation in
let ffiStreamActor = FfiStreamActor()
let task = Task {
self.streamHolder.stream = await self.client.v3Client?.conversations().stream(
let stream = await self.client.v3Client?.conversations().stream(
callback: GroupStreamCallback(client: self.client) { group in
guard !Task.isCancelled else {
continuation.finish()
Expand All @@ -168,14 +184,19 @@ public actor Conversations {
continuation.yield(Conversation.group(group))
}
)
await ffiStreamActor.setFfiStream(stream)
continuation.onTermination = { @Sendable reason in
self.streamHolder.stream?.end()
Task {
await ffiStreamActor.endStream()
}
}
}

continuation.onTermination = { @Sendable reason in
task.cancel()
self.streamHolder.stream?.end()
Task {
await ffiStreamActor.endStream()
}
}
}
}
Expand Down Expand Up @@ -412,12 +433,15 @@ public actor Conversations {

public func streamAllGroupMessages() -> AsyncThrowingStream<DecodedMessage, Error> {
AsyncThrowingStream { continuation in
let ffiStreamActor = FfiStreamActor()
let task = Task {
self.streamHolder.stream = await self.client.v3Client?.conversations().streamAllMessages(
let stream = await self.client.v3Client?.conversations().streamAllMessages(
messageCallback: MessageCallback(client: self.client) { message in
guard !Task.isCancelled else {
continuation.finish()
self.streamHolder.stream?.end() // End the stream upon cancellation
Task {
await ffiStreamActor.endStream() // End the stream upon cancellation
}
return
}
do {
Expand All @@ -427,24 +451,26 @@ public actor Conversations {
}
}
)
await ffiStreamActor.setFfiStream(stream)
}

continuation.onTermination = { _ in
task.cancel()
self.streamHolder.stream?.end()
Task {
await ffiStreamActor.endStream()
}
}
}
}

public func streamAllMessages(includeGroups: Bool = false) -> AsyncThrowingStream<DecodedMessage, Error> {
AsyncThrowingStream<DecodedMessage, Error> { continuation in
@Sendable func forwardStreamToMerged(stream: AsyncThrowingStream<DecodedMessage, Error>) async {
@Sendable func forwardStreamToMerged(stream: AsyncThrowingStream<DecodedMessage, Error>) async {
do {
var iterator = stream.makeAsyncIterator()
while let element = try await iterator.next() {
guard !Task.isCancelled else {
continuation.finish()
self.streamHolder.stream?.end()
return
}
continuation.yield(element)
Expand All @@ -456,30 +482,31 @@ public actor Conversations {
}

let task = Task {
await forwardStreamToMerged(stream: streamAllV2Messages())
}

if includeGroups {
Task {
await forwardStreamToMerged(stream: streamAllGroupMessages())
}
await forwardStreamToMerged(stream: streamAllV2Messages())
}

let groupTask = includeGroups ? Task {
await forwardStreamToMerged(stream: streamAllGroupMessages())
} : nil

continuation.onTermination = { _ in
task.cancel()
self.streamHolder.stream?.end()
groupTask?.cancel()
}
}
}

public func streamAllGroupDecryptedMessages() -> AsyncThrowingStream<DecryptedMessage, Error> {
AsyncThrowingStream { continuation in
let ffiStreamActor = FfiStreamActor()
let task = Task {
self.streamHolder.stream = await self.client.v3Client?.conversations().streamAllMessages(
let stream = await self.client.v3Client?.conversations().streamAllMessages(
messageCallback: MessageCallback(client: self.client) { message in
guard !Task.isCancelled else {
continuation.finish()
self.streamHolder.stream?.end() // End the stream upon cancellation
Task {
await ffiStreamActor.endStream() // End the stream upon cancellation
}
return
}
do {
Expand All @@ -489,24 +516,26 @@ public actor Conversations {
}
}
)
await ffiStreamActor.setFfiStream(stream)
}

continuation.onTermination = { _ in
task.cancel()
self.streamHolder.stream?.end()
Task {
await ffiStreamActor.endStream()
}
}
}
}

public func streamAllDecryptedMessages(includeGroups: Bool = false) -> AsyncThrowingStream<DecryptedMessage, Error> {
AsyncThrowingStream<DecryptedMessage, Error> { continuation in
@Sendable func forwardStreamToMerged(stream: AsyncThrowingStream<DecryptedMessage, Error>) async {
@Sendable func forwardStreamToMerged(stream: AsyncThrowingStream<DecryptedMessage, Error>) async {
do {
var iterator = stream.makeAsyncIterator()
while let element = try await iterator.next() {
guard !Task.isCancelled else {
continuation.finish()
self.streamHolder.stream?.end()
return
}
continuation.yield(element)
Expand All @@ -520,16 +549,14 @@ public actor Conversations {
let task = Task {
await forwardStreamToMerged(stream: streamAllV2DecryptedMessages())
}

if includeGroups {
Task {
await forwardStreamToMerged(stream: streamAllGroupDecryptedMessages())
}
}

let groupTask = includeGroups ? Task {
await forwardStreamToMerged(stream: streamAllGroupDecryptedMessages())
} : nil

continuation.onTermination = { _ in
task.cancel()
self.streamHolder.stream?.end()
task.cancel()
groupTask?.cancel()
}
}
}
Expand Down
Loading