Skip to content

Split NIOHTTPServer into separate module #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aryan-25 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Split NIOHTTPServer into separate module #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6ee7f8
Split NIOHTTPServer into separate module
aryan-25 Jan 27, 2026
10538f2
Remove unused imports
aryan-25 Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ let package = Package(
.library(
name: "HTTPServer",
targets: ["HTTPServer"]
)
),
.library(
name: "NIOHTTPServer",
targets: ["NIOHTTPServer"]
),
],
traits: [
.trait(name: "SwiftConfiguration"),
Expand Down Expand Up @@ -65,11 +69,20 @@ let package = Package(
.product(name: "Logging", package: "swift-log"),
"HTTPServer",
"Middleware",
"NIOHTTPServer",
],
swiftSettings: extraSettings
),
.target(
name: "HTTPServer",
dependencies: [
"AsyncStreaming",
.product(name: "HTTPTypes", package: "swift-http-types"),
],
swiftSettings: extraSettings
),
.target(
name: "NIOHTTPServer",
dependencies: [
"AsyncStreaming",
.product(name: "DequeModule", package: "swift-collections"),
Expand All @@ -90,6 +103,7 @@ let package = Package(
package: "swift-configuration",
condition: .when(traits: ["SwiftConfiguration"])
),
"HTTPServer",
],
swiftSettings: extraSettings
),
Expand All @@ -109,10 +123,10 @@ let package = Package(
swiftSettings: extraSettings
),
.testTarget(
name: "HTTPServerTests",
name: "NIOHTTPServerTests",
dependencies: [
.product(name: "Logging", package: "swift-log"),
"HTTPServer",
"NIOHTTPServer",
]
),
]
Expand Down
1 change: 1 addition & 0 deletions Sources/Example/Example.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import HTTPTypes
import Instrumentation
import Logging
import Middleware
import NIOHTTPServer
import X509

@main
Expand Down
0 ...er/HTTPRequestConcludingAsyncReader.swift → ...er/HTTPRequestConcludingAsyncReader.swift
View file
Open in desktop
File renamed without changes.
0 ...r/HTTPResponseConcludingAsyncWriter.swift → ...r/HTTPResponseConcludingAsyncWriter.swift
View file
Open in desktop
File renamed without changes.
0 ...ver/NIOHTTPServer+ConnectionContext.swift → ...ver/NIOHTTPServer+ConnectionContext.swift
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...es/HTTPServer/NIOHTTPServer+HTTP1_1.swift → ...NIOHTTPServer/NIOHTTPServer+HTTP1_1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
//
//===----------------------------------------------------------------------===//

import HTTPServer
import NIOCore
import NIOEmbedded
import NIOHTTP1
Expand Down
0 ...rver/NIOHTTPServer+ListeningAddress.swift → ...rver/NIOHTTPServer+ListeningAddress.swift
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...PServer/NIOHTTPServer+SecureUpgrade.swift → ...PServer/NIOHTTPServer+SecureUpgrade.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
//
//===----------------------------------------------------------------------===//

import HTTPServer
import Logging
import NIOCore
import NIOEmbedded
Expand Down
0 ...er/NIOHTTPServer+SwiftConfiguration.swift → ...er/NIOHTTPServer+SwiftConfiguration.swift
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions Sources/HTTPServer/NIOHTTPServer.swift → Sources/NIOHTTPServer/NIOHTTPServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
//
//===----------------------------------------------------------------------===//

public import HTTPServer
import HTTPTypes
public import Logging
import NIOCertificateReloading
Expand Down
0 ...TPServer/NIOHTTPServerConfiguration.swift → ...TPServer/NIOHTTPServerConfiguration.swift
View file
Open in desktop
File renamed without changes.
0 Sources/HTTPServer/NIOSSL+X509.swift → Sources/NIOHTTPServer/NIOSSL+X509.swift
View file
Open in desktop
File renamed without changes.
0 Sources/HTTPServer/SocketAddress.swift → Sources/NIOHTTPServer/SocketAddress.swift
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...TPRequestConcludingAsyncReaderTests.swift → ...TPRequestConcludingAsyncReaderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import NIOHTTPTypes
import NIOPosix
import Testing

@testable import HTTPServer
@testable import NIOHTTPServer

