Merge pull request #22 from tayloraswift/build-automation

turn PackageBuildStatus into a type and JSON coding model

Author: tayloraswift

.gitignore

@@ -1,5 +1,6 @@
 .build
 .massbuild
+.swiftinit
 .testing
 .unidoc
 .vscode

Package.swift

@@ -56,6 +56,7 @@ let package:Package = .init(
 
         .library(name: "Unidoc", targets: ["Unidoc"]),
         .library(name: "UnidocAnalysis", targets: ["UnidocAnalysis"]),
+        .library(name: "UnidocAutomation", targets: ["UnidocAutomation"]),
         .library(name: "UnidocDB", targets: ["UnidocDB"]),
         .library(name: "UnidocDiagnostics", targets: ["UnidocDiagnostics"]),
         .library(name: "UnidocLinker", targets: ["UnidocLinker"]),
@@ -65,6 +66,7 @@ let package:Package = .init(
         .library(name: "UnidocSelectors", targets: ["UnidocSelectors"]),
         .library(name: "URI", targets: ["URI"]),
 
+        .executable(name: "UnidocBuild", targets: ["UnidocBuild"]),
         .executable(name: "UnidocServer", targets: ["UnidocServer"]),
     ],
     dependencies:
@@ -381,6 +383,11 @@ let package:Package = .init(
                 .target(name: "UnidocSelectors"),
             ]),
 
+        .target(name: "UnidocAutomation", dependencies:
+            [
+                .target(name: "JSON"),
+            ]),
+
         .target(name: "UnidocDB", dependencies:
             [
                 .target(name: "GitHubAPI"),
@@ -409,6 +416,7 @@ let package:Package = .init(
                 .target(name: "GitHubAPI"),
                 .target(name: "HTTP"),
                 .target(name: "MarkdownRendering"),
+                .target(name: "UnidocAutomation"),
                 .target(name: "UnidocQueries"),
                 .target(name: "URI"),
             ]),
@@ -447,8 +455,10 @@ let package:Package = .init(
             ]),
 
 
-        .executableTarget(name: "Massbuild", dependencies:
+        .executableTarget(name: "UnidocBuild", dependencies:
             [
+                .target(name: "HTTPClient"),
+                .target(name: "UnidocAutomation"),
                 .target(name: "SymbolGraphBuilder"),
             ]),
 

Sources/GitHubClient/GitHubClient.Connection.swift

@@ -94,7 +94,7 @@ extension GitHubClient<GitHubOAuth.API>.Connection
             }
 
             status = response.status
-            break
+            break following
         }
 
         throw GitHubClient<GitHubOAuth.API>.StatusError.init(code: status)

Sources/HTTPClient/ClientInterfaceHandler.swift

@@ -44,6 +44,12 @@ extension ClientInterfaceHandler:ChannelOutboundHandler
         batch:[HPACKHeaders]
     )
 
+    func errorCaught(context:ChannelHandlerContext, error:any Error)
+    {
+        self.owner?.finish(throwing: error)
+        context.channel.close(promise: nil)
+    }
+
     func write(context:ChannelHandlerContext, data:NIOAny, promise:EventLoopPromise<Void>?)
     {
         let owner:AsyncThrowingStream<HTTP2Client.Facet, any Error>.Continuation
@@ -65,14 +71,12 @@ extension ClientInterfaceHandler:ChannelOutboundHandler
                 switch $0
                 {
                 case .success(let stream):
-                    stream.write(HTTP2Frame.FramePayload.headers(
+                    stream.writeAndFlush(HTTP2Frame.FramePayload.headers(
                         HTTP2Frame.FramePayload.Headers.init(
                             headers: request,
                             endStream: true)),
                         promise: nil)
 
-                    stream.flush()
-
                 case .failure(let error):
                     owner.finish(throwing: error)
                     context.channel.close(promise: nil)

Sources/HTTPClient/HTTP2Client.swift

@@ -84,11 +84,11 @@ extension HTTP2Client
 {
     /// Connect to the remote host over HTTPS and perform the given operation.
     @inlinable public
-    func connect<T>(with body:(Connection) async throws -> T) async throws -> T
+    func connect<T>(port:Int = 443, with body:(Connection) async throws -> T) async throws -> T
     {
         let channel:any Channel = try await self.bootstrap.connect(
             host: self.remote,
-            port: 443).get()
+            port: port).get()
 
         defer
         {

Sources/HTTPServer/Channels/HTTPServerOperation.swift

@@ -18,19 +18,33 @@ protocol HTTPServerOperation:Sendable
         address:SocketAddress?,
         headers:HTTPHeaders,
         body:[UInt8])
+
+    init?(put uri:String,
+        address:SocketAddress?,
+        headers:HTTPHeaders,
+        body:[UInt8])
 }
 extension HTTPServerOperation
 {
     @inlinable public
-    init?(_ uri:String,
+    init?(get uri:String,
         address:SocketAddress?,
         headers:HTTPHeaders)
     {
         nil
     }
 
     @inlinable public
-    init?(_ uri:String,
+    init?(post uri:String,
+        address:SocketAddress?,
+        headers:HTTPHeaders,
+        body:[UInt8])
+    {
+        nil
+    }
+
+    @inlinable public
+    init?(put uri:String,
         address:SocketAddress?,
         headers:HTTPHeaders,
         body:[UInt8])

Sources/HTTPServer/Channels/ServerInterfaceHandler.swift

@@ -77,7 +77,7 @@ extension ServerInterfaceHandler:ChannelInboundHandler, RemovableChannelHandler
                     self.send(message: .init(status: .badRequest), context: context)
                 }
 
-            case .POST:
+            case .POST, .PUT:
                 self.request = (head, .init())
 
             case _:
@@ -119,10 +119,27 @@ extension ServerInterfaceHandler:ChannelInboundHandler, RemovableChannelHandler
 
             self.request = nil
 
-            if  let operation:Server.Operation = .init(post: head.uri,
+            let operation:Server.Operation?
+
+            switch head.method
+            {
+            case .POST:
+                operation = .init(post: head.uri,
                     address: self.address,
                     headers: head.headers,
                     body: body)
+
+            case .PUT:
+                operation = .init(put: head.uri,
+                    address: self.address,
+                    headers: head.headers,
+                    body: body)
+
+            case _:
+                fatalError("unreachable: collected buffers for method \(head.method)!")
+            }
+
+            if  let operation:Server.Operation
             {
                 self.server.submit(operation, promise: self.accept(context: context))
             }

Sources/JSONEncoding/JSONObjectEncodable.swift

@@ -0,0 +1,17 @@
+import JSONAST
+
+public
+protocol JSONObjectEncodable<CodingKey>:JSONEncodable
+{
+    associatedtype CodingKey:RawRepresentable<String> = JSON.Key
+
+    func encode(to json:inout JSON.ObjectEncoder<CodingKey>)
+}
+extension JSONObjectEncodable
+{
+    @inlinable public
+    func encode(to json:inout JSON)
+    {
+        self.encode(to: &json[as: JSON.ObjectEncoder<CodingKey>.self])
+    }
+}

Sources/Massbuild/Main.swift

@@ -3,6 +3,7 @@ enum MediaSubtype:String, Equatable, Hashable, Sendable
 {
     case apng
     case avif
+    case bson
     case css
     case gif
     case html
@@ -75,6 +76,7 @@ extension MediaSubtype
         {
         case .apng:                     return "apng"
         case .avif:                     return "avif"
+        case .bson:                     return "bson"
         case .css:                      return "css"
         case .gif:                      return "gif"
         case .html:                     return "html"