Update builder API to use grpc-swift-2.

- Closes apple#1308.
- Applies dependency and code changes similar
  to apple/containerization#578.
- Upgrades hawkeye to latest version.
- Update StderrLogHandler not to create a
  (non-Sendable) Swift time formatter object
  for every log message.

Author: jglogan

Package.resolved

@@ -52,12 +52,12 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.2.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.80.0"),
-        .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.34.1"),
-        .package(url: "https://github.com/apple/swift-system.git", from: "1.4.0"),
+        .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.36.0"),
+        .package(url: "https://github.com/apple/swift-system.git", from: "1.6.4"),
         .package(url: "https://github.com/Bouke/DNS.git", from: "1.2.0"),
-        .package(url: "https://github.com/grpc/grpc-swift-2.git", from: "2.2.1"),
-        .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", from: "2.1.2"),
-        .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", from: "2.2.0"),
+        .package(url: "https://github.com/grpc/grpc-swift-2.git", from: "2.3.0"),
+        .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", from: "2.4.4"),
+        .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", from: "2.2.0"),
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.20.1"),
         .package(url: "https://github.com/swiftlang/swift-docc-plugin.git", from: "1.1.0"),
     ],

Package.swift

@@ -23,6 +23,7 @@ import GRPCCore
 import GRPCNIOTransportHTTP2
 import Logging
 import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 import NIOPosix
@@ -42,6 +43,11 @@ public struct Builder: Sendable {
         try socket.setRecvBufSize(2 << 20)
 
         let channel = try ClientBootstrap(group: group)
+            .channelInitializer { channel in
+                channel.eventLoop.makeCompletedFuture(withResultOf: {
+                    try channel.pipeline.syncOperations.addHandler(HTTP2ConnectBufferingHandler())
+                })
+            }
             .withConnectedSocket(socket.fileDescriptor)
             .wait()
 
@@ -407,3 +413,49 @@ extension FileHandle {
         }
     }
 }
+
+/// Buffers incoming bytes until the full gRPC HTTP/2 pipeline is configured, then replays them.
+///
+/// See the equivalent in Containerization/Vminitd.swift for a full explanation.
+private final class HTTP2ConnectBufferingHandler: ChannelDuplexHandler, RemovableChannelHandler {
+    typealias InboundIn = ByteBuffer
+    typealias InboundOut = ByteBuffer
+    typealias OutboundIn = ByteBuffer
+    typealias OutboundOut = ByteBuffer
+
+    private var removalScheduled = false
+    private var bufferedReads: [NIOAny] = []
+
+    func channelRead(context: ChannelHandlerContext, data: NIOAny) {
+        bufferedReads.append(data)
+    }
+
+    func channelReadComplete(context: ChannelHandlerContext) {}
+
+    func flush(context: ChannelHandlerContext) {
+        if !removalScheduled {
+            removalScheduled = true
+            context.eventLoop.assumeIsolatedUnsafeUnchecked().execute {
+                context.pipeline.syncOperations.removeHandler(self, promise: nil)
+            }
+        }
+        context.flush()
+    }
+
+    func removeHandler(context: ChannelHandlerContext, removalToken: ChannelHandlerContext.RemovalToken) {
+        var didRead = false
+        while !bufferedReads.isEmpty {
+            context.fireChannelRead(bufferedReads.removeFirst())
+            didRead = true
+        }
+        if didRead {
+            context.fireChannelReadComplete()
+        }
+        context.leavePipeline(removalToken: removalToken)
+    }
+
+    func channelInactive(context: ChannelHandlerContext) {
+        bufferedReads.removeAll()
+        context.fireChannelInactive()
+    }
+}

Sources/ContainerBuild/Builder.swift

@@ -46,31 +46,42 @@ public struct StderrLogHandler: LogHandler {
         let data: Data
         switch logLevel {
         case .debug, .trace:
-            let timestamp = ISO8601DateFormatter().string(from: Date())
+            let timestamp = isoTimestamp()
             if let metadata, !metadata.isEmpty {
                 data =
-                    "\(timestamp) \(message.description): \(metadata.description)"
+                    "\(timestamp) \(message.description): \(metadata.description)\n"
                     .data(using: .utf8) ?? Data()
             } else {
                 data =
-                    "\(timestamp) \(message.description)"
+                    "\(timestamp) \(message.description)\n"
                     .data(using: .utf8) ?? Data()
             }
         default:
             if let metadata, !metadata.isEmpty {
                 data =
-                    "\(message.description): \(metadata.description)"
+                    "\(message.description): \(metadata.description)\n"
                     .data(using: .utf8) ?? Data()
             } else {
                 data =
-                    message.description
+                    "\(message.description)\n"
                     .data(using: .utf8) ?? Data()
             }
         }
 
-        // Use a single write call for atomicity
-        var output = data
-        output.append("\n".data(using: .utf8)!)
-        FileHandle.standardError.write(output)
+        FileHandle.standardError.write(data)
+    }
+
+    private func isoTimestamp() -> String {
+        let date = Date()
+        var time = time_t(date.timeIntervalSince1970)
+        var ms = Int(date.timeIntervalSince1970 * 1000) % 1000
+        if ms < 0 { ms += 1000 }
+        var tm = tm()
+        gmtime_r(&time, &tm)
+        let buf = withUnsafeTemporaryAllocation(of: CChar.self, capacity: 32) { ptr -> String in
+            strftime(ptr.baseAddress!, 32, "%Y-%m-%dT%H:%M:%S", &tm)
+            return String(cString: ptr.baseAddress!)
+        }
+        return String(format: "%@.%03dZ", buf, ms)
     }
 }

Sources/ContainerLog/StderrLogHandler.swift

@@ -17,6 +17,6 @@ if command -v .local/bin/hawkeye >/dev/null 2>&1; then
     echo "hawkeye already installed"
 else
     echo "Installing hawkeye"
-    export VERSION=v6.1.0
+    export VERSION=v6.5.1
     curl --proto '=https' --tlsv1.2 -LsSf https://github.com/korandoru/hawkeye/releases/download/${VERSION}/hawkeye-installer.sh | CARGO_HOME=.local sh -s -- --no-modify-path
 fi