starpc 0.45.0 → 0.46.1

package/dist/echo/echo.pb.js

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es-lite unknown with parameter "ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
 /* eslint-disable */
 import { createMessageType, ScalarType } from '@aptre/protobuf-es-lite';

package/dist/mock/mock.pb.js

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es-lite unknown with parameter "ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/mock/mock.proto (package e2e.mock, syntax proto3)
 /* eslint-disable */
 import { createMessageType, ScalarType } from '@aptre/protobuf-es-lite';

package/dist/rpcstream/rpcstream.pb.js

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es-lite unknown with parameter "ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/rpcstream/rpcstream.proto (package rpcstream, syntax proto3)
 /* eslint-disable */
 import { createMessageType, ScalarType } from '@aptre/protobuf-es-lite';

package/dist/srpc/rpcproto.pb.js

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es-lite unknown with parameter "ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/srpc/rpcproto.proto (package srpc, syntax proto3)
 /* eslint-disable */
 import { createMessageType, ScalarType } from '@aptre/protobuf-es-lite';

package/echo/Cargo.toml

@@ -15,7 +15,3 @@ starpc = { workspace = true }
 prost = { workspace = true }
 tokio = { version = "1", features = ["full"] }
 async-trait = { workspace = true }
-
-[build-dependencies]
-starpc-build = { workspace = true }
-prost-build = { workspace = true }

package/echo/echo.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-lite. DO NOT EDIT.
-// protoc-gen-go-lite version: v0.12.0
+// protoc-gen-go-lite version: v0.12.1
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 package echo

package/echo/echo.pb.rs

@@ -0,0 +1,9 @@
+// @generated
+// This file is @generated by prost-build.
+/// EchoMsg is the message body for Echo.
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct EchoMsg {
+    #[prost(string, tag="1")]
+    pub body: ::prost::alloc::string::String,
+}
+// @@protoc_insertion_point(module)

package/echo/echo.pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es-lite unknown with parameter "ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
 /* eslint-disable */
 

package/echo/echo_e2e_test.cpp

@@ -1,4 +1,4 @@
-// go:build deps_only
+//go:build deps_only
 
 // Echo end-to-end test for starpc C++ implementation.
 // Tests unary and streaming RPC patterns.
