Changes from PR comments

hummingbird-project · May 11, 2024 · b5c5766 · b5c5766
1 parent 5a32fb0
commit b5c5766
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Sources/HummingbirdCompression/RequestDecompressionMiddleware.swift b/Sources/HummingbirdCompression/RequestDecompressionMiddleware.swift
@@ -86,8 +86,7 @@ struct DecompressByteBufferSequence<Base: AsyncSequence & Sendable>: AsyncSequen
             if self.currentBuffer == nil {
                 self.currentBuffer = try await self.baseIterator.next()
             }
-            self.window.moveReaderIndex(to: 0)
-            self.window.moveWriterIndex(to: 0)
+            self.window.clear()
             while var buffer = self.currentBuffer {
                 do {
                     try buffer.decompressStream(to: &self.window, with: self.decompressor)

diff --git a/Sources/HummingbirdCompression/ResponseCompressionMiddleware.swift b/Sources/HummingbirdCompression/ResponseCompressionMiddleware.swift
@@ -66,20 +66,17 @@ public struct ResponseCompressionMiddleware<Context: BaseRequestContext>: Router
         /// Finish compressed response writing
         func finish() async throws {
             // The last buffer must be finished
-            if var lastBuffer {
-                var window = self.compressor.window!
+            if var lastBuffer, var window = self.compressor.window {
                 // keep finishing stream until we don't get a buffer overflow
                 while true {
                     do {
                         try lastBuffer.compressStream(to: &window, with: self.compressor, flush: .finish)
                         try await self.parentWriter.write(window)
-                        window.moveReaderIndex(to: 0)
-                        window.moveWriterIndex(to: 0)
+                        window.clear()
                         break
                     } catch let error as CompressNIOError where error == .bufferOverflow {
                         try await self.parentWriter.write(window)
-                        window.moveReaderIndex(to: 0)
-                        window.moveWriterIndex(to: 0)
+                        window.clear()
                     }
                 }
             }