Merge remote-tracking branch 'origin/main' into log-actual-port

Package.swift

@@ -34,7 +34,7 @@ let package = Package(
         .package(url: "https://github.com/swift-server/swift-backtrace.git", from: "1.1.1"),
 
         // Event-driven network application framework for high performance protocol servers & clients, non-blocking.
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.62.0"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.63.0"),
 
         // Bindings to OpenSSL-compatible libraries for TLS support in SwiftNIO
         .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.8.0"),
@@ -92,6 +92,8 @@ let package = Package(
             .product(name: "WebSocketKit", package: "websocket-kit"),
             .product(name: "MultipartKit", package: "multipart-kit"),
             .product(name: "Atomics", package: "swift-atomics"),
+
+            .product(name: "_NIOFileSystem", package: "swift-nio"),
         ]),
 
         // Development

Package@swift-5.9.swift

@@ -31,7 +31,7 @@ let package = Package(
         .package(url: "https://github.com/vapor/routing-kit.git", from: "4.9.0"),
 
         // Event-driven network application framework for high performance protocol servers & clients, non-blocking.
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.62.0"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.63.0"),
 
         // Bindings to OpenSSL-compatible libraries for TLS support in SwiftNIO
         .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.8.0"),
@@ -90,6 +90,8 @@ let package = Package(
                 .product(name: "WebSocketKit", package: "websocket-kit"),
                 .product(name: "MultipartKit", package: "multipart-kit"),
                 .product(name: "Atomics", package: "swift-atomics"),
+
+                .product(name: "_NIOFileSystem", package: "swift-nio"),
             ],
             swiftSettings: [.enableExperimentalFeature("StrictConcurrency=complete")]
         ),

Sources/Vapor/Middleware/FileMiddleware.swift