@@ -182,9 +182,9 @@ public:
 
   starpc::Error RpcStream(echo::SRPCEchoer_RpcStreamStream *strm) override {
     // Wrap stream to implement rpcstream::RpcStream interface
-    RpcStreamAdapter adapter(strm);
+    auto adapter = std::make_shared<RpcStreamAdapter>(strm);
     return rpcstream::HandleRpcStream(
-        &adapter, [this](const std::string &component_id) {
+        adapter, [this](const std::string &component_id) {
           if (!rpc_stream_mux_) {
             return std::make_tuple(static_cast<starpc::Invoker *>(nullptr),
                                    std::function<void()>(),

package/echo/echo_srpc.pb.cpp

@@ -1,20 +1,18 @@
-// go:build deps_only
+//go:build deps_only
 
 // Code generated by protoc-gen-starpc-cpp. DO NOT EDIT.
-// protoc-gen-starpc-cpp version: v0.43.2-0.20260131104303-1de77bff6409+dirty
+// protoc-gen-starpc-cpp version: v0.45.1-0.20260203090429-3e915608d4e8
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 #include "echo_srpc.pb.hpp"
 
 namespace echo {
 
-starpc::Error SRPCEchoerClientImpl::Echo(const echo::EchoMsg &in,
-                                         echo::EchoMsg *out) {
+starpc::Error SRPCEchoerClientImpl::Echo(const echo::EchoMsg& in, echo::EchoMsg* out) {
   return cc_->ExecCall(service_id_, "Echo", in, out);
 }
 
-std::pair<std::unique_ptr<SRPCEchoer_EchoServerStreamClient>, starpc::Error>
-SRPCEchoerClientImpl::EchoServerStream(const echo::EchoMsg &in) {
+std::pair<std::unique_ptr<SRPCEchoer_EchoServerStreamClient>, starpc::Error> SRPCEchoerClientImpl::EchoServerStream(const echo::EchoMsg& in) {
   auto [strm, err] = cc_->NewStream(service_id_, "EchoServerStream", &in);
   if (err != starpc::Error::OK) {
     return {nullptr, err};
@@ -23,56 +21,52 @@ SRPCEchoerClientImpl::EchoServerStream(const echo::EchoMsg &in) {
   if (err != starpc::Error::OK) {
     return {nullptr, err};
   }
-  return {std::make_unique<SRPCEchoer_EchoServerStreamClient>(std::move(strm)),
-          starpc::Error::OK};
+  return {std::make_unique<SRPCEchoer_EchoServerStreamClient>(std::move(strm)), starpc::Error::OK};
 }
 
-std::pair<std::unique_ptr<SRPCEchoer_EchoClientStreamClient>, starpc::Error>
-SRPCEchoerClientImpl::EchoClientStream() {
+std::pair<std::unique_ptr<SRPCEchoer_EchoClientStreamClient>, starpc::Error> SRPCEchoerClientImpl::EchoClientStream() {
   auto [strm, err] = cc_->NewStream(service_id_, "EchoClientStream", nullptr);
   if (err != starpc::Error::OK) {
     return {nullptr, err};
   }
-  return {std::make_unique<SRPCEchoer_EchoClientStreamClient>(std::move(strm)),
-          starpc::Error::OK};
+  return {std::make_unique<SRPCEchoer_EchoClientStreamClient>(std::move(strm)), starpc::Error::OK};
 }
 
-std::pair<std::unique_ptr<SRPCEchoer_EchoBidiStreamClient>, starpc::Error>
-SRPCEchoerClientImpl::EchoBidiStream() {
+std::pair<std::unique_ptr<SRPCEchoer_EchoBidiStreamClient>, starpc::Error> SRPCEchoerClientImpl::EchoBidiStream() {
   auto [strm, err] = cc_->NewStream(service_id_, "EchoBidiStream", nullptr);
   if (err != starpc::Error::OK) {
     return {nullptr, err};
   }
-  return {std::make_unique<SRPCEchoer_EchoBidiStreamClient>(std::move(strm)),
-          starpc::Error::OK};
+  return {std::make_unique<SRPCEchoer_EchoBidiStreamClient>(std::move(strm)), starpc::Error::OK};
 }
 
-std::pair<std::unique_ptr<SRPCEchoer_RpcStreamClient>, starpc::Error>
-SRPCEchoerClientImpl::RpcStream() {
+std::pair<std::unique_ptr<SRPCEchoer_RpcStreamClient>, starpc::Error> SRPCEchoerClientImpl::RpcStream() {
   auto [strm, err] = cc_->NewStream(service_id_, "RpcStream", nullptr);
   if (err != starpc::Error::OK) {
     return {nullptr, err};
   }
-  return {std::make_unique<SRPCEchoer_RpcStreamClient>(std::move(strm)),
-          starpc::Error::OK};
+  return {std::make_unique<SRPCEchoer_RpcStreamClient>(std::move(strm)), starpc::Error::OK};
 }
 
-starpc::Error SRPCEchoerClientImpl::DoNothing(const google::protobuf::Empty &in,
-                                              google::protobuf::Empty *out) {
+starpc::Error SRPCEchoerClientImpl::DoNothing(const google::protobuf::Empty& in, google::protobuf::Empty* out) {
   return cc_->ExecCall(service_id_, "DoNothing", in, out);
 }
 
 std::vector<std::string> SRPCEchoerHandler::GetMethodIDs() const {
   return {
-      "Echo",           "EchoServerStream", "EchoClientStream",
-      "EchoBidiStream", "RpcStream",        "DoNothing",
+    "Echo",
+    "EchoServerStream",
+    "EchoClientStream",
+    "EchoBidiStream",
+    "RpcStream",
+    "DoNothing",
   };
 }
 
-std::pair<bool, starpc::Error>
-SRPCEchoerHandler::InvokeMethod(const std::string &service_id,
-                                const std::string &method_id,
-                                starpc::Stream *strm) {
+std::pair<bool, starpc::Error> SRPCEchoerHandler::InvokeMethod(
+    const std::string& service_id,
+    const std::string& method_id,
+    starpc::Stream* strm) {
   if (!service_id.empty() && service_id != service_id_) {
     return {false, starpc::Error::OK};
   }
@@ -80,26 +74,22 @@ SRPCEchoerHandler::InvokeMethod(const std::string &service_id,
   if (method_id == "Echo") {
     echo::EchoMsg req;
     starpc::Error err = strm->MsgRecv(&req);
-    if (err != starpc::Error::OK)
-      return {true, err};
+    if (err != starpc::Error::OK) return {true, err};
     echo::EchoMsg resp;
     err = impl_->Echo(req, &resp);
-    if (err != starpc::Error::OK)
-      return {true, err};
+    if (err != starpc::Error::OK) return {true, err};
     return {true, strm->MsgSend(resp)};
   } else if (method_id == "EchoServerStream") {
     echo::EchoMsg req;
     starpc::Error err = strm->MsgRecv(&req);
-    if (err != starpc::Error::OK)
-      return {true, err};
+    if (err != starpc::Error::OK) return {true, err};
     SRPCEchoer_EchoServerStreamStream serverStrm(strm);
     return {true, impl_->EchoServerStream(req, &serverStrm)};
   } else if (method_id == "EchoClientStream") {
     SRPCEchoer_EchoClientStreamStream clientStrm(strm);
     echo::EchoMsg resp;
     starpc::Error err = impl_->EchoClientStream(&clientStrm, &resp);
-    if (err != starpc::Error::OK)
-      return {true, err};
+    if (err != starpc::Error::OK) return {true, err};
     return {true, strm->MsgSend(resp)};
   } else if (method_id == "EchoBidiStream") {
     SRPCEchoer_EchoBidiStreamStream bidiStrm(strm);
@@ -110,16 +100,14 @@ SRPCEchoerHandler::InvokeMethod(const std::string &service_id,
   } else if (method_id == "DoNothing") {
     google::protobuf::Empty req;
     starpc::Error err = strm->MsgRecv(&req);
-    if (err != starpc::Error::OK)
-      return {true, err};
+    if (err != starpc::Error::OK) return {true, err};
     google::protobuf::Empty resp;
     err = impl_->DoNothing(req, &resp);
-    if (err != starpc::Error::OK)
-      return {true, err};
+    if (err != starpc::Error::OK) return {true, err};
     return {true, strm->MsgSend(resp)};
   }
 
   return {false, starpc::Error::OK};
 }
 
-} // namespace echo
+}  // namespace echo

package/echo/echo_srpc.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-srpc. DO NOT EDIT.
-// protoc-gen-srpc version: v0.42.0
+// protoc-gen-srpc version: v0.45.1-0.20260203090429-3e915608d4e8
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 package echo

package/echo/echo_srpc.pb.hpp

@@ -1,5 +1,7 @@
+//go:build deps_only && cgo
+
 // Code generated by protoc-gen-starpc-cpp. DO NOT EDIT.
-// protoc-gen-starpc-cpp version: v0.43.2-0.20260131104303-1de77bff6409+dirty
+// protoc-gen-starpc-cpp version: v0.45.1-0.20260203090429-3e915608d4e8
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 #pragma once
@@ -16,7 +18,7 @@
 namespace echo {
 
 // Service ID for Echoer
-constexpr const char *kSRPCEchoerServiceID = "echo.Echoer";
+constexpr const char* kSRPCEchoerServiceID = "echo.Echoer";
 
 class SRPCEchoer_EchoServerStreamClient;
 class SRPCEchoer_EchoServerStreamStream;
@@ -29,130 +31,102 @@ class SRPCEchoer_RpcStreamStream;
 
 // SRPCEchoerClient is the client API for Echoer service.
 class SRPCEchoerClient {
-public:
+ public:
   virtual ~SRPCEchoerClient() = default;
 
   // SRPCClient returns the underlying SRPC client.
-  virtual starpc::Client *SRPCClient() = 0;
+  virtual starpc::Client* SRPCClient() = 0;
 
   // Echo
-  virtual starpc::Error Echo(const echo::EchoMsg &in, echo::EchoMsg *out) = 0;
+  virtual starpc::Error Echo(const echo::EchoMsg& in, echo::EchoMsg* out) = 0;
   // EchoServerStream
-  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoServerStreamClient>,
-                    starpc::Error>
-  EchoServerStream(const echo::EchoMsg &in) = 0;
+  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoServerStreamClient>, starpc::Error> EchoServerStream(const echo::EchoMsg& in) = 0;
   // EchoClientStream
-  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoClientStreamClient>,
-                    starpc::Error>
-  EchoClientStream() = 0;
+  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoClientStreamClient>, starpc::Error> EchoClientStream() = 0;
   // EchoBidiStream
-  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoBidiStreamClient>,
-                    starpc::Error>
-  EchoBidiStream() = 0;
+  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoBidiStreamClient>, starpc::Error> EchoBidiStream() = 0;
   // RpcStream
-  virtual std::pair<std::unique_ptr<SRPCEchoer_RpcStreamClient>, starpc::Error>
-  RpcStream() = 0;
+  virtual std::pair<std::unique_ptr<SRPCEchoer_RpcStreamClient>, starpc::Error> RpcStream() = 0;
   // DoNothing
-  virtual starpc::Error DoNothing(const google::protobuf::Empty &in,
-                                  google::protobuf::Empty *out) = 0;
+  virtual starpc::Error DoNothing(const google::protobuf::Empty& in, google::protobuf::Empty* out) = 0;
 };
 
 // SRPCEchoerClientImpl implements SRPCEchoerClient.
 class SRPCEchoerClientImpl : public SRPCEchoerClient {
-public:
-  explicit SRPCEchoerClientImpl(starpc::Client *cc,
-                                const std::string &service_id = "")
-      : cc_(cc),
-        service_id_(service_id.empty() ? kSRPCEchoerServiceID : service_id) {}
+ public:
+  explicit SRPCEchoerClientImpl(starpc::Client* cc, const std::string& service_id = "")
+      : cc_(cc), service_id_(service_id.empty() ? kSRPCEchoerServiceID : service_id) {}
 
-  starpc::Client *SRPCClient() override { return cc_; }
+  starpc::Client* SRPCClient() override { return cc_; }
 
   // Echo
-  virtual starpc::Error Echo(const echo::EchoMsg &in,
-                             echo::EchoMsg *out) override;
+  virtual starpc::Error Echo(const echo::EchoMsg& in, echo::EchoMsg* out) override;
   // EchoServerStream
-  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoServerStreamClient>,
-                    starpc::Error>
-  EchoServerStream(const echo::EchoMsg &in) override;
+  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoServerStreamClient>, starpc::Error> EchoServerStream(const echo::EchoMsg& in) override;
   // EchoClientStream
-  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoClientStreamClient>,
-                    starpc::Error>
-  EchoClientStream() override;
+  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoClientStreamClient>, starpc::Error> EchoClientStream() override;
   // EchoBidiStream
-  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoBidiStreamClient>,
-                    starpc::Error>
-  EchoBidiStream() override;
+  virtual std::pair<std::unique_ptr<SRPCEchoer_EchoBidiStreamClient>, starpc::Error> EchoBidiStream() override;
   // RpcStream
-  virtual std::pair<std::unique_ptr<SRPCEchoer_RpcStreamClient>, starpc::Error>
-  RpcStream() override;
+  virtual std::pair<std::unique_ptr<SRPCEchoer_RpcStreamClient>, starpc::Error> RpcStream() override;
   // DoNothing
-  virtual starpc::Error DoNothing(const google::protobuf::Empty &in,
-                                  google::protobuf::Empty *out) override;
+  virtual starpc::Error DoNothing(const google::protobuf::Empty& in, google::protobuf::Empty* out) override;
 
-private:
-  starpc::Client *cc_;
+ private:
+  starpc::Client* cc_;
   std::string service_id_;
 };
 
 // NewSRPCEchoerClient creates a new client.
-inline std::unique_ptr<SRPCEchoerClient>
-NewSRPCEchoerClient(starpc::Client *cc) {
+inline std::unique_ptr<SRPCEchoerClient> NewSRPCEchoerClient(starpc::Client* cc) {
   return std::make_unique<SRPCEchoerClientImpl>(cc);
 }
 
 // SRPCEchoerServer is the server API for Echoer service.
 class SRPCEchoerServer {
-public:
+ public:
   virtual ~SRPCEchoerServer() = default;
 
   // Echo
-  virtual starpc::Error Echo(const echo::EchoMsg &req, echo::EchoMsg *resp) = 0;
+  virtual starpc::Error Echo(const echo::EchoMsg& req, echo::EchoMsg* resp) = 0;
   // EchoServerStream
-  virtual starpc::Error
-  EchoServerStream(const echo::EchoMsg &req,
-                   SRPCEchoer_EchoServerStreamStream *strm) = 0;
+  virtual starpc::Error EchoServerStream(const echo::EchoMsg& req, SRPCEchoer_EchoServerStreamStream* strm) = 0;
   // EchoClientStream
-  virtual starpc::Error
-  EchoClientStream(SRPCEchoer_EchoClientStreamStream *strm,
-                   echo::EchoMsg *resp) = 0;
+  virtual starpc::Error EchoClientStream(SRPCEchoer_EchoClientStreamStream* strm, echo::EchoMsg* resp) = 0;
   // EchoBidiStream
-  virtual starpc::Error
-  EchoBidiStream(SRPCEchoer_EchoBidiStreamStream *strm) = 0;
+  virtual starpc::Error EchoBidiStream(SRPCEchoer_EchoBidiStreamStream* strm) = 0;
   // RpcStream
-  virtual starpc::Error RpcStream(SRPCEchoer_RpcStreamStream *strm) = 0;
+  virtual starpc::Error RpcStream(SRPCEchoer_RpcStreamStream* strm) = 0;
   // DoNothing
-  virtual starpc::Error DoNothing(const google::protobuf::Empty &req,
-                                  google::protobuf::Empty *resp) = 0;
+  virtual starpc::Error DoNothing(const google::protobuf::Empty& req, google::protobuf::Empty* resp) = 0;
 };
 
 // SRPCEchoerHandler implements starpc::Handler for Echoer.
 class SRPCEchoerHandler : public starpc::Handler {
-public:
-  SRPCEchoerHandler(SRPCEchoerServer *impl, const std::string &service_id = "")
-      : impl_(impl),
-        service_id_(service_id.empty() ? kSRPCEchoerServiceID : service_id) {}
+ public:
+  SRPCEchoerHandler(SRPCEchoerServer* impl, const std::string& service_id = "")
+      : impl_(impl), service_id_(service_id.empty() ? kSRPCEchoerServiceID : service_id) {}
 
-  const std::string &GetServiceID() const override { return service_id_; }
+  const std::string& GetServiceID() const override { return service_id_; }
   std::vector<std::string> GetMethodIDs() const override;
-  std::pair<bool, starpc::Error> InvokeMethod(const std::string &service_id,
-                                              const std::string &method_id,
-                                              starpc::Stream *strm) override;
+  std::pair<bool, starpc::Error> InvokeMethod(
+      const std::string& service_id,
+      const std::string& method_id,
+      starpc::Stream* strm) override;
 
-private:
-  SRPCEchoerServer *impl_;
+ private:
+  SRPCEchoerServer* impl_;
   std::string service_id_;
 };
 
 // NewSRPCEchoerHandler creates a new handler for the given implementation.
-inline std::unique_ptr<SRPCEchoerHandler>
-NewSRPCEchoerHandler(SRPCEchoerServer *impl) {
+inline std::unique_ptr<SRPCEchoerHandler> NewSRPCEchoerHandler(SRPCEchoerServer* impl) {
   return std::make_unique<SRPCEchoerHandler>(impl);
 }
 
 // SRPCRegisterEchoer registers the server implementation with the mux.
 // The returned handler must outlive the mux registration.
-inline std::pair<std::unique_ptr<SRPCEchoerHandler>, starpc::Error>
-SRPCRegisterEchoer(starpc::Mux *mux, SRPCEchoerServer *impl) {
+inline std::pair<std::unique_ptr<SRPCEchoerHandler>, starpc::Error> SRPCRegisterEchoer(starpc::Mux* mux, SRPCEchoerServer* impl) {
   auto handler = NewSRPCEchoerHandler(impl);
   starpc::Error err = mux->Register(handler.get());
   if (err != starpc::Error::OK) {
@@ -163,155 +137,158 @@ SRPCRegisterEchoer(starpc::Mux *mux, SRPCEchoerServer *impl) {
 
 // SRPCEchoer_EchoServerStreamClient is the client stream for EchoServerStream.
 class SRPCEchoer_EchoServerStreamClient {
-public:
-  explicit SRPCEchoer_EchoServerStreamClient(
-      std::unique_ptr<starpc::Stream> strm)
-      : strm_(std::move(strm)) {}
+ public:
+  explicit SRPCEchoer_EchoServerStreamClient(std::unique_ptr<starpc::Stream> strm) : strm_(std::move(strm)) {}
 
-  starpc::Error Recv(echo::EchoMsg *msg) { return strm_->MsgRecv(msg); }
+  starpc::Error Recv(echo::EchoMsg* msg) {
+    return strm_->MsgRecv(msg);
+  }
 
   starpc::Error CloseSend() { return strm_->CloseSend(); }
   starpc::Error Close() { return strm_->Close(); }
 
-private:
+ private:
   std::unique_ptr<starpc::Stream> strm_;
 };
 
 // SRPCEchoer_EchoServerStreamStream is the server stream for EchoServerStream.
 class SRPCEchoer_EchoServerStreamStream {
-public:
-  explicit SRPCEchoer_EchoServerStreamStream(starpc::Stream *strm)
-      : strm_(strm) {}
+ public:
+  explicit SRPCEchoer_EchoServerStreamStream(starpc::Stream* strm) : strm_(strm) {}
 
-  starpc::Error Send(const echo::EchoMsg &msg) { return strm_->MsgSend(msg); }
+  starpc::Error Send(const echo::EchoMsg& msg) {
+    return strm_->MsgSend(msg);
+  }
 
-  starpc::Error SendAndClose(const echo::EchoMsg &msg) {
+  starpc::Error SendAndClose(const echo::EchoMsg& msg) {
     starpc::Error err = strm_->MsgSend(msg);
-    if (err != starpc::Error::OK)
-      return err;
+    if (err != starpc::Error::OK) return err;
     return strm_->CloseSend();
   }
 
-private:
-  starpc::Stream *strm_;
+ private:
+  starpc::Stream* strm_;
 };
 
 // SRPCEchoer_EchoClientStreamClient is the client stream for EchoClientStream.
 class SRPCEchoer_EchoClientStreamClient {
-public:
-  explicit SRPCEchoer_EchoClientStreamClient(
-      std::unique_ptr<starpc::Stream> strm)
-      : strm_(std::move(strm)) {}
+ public:
+  explicit SRPCEchoer_EchoClientStreamClient(std::unique_ptr<starpc::Stream> strm) : strm_(std::move(strm)) {}
 
-  starpc::Error Send(const echo::EchoMsg &msg) { return strm_->MsgSend(msg); }
+  starpc::Error Send(const echo::EchoMsg& msg) {
+    return strm_->MsgSend(msg);
+  }
 
-  starpc::Error CloseAndRecv(echo::EchoMsg *msg) {
+  starpc::Error CloseAndRecv(echo::EchoMsg* msg) {
     starpc::Error err = strm_->CloseSend();
-    if (err != starpc::Error::OK)
-      return err;
+    if (err != starpc::Error::OK) return err;
     return strm_->MsgRecv(msg);
   }
 
   starpc::Error CloseSend() { return strm_->CloseSend(); }
   starpc::Error Close() { return strm_->Close(); }
 
-private:
+ private:
   std::unique_ptr<starpc::Stream> strm_;
 };
 
 // SRPCEchoer_EchoClientStreamStream is the server stream for EchoClientStream.
 class SRPCEchoer_EchoClientStreamStream {
-public:
-  explicit SRPCEchoer_EchoClientStreamStream(starpc::Stream *strm)
-      : strm_(strm) {}
+ public:
+  explicit SRPCEchoer_EchoClientStreamStream(starpc::Stream* strm) : strm_(strm) {}
 
-  starpc::Error Recv(echo::EchoMsg *msg) { return strm_->MsgRecv(msg); }
+  starpc::Error Recv(echo::EchoMsg* msg) {
+    return strm_->MsgRecv(msg);
+  }
 
-private:
-  starpc::Stream *strm_;
+ private:
+  starpc::Stream* strm_;
 };
 
 // SRPCEchoer_EchoBidiStreamClient is the client stream for EchoBidiStream.
 class SRPCEchoer_EchoBidiStreamClient {
-public:
-  explicit SRPCEchoer_EchoBidiStreamClient(std::unique_ptr<starpc::Stream> strm)
-      : strm_(std::move(strm)) {}
+ public:
+  explicit SRPCEchoer_EchoBidiStreamClient(std::unique_ptr<starpc::Stream> strm) : strm_(std::move(strm)) {}
 
-  starpc::Error Send(const echo::EchoMsg &msg) { return strm_->MsgSend(msg); }
+  starpc::Error Send(const echo::EchoMsg& msg) {
+    return strm_->MsgSend(msg);
+  }
 
-  starpc::Error Recv(echo::EchoMsg *msg) { return strm_->MsgRecv(msg); }
+  starpc::Error Recv(echo::EchoMsg* msg) {
+    return strm_->MsgRecv(msg);
+  }
 
   starpc::Error CloseSend() { return strm_->CloseSend(); }
   starpc::Error Close() { return strm_->Close(); }
 
-private:
+ private:
   std::unique_ptr<starpc::Stream> strm_;
 };
 
 // SRPCEchoer_EchoBidiStreamStream is the server stream for EchoBidiStream.
 class SRPCEchoer_EchoBidiStreamStream {
-public:
-  explicit SRPCEchoer_EchoBidiStreamStream(starpc::Stream *strm)
-      : strm_(strm) {}
+ public:
+  explicit SRPCEchoer_EchoBidiStreamStream(starpc::Stream* strm) : strm_(strm) {}
 
-  starpc::Error Send(const echo::EchoMsg &msg) { return strm_->MsgSend(msg); }
+  starpc::Error Send(const echo::EchoMsg& msg) {
+    return strm_->MsgSend(msg);
+  }
 
-  starpc::Error SendAndClose(const echo::EchoMsg &msg) {
+  starpc::Error SendAndClose(const echo::EchoMsg& msg) {
     starpc::Error err = strm_->MsgSend(msg);
-    if (err != starpc::Error::OK)
-      return err;
+    if (err != starpc::Error::OK) return err;
     return strm_->CloseSend();
   }
 
-  starpc::Error Recv(echo::EchoMsg *msg) { return strm_->MsgRecv(msg); }
+  starpc::Error Recv(echo::EchoMsg* msg) {
+    return strm_->MsgRecv(msg);
+  }
 
-private:
-  starpc::Stream *strm_;
+ private:
+  starpc::Stream* strm_;
 };
 
 // SRPCEchoer_RpcStreamClient is the client stream for RpcStream.
 class SRPCEchoer_RpcStreamClient {
-public:
-  explicit SRPCEchoer_RpcStreamClient(std::unique_ptr<starpc::Stream> strm)
-      : strm_(std::move(strm)) {}
+ public:
+  explicit SRPCEchoer_RpcStreamClient(std::unique_ptr<starpc::Stream> strm) : strm_(std::move(strm)) {}
 
-  starpc::Error Send(const rpcstream::RpcStreamPacket &msg) {
+  starpc::Error Send(const rpcstream::RpcStreamPacket& msg) {
     return strm_->MsgSend(msg);
   }
 
-  starpc::Error Recv(rpcstream::RpcStreamPacket *msg) {
+  starpc::Error Recv(rpcstream::RpcStreamPacket* msg) {
     return strm_->MsgRecv(msg);
   }
 
   starpc::Error CloseSend() { return strm_->CloseSend(); }
   starpc::Error Close() { return strm_->Close(); }
 
-private:
+ private:
   std::unique_ptr<starpc::Stream> strm_;
 };
 
 // SRPCEchoer_RpcStreamStream is the server stream for RpcStream.
 class SRPCEchoer_RpcStreamStream {
-public:
-  explicit SRPCEchoer_RpcStreamStream(starpc::Stream *strm) : strm_(strm) {}
+ public:
+  explicit SRPCEchoer_RpcStreamStream(starpc::Stream* strm) : strm_(strm) {}
 
-  starpc::Error Send(const rpcstream::RpcStreamPacket &msg) {
+  starpc::Error Send(const rpcstream::RpcStreamPacket& msg) {
     return strm_->MsgSend(msg);
   }
 
-  starpc::Error SendAndClose(const rpcstream::RpcStreamPacket &msg) {
+  starpc::Error SendAndClose(const rpcstream::RpcStreamPacket& msg) {
     starpc::Error err = strm_->MsgSend(msg);
-    if (err != starpc::Error::OK)
-      return err;
+    if (err != starpc::Error::OK) return err;
     return strm_->CloseSend();
   }
 
-  starpc::Error Recv(rpcstream::RpcStreamPacket *msg) {
+  starpc::Error Recv(rpcstream::RpcStreamPacket* msg) {
     return strm_->MsgRecv(msg);
   }
 
-private:
-  starpc::Stream *strm_;
+ private:
+  starpc::Stream* strm_;
 };
 
-} // namespace echo
+}  // namespace echo