Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Fix for value leaks its continuation #2427

Merged
merged 7 commits into from
Jun 3, 2022
Merged

Fix for value leaks its continuation #2427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7335851
handle onDispose for value property for primitive sequences
kjaklinovic Jun 2, 2022
feab4e7
edit comments
kjaklinovic Jun 2, 2022
4cfba50
add tests
kjaklinovic Jun 2, 2022
96d810a
add check if task is cancelled
kjaklinovic Jun 2, 2022
e3d058e
fix typo
kjaklinovic Jun 2, 2022
56b7b71
remove comments
kjaklinovic Jun 3, 2022
8a9b5a5
rename test functions
kjaklinovic Jun 3, 2022
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
42 changes: 37 additions & 5 deletions RxSwift/Traits/PrimitiveSequence/PrimitiveSequence+Concurrency.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,21 @@ public extension PrimitiveSequenceType where Trait == SingleTrait {
return try await withTaskCancellationHandler(
operation: {
try await withCheckedThrowingContinuation { continuation in
var didResume = false
disposable.setDisposable(
self.subscribe(
onSuccess: { continuation.resume(returning: $0) },
onFailure: { continuation.resume(throwing: $0) }
onSuccess: {
didResume = true
continuation.resume(returning: $0)
},
onFailure: {
didResume = true
continuation.resume(throwing: $0)
},
onDisposed: {
guard !didResume else { return }
continuation.resume(throwing: CancellationError())
}
)
)
}
Expand Down Expand Up @@ -69,16 +80,26 @@ public extension PrimitiveSequenceType where Trait == MaybeTrait {
operation: {
try await withCheckedThrowingContinuation { continuation in
var didEmit = false
var didResume = false
disposable.setDisposable(
self.subscribe(
onSuccess: { value in
didEmit = true
didResume = true
continuation.resume(returning: value)
},
onError: { error in continuation.resume(throwing: error) },
onError: { error in
didResume = true
continuation.resume(throwing: error)
},
onCompleted: {
guard !didEmit else { return }
didResume = true
continuation.resume(returning: nil)
},
onDisposed: {
guard !didResume else { return }
continuation.resume(throwing: CancellationError())
}
)
)
Expand Down Expand Up @@ -114,10 +135,21 @@ public extension PrimitiveSequenceType where Trait == CompletableTrait, Element
return try await withTaskCancellationHandler(
operation: {
try await withCheckedThrowingContinuation { continuation in
var didResume = false
disposable.setDisposable(
self.subscribe(
onCompleted: { continuation.resume() },
onError: { error in continuation.resume(throwing: error) }
onCompleted: {
didResume = true
continuation.resume()
},
onError: { error in
didResume = true
continuation.resume(throwing: error)
},
onDisposed: {
guard !didResume else { return }
continuation.resume(throwing: CancellationError())
}
)
)
}
Expand Down
101 changes: 101 additions & 0 deletions Tests/RxSwiftTests/PrimitiveSequence+ConcurrencyTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,37 @@ extension PrimitiveSequenceConcurrencyTests {
XCTAssertTrue(true)
}
}

func testSingleThrowsCancellationWithoutEvents() async throws {
let single = Single<Void>.never()

Task {
do {
try await single.value
XCTFail("Should not proceed beyond try")
} catch {
XCTAssertTrue(Task.isCancelled)
XCTAssertTrue(error is CancellationError)
}
}.cancel()
}

func testSingleNotThrowingCancellation() async throws {
let single = Single.just(())

let task = Task {
do {
try await single.value
XCTAssertTrue(true)
} catch {
XCTFail()
}
}

try await Task.sleep(nanoseconds: 1_000_000)
task.cancel()
}

}

// MARK: - Maybe
Expand Down Expand Up @@ -79,6 +110,49 @@ extension PrimitiveSequenceConcurrencyTests {
XCTAssertTrue(true)
}
}

func testMaybeThrowsCancellationWithoutEvents() async throws {
let maybe = Maybe<Void>.never()

Task {
do {
try await maybe.value
XCTFail("Should not proceed beyond try")
} catch {
XCTAssertTrue(Task.isCancelled)
XCTAssertTrue(error is CancellationError)
}
}.cancel()
}

func testMaybeNotThrowingCancellationWhenCompleted() async throws {
let maybe = Maybe<Int>.empty()

Task {
do {
let value = try await maybe.value
XCTAssertNil(value)
} catch {
XCTFail("Should not throw an error")
}
}.cancel()
}

func testMaybeNotThrowingCancellation() async throws {
let maybe = Maybe.just(())

let task = Task {
do {
try await maybe.value
XCTAssertTrue(true)
} catch {
XCTFail("Should not throw an error")
}
}

try await Task.sleep(nanoseconds: 1_000_000)
task.cancel()
}
}

// MARK: - Completable
Expand All @@ -105,6 +179,33 @@ extension PrimitiveSequenceConcurrencyTests {
XCTAssertTrue(true)
}
}

func testCompletableThrowsCancellationWithoutEvents() async throws {
let completable = Completable.never()

Task {
do {
try await completable.value
XCTFail()
} catch {
XCTAssertTrue(Task.isCancelled)
XCTAssertTrue(error is CancellationError)
}
}.cancel()
}

func testCompletableNotThrowingCancellation() async throws {
let completable = Completable.empty()

Task {
do {
try await completable.value
XCTAssertTrue(true)
} catch {
XCTFail("Should not throw an error")
}
}.cancel()
}
}
#endif