Update echo

Author: glbrntt

Examples/echo/Sources/Subcommands/Collect.swift

@@ -30,7 +30,7 @@ struct Collect: AsyncParsableCommand {
     let client = GRPCClient(
       transport: try .http2NIOPosix(
         target: self.arguments.target,
-        config: .defaults(transportSecurity: .plaintext)
+        transportSecurity: .plaintext
       )
     )
 
@@ -39,7 +39,7 @@ struct Collect: AsyncParsableCommand {
         try await client.run()
       }
 
-      let echo = Echo_Echo_Client(wrapping: client)
+      let echo = Echo_Echo.Client(wrapping: client)
 
       for _ in 0 ..< self.arguments.repetitions {
         let message = try await echo.collect { writer in

Examples/echo/Sources/Subcommands/Expand.swift

@@ -30,7 +30,7 @@ struct Expand: AsyncParsableCommand {
     let client = GRPCClient(
       transport: try .http2NIOPosix(
         target: self.arguments.target,
-        config: .defaults(transportSecurity: .plaintext)
+        transportSecurity: .plaintext
       )
     )
 
@@ -39,7 +39,7 @@ struct Expand: AsyncParsableCommand {
         try await client.run()
       }
 
-      let echo = Echo_Echo_Client(wrapping: client)
+      let echo = Echo_Echo.Client(wrapping: client)
 
       for _ in 0 ..< self.arguments.repetitions {
         let message = Echo_EchoRequest.with { $0.text = self.arguments.message }

Examples/echo/Sources/Subcommands/Get.swift

@@ -28,7 +28,7 @@ struct Get: AsyncParsableCommand {
     let client = GRPCClient(
       transport: try .http2NIOPosix(
         target: self.arguments.target,
-        config: .defaults(transportSecurity: .plaintext)
+        transportSecurity: .plaintext
       )
     )
 
@@ -37,7 +37,7 @@ struct Get: AsyncParsableCommand {
         try await client.run()
       }
 
-      let echo = Echo_Echo_Client(wrapping: client)
+      let echo = Echo_Echo.Client(wrapping: client)
 
       for _ in 0 ..< self.arguments.repetitions {
         let message = Echo_EchoRequest.with { $0.text = self.arguments.message }

Examples/echo/Sources/Subcommands/Serve.swift

@@ -28,7 +28,7 @@ struct Serve: AsyncParsableCommand {
     let server = GRPCServer(
       transport: .http2NIOPosix(
         address: .ipv4(host: "127.0.0.1", port: self.port),
-        config: .defaults(transportSecurity: .plaintext)
+        transportSecurity: .plaintext
       ),
       services: [EchoService()]
     )
@@ -42,44 +42,40 @@ struct Serve: AsyncParsableCommand {
   }
 }
 
-struct EchoService: Echo_Echo_ServiceProtocol {
+struct EchoService: Echo_Echo.SimpleServiceProtocol {
   func get(
-    request: ServerRequest<Echo_EchoRequest>,
+    request: Echo_EchoRequest,
     context: ServerContext
-  ) async throws -> ServerResponse<Echo_EchoResponse> {
-    return ServerResponse(message: .with { $0.text = request.message.text })
+  ) async throws -> Echo_EchoResponse {
+    return .with { $0.text = request.text }
   }
 
   func collect(
-    request: StreamingServerRequest<Echo_EchoRequest>,
+    request: RPCAsyncSequence<Echo_EchoRequest, any Error>,
     context: ServerContext
-  ) async throws -> ServerResponse<Echo_EchoResponse> {
-    let messages = try await request.messages.reduce(into: []) { $0.append($1.text) }
+  ) async throws -> Echo_EchoResponse {
+    let messages = try await request.reduce(into: []) { $0.append($1.text) }
     let joined = messages.joined(separator: " ")
-    return ServerResponse(message: .with { $0.text = joined })
+    return .with { $0.text = joined }
   }
 
   func expand(
-    request: ServerRequest<Echo_EchoRequest>,
+    request: Echo_EchoRequest,
+    response: RPCWriter<Echo_EchoResponse>,
     context: ServerContext
-  ) async throws -> StreamingServerResponse<Echo_EchoResponse> {
-    return StreamingServerResponse { writer in
-      let parts = request.message.text.split(separator: " ")
-      let messages = parts.map { part in Echo_EchoResponse.with { $0.text = String(part) } }
-      try await writer.write(contentsOf: messages)
-      return [:]
-    }
+  ) async throws {
+    let parts = request.text.split(separator: " ")
+    let messages = parts.map { part in Echo_EchoResponse.with { $0.text = String(part) } }
+    try await response.write(contentsOf: messages)
   }
 
   func update(
-    request: StreamingServerRequest<Echo_EchoRequest>,
+    request: RPCAsyncSequence<Echo_EchoRequest, any Error>,
+    response: RPCWriter<Echo_EchoResponse>,
     context: ServerContext
-  ) async throws -> StreamingServerResponse<Echo_EchoResponse> {
-    return StreamingServerResponse { writer in
-      for try await message in request.messages {
-        try await writer.write(.with { $0.text = message.text })
-      }
-      return [:]
+  ) async throws {
+    for try await message in request {
+      try await response.write(.with { $0.text = message.text })
     }
   }
 }

Examples/echo/Sources/Subcommands/Update.swift

@@ -30,7 +30,7 @@ struct Update: AsyncParsableCommand {
     let client = GRPCClient(
       transport: try .http2NIOPosix(
         target: self.arguments.target,
-        config: .defaults(transportSecurity: .plaintext)
+        transportSecurity: .plaintext
       )
     )
 
@@ -39,7 +39,7 @@ struct Update: AsyncParsableCommand {
         try await client.run()
       }
 
-      let echo = Echo_Echo_Client(wrapping: client)
+      let echo = Echo_Echo.Client(wrapping: client)
 
       for _ in 0 ..< self.arguments.repetitions {
         try await echo.update { writer in