Migrate to Async NIOFileIO APIs #3167
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3167 +/- ##
==========================================
- Coverage 76.86% 76.78% -0.09%
==========================================
Files 211 210 -1
Lines 8119 8132 +13
==========================================
+ Hits 6241 6244 +3
- Misses 1878 1888 +10
|
0xTim
added
semver-minor
ptoffy
approved these changes
Apr 17, 2024
Sources/Vapor/Utilities/FileIO.swift
Outdated
| /// - returns: `ByteBuffer` containing the file data. | ||
| public func collectFile(at path: String) async throws -> ByteBuffer { | ||
| guard | ||
| let attributes = try? FileManager.default.attributesOfItem(atPath: path), |
There was a problem hiding this comment.
While IMO this should use NIOFileSystem rather than FileManager I get that it probably makes sense to wait for it to be more stable
* Add AsyncSequence-based file read method * Add `NIOFileSystem` dependency to standard manifest * Update test * Add long test file
keniwhat
pushed a commit
to keniwhat/vapor
that referenced
this pull request
Apr 27, 2024
* main: Patch configuration and log actual port on startup (vapor#3160) Update provider tests to 5.10 (vapor#3178) Migrate to Async NIOFileIO APIs (vapor#3167) Removed streamFile deprecation + deactivated advancedETagComparison by default (vapor#3177) Remove HeadResponder (vapor#3147) Advanced ETag Comparison now supported (vapor#3015) Enabled Request Decompression By Default (vapor#3175) HTTP2 Response Compression/Request Decompression (vapor#3126) Don't set ignore status for SIGTERM and SIGINT on Linux (vapor#3174) Fix typos across the codebase (vapor#3162) Fix some Sendable warnings on 5.10 (vapor#3158) Allow `HTTPServer`'s configuration to be dynamically updatable (vapor#3132) Fix issue when client disconnects midway through a stream (vapor#3102) Fix handling of "flag" URL query params (vapor#3151) Bump the dependencies group with 1 update (vapor#3148) Merge Async Tests (vapor#3141) Fix URI handling with multiple slashes and variable components. (vapor#3143) Fix broken URI behaviors (vapor#3140) # Conflicts: # Package.swift
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These changes are now available in 4.94.0
This migrates
collectFile(at:)andwriteFile(_:at:)to use NIO's async NIOFileIO APIs introduced in https://github.com/apple/swift-nio/releases/tag/2.63.0Also adds a new API for streaming files using a
AsyncSequencebased on the newNIOFileSystem.This work is required to move the
DotEnvsupport over to an async API to avoid callingwait()s in an async context which can cause issues