starpc 0.45.0 → 0.46.1

package/mock/mock_srpc.pb.rs

@@ -0,0 +1,103 @@
+// Code generated by protoc-gen-starpc-rust. DO NOT EDIT.
+// protoc-gen-starpc-rust version: v0.45.1-0.20260203090429-3e915608d4e8
+// source: github.com/aperturerobotics/starpc/mock/mock.proto
+
+#[allow(unused_imports)]
+use starpc::StreamExt;
+
+/// Service ID for Mock.
+pub const MOCK_SERVICE_ID: &str = "e2e.mock.Mock";
+
+/// Client trait for Mock.
+#[starpc::async_trait]
+pub trait MockClient: Send + Sync {
+    /// MockRequest.
+    async fn mock_request(&self, request: &MockMsg) -> starpc::Result<MockMsg>;
+}
+
+/// Client implementation for Mock.
+pub struct MockClientImpl<C> {
+    client: C,
+}
+
+impl<C: starpc::Client> MockClientImpl<C> {
+    /// Creates a new client.
+    pub fn new(client: C) -> Self {
+        Self { client }
+    }
+}
+
+#[starpc::async_trait]
+impl<C: starpc::Client + 'static> MockClient for MockClientImpl<C> {
+    async fn mock_request(&self, request: &MockMsg) -> starpc::Result<MockMsg> {
+        self.client.exec_call("e2e.mock.Mock", "MockRequest", request).await
+    }
+}
+
+/// Server trait for Mock.
+#[starpc::async_trait]
+pub trait MockServer: Send + Sync {
+    /// MockRequest.
+    async fn mock_request(&self, request: MockMsg) -> starpc::Result<MockMsg>;
+}
+
+const MOCK_METHOD_IDS: &[&str] = &[
+    "MockRequest",
+];
+
+/// Handler for Mock.
+pub struct MockHandler<S: MockServer> {
+    server: std::sync::Arc<S>,
+}
+
+impl<S: MockServer + 'static> MockHandler<S> {
+    /// Creates a new handler wrapping the server implementation.
+    pub fn new(server: S) -> Self {
+        Self { server: std::sync::Arc::new(server) }
+    }
+
+    /// Creates a new handler with a shared server.
+    pub fn with_arc(server: std::sync::Arc<S>) -> Self {
+        Self { server }
+    }
+}
+
+#[starpc::async_trait]
+impl<S: MockServer + 'static> starpc::Invoker for MockHandler<S> {
+    async fn invoke_method(
+        &self,
+        _service_id: &str,
+        method_id: &str,
+        stream: Box<dyn starpc::Stream>,
+    ) -> (bool, starpc::Result<()>) {
+        match method_id {
+            "MockRequest" => {
+                let request: MockMsg = match stream.msg_recv().await {
+                    Ok(r) => r,
+                    Err(e) => return (true, Err(e)),
+                };
+                match self.server.mock_request(request).await {
+                    Ok(response) => {
+                        if let Err(e) = stream.msg_send(&response).await {
+                            return (true, Err(e));
+                        }
+                        (true, Ok(()))
+                    }
+                    Err(e) => (true, Err(e)),
+                }
+            }
+            _ => (false, Err(starpc::Error::Unimplemented)),
+        }
+    }
+}
+
+impl<S: MockServer + 'static> starpc::Handler for MockHandler<S> {
+    fn service_id(&self) -> &'static str {
+        "e2e.mock.Mock"
+    }
+
+    fn method_ids(&self) -> &'static [&'static str] {
+        MOCK_METHOD_IDS
+    }
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.45.0",
+  "version": "0.46.1",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {

package/srpc/Cargo.toml

@@ -21,6 +21,5 @@ futures = { workspace = true }
 thiserror = { workspace = true }
 async-trait = { workspace = true }
 pin-project-lite = { workspace = true }
+scopeguard = { workspace = true }
 
-[build-dependencies]
-prost-build = { workspace = true }

package/srpc/client-rpc.cpp

@@ -1,4 +1,4 @@
-// go:build deps_only
+//go:build deps_only
 
 #include "client-rpc.hpp"
 

package/srpc/client.cpp

@@ -1,4 +1,4 @@
-// go:build deps_only
+//go:build deps_only
 
 #include "client.hpp"
 

package/srpc/common-rpc.cpp

@@ -1,4 +1,4 @@
-// go:build deps_only
+//go:build deps_only
 
 #include "common-rpc.hpp"
 

package/srpc/lib.rs

@@ -66,6 +66,8 @@ pub mod mux;
 pub mod packet;
 pub mod proto;
 pub mod rpc;
+#[path = "../rpcstream/mod.rs"]
+pub mod rpcstream;
 pub mod server;
 pub mod stream;
 pub mod testing;

package/srpc/mux.cpp

@@ -1,4 +1,4 @@
-// go:build deps_only
+//go:build deps_only
 
 #include "mux.hpp"
 #include <mutex>

package/srpc/packet.cpp

@@ -1,4 +1,4 @@
-// go:build deps_only
+//go:build deps_only
 
 #include "packet.hpp"
 

package/srpc/proto.rs

@@ -0,0 +1,5 @@
+//! Protocol buffer definitions for starpc.
+//!
+//! This module contains the generated protobuf types from rpcproto.proto.
+
+include!("rpcproto.pb.rs");

package/srpc/rpcproto.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/srpc/rpcproto.proto
 
 package srpc

package/srpc/rpcproto.pb.rs

@@ -0,0 +1,62 @@
+// @generated
+// This file is @generated by prost-build.
+/// Packet is a message sent over a srpc packet connection.
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct Packet {
+    /// Body is the packet body.
+    #[prost(oneof="packet::Body", tags="1, 2, 3")]
+    pub body: ::core::option::Option<packet::Body>,
+}
+/// Nested message and enum types in `Packet`.
+pub mod packet {
+    /// Body is the packet body.
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Oneof)]
+    pub enum Body {
+        /// CallStart initiates a new call.
+        #[prost(message, tag="1")]
+        CallStart(super::CallStart),
+        /// CallData is a message in a streaming RPC sequence.
+        #[prost(message, tag="2")]
+        CallData(super::CallData),
+        /// CallCancel cancels the call.
+        #[prost(bool, tag="3")]
+        CallCancel(bool),
+    }
+}
+/// CallStart requests starting a new RPC call.
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct CallStart {
+    /// RpcService is the service to contact.
+    /// Must be set.
+    #[prost(string, tag="1")]
+    pub rpc_service: ::prost::alloc::string::String,
+    /// RpcMethod is the RPC method to call.
+    /// Must be set.
+    #[prost(string, tag="2")]
+    pub rpc_method: ::prost::alloc::string::String,
+    /// Data contains the request or the first message in the stream.
+    /// Optional if streaming.
+    #[prost(bytes="vec", tag="3")]
+    pub data: ::prost::alloc::vec::Vec<u8>,
+    /// DataIsZero indicates Data is set with an empty message.
+    #[prost(bool, tag="4")]
+    pub data_is_zero: bool,
+}
+/// CallData contains a message in a streaming RPC sequence.
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct CallData {
+    /// Data contains the packet in the sequence.
+    #[prost(bytes="vec", tag="1")]
+    pub data: ::prost::alloc::vec::Vec<u8>,
+    /// DataIsZero indicates Data is set with an empty message.
+    #[prost(bool, tag="2")]
+    pub data_is_zero: bool,
+    /// Complete indicates the RPC call is completed.
+    #[prost(bool, tag="3")]
+    pub complete: bool,
+    /// Error contains any error that caused the RPC to fail.
+    /// If set, implies complete=true.
+    #[prost(string, tag="4")]
+    pub error: ::prost::alloc::string::String,
+}
+// @@protoc_insertion_point(module)

