File handles can use NIOLoopBound

vapor · Apr 18, 2023 · 89cdbcf · 89cdbcf
1 parent 0bbf86e
commit 89cdbcf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/Sources/Vapor/Environment/Environment+Secret.swift b/Sources/Vapor/Environment/Environment+Secret.swift
@@ -49,7 +49,7 @@ extension Environment {
         return fileIO
             .openFile(path: path, eventLoop: eventLoop)
             .flatMap { handle, region in
-                let handleWrapper = FileHandleWrapper(value: handle)
+                let handleWrapper = NIOLoopBound(handle, eventLoop: eventLoop)
                 return fileIO
                     .read(fileRegion: region, allocator: .init(), eventLoop: eventLoop)
                     .always { _ in try? handleWrapper.value.close() }

diff --git a/Sources/Vapor/Utilities/DotEnv.swift b/Sources/Vapor/Utilities/DotEnv.swift
@@ -172,7 +172,7 @@ public struct DotEnvFile: Sendable {
         on eventLoop: EventLoop
     ) -> EventLoopFuture<DotEnvFile> {
         return fileio.openFile(path: path, eventLoop: eventLoop).flatMap { arg -> EventLoopFuture<ByteBuffer> in
-            let fileHandleWrapper = FileHandleWrapper(value: arg.0)
+            let fileHandleWrapper = NIOLoopBound(arg.0, eventLoop: eventLoop)
             return fileio.read(fileRegion: arg.1, allocator: .init(), eventLoop: eventLoop)
                 .flatMapThrowing
             { buffer in

diff --git a/Sources/Vapor/Utilities/FileIO.swift b/Sources/Vapor/Utilities/FileIO.swift
@@ -235,7 +235,7 @@ public struct FileIO: Sendable {
     ) -> EventLoopFuture<Void> {
         do {
             let fd = try NIOFileHandle(path: path)
-            let fdWrapper = FileHandleWrapper(value: fd)
+            let fdWrapper = NIOLoopBound(fd, eventLoop: self.request.eventLoop)
             let done = self.io.readChunked(
                 fileHandle: fd,
                 fromOffset: offset,
@@ -267,7 +267,7 @@ public struct FileIO: Sendable {
     public func writeFile(_ buffer: ByteBuffer, at path: String) -> EventLoopFuture<Void> {
         do {
             let fd = try NIOFileHandle(path: path, mode: .write, flags: .allowFileCreation())
-            let fdWrapper = FileHandleWrapper(value: fd)
+            let fdWrapper = NIOLoopBound(fd, eventLoop: self.request.eventLoop)
             let done = io.write(fileHandle: fd, buffer: buffer, eventLoop: self.request.eventLoop)
             done.whenComplete { _ in
                 try? fdWrapper.value.close()
@@ -309,11 +309,3 @@ extension HTTPHeaders.Range.Value {
         }
     }
 }
-
-final class FileHandleWrapper: @unchecked Sendable {
-    var value: NIOFileHandle
-
-    init(value: NIOFileHandle) {
-        self.value = value
-    }
-}
diff --git a/Sources/Vapor/View/PlaintextRenderer.swift b/Sources/Vapor/View/PlaintextRenderer.swift
@@ -38,7 +38,7 @@ public struct PlaintextRenderer: ViewRenderer, Sendable {
             ? name
             : self.viewsDirectory + name
         return self.fileio.openFile(path: path, eventLoop: eventLoop).flatMap { (handle, region) in
-            let fileHandleWrapper = FileHandleWrapper(value: handle)
+            let fileHandleWrapper = NIOLoopBound(handle, eventLoop: eventLoop)
             return self.fileio.read(fileRegion: region, allocator: .init(), eventLoop: eventLoop).flatMapThrowing { buffer in
                 try fileHandleWrapper.value.close()
                 return buffer