minor: improve code style (swift-server#103)

Author: weissi

Package.swift

@@ -31,7 +31,7 @@ let package = Package(
 ),
 .testTarget(
  name:"AsyncHTTPClientTests",
- dependencies:["AsyncHTTPClient","NIOFoundationCompat"]
+ dependencies:["NIO","NIOConcurrencyHelpers","NIOSSL","AsyncHTTPClient","NIOFoundationCompat"]
 ),
 ]
 )

Sources/AsyncHTTPClient/HTTPHandler.swift

@@ -551,17 +551,15 @@ internal class TaskHandler<Delegate: HTTPClientResponseDelegate>: ChannelInbound
 }
 
 privatefunc writeBody(request:HTTPClient.Request, context:ChannelHandlerContext)->EventLoopFuture<Void>{
-iflet body = request.body {
-return body.stream(HTTPClient.Body.StreamWriter{ part in
-letfuture= context.writeAndFlush(self.wrapOutboundOut(.body(part)))
- future.whenSuccess{ _ in
-self.delegate.didSendRequestPart(task:self.task, part)
-}
-return future
-})
-}else{
+guardlet body = request.body else{
 return context.eventLoop.makeSucceededFuture(())
 }
+
+return body.stream(HTTPClient.Body.StreamWriter{ part in
+ context.writeAndFlush(self.wrapOutboundOut(.body(part))).map{
+self.delegate.didSendRequestPart(task:self.task, part)
+}
+})
 }
 
 publicfunc read(context:ChannelHandlerContext){

Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift

@@ -74,11 +74,11 @@ class HTTPClientInternalTests: XCTestCase{
 }
 
 func testProxyStreaming()throws{
-lethttpBin=HttpBin()
+lethttpBin=HTTPBin()
 lethttpClient=HTTPClient(eventLoopGroupProvider:.createNew)
 defer{
 XCTAssertNoThrow(try httpClient.syncShutdown())
- httpBin.shutdown()
+XCTAssertNoThrow(tryhttpBin.shutdown())
 }
 
 letbody:HTTPClient.Body=.stream(length:50){ writer in
@@ -104,11 +104,11 @@ class HTTPClientInternalTests: XCTestCase{
 }
 
 func testProxyStreamingFailure()throws{
-lethttpBin=HttpBin()
+lethttpBin=HTTPBin()
 lethttpClient=HTTPClient(eventLoopGroupProvider:.createNew)
 defer{
 XCTAssertNoThrow(try httpClient.syncShutdown())
- httpBin.shutdown()
+XCTAssertNoThrow(tryhttpBin.shutdown())
 }
 
 varbody:HTTPClient.Body=.stream(length:50){ _ in
@@ -165,11 +165,11 @@ class HTTPClientInternalTests: XCTestCase{
 
 lethttpClient=HTTPClient(eventLoopGroupProvider:.createNew)
 letpromise:EventLoopPromise<Channel>= httpClient.eventLoopGroup.next().makePromise()
-lethttpBin=HttpBin(channelPromise: promise)
+lethttpBin=HTTPBin(channelPromise: promise)
 
 defer{
 XCTAssertNoThrow(try httpClient.syncShutdown())
- httpBin.shutdown()
+XCTAssertNoThrow(tryhttpBin.shutdown())
 }
 
 letrequest=tryRequest(url:"http://localhost:\(httpBin.port)/custom")

Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift

@@ -15,6 +15,7 @@
 import AsyncHTTPClient
 import Foundation
 import NIO
+import NIOConcurrencyHelpers
 import NIOHTTP1
 import NIOSSL
 
@@ -90,9 +91,10 @@ internal final class RecordingHandler<Input, Output>: ChannelDuplexHandler{
 }
 }
 
-internalclassHttpBin{
+internalfinalclassHTTPBin{
 letgroup=MultiThreadedEventLoopGroup(numberOfThreads:1)
 letserverChannel:Channel
+letisShutdown:Atomic<Bool>=.init(value:false)
 
 varport:Int{
 returnInt(self.serverChannel.localAddress!.port!)
@@ -125,7 +127,7 @@ internal class HttpBin{
 }
 }.flatMap{
 if ssl {
-returnHttpBin.configureTLS(channel: channel).flatMap{
+returnHTTPBin.configureTLS(channel: channel).flatMap{
  channel.pipeline.addHandler(HttpBinHandler(channelPromise: channelPromise))
 }
 }else{
@@ -135,8 +137,13 @@ internal class HttpBin{
 }.bind(host:"127.0.0.1", port:0).wait()
 }
 
-func shutdown(){
-try!self.group.syncShutdownGracefully()
+func shutdown()throws{
+self.isShutdown.store(true)
+tryself.group.syncShutdownGracefully()
+}
+
+deinit{
+assert(self.isShutdown.load(),"HTTPBin not shutdown before deinit")
 }
 }
 
@@ -186,7 +193,7 @@ final class HTTPProxySimulator: ChannelInboundHandler, RemovableChannelHandler{
 
 switchself.option {
 case.tls:
- _ =HttpBin.configureTLS(channel: context.channel)
+ _ =HTTPBin.configureTLS(channel: context.channel)
 case.plaintext:break
 }
 }
@@ -311,20 +318,16 @@ internal final class HttpBinHandler: ChannelInboundHandler{
  response.add(body)
 self.resps.prepend(response)
 case.end:
-iflet promise =self.channelPromise {
- promise.succeed(context.channel)
-}
+self.channelPromise?.succeed(context.channel)
 ifself.resps.isEmpty {
 return
 }
 letresponse=self.resps.removeFirst()
  context.write(wrapOutboundOut(.head(response.head)), promise:nil)
-iflet body = response.body {
-letdata= body.withUnsafeReadableBytes{
-Data(bytes: $0.baseAddress!, count: $0.count)
-}
-
-letserialized=try!JSONEncoder().encode(RequestInfo(data:String(data: data, encoding:.utf8)!))
+ifvar body = response.body {
+letdata= body.readData(length: body.readableBytes)!
+letserialized=try!JSONEncoder().encode(RequestInfo(data:String(decoding: data,
+ as:Unicode.UTF8.self)))
 
 varresponseBody= context.channel.allocator.buffer(capacity: serialized.count)
  responseBody.writeBytes(serialized)
@@ -395,9 +398,7 @@ internal final class HttpBinForSSLUncleanShutdownHandler: ChannelInboundHandler
 func channelRead(context:ChannelHandlerContext, data:NIOAny){
 switchself.unwrapInboundIn(data){
 case.head(let req):
-iflet promise =self.channelPromise {
- promise.succeed(context.channel)
-}
+self.channelPromise?.succeed(context.channel)
 
 letresponse:String?
 switch req.uri {
@@ -440,7 +441,7 @@ internal final class HttpBinForSSLUncleanShutdownHandler: ChannelInboundHandler
  context.writeAndFlush(self.wrapOutboundOut(buffer), promise:nil)
 }
 
-_ =context.channel.pipeline.removeHandler(name:"NIOSSLServerHandler").map{ _ in
+ context.channel.pipeline.removeHandler(name:"NIOSSLServerHandler").whenSuccess{
  context.close(promise:nil)
 }
 case.body: