Skip to content

Commit

Permalink
SwiftFormat
Browse files Browse the repository at this point in the history
  • Loading branch information
@adam-fowler
adam-fowler committed Apr 30, 2024
1 parent 06b2786 commit 2ab6f43
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 110 deletions.
70 changes: 35 additions & 35 deletions Sources/HummingbirdCore/Server/EventLoopExecutor.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,49 +15,49 @@
import NIOCore

#if compiler(>=6.0)
final class EventLoopExecutor: TaskExecutor, SerialExecutor {
@usableFromInline let eventLoop: EventLoop
final class EventLoopExecutor: TaskExecutor, SerialExecutor {
@usableFromInline let eventLoop: EventLoop

init(eventLoop: EventLoop) {
self.eventLoop = eventLoop
}

func asUnownedTaskExecutor() -> UnownedTaskExecutor {
UnownedTaskExecutor(ordinary: self)
}
init(eventLoop: EventLoop) {
self.eventLoop = eventLoop
}

@inlinable
func enqueue(_ job: consuming ExecutorJob) {
let job = UnownedJob(job)
self.eventLoop.execute {
job.runSynchronously(on: self.asUnownedTaskExecutor())
}
}
func asUnownedTaskExecutor() -> UnownedTaskExecutor {
UnownedTaskExecutor(ordinary: self)
}

@inlinable
func asUnownedSerialExecutor() -> UnownedSerialExecutor {
UnownedSerialExecutor(complexEquality: self)
@inlinable
func enqueue(_ job: consuming ExecutorJob) {
let job = UnownedJob(job)
self.eventLoop.execute {
job.runSynchronously(on: self.asUnownedTaskExecutor())
}
}

@inlinable
func isSameExclusiveExecutionContext(other: EventLoopExecutor) -> Bool {
self.eventLoop === other.eventLoop
}
@inlinable
func asUnownedSerialExecutor() -> UnownedSerialExecutor {
UnownedSerialExecutor(complexEquality: self)
}

struct EventLoopExecutorMap {
init(eventLoopGroup: EventLoopGroup) {
var executors: [ObjectIdentifier: EventLoopExecutor] = [:]
for eventLoop in eventLoopGroup.makeIterator() {
executors[ObjectIdentifier(eventLoop)] = EventLoopExecutor(eventLoop: eventLoop)
}
self.executors = executors
}
@inlinable
func isSameExclusiveExecutionContext(other: EventLoopExecutor) -> Bool {
self.eventLoop === other.eventLoop
}
}

subscript(eventLoop: EventLoop) -> EventLoopExecutor? {
return self.executors[ObjectIdentifier(eventLoop)]
struct EventLoopExecutorMap {
init(eventLoopGroup: EventLoopGroup) {
var executors: [ObjectIdentifier: EventLoopExecutor] = [:]
for eventLoop in eventLoopGroup.makeIterator() {
executors[ObjectIdentifier(eventLoop)] = EventLoopExecutor(eventLoop: eventLoop)
}
self.executors = executors
}

let executors: [ObjectIdentifier: EventLoopExecutor]
subscript(eventLoop: EventLoop) -> EventLoopExecutor? {
return self.executors[ObjectIdentifier(eventLoop)]
}
#endif // swift(>=6.0)

let executors: [ObjectIdentifier: EventLoopExecutor]
}
#endif // swift(>=6.0)
6 changes: 3 additions & 3 deletions Sources/HummingbirdCore/Server/HTTP/HTTP1Channel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ public struct HTTP1Channel: ServerChildChannel, HTTPChannelHandler {
public func setup(channel: Channel, logger: Logger) -> EventLoopFuture<Value> {
let childChannelHandlers: [any ChannelHandler] =
[HTTP1ToHTTPServerCodec(secure: false)] + self.additionalChannelHandlers() + [
HTTPUserEventHandler(logger: logger)
HTTPUserEventHandler(logger: logger),
]
return channel.eventLoop.makeCompletedFuture {
try channel.pipeline.syncOperations.configureHTTPServerPipeline(
withPipeliningAssistance: false, // HTTP is pipelined by NIOAsyncChannel
withPipeliningAssistance: false, // HTTP is pipelined by NIOAsyncChannel
withErrorHandling: true,
withOutboundHeaderValidation: false // Swift HTTP Types are already doing this validation
withOutboundHeaderValidation: false // Swift HTTP Types are already doing this validation
)
try channel.pipeline.syncOperations.addHandlers(childChannelHandlers)
return try NIOAsyncChannel(
Expand Down
141 changes: 72 additions & 69 deletions Sources/HummingbirdCore/Server/Server.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import NIOPosix
import ServiceLifecycle

#if canImport(Network)
import Network
import NIOTransportServices
import Network
import NIOTransportServices
#endif

/// HTTP server class
Expand Down Expand Up @@ -115,27 +115,30 @@ public actor Server<ChildChannel: ServerChildChannel>: Service {

let logger = self.logger
#if compiler(>=6.0)
let eventLoopExecutorMap = EventLoopExecutorMap(
eventLoopGroup: self.eventLoopGroup)
let eventLoopExecutorMap = EventLoopExecutorMap(
eventLoopGroup: self.eventLoopGroup)
#endif
// We can now start to handle our work.
await withDiscardingTaskGroup { group in
do {
try await asyncChannel.executeThenClose { inbound in
for try await childChannel in inbound {
#if compiler(>=6.0)
group.addTask(
executorPreference: eventLoopExecutorMap[
childChannel.eventLoop]
) {
await childChannelSetup.handle(
value: childChannel, logger: logger)
}
group.addTask(
executorPreference: eventLoopExecutorMap[
childChannel.eventLoop
]
) {
await childChannelSetup.handle(
value: childChannel, logger: logger
)
}
#else
group.addTask {
await childChannelSetup.handle(
value: childChannel, logger: logger)
}
group.addTask {
await childChannelSetup.handle(
value: childChannel, logger: logger
)
}
#endif
}
}
Expand Down Expand Up @@ -200,25 +203,25 @@ public actor Server<ChildChannel: ServerChildChannel>: Service {
{
let bootstrap: ServerBootstrapProtocol
#if canImport(Network)
if let tsBootstrap = self.createTSBootstrap(configuration: configuration) {
bootstrap = tsBootstrap
} else {
#if os(iOS) || os(tvOS)
self.logger.warning(
"Running BSD sockets on iOS or tvOS is not recommended. Please use NIOTSEventLoopGroup, to run with the Network framework"
)
#endif
if configuration.tlsOptions.options != nil {
self.logger.warning(
"tlsOptions set in Configuration will not be applied to a BSD sockets server. Please use NIOTSEventLoopGroup, to run with the Network framework"
)
}
bootstrap = self.createSocketsBootstrap(configuration: configuration)
if let tsBootstrap = self.createTSBootstrap(configuration: configuration) {
bootstrap = tsBootstrap
} else {
#if os(iOS) || os(tvOS)
self.logger.warning(
"Running BSD sockets on iOS or tvOS is not recommended. Please use NIOTSEventLoopGroup, to run with the Network framework"
)
#endif
if configuration.tlsOptions.options != nil {
self.logger.warning(
"tlsOptions set in Configuration will not be applied to a BSD sockets server. Please use NIOTSEventLoopGroup, to run with the Network framework"
)
}
bootstrap = self.createSocketsBootstrap(configuration: configuration)
}
#else
bootstrap = self.createSocketsBootstrap(
configuration: configuration
)
bootstrap = self.createSocketsBootstrap(
configuration: configuration
)
#endif

do {
Expand Down Expand Up @@ -279,32 +282,32 @@ public actor Server<ChildChannel: ServerChildChannel>: Service {
}

#if canImport(Network)
/// create a NIOTransportServices bootstrap using Network.framework
@available(macOS 10.14, iOS 12, tvOS 12, *)
private nonisolated func createTSBootstrap(
configuration: ServerConfiguration
) -> NIOTSListenerBootstrap? {
guard
let bootstrap = NIOTSListenerBootstrap(validatingGroup: self.eventLoopGroup)?
.serverChannelOption(
ChannelOptions.socketOption(.so_reuseaddr),
value: configuration.reuseAddress ? 1 : 0
)
// Set the handlers that are applied to the accepted Channels
.childChannelOption(
ChannelOptions.socketOption(.so_reuseaddr),
value: configuration.reuseAddress ? 1 : 0
)
.childChannelOption(ChannelOptions.allowRemoteHalfClosure, value: true)
else {
return nil
}
/// create a NIOTransportServices bootstrap using Network.framework
@available(macOS 10.14, iOS 12, tvOS 12, *)
private nonisolated func createTSBootstrap(
configuration: ServerConfiguration
) -> NIOTSListenerBootstrap? {
guard
let bootstrap = NIOTSListenerBootstrap(validatingGroup: self.eventLoopGroup)?
.serverChannelOption(
ChannelOptions.socketOption(.so_reuseaddr),
value: configuration.reuseAddress ? 1 : 0
)
// Set the handlers that are applied to the accepted Channels
.childChannelOption(
ChannelOptions.socketOption(.so_reuseaddr),
value: configuration.reuseAddress ? 1 : 0
)
.childChannelOption(ChannelOptions.allowRemoteHalfClosure, value: true)
else {
return nil
}

if let tlsOptions = configuration.tlsOptions.options {
return bootstrap.tlsOptions(tlsOptions)
}
return bootstrap
if let tlsOptions = configuration.tlsOptions.options {
return bootstrap.tlsOptions(tlsOptions)
}
return bootstrap
}
#endif
}

Expand All @@ -331,20 +334,20 @@ protocol ServerBootstrapProtocol {
extension ServerBootstrap: ServerBootstrapProtocol {}

#if canImport(Network)
@available(macOS 10.14, iOS 12, tvOS 12, *)
extension NIOTSListenerBootstrap: ServerBootstrapProtocol {
// need to be able to extend `NIOTSListenerBootstrap` to conform to `ServerBootstrapProtocol`
// before we can use TransportServices
func bind<Output: Sendable>(
unixDomainSocketPath: String,
cleanupExistingSocketFile: Bool,
serverBackPressureStrategy: NIOAsyncSequenceProducerBackPressureStrategies
.HighLowWatermark?,
childChannelInitializer: @escaping @Sendable (Channel) -> EventLoopFuture<Output>
) async throws -> NIOAsyncChannel<Output, Never> {
preconditionFailure("Binding to a unixDomainSocketPath is currently not available")
}
@available(macOS 10.14, iOS 12, tvOS 12, *)
extension NIOTSListenerBootstrap: ServerBootstrapProtocol {
// need to be able to extend `NIOTSListenerBootstrap` to conform to `ServerBootstrapProtocol`
// before we can use TransportServices
func bind<Output: Sendable>(
unixDomainSocketPath: String,
cleanupExistingSocketFile: Bool,
serverBackPressureStrategy: NIOAsyncSequenceProducerBackPressureStrategies
.HighLowWatermark?,
childChannelInitializer: @escaping @Sendable (Channel) -> EventLoopFuture<Output>
) async throws -> NIOAsyncChannel<Output, Never> {
preconditionFailure("Binding to a unixDomainSocketPath is currently not available")
}
}
#endif

extension Server: CustomStringConvertible {
Expand Down
7 changes: 4 additions & 3 deletions Sources/HummingbirdHTTP2/HTTP2Channel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ public struct HTTP2UpgradeChannel: HTTPChannelHandler {
self.sslContext = try NIOSSLContext(configuration: tlsConfiguration)
self.additionalChannelHandlers = additionalChannelHandlers
self.http1 = HTTP1Channel(
responder: responder, additionalChannelHandlers: additionalChannelHandlers)
responder: responder, additionalChannelHandlers: additionalChannelHandlers
)
}

/// Setup child channel for HTTP1 with HTTP2 upgrade
Expand All @@ -82,7 +83,7 @@ public struct HTTP2UpgradeChannel: HTTPChannelHandler {
http1Channel -> EventLoopFuture<HTTP1Channel.Value> in
let childChannelHandlers: [ChannelHandler] =
[HTTP1ToHTTPServerCodec(secure: false)] + self.additionalChannelHandlers() + [
HTTPUserEventHandler(logger: logger)
HTTPUserEventHandler(logger: logger),
]

return http1Channel
Expand All @@ -100,7 +101,7 @@ public struct HTTP2UpgradeChannel: HTTPChannelHandler {
} http2StreamInitializer: { http2ChildChannel -> EventLoopFuture<HTTP1Channel.Value> in
let childChannelHandlers: [ChannelHandler] =
self.additionalChannelHandlers() + [
HTTPUserEventHandler(logger: logger)
HTTPUserEventHandler(logger: logger),
]

return http2ChildChannel
Expand Down

0 comments on commit 2ab6f43

Please sign in to comment.