factor the data types out of the HTTPServer module and into the new HTTP module, and have UnidocPages depend on that instead of HTTPServer

tayloraswift · tayloraswift · commit b98fa7eb91e4 · 2023-09-06T03:38:24.000Z
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -75,6 +75,8 @@ let package:Package = .init(
         .package(url: "https://github.com/tayloraswift/swift-mongodb", .upToNextMinor(
            from: "0.7.2")),
 
+        .package(url: "https://github.com/swift-server/swift-backtrace", .upToNextMinor(
+            from: "1.3.4")),
         .package(url: "https://github.com/apple/swift-nio", .upToNextMinor(
             from: "2.57.0")),
         .package(url: "https://github.com/apple/swift-nio-http2", .upToNextMinor(
@@ -147,6 +149,14 @@ let package:Package = .init(
                 .target(name: "HTMLDOM"),
             ]),
 
+        .target(name: "HTTP", dependencies:
+            [
+                .target(name: "Media"),
+                .target(name: "MD5"),
+
+                .product(name: "NIOCore", package: "swift-nio"),
+            ]),
+
         .target(name: "HTTPClient", dependencies:
             [
                 .target(name: "HTML"),
@@ -161,8 +171,7 @@ let package:Package = .init(
         .target(name: "HTTPServer", dependencies:
             [
                 .target(name: "HTML"),
-                .target(name: "Media"),
-                .target(name: "MD5"),
+                .target(name: "HTTP"),
                 .product(name: "NIOHTTP1", package: "swift-nio"),
                 .product(name: "NIOSSL", package: "swift-nio-ssl"),
                 .product(name: "TraceableErrors", package: "swift-grammar"),
@@ -388,7 +397,7 @@ let package:Package = .init(
         .target(name: "UnidocPages", dependencies:
             [
                 .target(name: "GitHubIntegration"),
-                .target(name: "HTTPServer"),
+                .target(name: "HTTP"),
                 .target(name: "MarkdownRendering"),
                 .target(name: "UnidocQueries"),
                 .target(name: "URI"),
@@ -434,9 +443,12 @@ let package:Package = .init(
         .executableTarget(name: "UnidocServer", dependencies:
             [
                 .target(name: "GitHubClient"),
+                .target(name: "HTTPServer"),
                 .target(name: "Multiparts"),
                 .target(name: "System"),
                 .target(name: "UnidocPages"),
+
+                .product(name: "Backtrace", package: "swift-backtrace"),
             ]),
 
 
diff --git a/Sources/HTTP/Cookie.swift b/Sources/HTTP/Cookie.swift
diff --git a/Sources/HTTP/ServerRedirect.swift b/Sources/HTTP/ServerRedirect.swift
diff --git a/Sources/HTTP/ServerResource.Content.swift b/Sources/HTTP/ServerResource.Content.swift
diff --git a/Sources/HTTP/ServerResource.Results.swift b/Sources/HTTP/ServerResource.Results.swift
diff --git a/Sources/HTTP/ServerResource.swift b/Sources/HTTP/ServerResource.swift
diff --git a/Sources/HTTP/ServerResponse.swift b/Sources/HTTP/ServerResponse.swift
diff --git a/Sources/HTTP/ServerResponseFactory.swift b/Sources/HTTP/ServerResponseFactory.swift
diff --git a/Sources/HTTPServer/Channels/HTTPServerDelegate.swift b/Sources/HTTPServer/Channels/HTTPServerDelegate.swift
@@ -1,3 +1,4 @@
+import HTTP
 import NIOCore
 import NIOPosix
 import NIOHTTP1
diff --git a/Sources/HTTPServer/Channels/ServerInterfaceHandler.swift b/Sources/HTTPServer/Channels/ServerInterfaceHandler.swift
@@ -1,3 +1,4 @@
+import HTTP
 import MD5
 import NIOCore
 import NIOHTTP1
diff --git a/Sources/HTTPServer/Channels/ServerMessage.swift b/Sources/HTTPServer/Channels/ServerMessage.swift
@@ -1,3 +1,4 @@
+import HTTP
 import Media
 import MD5
 import NIOCore
diff --git a/Sources/UnidocPages/FixedPage.swift b/Sources/UnidocPages/FixedPage.swift
@@ -1,5 +1,5 @@
 import HTML
-import HTTPServer
+import HTTP
 import Media
 import URI
 
diff --git a/Sources/UnidocPages/Inlining/Record.Passage (ext).swift b/Sources/UnidocPages/Inlining/Record.Passage (ext).swift
@@ -1,4 +1,3 @@
-
 import MarkdownABI
 import MarkdownRendering
 import UnidocRecords
diff --git a/Sources/UnidocPages/SearchIndexQuery.Output (ext).swift b/Sources/UnidocPages/SearchIndexQuery.Output (ext).swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 import UnidocQueries
 import URI
 
diff --git a/Sources/UnidocPages/ThinQuery.Output (ext).swift b/Sources/UnidocPages/ThinQuery.Output (ext).swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 import UnidocQueries
 import UnidocRecords
 import URI
diff --git a/Sources/UnidocPages/WideQuery.Output (ext).swift b/Sources/UnidocPages/WideQuery.Output (ext).swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 import UnidocQueries
 import UnidocRecords
 import URI
diff --git a/Sources/UnidocRecords/Selectors/Volume.Stem.swift b/Sources/UnidocRecords/Selectors/Volume.Stem.swift
@@ -223,7 +223,6 @@ extension Volume.Stem
     @inlinable public mutating
     func append(gay component:some StringProtocol)
     {
-        precondition(!component.isEmpty)
         self.rawValue.append("\t")
         self.rawValue += component
     }
diff --git a/Sources/UnidocServer/Caching/Cache.Request.swift b/Sources/UnidocServer/Caching/Cache.Request.swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 import MD5
 
 extension Cache
diff --git a/Sources/UnidocServer/Caching/Cache.swift b/Sources/UnidocServer/Caching/Cache.swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 import MD5
 import System
 
diff --git a/Sources/UnidocServer/Caching/CacheKey.swift b/Sources/UnidocServer/Caching/CacheKey.swift
@@ -1,4 +1,3 @@
-import HTTPServer
 import Media
 import System
 
diff --git a/Sources/UnidocServer/DatabaseOperation.swift b/Sources/UnidocServer/DatabaseOperation.swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 
 protocol DatabaseOperation:StatefulOperation
 {
diff --git a/Sources/UnidocServer/Endpoints/Server.Endpoint.Admin.swift b/Sources/UnidocServer/Endpoints/Server.Endpoint.Admin.swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 import MongoDB
 import Multiparts
 import SymbolGraphs
diff --git a/Sources/UnidocServer/Endpoints/Server.Endpoint.Bounce.swift b/Sources/UnidocServer/Endpoints/Server.Endpoint.Bounce.swift
@@ -1,6 +1,6 @@
 import GitHubClient
 import GitHubIntegration
-import HTTPServer
+import HTTP
 import UnidocPages
 
 extension Server.Endpoint
diff --git a/Sources/UnidocServer/Endpoints/Server.Endpoint.Login.swift b/Sources/UnidocServer/Endpoints/Server.Endpoint.Login.swift
@@ -1,6 +1,6 @@
 import GitHubClient
 import GitHubIntegration
-import HTTPServer
+import HTTP
 import MongoDB
 import UnidocDatabase
 
diff --git a/Sources/UnidocServer/Endpoints/Server.Endpoint.Pipeline.swift b/Sources/UnidocServer/Endpoints/Server.Endpoint.Pipeline.swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 import MD5
 import MongoDB
 import UnidocDatabase
diff --git a/Sources/UnidocServer/Endpoints/Server.Endpoint.Register.swift b/Sources/UnidocServer/Endpoints/Server.Endpoint.Register.swift
@@ -1,6 +1,6 @@
 import GitHubClient
 import GitHubIntegration
-import HTTPServer
+import HTTP
 import MongoDB
 import UnidocDatabase
 import UnidocPages
diff --git a/Sources/UnidocServer/Endpoints/Server.Endpoint.SiteMap.swift b/Sources/UnidocServer/Endpoints/Server.Endpoint.SiteMap.swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 import MD5
 import ModuleGraphs
 import MongoDB
diff --git a/Sources/UnidocServer/Endpoints/Server.Endpoint.swift b/Sources/UnidocServer/Endpoints/Server.Endpoint.swift
@@ -1,5 +1,5 @@
 import FNV1
-import HTTPServer
+import HTTP
 import MD5
 import Multiparts
 import Symbols
diff --git a/Sources/UnidocServer/RestrictedOperation.swift b/Sources/UnidocServer/RestrictedOperation.swift
@@ -1,5 +1,5 @@
 import MongoDB
-import HTTPServer
+import HTTP
 import UnidocDatabase
 import UnidocPages
 
diff --git a/Sources/UnidocServer/Server/Server.Operation.swift b/Sources/UnidocServer/Server/Server.Operation.swift
@@ -36,6 +36,9 @@ extension Server.Operation:HTTPServerOperation
 
         let path:[String] = uri.path.normalized(lowercase: true)
 
+
+        print(headers[canonicalForm: "user-agent"])
+
         let cookies:Server.Request.Cookies = .init(headers[canonicalForm: "cookie"])
         let tag:MD5? = headers.ifNoneMatch.first.flatMap(MD5.init(_:))
 
diff --git a/Sources/UnidocServer/Server/Server.Request.swift b/Sources/UnidocServer/Server/Server.Request.swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 import NIOCore
 
 extension Server
diff --git a/Sources/UnidocServer/Server/Server.swift b/Sources/UnidocServer/Server/Server.swift
@@ -1,5 +1,7 @@
+import Backtrace
 import GitHubClient
 import GitHubIntegration
+import HTTP
 import HTTPClient
 import HTTPServer
 import MongoDB
@@ -145,6 +147,8 @@ extension Server
     public static
     func main() async throws
     {
+        Backtrace.install()
+
         let threads:MultiThreadedEventLoopGroup = .init(numberOfThreads: 2)
         let options:Options = try .parse()
         if  options.redirect
diff --git a/Sources/UnidocServer/StatefulOperation.swift b/Sources/UnidocServer/StatefulOperation.swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 
 protocol StatefulOperation:Sendable
 {
diff --git a/Sources/UnidocServer/UnrestrictedOperation.swift b/Sources/UnidocServer/UnrestrictedOperation.swift
@@ -1,4 +1,4 @@
-import HTTPServer
+import HTTP
 
 protocol UnrestrictedOperation:StatefulOperation
 {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import HTTP`
`1`	`2`	`import NIOCore`
`2`	`3`	`import NIOPosix`
`3`	`4`	`import NIOHTTP1`