package/srpc/rpcproto.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/srpc/rpcproto.proto (package srpc, syntax proto3)
 /* eslint-disable */
 

package/srpc/server-rpc.cpp

@@ -1,4 +1,4 @@
-// go:build deps_only
+//go:build deps_only
 
 #include "server-rpc.hpp"
 

package/echo/build.rs

@@ -1,15 +0,0 @@
-use std::io::Result;
-use std::path::PathBuf;
-
-fn main() -> Result<()> {
-    let manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    // Use simplified proto without rpcstream dependency
-    let proto_path = manifest_dir.join("echo_rust.proto");
-
-    println!("cargo:rerun-if-changed={}", proto_path.display());
-
-    starpc_build::configure()
-        .compile_protos(&[proto_path], &[&manifest_dir])?;
-
-    Ok(())
-}

package/srpc/build.rs

@@ -1,15 +0,0 @@
-use std::io::Result;
-use std::path::PathBuf;
-
-fn main() -> Result<()> {
-    // Get the path to the proto file in the same directory.
-    let manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    let proto_path = manifest_dir.join("rpcproto.proto");
-
-    println!("cargo:rerun-if-changed={}", proto_path.display());
-
-    prost_build::Config::new()
-        .compile_protos(&[proto_path], &[&manifest_dir])?;
-
-    Ok(())
-}

package/srpc/proto/mod.rs

@@ -1,10 +0,0 @@
-//! Generated protocol buffer types for starpc.
-//!
-//! This module contains the Packet, CallStart, CallData types generated from
-//! rpcproto.proto. These types define the wire protocol for starpc.
-
-// Include the generated protobuf types.
-include!(concat!(env!("OUT_DIR"), "/srpc.rs"));
-
-// Re-export commonly used items.
-pub use self::packet::Body;