Skip to content

refactor: use makeStream for creating AsyncStream with continuation #3710

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.

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

Merged
merged 1 commit into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions Amplify/Core/Support/AmplifyAsyncSequence.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,16 @@ public typealias WeakAmplifyAsyncSequenceRef<Element> = WeakRef<AmplifyAsyncSequ

public class AmplifyAsyncSequence<Element: Sendable>: AsyncSequence, Cancellable {
public typealias Iterator = AsyncStream<Element>.Iterator
private var asyncStream: AsyncStream<Element>! = nil
private var continuation: AsyncStream<Element>.Continuation! = nil
private let asyncStream: AsyncStream<Element>
private let continuation: AsyncStream<Element>.Continuation
private var parent: Cancellable?

public private(set) var isCancelled: Bool = false

public init(parent: Cancellable? = nil,
bufferingPolicy: AsyncStream<Element>.Continuation.BufferingPolicy = .unbounded) {
self.parent = parent
asyncStream = AsyncStream<Element>(Element.self, bufferingPolicy: bufferingPolicy) { continuation in
self.continuation = continuation
}
(asyncStream, continuation) = AsyncStream.makeStream(of: Element.self, bufferingPolicy: bufferingPolicy)
}

public func makeAsyncIterator() -> Iterator {
Expand Down
8 changes: 3 additions & 5 deletions Amplify/Core/Support/AmplifyAsyncThrowingSequence.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,16 @@ public typealias WeakAmplifyAsyncThrowingSequenceRef<Element> = WeakRef<AmplifyA

public class AmplifyAsyncThrowingSequence<Element: Sendable>: AsyncSequence, Cancellable {
public typealias Iterator = AsyncThrowingStream<Element, Error>.Iterator
private var asyncStream: AsyncThrowingStream<Element, Error>! = nil
private var continuation: AsyncThrowingStream<Element, Error>.Continuation! = nil
private let asyncStream: AsyncThrowingStream<Element, Error>
private let continuation: AsyncThrowingStream<Element, Error>.Continuation
private var parent: Cancellable?

public private(set) var isCancelled: Bool = false

public init(parent: Cancellable? = nil,
bufferingPolicy: AsyncThrowingStream<Element, Error>.Continuation.BufferingPolicy = .unbounded) {
self.parent = parent
asyncStream = AsyncThrowingStream(Element.self, bufferingPolicy: bufferingPolicy, { continuation in
self.continuation = continuation
})
(asyncStream, continuation) = AsyncThrowingStream.makeStream(of: Element.self, bufferingPolicy: bufferingPolicy)
}

public func makeAsyncIterator() -> Iterator {
Expand Down
7 changes: 3 additions & 4 deletions Amplify/Core/Support/TaskQueue.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ import Foundation
/// A helper for executing asynchronous work serially.
public class TaskQueue<Success> {
typealias Block = @Sendable () async -> Void
private var streamContinuation: AsyncStream<Block>.Continuation!
private let streamContinuation: AsyncStream<Block>.Continuation

public init() {
let stream = AsyncStream<Block>.init { continuation in
streamContinuation = continuation
}
let (stream, continuation) = AsyncStream.makeStream(of: Block.self)
self.streamContinuation = continuation

Task {
for await block in stream {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ class CancellableAsyncStream<Element>: AsyncSequence {
}

convenience init(with publisher: AnyPublisher<Element, Never>) {
var cancellable: AnyCancellable?
self.init(asyncStream: AsyncStream { continuation in
cancellable = publisher.sink { _ in
continuation.finish()
} receiveValue: {
continuation.yield($0)
}
}, cancellable: cancellable)
let (asyncStream, contiuation) = AsyncStream.makeStream(of: Element.self)
let cancellable = publisher.sink { _ in
contiuation.finish()
} receiveValue: {
contiuation.yield($0)
}

self.init(asyncStream: asyncStream, cancellable: cancellable)
}

func makeAsyncIterator() -> AsyncStream<Element>.AsyncIterator {
Expand Down
Loading