@@ -40,7 +40,7 @@ public final class FileMiddleware: Middleware {
     ///     an absolute path from the public directory root. If `nil`, no default files are served.
     ///     - directoryAction: Determines the action to take when the request doesn't have a trailing slash but matches a directory.
     ///     - advancedETagComparison: The method used when ETags are generated. If true, a byte-by-byte hash is created (and cached), otherwise a simple comparison based on the file's last modified date and size.
-    public init(publicDirectory: String, defaultFile: String? = nil, directoryAction: DirectoryAction = .none, advancedETagComparison: Bool = true) {
+    public init(publicDirectory: String, defaultFile: String? = nil, directoryAction: DirectoryAction = .none, advancedETagComparison: Bool = false) {
         self.publicDirectory = publicDirectory.addTrailingSlash()
         self.defaultFile = defaultFile
         self.directoryAction = directoryAction

Sources/Vapor/Utilities/FileIO.swift

@@ -1,5 +1,6 @@
 import Foundation
 import NIOCore
+import NIOFileSystem
 import NIOHTTP1
 import NIOPosix
 import Logging
@@ -22,21 +23,19 @@ extension Request {
 ///
 /// It can read files, both in their entirety and chunked.
 ///
-///     let fileio = try c.make(FileIO.self)
 ///
-///     fileio.readFile(at: "/path/to/file.txt") { chunk in
+///     req.fileio.readFile(at: "/path/to/file.txt") { chunk in
 ///         print(chunk) // part of file
 ///     }
 ///
-///     fileio.collectFile(at: "/path/to/file.txt").map { file in
+///     req.fileio.collectFile(at: "/path/to/file.txt").map { file in
 ///         print(file) // entire file
 ///     }
 ///
 /// It can also create streaming HTTP responses.
 ///
-///     let fileio = try c.make(FileIO.self)
-///     router.get("file-stream") { req -> Response in
-///         return fileio.streamFile(at: "/path/to/file.txt", for: req)
+///     app.get("file-stream") { req -> Response in
+///         return req.fileio.streamFile(at: "/path/to/file.txt", for: req)
 ///     }
 ///
 /// Streaming file responses respect `E-Tag` headers present in the request.
@@ -50,6 +49,8 @@ public struct FileIO: Sendable {
     /// HTTP request context.
     let request: Request
 
+    let fileSystem: FileSystem = .shared
+
     /// Creates a new `FileIO`.
     ///
     /// See `Request.fileio()` to create one.
@@ -61,12 +62,12 @@ public struct FileIO: Sendable {
 
     /// Reads the contents of a file at the supplied path.
     ///
-    ///     let data = try req.fileio().read(file: "/path/to/file.txt").wait()
+    ///     let data = try req.fileio.collectFile(at: "/path/to/file.txt").wait()
     ///     print(data) // file data
     ///
     /// - parameters:
     ///     - path: Path to file on the disk.
-    /// - returns: `Future` containing the file data.
+    /// - returns: `Future` containing the file data as a `ByteBuffer`.
     public func collectFile(at path: String) -> EventLoopFuture<ByteBuffer> {
         let dataWrapper: NIOLockedValueBox<ByteBuffer> = .init(self.allocator.buffer(capacity: 0))
         return self.readFile(at: path) { new in
@@ -78,7 +79,7 @@ public struct FileIO: Sendable {
 
     /// Reads the contents of a file at the supplied path in chunks.
     ///
-    ///     try req.fileio().readChunked(file: "/path/to/file.txt") { chunk in
+    ///     try req.fileio.readFile(at: "/path/to/file.txt") { chunk in
     ///         print("chunk: \(data)")
     ///     }.wait()
     ///
@@ -113,7 +114,7 @@ public struct FileIO: Sendable {
     /// has not been modified since last served. This method will also set the `"Content-Type"` header
     /// automatically if an appropriate `MediaType` can be found for the file's suffix.
     ///
-    ///     router.get("file-stream") { req in
+    ///     app.get("file-stream") { req in
     ///         return req.fileio.streamFile(at: "/path/to/file.txt")
     ///     }
     ///
@@ -123,7 +124,6 @@ public struct FileIO: Sendable {
     ///     - mediaType: HTTPMediaType, if not specified, will be created from file extension.
     ///     - onCompleted: Closure to be run on completion of stream.
     /// - returns: A `200 OK` response containing the file stream and appropriate headers.
-    @available(*, deprecated, message: "Use the new `streamFile` method which returns EventLoopFuture<Response>")
     @preconcurrency public func streamFile(
         at path: String,
         chunkSize: Int = NonBlockingFileIO.defaultChunkSize,
@@ -384,6 +384,19 @@ public struct FileIO: Sendable {
         }
     }
 
+    /// Async version of `read(path:fromOffset:byteCount:chunkSize:onRead)`
+    private func read(
+        path: String,
+        fromOffset offset: Int64,
+        byteCount: Int
+    ) async throws -> ByteBuffer {
+        let fd = try NIOFileHandle(path: path)
+        defer {
+            try? fd.close()
+        }
+        return try await self.io.read(fileHandle: fd, fromOffset: offset, byteCount: byteCount, allocator: allocator)
+    }
+
     /// Write the contents of buffer to a file at the supplied path.
     ///
     ///     let data = ByteBuffer(string: "ByteBuffer")
@@ -423,11 +436,101 @@ public struct FileIO: Sendable {
 
                 // update hash in dictionary
                 request.application.storage[FileMiddleware.ETagHashes.self]?[path] = FileMiddleware.ETagHashes.FileHash(lastModified: lastModified, digestHex: digest.hex)
-
+                
                 return digest.hex
             }
         }
     }
+
+    // MARK: - Concurrency
+    /// Reads the contents of a file at the supplied path.
+    ///
+    ///     let data = try await req.fileio.collectFile(file: "/path/to/file.txt")
+    ///     print(data) // file data
+    ///
+    /// - parameters:
+    ///     - path: Path to file on the disk.
+    /// - returns: `ByteBuffer` containing the file data.
+    public func collectFile(at path: String) async throws -> ByteBuffer {
+        guard let fileSize = try await FileSystem.shared.info(forFileAt: .init(path))?.size else {
+            throw Abort(.internalServerError)
+        }
+        return try await self.read(path: path, fromOffset: 0, byteCount: Int(fileSize))
+    }
+
+    /// Wrapper around `NIOFileSystem.FileChunks`.
+    /// This can be removed once `NIOFileSystem` reaches a stable API.
+    public struct FileChunks: AsyncSequence {
+        public typealias Element = ByteBuffer
+        private let fileHandle: NIOFileSystem.FileHandleProtocol
+        private let fileChunks: NIOFileSystem.FileChunks
+
+        init(fileChunks: NIOFileSystem.FileChunks, fileHandle: some NIOFileSystem.FileHandleProtocol) {
+            self.fileChunks = fileChunks
+            self.fileHandle = fileHandle
+        }
+
+        public struct FileChunksIterator: AsyncIteratorProtocol {
+            private var iterator: NIOFileSystem.FileChunks.AsyncIterator
+            private let fileHandle: NIOFileSystem.FileHandleProtocol
+
+            fileprivate init(wrapping iterator: NIOFileSystem.FileChunks.AsyncIterator, fileHandle: some NIOFileSystem.FileHandleProtocol) {
+                self.iterator = iterator
+                self.fileHandle = fileHandle
+            }
+
+            public mutating func next() async throws -> ByteBuffer? {
+                let chunk = try await iterator.next()
+                if chunk == nil {
+                    try await fileHandle.close()
+                }
+                return chunk
+            }
+        }
+
+        public func makeAsyncIterator() -> FileChunksIterator {
+            FileChunksIterator(wrapping: fileChunks.makeAsyncIterator(), fileHandle: fileHandle)
+        }
+    }
+
+    /// Reads the contents of a file at the supplied path in chunks.
+    ///
+    ///    for chunk in try await req.fileio.readFile(at: "/path/to/file.txt") {
+    ///        print("chunk: \(data)")
+    ///    }
+    ///
+    /// - parameters:
+    ///     - path: Path to file on the disk.
+    ///     - chunkSize: Maximum size for the file data chunks.
+    /// - returns: `FileChunks` containing the file data chunks.
+    public func readFile(
+        at path: String,
+        chunkSize: Int = NonBlockingFileIO.defaultChunkSize
+    ) async throws -> FileChunks {
+        let filePath = FilePath(path)
+
+        let readHandle = try await fileSystem.openFile(forReadingAt: filePath)
+        let chunks = readHandle.readChunks(chunkLength: .bytes(Int64(chunkSize)))
+
+        return FileChunks(fileChunks: chunks, fileHandle: readHandle)
+    }
+
+    /// Write the contents of buffer to a file at the supplied path.
+    ///
+    ///     let data = ByteBuffer(string: "ByteBuffer")
+    ///     try await req.fileio.writeFile(data, at: "/path/to/file.txt")
+    ///
+    /// - parameters:
+    ///     - path: Path to file on the disk.
+    ///     - buffer: The `ByteBuffer` to write.
+    /// - returns: `Void` when the file write is finished.
+    public func writeFile(_ buffer: ByteBuffer, at path: String) async throws {
+        let fd = try NIOFileHandle(path: path, mode: .write, flags: .allowFileCreation())
+        defer {
+            try? fd.close()
+        }
+        try await self.io.write(fileHandle: fd, buffer: buffer)
+    }
 }
 
 extension HTTPHeaders.Range.Value {

Tests/VaporTests/FileTests.swift

@@ -537,4 +537,39 @@ final class FileTests: XCTestCase {
             XCTAssertEqual(res.status, .badRequest)
         }
     }
+
+    func testAsyncFileWrite() async throws {
+        let app = Application(.testing)
+        defer { app.shutdown() }
+
+        let request = Request(application: app, on: app.eventLoopGroup.next())
+
+        let data = "Hello"
+        let path = "/tmp/fileio_write.txt"
+
+        try await request.fileio.writeFile(ByteBuffer(string: data), at: path)
+        defer { try? FileManager.default.removeItem(atPath: path) }
+
+        let result = try String(contentsOfFile: path)
+        XCTAssertEqual(result, data)
+    }
+
+    func testAsyncFileRead() async throws {
+        let app = Application(.testing)
+        defer { app.shutdown() }
+
+        let request = Request(application: app, on: app.eventLoopGroup.next())
+
+        let path = "/" + #filePath.split(separator: "/").dropLast().joined(separator: "/") + "/Utilities/long-test-file.txt"
+
+        let content = try String(contentsOfFile: path)
+
+        var readContent = ""
+        let file = try await request.fileio.readFile(at: path, chunkSize: 16 * 1024) // 32Kb, ~5 chunks
+        for try await chunk in file {
+            readContent += String(buffer: chunk)
+        }
+
+        XCTAssertEqual(readContent, content, "The content read from the file does not match the expected content.")
+    }
 }