@Suite
struct HTTPRequestConcludingAsyncReaderTests {
Expand Down
2 changes: 1 addition & 1 deletion ...PResponseConcludingAsyncWriterTests.swift → ...PResponseConcludingAsyncWriterTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import NIOCore
import NIOHTTPTypes
import Testing

@testable import HTTPServer
@testable import NIOHTTPServer

@Suite
struct HTTPResponseConcludingAsyncWriterTests {
Expand Down
3 changes: 2 additions & 1 deletion ...ServerTests/HTTPResponseSenderTests.swift → ...ServerTests/HTTPResponseSenderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
//
//===----------------------------------------------------------------------===//

import HTTPServer
import HTTPTypes
import NIOCore
import NIOHTTPTypes
import Testing

@testable import HTTPServer
@testable import NIOHTTPServer

@Suite
struct HTTPResponseSenderTests {
Expand Down
1 change: 1 addition & 0 deletions Tests/HTTPServerTests/HTTPServerTests.swift → .../NIOHTTPServerTests/HTTPServerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import HTTPServer
import HTTPTypes
import Logging
import NIOHTTPServer
import Testing

@Suite
Expand Down
4 changes: 3 additions & 1 deletion ...verTests/NIOHTTPServerEndToEndTests.swift → ...verTests/NIOHTTPServerEndToEndTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
//
//===----------------------------------------------------------------------===//

import HTTPServer
import HTTPTypes
import NIOCore
import NIOEmbedded
import NIOHTTP1
Expand All @@ -22,7 +24,7 @@ import NIOSSL
import Testing
import X509

@testable import HTTPServer
@testable import NIOHTTPServer

@Suite
struct NIOHTTPServerEndToEndTests {
Expand Down
2 changes: 1 addition & 1 deletion ...IOHTTPServerSwiftConfigurationTests.swift → ...IOHTTPServerSwiftConfigurationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import SwiftASN1
import Testing
import X509

@testable import HTTPServer
@testable import NIOHTTPServer

@Suite
struct NIOHTTPServerSwiftConfigurationTests {
Expand Down
2 changes: 1 addition & 1 deletion .../HTTPServerTests/NIOHTTPServerTests.swift → ...OHTTPServerTests/NIOHTTPServerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import NIOHTTPTypes
import Testing
import X509

@testable import HTTPServer
@testable import NIOHTTPServer

#if canImport(Dispatch)
import Dispatch
Expand Down
0 ...HTTPServerTests/Utilities/TestError.swift → Tests/NIOHTTPServerTests/TestError.swift
View file
Open in desktop
File renamed without changes.
0 ...PServerTests/Utilities/Certificates.swift → ...PServerTests/Utilities/Certificates.swift
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Tests/HTTPServerTests/Utilities/Client.swift → ...NIOHTTPServerTests/Utilities/Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import NIOPosix
import NIOSSL
import X509

@testable import HTTPServer
@testable import NIOHTTPServer

@available(macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
func setUpClient(host: String, port: Int) async throws -> NIOAsyncChannel<HTTPResponsePart, HTTPRequestPart> {
Expand Down
1 change: 1 addition & 0 deletions ...Utilities/HTTP1ClientServerProvider.swift → ...Utilities/HTTP1ClientServerProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import NIOHTTPTypesHTTP1
import X509

@testable import HTTPServer
@testable import NIOHTTPServer

@available(macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
struct HTTP1ClientServerProvider {
Expand Down
1 change: 1 addition & 0 deletions ...TPSecureUpgradeClientServerProvider.swift → ...TPSecureUpgradeClientServerProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import NIOSSL
import X509

@testable import HTTPServer
@testable import NIOHTTPServer

@available(macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
struct HTTPSecureUpgradeClientServerProvider {
Expand Down
1 change: 1 addition & 0 deletions ...Tests/Utilities/NIOHTTPServer+HTTP1.swift → ...Tests/Utilities/NIOHTTPServer+HTTP1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import NIOEmbedded
import NIOHTTPTypes

@testable import HTTPServer
@testable import NIOHTTPServer

@available(macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
extension NIOHTTPServer {
Expand Down
1 change: 1 addition & 0 deletions ...ilities/NIOHTTPServer+SecureUpgrade.swift → ...ilities/NIOHTTPServer+SecureUpgrade.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import NIOEmbedded
import NIOHTTPTypes

@testable import HTTPServer
@testable import NIOHTTPServer

@available(macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
extension NIOHTTPServer {
Expand Down
Loading