return a slightly nicer looking 404, and return 300 instead of 200 for disambiguation pages

Author: tayloraswift

Sources/HTTP/ServerResource.Headers.swift

@@ -0,0 +1,15 @@
+extension ServerResource
+{
+    @frozen public
+    struct Headers:Equatable, Hashable, Sendable
+    {
+        public
+        var canonical:String?
+
+        @inlinable public
+        init(canonical:String? = nil)
+        {
+            self.canonical = canonical
+        }
+    }
+}

Sources/HTTP/ServerResource.Results.swift

@@ -5,7 +5,7 @@ import MD5
 struct ServerResource:Equatable, Sendable
 {
     public
-    let results:Results
+    let headers:Headers
     public
     var content:Content
     public
@@ -14,9 +14,9 @@ struct ServerResource:Equatable, Sendable
     var hash:MD5?
 
     @inlinable public
-    init(_ results:Results, content:Content, type:MediaType, hash:MD5? = nil)
+    init(headers:Headers = .init(), content:Content, type:MediaType, hash:MD5? = nil)
     {
-        self.results = results
+        self.headers = headers
         self.content = content
         self.type = type
         self.hash = hash

Sources/HTTP/ServerResource.swift

@@ -3,8 +3,13 @@ import Media
 @frozen public
 enum ServerResponse:Equatable, Sendable
 {
-    case redirect(ServerRedirect, cookies:[Cookie] = [])
-    case resource(ServerResource)
+    case error      (ServerResource)
+    case forbidden  (ServerResource)
+    case ok         (ServerResource)
+    case multiple   (ServerResource)
+    case notFound   (ServerResource)
+
+    case redirect   (ServerRedirect, cookies:[Cookie] = [])
 }
 extension ServerResponse
 {
@@ -17,12 +22,16 @@ extension ServerResponse
 extension ServerResponse
 {
     @inlinable public
-    var resource:ServerResource?
+    var size:Int
     {
         switch self
         {
-        case .redirect:                 return nil
-        case .resource(let resource):   return resource
+        case .redirect:                 return 0
+        case .error     (let resource): return resource.content.size
+        case .forbidden (let resource): return resource.content.size
+        case .ok        (let resource): return resource.content.size
+        case .multiple  (let resource): return resource.content.size
+        case .notFound  (let resource): return resource.content.size
         }
     }
 }

Sources/HTTP/ServerResponse.swift

@@ -146,20 +146,13 @@ extension ServerInterfaceHandler
             switch $0
             {
             case .success(let response):
-                switch response
-                {
-                case .redirect(let redirect, cookies: let cookies):
-                    self.send(message: .init(redirect: redirect, cookies: cookies),
-                        context: context)
-
-                case .resource(let resource):
-                    self.send(message: .init(resource: resource,
-                            using: context.channel.allocator),
-                        context: context)
-                }
+                self.send(
+                    message: .init(response: response, using: context.channel.allocator),
+                    context: context)
 
             case .failure(let error):
-                self.send(message: .init(redacting: error, using: context.channel.allocator),
+                self.send(
+                    message: .init(redacting: error, using: context.channel.allocator),
                     context: context)
             }
         }

Sources/HTTPServer/Channels/ServerInterfaceHandler.swift

@@ -20,6 +20,43 @@ struct ServerMessage<Authority> where Authority:ServerAuthority
 }
 extension ServerMessage
 {
+    init(response:ServerResponse, using allocator:__shared ByteBufferAllocator)
+    {
+        switch response
+        {
+        case .redirect(let redirect, cookies: let cookies):
+            self.init(redirect: redirect, cookies: cookies)
+
+        case .error(let resource):
+            self.init(resource: resource, using: allocator, as: .internalServerError)
+
+        case .forbidden(let resource):
+            self.init(resource: resource, using: allocator, as: .forbidden)
+
+        case .ok(let resource):
+            self.init(resource: resource, using: allocator, as: .ok)
+
+        case .multiple(let resource):
+            self.init(resource: resource, using: allocator, as: .multipleChoices)
+
+        case .notFound(let resource):
+            self.init(resource: resource, using: allocator, as: .notFound)
+        }
+    }
+
+    init(redacting error:any Error, using allocator:__shared ByteBufferAllocator)
+    {
+        self.init(resource: .init(
+                headers: .init(),
+                content: .string(Authority.redact(error: error)),
+                type: .text(.plain, charset: .utf8)),
+            using: allocator,
+            as: .internalServerError)
+    }
+}
+extension ServerMessage
+{
+    private
     init(redirect:ServerRedirect, cookies:[Cookie])
     {
         var headers:HTTPHeaders = .init()
@@ -43,38 +80,22 @@ extension ServerMessage
         self.init(headers: headers, status: status, body: nil)
     }
 
-    init(resource:ServerResource, using allocator:__shared ByteBufferAllocator)
+    private
+    init(resource:ServerResource,
+        using allocator:__shared ByteBufferAllocator,
+        as status:HTTPResponseStatus)
     {
         var headers:HTTPHeaders = .init()
 
         headers.add(name: "host", value: Authority.domain)
 
-        let status:HTTPResponseStatus
-        switch resource.results
+        if  let canonical:String = resource.headers.canonical
         {
-        case .error:
-            status = .internalServerError
-
-        case .forbidden:
-            status = .forbidden
-
-        case .none:
-            status = .notFound
-
-        case .many:
-            status = .multipleChoices
-
-        case .one(canonical: let location):
-            status = .ok
-
-            if  let location:String
-            {
-                headers.add(name: "link", value: Authority.link(location, rel: .canonical))
-            }
-            if  let hash:MD5 = resource.hash
-            {
-                headers.add(name: "etag", value: "\"\(hash)\"")
-            }
+            headers.add(name: "link", value: Authority.link(canonical, rel: .canonical))
+        }
+        if  let hash:MD5 = resource.hash
+        {
+            headers.add(name: "etag", value: "\"\(hash)\"")
         }
 
         let buffer:ByteBuffer?
@@ -101,7 +122,7 @@ extension ServerMessage
         headers.add(name: "content-length", value: "\(length)")
         headers.add(name: "content-type",   value: "\(resource.type)")
 
-        if  let buffer
+        if  let buffer:ByteBuffer
         {
             self.init(headers: headers, status: status, body: buffer)
         }
@@ -110,14 +131,6 @@ extension ServerMessage
             self.init(headers: headers, status: .notModified)
         }
     }
-
-    init(redacting error:any Error, using allocator:__shared ByteBufferAllocator)
-    {
-        self.init(resource: .init(.error,
-                content: .string(Authority.redact(error: error)),
-                type: .text(.plain, charset: .utf8)),
-            using: allocator)
-    }
 }
 extension ServerMessage
 {

Sources/HTTPServer/Channels/ServerMessage.swift

@@ -7,6 +7,6 @@ extension Site.API
         case register
     }
 }
-extension Site.API.Get:FixedAPI
+extension Site.API.Get:StaticAPI
 {
 }

Sources/UnidocPages/API/Site.API.Get.swift

@@ -6,6 +6,6 @@ extension Site.API
         case index
     }
 }
-extension Site.API.Post:FixedAPI
+extension Site.API.Post:StaticAPI
 {
 }

Sources/UnidocPages/API/Site.API.Post.swift

@@ -5,7 +5,7 @@ extension Site
     {
     }
 }
-extension Site.API:FixedRoot
+extension Site.API:StaticRoot
 {
     @inlinable public static
     var root:String { "api" }

Sources/UnidocPages/API/Site.API.swift

@@ -25,6 +25,6 @@ extension Site.Asset
         case robots_txt         = "robots.txt"
     }
 }
-extension Site.Asset.Get:FixedAPI
+extension Site.Asset.Get:StaticAPI
 {
 }