Fix IStreamable with End Of Stream Status (#331)

Author: waahm7

Source/AwsCommonRuntimeKit/crt/ByteBuffer.swift

@@ -69,4 +69,8 @@ extension ByteBuffer: IStreamable {
         currentIndex = endIndex
         return dataSlice.count
     }
+    
+    public func isEndOfStream() -> Bool {
+        return self.currentIndex >= self.data.count
+    }
 }

Source/AwsCommonRuntimeKit/http/HTTP2Stream.swift

@@ -36,7 +36,7 @@ public class HTTP2Stream: HTTPStream {
             throw CommonRunTimeError.crtError(.makeFromLastError())
         }
     }
-
+    
     /// manualDataWrites must have been enabled during HTTP2Request creation.
     /// A write with that has endOfStream set to be true will end the stream and prevent any further write.
     ///

Source/AwsCommonRuntimeKit/io/Stream.swift

@@ -29,6 +29,10 @@ public protocol IStreamable {
     ///   Returns `0` if the data is not yet available.
     ///   Otherwise returns the number of bytes read.
     func read(buffer: UnsafeMutableBufferPointer<UInt8>) throws -> Int?
+    
+    /// Whether the stream has ended. If the read function returns Nil that will also signify end of stream,
+    /// so if your stream will never know in advance that it's ended and always requires an extra read to know the end, you can always return false from this method.
+    func isEndOfStream() -> Bool
 }
 
 public extension IStreamable {
@@ -50,67 +54,3 @@ public enum StreamSeekType: UInt32 {
     case end = 2
 }
 
-extension FileHandle: IStreamable {
-
-    public func length() throws -> UInt64 {
-        let length: UInt64
-        let savedPos: UInt64
-        if #available(macOS 11, tvOS 13.4, iOS 13.4, watchOS 6.2, *) {
-            savedPos = try offset()
-            try seekToEnd()
-            length = try offset()
-        } else {
-            savedPos = offsetInFile
-            seekToEndOfFile()
-            length = offsetInFile
-        }
-        guard length != savedPos else {
-            return length
-        }
-        try self.seek(toOffset: savedPos)
-        return length
-    }
-
-    public func seek(offset: Int64, streamSeekType: StreamSeekType) throws {
-        let targetOffset: UInt64
-        switch streamSeekType {
-        case .begin:
-            guard offset >= 0 else {
-                throw CommonRunTimeError.crtError(CRTError(code: AWS_IO_STREAM_INVALID_SEEK_POSITION.rawValue))
-            }
-            targetOffset = UInt64(offset)
-        case .end:
-            guard offset != 0 else {
-                if #available(macOS 11, tvOS 13.4, iOS 13.4, watchOS 6.2, *) {
-                    try seekToEnd()
-                } else {
-                    seekToEndOfFile()
-                }
-                return
-            }
-            let length = try length()
-            guard offset <= 0, abs(offset) <= length else {
-                throw CommonRunTimeError.crtError(CRTError(code: AWS_IO_STREAM_INVALID_SEEK_POSITION.rawValue))
-            }
-            targetOffset = length - UInt64(abs(offset))
-        }
-        try self.seek(toOffset: targetOffset)
-    }
-
-    public func read(buffer: UnsafeMutableBufferPointer<UInt8>) throws -> Int? {
-        let data: Data?
-        if #available(macOS 11, tvOS 13.4, iOS 13.4, watchOS 6.2, *) {
-            data = try self.read(upToCount: buffer.count)
-        } else {
-            data = self.readData(ofLength: buffer.count)
-        }
-        guard let data = data else {
-            return nil
-        }
-
-        if !data.isEmpty {
-            data.copyBytes(to: buffer, from: 0..<data.count)
-        }
-        return data.count
-    }
-}

Source/AwsCommonRuntimeKit/io/StreamCore.swift

@@ -79,6 +79,9 @@ private func doRead(_ stream: UnsafeMutablePointer<aws_input_stream>!,
 private func doGetStatus(_ stream: UnsafeMutablePointer<aws_input_stream>!,
                          _ result: UnsafeMutablePointer<aws_stream_status>!) -> Int32 {
     let iStreamCore = Unmanaged<IStreamCore>.fromOpaque(stream.pointee.impl).takeUnretainedValue()
+    if(!iStreamCore.isEndOfStream) {
+        iStreamCore.isEndOfStream = iStreamCore.iStreamable.isEndOfStream()
+    }
     result.pointee = aws_stream_status(is_end_of_stream: iStreamCore.isEndOfStream, is_valid: true)
     return AWS_OP_SUCCESS
 }

Test/AwsCommonRuntimeKitTests/Resources/stream-test.txt

@@ -6,12 +6,6 @@ import Foundation
 
 class StreamTests: XCBaseTestCase {
 
-  func testFileStream() throws {
-    let fileHandle = FileHandle(forReadingAtPath: Bundle.module.path(forResource: "stream-test", ofType: "txt")!)!
-    let iStreamCore = IStreamCore(iStreamable: fileHandle)
-    try testStream(iStreamCore: iStreamCore)
-  }
-
   func testByteBufferStream() throws {
     let byteBuffer = ByteBuffer(data: "12345678900987654321".data(using: .utf8)!)
     let iStreamCore = IStreamCore(iStreamable: byteBuffer)