starpc 0.4.9 → 0.5.2

package/dist/srpc/handler.js

@@ -1,7 +1,7 @@
 import { pipe } from 'it-pipe';
 import { pushable } from 'it-pushable';
-import { from as observableFrom } from 'rxjs';
 import { buildDecodeMessageTransform, buildEncodeMessageTransform, } from './message.js';
+import { writeToPushable } from './pushable.js';
 // StaticHandler is a handler with a definition and implementation.
 export class StaticHandler {
     constructor(serviceID, methods) {
@@ -40,8 +40,8 @@ export function createInvokeFn(methodInfo, methodProto) {
         // build the request argument.
         let requestArg;
         if (methodInfo.requestStream) {
-            // convert the request data source into an Observable<T>
-            requestArg = observableFrom(requestSource);
+            // use the request source as the argument.
+            requestArg = requestSource;
         }
         else {
             // receive a single message for the argument.
@@ -62,25 +62,8 @@ export function createInvokeFn(methodInfo, methodProto) {
                 throw new Error('return value was undefined');
             }
             if (methodInfo.responseStream) {
-                const responseObs = responseObj;
-                if (!responseObs.subscribe) {
-                    throw new Error('expected return value to be an Observable');
-                }
-                return new Promise((resolve, reject) => {
-                    responseObs.subscribe({
-                        next(value) {
-                            responseSink.push(value);
-                        },
-                        error: (err) => {
-                            responseSink.throw(err);
-                            reject(err);
-                        },
-                        complete: () => {
-                            responseSink.end();
-                            resolve();
-                        },
-                    });
-                });
+                const response = responseObj;
+                return writeToPushable(response, responseSink);
             }
             else {
                 const responsePromise = responseObj;

package/dist/srpc/index.d.ts

@@ -4,7 +4,7 @@ export { Server } from './server.js';
 export { Conn, ConnParams } from './conn.js';
 export { Handler, InvokeFn, createHandler, createInvokeFn } from './handler.js';
 export { Packet, CallStart, CallData } from './rpcproto.pb.js';
-export { Mux, createMux } from './mux.js';
+export { Mux, StaticMux, createMux } from './mux.js';
 export { BroadcastChannelDuplex, newBroadcastChannelDuplex, BroadcastChannelConn, } from './broadcast-channel.js';
 export { MessagePortIterable, newMessagePortIterable, MessagePortConn, } from './message-port.js';
-export { ObservableSource } from './observable-source.js';
+export { writeToPushable } from './pushable';

package/dist/srpc/index.js

@@ -3,7 +3,7 @@ export { Server } from './server.js';
 export { Conn } from './conn.js';
 export { createHandler, createInvokeFn } from './handler.js';
 export { Packet, CallStart, CallData } from './rpcproto.pb.js';
-export { createMux } from './mux.js';
+export { StaticMux, createMux } from './mux.js';
 export { BroadcastChannelDuplex, newBroadcastChannelDuplex, BroadcastChannelConn, } from './broadcast-channel.js';
 export { MessagePortIterable, newMessagePortIterable, MessagePortConn, } from './message-port.js';
-export { ObservableSource } from './observable-source.js';
+export { writeToPushable } from './pushable';

package/dist/srpc/packet.js

@@ -66,35 +66,3 @@ export function prependPacketLen(msgData) {
     merged.set(msgData, msgLenData.length);
     return merged;
 }
-/*
-// buildCallDataPacket builds a CallData packet.
-function buildCallDataPacket(data: Uint8Array): Packet {
-  const callData: CallData = {
-    data: p,
-    complete: false,
-    error: '',
-  }
-  const pkt: Packet = {
-    body: {
-      $case: 'callData',
-      callData: callData,
-    }
-  }
-  return pkt
-}
-
-// wrapCallDataTransform is a transformer that wraps call data into a Packet.
-export async function* wrapCallDataTransform(
-  source: Source<Uint8Array | Uint8Array>
-): AsyncIterable<Packet> {
-  for await (const pkt of source) {
-    if (Array.isArray(pkt)) {
-      for (const p of pkt) {
-        yield* [buildCallDataPacket(p)]
-      }
-    } else {
-      yield* [buildCallDataPacket(pkt)]
-    }
-  }
-}
-*/

package/dist/srpc/pushable.d.ts

@@ -0,0 +1,2 @@
+import { Pushable } from 'it-pushable';
+export declare function writeToPushable<T>(dataSource: AsyncIterable<T>, out: Pushable<T>): Promise<void>;

package/dist/srpc/pushable.js

@@ -0,0 +1,13 @@
+// writeToPushable writes the incoming server data to the pushable.
+export async function writeToPushable(dataSource, out) {
+    try {
+        for await (const data of dataSource) {
+            out.push(data);
+        }
+        out.end();
+    }
+    catch (err) {
+        out.end(err);
+        throw err;
+    }
+}

package/dist/srpc/rpcproto.pb.d.ts

@@ -48,6 +48,8 @@ export interface CallData {
 export declare const Packet: {
     encode(message: Packet, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number): Packet;
+    encodeTransform(source: AsyncIterable<Packet | Packet[]> | Iterable<Packet | Packet[]>): AsyncIterable<Uint8Array>;
+    decodeTransform(source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>): AsyncIterable<Packet>;
     fromJSON(object: any): Packet;
     toJSON(message: Packet): unknown;
     fromPartial<I extends {
@@ -121,6 +123,8 @@ export declare const Packet: {
 export declare const CallStart: {
     encode(message: CallStart, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number): CallStart;
+    encodeTransform(source: AsyncIterable<CallStart | CallStart[]> | Iterable<CallStart | CallStart[]>): AsyncIterable<Uint8Array>;
+    decodeTransform(source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>): AsyncIterable<CallStart>;
     fromJSON(object: any): CallStart;
     toJSON(message: CallStart): unknown;
     fromPartial<I extends {
@@ -138,6 +142,8 @@ export declare const CallStart: {
 export declare const CallData: {
     encode(message: CallData, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number): CallData;
+    encodeTransform(source: AsyncIterable<CallData | CallData[]> | Iterable<CallData | CallData[]>): AsyncIterable<Uint8Array>;
+    decodeTransform(source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>): AsyncIterable<CallData>;
     fromJSON(object: any): CallData;
     toJSON(message: CallData): unknown;
     fromPartial<I extends {

package/dist/srpc/rpcproto.pb.js

@@ -41,6 +41,34 @@ export const Packet = {
         }
         return message;
     },
+    // encodeTransform encodes a source of message objects.
+    // Transform<Packet, Uint8Array>
+    async *encodeTransform(source) {
+        for await (const pkt of source) {
+            if (Array.isArray(pkt)) {
+                for (const p of pkt) {
+                    yield* [Packet.encode(p).finish()];
+                }
+            }
+            else {
+                yield* [Packet.encode(pkt).finish()];
+            }
+        }
+    },
+    // decodeTransform decodes a source of encoded messages.
+    // Transform<Uint8Array, Packet>
+    async *decodeTransform(source) {
+        for await (const pkt of source) {
+            if (Array.isArray(pkt)) {
+                for (const p of pkt) {
+                    yield* [Packet.decode(p)];
+                }
+            }
+            else {
+                yield* [Packet.decode(pkt)];
+            }
+        }
+    },
     fromJSON(object) {
         return {
             body: isSet(object.callStart)
@@ -136,6 +164,34 @@ export const CallStart = {
         }
         return message;
     },
+    // encodeTransform encodes a source of message objects.
+    // Transform<CallStart, Uint8Array>
+    async *encodeTransform(source) {
+        for await (const pkt of source) {
+            if (Array.isArray(pkt)) {
+                for (const p of pkt) {
+                    yield* [CallStart.encode(p).finish()];
+                }
+            }
+            else {
+                yield* [CallStart.encode(pkt).finish()];
+            }
+        }
+    },
+    // decodeTransform decodes a source of encoded messages.
+    // Transform<Uint8Array, CallStart>
+    async *decodeTransform(source) {
+        for await (const pkt of source) {
+            if (Array.isArray(pkt)) {
+                for (const p of pkt) {
+                    yield* [CallStart.decode(p)];
+                }
+            }
+            else {
+                yield* [CallStart.decode(pkt)];
+            }
+        }
+    },
     fromJSON(object) {
         return {
             rpcService: isSet(object.rpcService) ? String(object.rpcService) : '',
@@ -214,6 +270,34 @@ export const CallData = {
         }
         return message;
     },
+    // encodeTransform encodes a source of message objects.
+    // Transform<CallData, Uint8Array>
+    async *encodeTransform(source) {
+        for await (const pkt of source) {
+            if (Array.isArray(pkt)) {
+                for (const p of pkt) {
+                    yield* [CallData.encode(p).finish()];
+                }
+            }
+            else {
+                yield* [CallData.encode(pkt).finish()];
+            }
+        }
+    },
+    // decodeTransform decodes a source of encoded messages.
+    // Transform<Uint8Array, CallData>
+    async *decodeTransform(source) {
+        for await (const pkt of source) {
+            if (Array.isArray(pkt)) {
+                for (const p of pkt) {
+                    yield* [CallData.decode(p)];
+                }
+            }
+            else {
+                yield* [CallData.decode(pkt)];
+            }
+        }
+    },
     fromJSON(object) {
         return {
             data: isSet(object.data)

package/dist/srpc/server.d.ts

@@ -10,5 +10,6 @@ export declare class Server implements StreamHandler {
     startRpc(): ServerRPC;
     handleStream(stream: Stream): ServerRPC;
     handleDuplex(stream: Duplex<Uint8Array>): ServerRPC;
+    handlePacketDuplex(stream: Duplex<Uint8Array>): ServerRPC;
     handlePacketStream(stream: Duplex<Packet>): ServerRPC;
 }

package/dist/srpc/server.js

@@ -21,6 +21,13 @@ export class Server {
         pipe(stream, parseLengthPrefixTransform(), decodePacketSource, rpc, encodePacketSource, prependLengthPrefixTransform(), stream);
         return rpc;
     }
+    // handlePacketDuplex handles an incoming Uint8Array duplex.
+    // skips the packet length prefix transform.
+    handlePacketDuplex(stream) {
+        const rpc = this.startRpc();
+        pipe(stream, decodePacketSource, rpc, encodePacketSource, stream);
+        return rpc;
+    }
     // handlePacketStream handles an incoming Packet duplex.
     handlePacketStream(stream) {
         const rpc = this.startRpc();

package/dist/srpc/ts-proto-rpc.d.ts

@@ -1,7 +1,6 @@
-import type { Observable } from 'rxjs';
 export interface TsProtoRpc {
     request(service: string, method: string, data: Uint8Array): Promise<Uint8Array>;
-    clientStreamingRequest(service: string, method: string, data: Observable<Uint8Array>): Promise<Uint8Array>;
-    serverStreamingRequest(service: string, method: string, data: Uint8Array): Observable<Uint8Array>;
-    bidirectionalStreamingRequest(service: string, method: string, data: Observable<Uint8Array>): Observable<Uint8Array>;
+    clientStreamingRequest(service: string, method: string, data: AsyncIterable<Uint8Array>): Promise<Uint8Array>;
+    serverStreamingRequest(service: string, method: string, data: Uint8Array): AsyncIterable<Uint8Array>;
+    bidirectionalStreamingRequest(service: string, method: string, data: AsyncIterable<Uint8Array>): AsyncIterable<Uint8Array>;
 }

package/e2e/e2e.ts

@@ -1,18 +1,20 @@
 import { pipe } from 'it-pipe'
 import { createHandler, createMux, Server, Client, Conn } from '../srpc'
 import { EchoerDefinition, EchoerServer, runClientTest } from '../echo'
+import { runRpcStreamTest } from '../echo/client-test'
 
 async function runRPC() {
   const mux = createMux()
-  const echoer = new EchoerServer()
-  mux.register(createHandler(EchoerDefinition, echoer))
   const server = new Server(mux)
+  const echoer = new EchoerServer(server)
+  mux.register(createHandler(EchoerDefinition, echoer))
 
   const clientConn = new Conn()
   const serverConn = new Conn(server)
   pipe(clientConn, serverConn, clientConn)
   const client = new Client(clientConn.buildOpenStreamFunc())
 
+  await runRpcStreamTest(client)
   await runClientTest(client)
 }
 
@@ -21,7 +23,6 @@ runRPC()
     console.log('finished successfully')
   })
   .catch((err) => {
-    console.log('failed')
     console.error(err)
     process.exit(1)
   })

package/e2e/e2e_test.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/aperturerobotics/starpc/echo"
+	"github.com/aperturerobotics/starpc/rpcstream"
 	"github.com/aperturerobotics/starpc/srpc"
 	"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
 	mp "github.com/libp2p/go-mplex"
@@ -17,8 +18,8 @@ import (
 // RunE2E runs an end to end test with a callback.
 func RunE2E(t *testing.T, cb func(client echo.SRPCEchoerClient) error) {
 	// construct the server
-	echoServer := &echo.EchoServer{}
 	mux := srpc.NewMux()
+	echoServer := echo.NewEchoServer(mux)
 	if err := echo.SRPCRegisterEchoer(mux, echoServer); err != nil {
 		t.Fatal(err.Error())
 	}
@@ -179,3 +180,25 @@ func TestE2E_BidiStream(t *testing.T) {
 		return strm.Close()
 	})
 }
+
+func TestE2E_RpcStream(t *testing.T) {
+	ctx := context.Background()
+	RunE2E(t, func(client echo.SRPCEchoerClient) error {
+		openStreamFn := rpcstream.NewRpcStreamOpenStream(func(ctx context.Context) (rpcstream.RpcStream, error) {
+			return client.RpcStream(ctx)
+		}, "test")
+		proxiedClient := srpc.NewClient(openStreamFn)
+		proxiedSvc := echo.NewSRPCEchoerClient(proxiedClient)
+
+		// run a RPC proxied over another RPC
+		resp, err := proxiedSvc.Echo(ctx, &echo.EchoMsg{Body: "hello world"})
+		if err != nil {
+			return err
+		}
+		if resp.GetBody() != "hello world" {
+			return errors.Errorf("response body incorrect: %q", resp.GetBody())
+		}
+
+		return nil
+	})
+}

package/echo/client-test.ts

@@ -1,6 +1,7 @@
 import { Client } from '../srpc/index.js'
 import { EchoerClientImpl, EchoMsg } from './echo.pb.js'
-import { Observable } from 'rxjs'
+import { pushable } from 'it-pushable'
+import { buildRpcStreamOpenStream } from '../rpcstream/rpcstream.js'
 
 export async function runClientTest(client: Client) {
   const demoServiceClient = new EchoerClientImpl(client)
@@ -12,10 +13,9 @@ export async function runClientTest(client: Client) {
   console.log('success: output', result.body)
 
   // observable for client requests
-  const clientRequestStream = new Observable<EchoMsg>((subscriber) => {
-    subscriber.next({ body: 'Hello world from streaming request.' })
-    subscriber.complete()
-  })
+  const clientRequestStream = pushable<EchoMsg>({ objectMode: true })
+  clientRequestStream.push({ body: 'Hello world from streaming request.' })
+  clientRequestStream.end()
 
   console.log('Calling EchoClientStream: client -> server...')
   result = await demoServiceClient.EchoClientStream(clientRequestStream)
@@ -25,17 +25,22 @@ export async function runClientTest(client: Client) {
   const serverStream = demoServiceClient.EchoServerStream({
     body: 'Hello world from server to client streaming request.',
   })
-  await new Promise<void>((resolve, reject) => {
-    serverStream.subscribe({
-      next(result) {
-        console.log('server: output', result.body)
-      },
-      complete() {
-        resolve()
-      },
-      error(err: Error) {
-        reject(err)
-      },
-    })
-  })
+  for await (const msg of serverStream) {
+    console.log('server: output', msg.body)
+  }
+}
+
+// runRpcStreamTest tests a RPCStream.
+export async function runRpcStreamTest(client: Client) {
+  console.log('Calling RpcStream to open a RPC stream client...')
+  const service = new EchoerClientImpl(client)
+  const openStreamFn = buildRpcStreamOpenStream(
+    'test',
+    service.RpcStream.bind(service)
+  )
+  const proxiedClient = new Client(openStreamFn)
+  const proxiedService = new EchoerClientImpl(proxiedClient)
+  console.log('Calling Echo via RPC stream...')
+  const resp = await proxiedService.Echo({ body: 'hello world via proxy' })
+  console.log('rpc stream test: succeeded: response: ' + resp.body)
 }

package/echo/echo.pb.go

@@ -10,6 +10,7 @@ import (
 	reflect "reflect"
 	sync "sync"
 
+	rpcstream "github.com/aperturerobotics/starpc/rpcstream"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
@@ -75,22 +76,31 @@ var file_github_com_aperturerobotics_starpc_echo_echo_proto_rawDesc = []byte{
 	0x0a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x70, 0x65,
 	0x72, 0x74, 0x75, 0x72, 0x65, 0x72, 0x6f, 0x62, 0x6f, 0x74, 0x69, 0x63, 0x73, 0x2f, 0x73, 0x74,
 	0x61, 0x72, 0x70, 0x63, 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x65, 0x63, 0x68, 0x6f, 0x22, 0x1d, 0x0a, 0x07, 0x45, 0x63,
-	0x68, 0x6f, 0x4d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x32, 0xca, 0x01, 0x0a, 0x06, 0x45, 0x63,
-	0x68, 0x6f, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x04, 0x45, 0x63, 0x68, 0x6f, 0x12, 0x0d, 0x2e, 0x65,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x65, 0x63, 0x68, 0x6f, 0x1a, 0x3c, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x70, 0x65, 0x72, 0x74, 0x75, 0x72, 0x65, 0x72,
+	0x6f, 0x62, 0x6f, 0x74, 0x69, 0x63, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x72, 0x70, 0x63, 0x2f, 0x72,
+	0x70, 0x63, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2f, 0x72, 0x70, 0x63, 0x73, 0x74, 0x72, 0x65,
+	0x61, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x1d, 0x0a, 0x07, 0x45, 0x63, 0x68, 0x6f,
+	0x4d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x32, 0x93, 0x02, 0x0a, 0x06, 0x45, 0x63, 0x68, 0x6f,
+	0x65, 0x72, 0x12, 0x24, 0x0a, 0x04, 0x45, 0x63, 0x68, 0x6f, 0x12, 0x0d, 0x2e, 0x65, 0x63, 0x68,
+	0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d, 0x73, 0x67, 0x1a, 0x0d, 0x2e, 0x65, 0x63, 0x68, 0x6f,
+	0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d, 0x73, 0x67, 0x12, 0x32, 0x0a, 0x10, 0x45, 0x63, 0x68, 0x6f,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x0d, 0x2e, 0x65,
 	0x63, 0x68, 0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d, 0x73, 0x67, 0x1a, 0x0d, 0x2e, 0x65, 0x63,
-	0x68, 0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d, 0x73, 0x67, 0x12, 0x32, 0x0a, 0x10, 0x45, 0x63,
-	0x68, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x0d,
-	0x2e, 0x65, 0x63, 0x68, 0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d, 0x73, 0x67, 0x1a, 0x0d, 0x2e,
-	0x65, 0x63, 0x68, 0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d, 0x73, 0x67, 0x30, 0x01, 0x12, 0x32,
-	0x0a, 0x10, 0x45, 0x63, 0x68, 0x6f, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x72, 0x65,
+	0x68, 0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d, 0x73, 0x67, 0x30, 0x01, 0x12, 0x32, 0x0a, 0x10,
+	0x45, 0x63, 0x68, 0x6f, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0x12, 0x0d, 0x2e, 0x65, 0x63, 0x68, 0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d, 0x73, 0x67, 0x1a,
+	0x0d, 0x2e, 0x65, 0x63, 0x68, 0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d, 0x73, 0x67, 0x28, 0x01,
+	0x12, 0x32, 0x0a, 0x0e, 0x45, 0x63, 0x68, 0x6f, 0x42, 0x69, 0x64, 0x69, 0x53, 0x74, 0x72, 0x65,
 	0x61, 0x6d, 0x12, 0x0d, 0x2e, 0x65, 0x63, 0x68, 0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d, 0x73,
 	0x67, 0x1a, 0x0d, 0x2e, 0x65, 0x63, 0x68, 0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d, 0x73, 0x67,
-	0x28, 0x01, 0x12, 0x32, 0x0a, 0x0e, 0x45, 0x63, 0x68, 0x6f, 0x42, 0x69, 0x64, 0x69, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x12, 0x0d, 0x2e, 0x65, 0x63, 0x68, 0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f,
-	0x4d, 0x73, 0x67, 0x1a, 0x0d, 0x2e, 0x65, 0x63, 0x68, 0x6f, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x4d,
-	0x73, 0x67, 0x28, 0x01, 0x30, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x28, 0x01, 0x30, 0x01, 0x12, 0x47, 0x0a, 0x09, 0x52, 0x70, 0x63, 0x53, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x12, 0x1a, 0x2e, 0x72, 0x70, 0x63, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52, 0x70,
+	0x63, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x1a, 0x1a, 0x2e,
+	0x72, 0x70, 0x63, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52, 0x70, 0x63, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x28, 0x01, 0x30, 0x01, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -107,19 +117,22 @@ func file_github_com_aperturerobotics_starpc_echo_echo_proto_rawDescGZIP() []byt
 
 var file_github_com_aperturerobotics_starpc_echo_echo_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_github_com_aperturerobotics_starpc_echo_echo_proto_goTypes = []interface{}{
-	(*EchoMsg)(nil), // 0: echo.EchoMsg
+	(*EchoMsg)(nil),                   // 0: echo.EchoMsg
+	(*rpcstream.RpcStreamPacket)(nil), // 1: rpcstream.RpcStreamPacket
 }
 var file_github_com_aperturerobotics_starpc_echo_echo_proto_depIdxs = []int32{
 	0, // 0: echo.Echoer.Echo:input_type -> echo.EchoMsg
 	0, // 1: echo.Echoer.EchoServerStream:input_type -> echo.EchoMsg
 	0, // 2: echo.Echoer.EchoClientStream:input_type -> echo.EchoMsg
 	0, // 3: echo.Echoer.EchoBidiStream:input_type -> echo.EchoMsg
-	0, // 4: echo.Echoer.Echo:output_type -> echo.EchoMsg
-	0, // 5: echo.Echoer.EchoServerStream:output_type -> echo.EchoMsg
-	0, // 6: echo.Echoer.EchoClientStream:output_type -> echo.EchoMsg
-	0, // 7: echo.Echoer.EchoBidiStream:output_type -> echo.EchoMsg
-	4, // [4:8] is the sub-list for method output_type
-	0, // [0:4] is the sub-list for method input_type
+	1, // 4: echo.Echoer.RpcStream:input_type -> rpcstream.RpcStreamPacket
+	0, // 5: echo.Echoer.Echo:output_type -> echo.EchoMsg
+	0, // 6: echo.Echoer.EchoServerStream:output_type -> echo.EchoMsg
+	0, // 7: echo.Echoer.EchoClientStream:output_type -> echo.EchoMsg
+	0, // 8: echo.Echoer.EchoBidiStream:output_type -> echo.EchoMsg
+	1, // 9: echo.Echoer.RpcStream:output_type -> rpcstream.RpcStreamPacket
+	5, // [5:10] is the sub-list for method output_type
+	0, // [0:5] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
 	0, // [0:0] is the sub-list for extension extendee
 	0, // [0:0] is the sub-list for field type_name