some AsyncChunkedSequence

Author: swhitty

FlyingFox/Sources/HTTPBodySequence.swift

@@ -46,7 +46,7 @@ public struct HTTPBodySequence: Sendable, AsyncSequence {
         self.storage = .complete(data)
     }
 
-    public init<S: AsyncChunkedSequence>(from bytes: S, count: Int) where S.Element == UInt8 {
+    public init(from bytes: some AsyncChunkedSequence<UInt8>, count: Int) {
         self.storage = .sequence(
             AsyncDataSequence(from: bytes, count: count, chunkSize: 4096)
         )
@@ -56,7 +56,7 @@ public struct HTTPBodySequence: Sendable, AsyncSequence {
         try self.init(file: url, chunkSize: 4096)
     }
 
-    init<S: AsyncChunkedSequence>(from bytes: S, count: Int, chunkSize: Int) where S.Element == UInt8 {
+    init(from bytes: some AsyncChunkedSequence<UInt8>, count: Int, chunkSize: Int) {
         self.storage = .sequence(
             AsyncDataSequence(from: bytes, count: count, chunkSize: chunkSize)
         )

FlyingFox/Sources/HTTPDecoder.swift

@@ -104,15 +104,15 @@ struct HTTPDecoder {
         return (HTTPHeader(name), value)
     }
 
-    static func readHeaders<S: AsyncChunkedSequence>(from bytes: S) async throws -> [HTTPHeader : String] where S.Element == UInt8 {
+    static func readHeaders(from bytes: some AsyncChunkedSequence<UInt8>) async throws -> [HTTPHeader : String] {
         try await bytes
             .lines
             .prefix { $0 != "\r" && $0 != "" }
             .compactMap(Self.readHeader)
             .reduce(into: [HTTPHeader: String]()) { $0[$1.header] = $1.value }
     }
 
-    static func readBody<S: AsyncChunkedSequence>(from bytes: S, length: String?, maxSizeForComplete: Int = 10_485_760) async throws -> HTTPBodySequence where S.Element == UInt8 {
+    static func readBody(from bytes: some AsyncChunkedSequence<UInt8>, length: String?, maxSizeForComplete: Int = 10_485_760) async throws -> HTTPBodySequence {
         guard let length = length.flatMap(Int.init) else {
             return HTTPBodySequence(data: Data())
         }
@@ -124,7 +124,7 @@ struct HTTPDecoder {
         }
     }
 
-    static func makeBodyData<S: AsyncChunkedSequence>(from bytes: S, length: Int) async throws -> Data where S.Element == UInt8 {
+    static func makeBodyData(from bytes: some AsyncChunkedSequence<UInt8>, length: Int) async throws -> Data {
         var iterator = bytes.makeAsyncIterator()
         guard let buffer = try await iterator.nextChunk(count: length) else {
             throw Error("AsyncChunkedSequence prematurely ended")

FlyingFox/Sources/WebSocket/AsyncStream+WSFrame.swift

@@ -33,7 +33,7 @@ import FlyingSocks
 
 extension AsyncThrowingStream<WSFrame, any Error> {
 
-    static func decodingFrames<S: AsyncChunkedSequence>(from bytes: S) -> Self where S.Element == UInt8 {
+    static func decodingFrames(from bytes: some AsyncChunkedSequence<UInt8>) -> Self {
         AsyncThrowingStream<WSFrame, any Error> {
             do {
                 return try await WSFrameEncoder.decodeFrame(from: bytes)

FlyingFox/Sources/WebSocket/WSFrameEncoder.swift

@@ -67,7 +67,7 @@ struct WSFrameEncoder {
         return data
     }
 
-    static func decodeFrame<S>(from bytes: S) async throws -> WSFrame where S: AsyncChunkedSequence, S.Element == UInt8 {
+    static func decodeFrame(from bytes: some AsyncChunkedSequence<UInt8>) async throws -> WSFrame {
         var frame = try await decodeFrame(from: bytes.take())
         let (length, mask) = try await decodeLengthMask(from: bytes)
         frame.payload = try await decodePayload(from: bytes, length: length, mask: mask)

FlyingSocks/Sources/AsyncChunkedSequence.swift

@@ -30,7 +30,7 @@
 //
 
 /// AsyncSequence that is able to also receive elements in chunks, instead of just one-at-a-time.
-public protocol AsyncChunkedSequence: AsyncSequence where AsyncIterator: AsyncChunkedIteratorProtocol {
+public protocol AsyncChunkedSequence<Element>: AsyncSequence where AsyncIterator: AsyncChunkedIteratorProtocol {
 
 }
 

FlyingSocks/Sources/AsyncDataSequence.swift

@@ -38,7 +38,7 @@ public struct AsyncDataSequence: AsyncSequence, Sendable {
 
     private let loader: DataLoader
 
-    public init<S: AsyncChunkedSequence>(from bytes: S, count: Int, chunkSize: Int) where S.Element == UInt8 {
+    public init(from bytes: some AsyncChunkedSequence<UInt8>, count: Int, chunkSize: Int) {
         self.loader = DataLoader(
             count: count,
             chunkSize: chunkSize,