Skip to content

Implement AsyncSequence/splitLines() #3411

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

Merged
merged 11 commits into from
Oct 21, 2025
Merged

Implement AsyncSequence/splitLines() #3411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f0ef7e8
Implement `AsyncSequence/split(whereSeparator:)`
MahdiBM Oct 15, 2025
b0ef0b1
Rework to only have `splitLines` as public API
MahdiBM Oct 17, 2025
4e4910f
Use `ByteToMessageDecoderVerifier` (tests R failing, verifier's issue)
MahdiBM Oct 17, 2025
23a92cb
Revert "Use `ByteToMessageDecoderVerifier` (tests R failing, verifier…
MahdiBM Oct 17, 2025
f227730
Don't check no-separator bytes multiple times
MahdiBM Oct 19, 2025
8a7e6d0
Push empty buffers in tests to ensure resilience
MahdiBM Oct 19, 2025
639b028
Minor documentation refinements
MahdiBM Oct 19, 2025
ded2211
Refine tests + add hardcoded arguments as well
MahdiBM Oct 19, 2025
2de4a54
Introduce a dedicated `NIOSplitUTF8LinesMessageDecoder`
MahdiBM Oct 20, 2025
1460d84
Publicize the 2 initializers + Update docs accordingly
MahdiBM Oct 21, 2025
83359c0
Remove trailing comma to satisfy 6.0 builds
MahdiBM Oct 21, 2025
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
18 changes: 9 additions & 9 deletions Sources/NIOCore/NIODecodedAsyncSequence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ extension NIODecodedAsyncSequence: AsyncSequence {
public struct AsyncIterator: AsyncIteratorProtocol {
@usableFromInline
enum State: Sendable {
case readingFromBuffer
case readLastChunkFromBuffer
case canReadFromBaseIterator
case baseIteratorIsExhausted
case finishedDecoding
}

Expand All @@ -114,7 +114,7 @@ extension NIODecodedAsyncSequence: AsyncSequence {
base.decoder,
maximumBufferSize: base.maximumBufferSize
)
self.state = .readingFromBuffer
self.state = .canReadFromBaseIterator
}

/// Retrieve the next element from the ``NIODecodedAsyncSequence``.
Expand All @@ -127,7 +127,7 @@ extension NIODecodedAsyncSequence: AsyncSequence {
switch self.state {
case .finishedDecoding:
return nil
case .readingFromBuffer:
case .canReadFromBaseIterator:
let (decoded, ended) = try self.processor.decodeNext(
decodeMode: .normal,
seenEOF: false
Expand All @@ -144,11 +144,11 @@ extension NIODecodedAsyncSequence: AsyncSequence {
// Read more data into the buffer so we can decode more messages
guard let nextBuffer = try await self.baseIterator.next() else {
// Ran out of data to read.
self.state = .readLastChunkFromBuffer
self.state = .baseIteratorIsExhausted
continue
}
self.processor.append(nextBuffer)
case .readLastChunkFromBuffer:
case .baseIteratorIsExhausted:
let (decoded, ended) = try self.processor.decodeNext(
decodeMode: .last,
seenEOF: true
Expand All @@ -175,7 +175,7 @@ extension NIODecodedAsyncSequence: AsyncSequence {
switch self.state {
case .finishedDecoding:
return nil
case .readingFromBuffer:
case .canReadFromBaseIterator:
let (decoded, ended) = try self.processor.decodeNext(
decodeMode: .normal,
seenEOF: false
Expand All @@ -192,11 +192,11 @@ extension NIODecodedAsyncSequence: AsyncSequence {
// Read more data into the buffer so we can decode more messages
guard let nextBuffer = try await self.baseIterator.next(isolation: actor) else {
// Ran out of data to read.
self.state = .readLastChunkFromBuffer
self.state = .baseIteratorIsExhausted
continue
}
self.processor.append(nextBuffer)
case .readLastChunkFromBuffer:
case .baseIteratorIsExhausted:
let (decoded, ended) = try self.processor.decodeNext(
decodeMode: .last,
seenEOF: true
Expand Down
Loading
Loading