starpc 0.1.7 → 0.2.0

package/srpc/message.ts

@@ -0,0 +1,60 @@
+import * as pbjs from 'protobufjs/minimal'
+import type { Source } from 'it-stream-types'
+
+// MessageDefinition represents a ts-proto message definition.
+export interface MessageDefinition<T> {
+  // encode encodes the message and returns writer.
+  encode(message: T, writer?: pbjs.Writer): pbjs.Writer
+  // decode decodes the message from the reader
+  decode(input: pbjs.Reader | Uint8Array, length?: number): T
+}
+
+// DecodeMessageTransform decodes messages to objects.
+type DecodeMessageTransform<T> = (
+  source: Source<Uint8Array | Uint8Array[]>
+) => AsyncIterable<T>
+
+// buildDecodeMessageTransform builds a source of decoded messages.
+export function buildDecodeMessageTransform<T>(
+  def: MessageDefinition<T>
+): DecodeMessageTransform<T> {
+  // decodeMessageSource unmarshals and async yields encoded Messages.
+  return async function* decodeMessageSource(
+    source: Source<Uint8Array | Uint8Array[]>
+  ): AsyncIterable<T> {
+    for await (const pkt of source) {
+      if (Array.isArray(pkt)) {
+        for (const p of pkt) {
+          yield* [def.decode(p)]
+        }
+      } else {
+        yield* [def.decode(pkt)]
+      }
+    }
+  }
+}
+
+// EncodeMessageTransform is a transformer that encodes messages.
+type EncodeMessageTransform<T> = (
+  source: Source<T | T[]>
+) => AsyncIterable<Uint8Array>
+
+// buildEncodeMessageTransform builds a source of decoded messages.
+export function buildEncodeMessageTransform<T>(
+  def: MessageDefinition<T>
+): EncodeMessageTransform<T> {
+  // encodeMessageSource encodes messages to byte arrays.
+  return async function* encodeMessageSource(
+    source: Source<T | T[]>
+  ): AsyncIterable<Uint8Array> {
+    for await (const pkt of source) {
+      if (Array.isArray(pkt)) {
+        for (const p of pkt) {
+          yield* [def.encode(p).finish()]
+        }
+      } else {
+        yield* [def.encode(pkt).finish()]
+      }
+    }
+  }
+}

package/srpc/mux.ts

@@ -0,0 +1,56 @@
+import { InvokeFn, Handler } from './handler'
+
+// Mux contains a set of <service, method> handlers.
+export interface Mux {
+  // register registers a new RPC method handler.
+  register(handler: Handler): void
+  // lookupMethod looks up the method matching the service & method ID.
+  // returns null if not found.
+  lookupMethod(serviceID: string, methodID: string): Promise<InvokeFn | null>
+}
+
+// createMux builds a new Mux.
+export function createMux(): Mux {
+  return new StaticMux()
+}
+
+// staticMuxMethods is a mapping from method id to handler.
+type staticMuxMethods = { [methodID: string]: Handler }
+
+// StaticMux contains a in-memory mapping between service ID and handlers.
+// implements Mux
+export class StaticMux implements Mux {
+  // services contains a mapping from service id to handlers.
+  private services: { [id: string]: staticMuxMethods } = {}
+
+  public register(handler: Handler): void {
+    const serviceID = handler?.getServiceID()
+    if (!serviceID) {
+      throw new Error('service id cannot be empty')
+    }
+    const serviceMethods = this.services[serviceID] || {}
+    const methodIDs = handler.getMethodIDs()
+    for (const methodID of methodIDs) {
+      serviceMethods[methodID] = handler
+    }
+    this.services[serviceID] = serviceMethods
+  }
+
+  public async lookupMethod(
+    serviceID: string,
+    methodID: string
+  ): Promise<InvokeFn | null> {
+    if (!serviceID) {
+      return null
+    }
+    const serviceMethods = this.services[serviceID]
+    if (!serviceMethods) {
+      return null
+    }
+    const handler = serviceMethods[methodID]
+    if (!handler) {
+      return null
+    }
+    return await handler.lookupMethod(serviceID, methodID)
+  }
+}

package/srpc/packet.go

@@ -10,8 +10,6 @@ func (p *Packet) Validate() error {
 		return b.CallStart.Validate()
 	case *Packet_CallData:
 		return b.CallData.Validate()
-	case *Packet_CallStartResp:
-		return b.CallStartResp.Validate()
 	default:
 		return ErrUnrecognizedPacket
 	}
@@ -49,9 +47,10 @@ func NewCallDataPacket(data []byte, complete bool, err error) *Packet {
 	}
 	return &Packet{Body: &Packet_CallData{
 		CallData: &CallData{
-			Data:     data,
-			Complete: err != nil || complete,
-			Error:    errStr,
+			Data:       data,
+			DataIsZero: len(data) == 0 && !complete && err == nil,
+			Complete:   err != nil || complete,
+			Error:      errStr,
 		},
 	}}
 }
@@ -63,9 +62,3 @@ func (p *CallData) Validate() error {
 	}
 	return nil
 }
-
-// Validate performs cursory validation of the packet.
-func (p *CallStartResp) Validate() error {
-	// nothing to check, empty packet is valid.
-	return nil
-}

package/srpc/packet.ts

@@ -1,39 +1,20 @@
-import type { Source, Transform } from 'it-stream-types'
-import { Packet } from './rpcproto'
+import type { Transform } from 'it-stream-types'
 import {
   encode as lengthPrefixEncode,
   decode as lengthPrefixDecode,
 } from 'it-length-prefixed'
 
-// decodePacketSource unmarshals and async yields encoded Packets.
-export async function* decodePacketSource(
-  source: Source<Uint8Array | Uint8Array[]>
-): AsyncIterable<Packet> {
-  for await (const pkt of source) {
-    if (Array.isArray(pkt)) {
-      for (const p of pkt) {
-        yield* [Packet.decode(p)]
-      }
-    } else {
-      yield* [Packet.decode(pkt)]
-    }
-  }
-}
+import { Packet } from './rpcproto.js'
+import {
+  buildDecodeMessageTransform,
+  buildEncodeMessageTransform,
+} from './message.js'
 
-// encodePacketSource marshals and async yields packets.
-export async function* encodePacketSource(
-  source: Source<Packet | Packet[]>
-): AsyncIterable<Uint8Array> {
-  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()]
-    }
-  }
-}
+// decodePacketSource decodes packets from a binary data stream.
+export const decodePacketSource = buildDecodeMessageTransform<Packet>(Packet)
+
+// encodePacketSource encodes packets from a packet object stream.
+export const encodePacketSource = buildEncodeMessageTransform<Packet>(Packet)
 
 // uint32LEDecode removes the length prefix.
 const uint32LEDecode = (data: Uint8Array) => {
@@ -107,3 +88,36 @@ export function prependPacketLen(msgData: Uint8Array): Uint8Array {
   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/srpc/rpcproto.pb.go

@@ -31,7 +31,6 @@ type Packet struct {
 	//
 	// Types that are assignable to Body:
 	//	*Packet_CallStart
-	//	*Packet_CallStartResp
 	//	*Packet_CallData
 	Body isPacket_Body `protobuf_oneof:"body"`
 }
@@ -82,13 +81,6 @@ func (x *Packet) GetCallStart() *CallStart {
 	return nil
 }
 
-func (x *Packet) GetCallStartResp() *CallStartResp {
-	if x, ok := x.GetBody().(*Packet_CallStartResp); ok {
-		return x.CallStartResp
-	}
-	return nil
-}
-
 func (x *Packet) GetCallData() *CallData {
 	if x, ok := x.GetBody().(*Packet_CallData); ok {
 		return x.CallData
@@ -105,20 +97,13 @@ type Packet_CallStart struct {
 	CallStart *CallStart `protobuf:"bytes,1,opt,name=call_start,json=callStart,proto3,oneof"`
 }
 
-type Packet_CallStartResp struct {
-	// CallStartResp is the response to CallStart.
-	CallStartResp *CallStartResp `protobuf:"bytes,2,opt,name=call_start_resp,json=callStartResp,proto3,oneof"`
-}
-
 type Packet_CallData struct {
 	// CallData is a message in a streaming RPC sequence.
-	CallData *CallData `protobuf:"bytes,3,opt,name=call_data,json=callData,proto3,oneof"`
+	CallData *CallData `protobuf:"bytes,2,opt,name=call_data,json=callData,proto3,oneof"`
 }
 
 func (*Packet_CallStart) isPacket_Body() {}
 
-func (*Packet_CallStartResp) isPacket_Body() {}
-
 func (*Packet_CallData) isPacket_Body() {}
 
 // CallStart requests starting a new RPC call.
@@ -136,6 +121,8 @@ type CallStart struct {
 	// Data contains the request or the first message in the stream.
 	// Optional if streaming.
 	Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+	// DataIsZero indicates Data is set with an empty message.
+	DataIsZero bool `protobuf:"varint,4,opt,name=data_is_zero,json=dataIsZero,proto3" json:"data_is_zero,omitempty"`
 }
 
 func (x *CallStart) Reset() {
@@ -191,54 +178,11 @@ func (x *CallStart) GetData() []byte {
 	return nil
 }
 
-// CallStartResp is the response to CallStart.
-type CallStartResp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Error contains any error starting the RPC call.
-	// Empty if successful.
-	Error string `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
-}
-
-func (x *CallStartResp) Reset() {
-	*x = CallStartResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CallStartResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CallStartResp) ProtoMessage() {}
-
-func (x *CallStartResp) ProtoReflect() protoreflect.Message {
-	mi := &file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CallStartResp.ProtoReflect.Descriptor instead.
-func (*CallStartResp) Descriptor() ([]byte, []int) {
-	return file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *CallStartResp) GetError() string {
+func (x *CallStart) GetDataIsZero() bool {
 	if x != nil {
-		return x.Error
+		return x.DataIsZero
 	}
-	return ""
+	return false
 }
 
 // CallData contains a message in a streaming RPC sequence.
@@ -249,17 +193,19 @@ type CallData struct {
 
 	// Data contains the packet in the sequence.
 	Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+	// DataIsZero indicates Data is set with an empty message.
+	DataIsZero bool `protobuf:"varint,2,opt,name=data_is_zero,json=dataIsZero,proto3" json:"data_is_zero,omitempty"`
 	// Complete indicates the RPC call is completed.
-	Complete bool `protobuf:"varint,2,opt,name=complete,proto3" json:"complete,omitempty"`
+	Complete bool `protobuf:"varint,3,opt,name=complete,proto3" json:"complete,omitempty"`
 	// Error contains any error that caused the RPC to fail.
 	// If set, implies complete=true.
-	Error string `protobuf:"bytes,3,opt,name=error,proto3" json:"error,omitempty"`
+	Error string `protobuf:"bytes,4,opt,name=error,proto3" json:"error,omitempty"`
 }
 
 func (x *CallData) Reset() {
 	*x = CallData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_msgTypes[3]
+		mi := &file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -272,7 +218,7 @@ func (x *CallData) String() string {
 func (*CallData) ProtoMessage() {}
 
 func (x *CallData) ProtoReflect() protoreflect.Message {
-	mi := &file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_msgTypes[3]
+	mi := &file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -285,7 +231,7 @@ func (x *CallData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CallData.ProtoReflect.Descriptor instead.
 func (*CallData) Descriptor() ([]byte, []int) {
-	return file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_rawDescGZIP(), []int{3}
+	return file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *CallData) GetData() []byte {
@@ -295,6 +241,13 @@ func (x *CallData) GetData() []byte {
 	return nil
 }
 
+func (x *CallData) GetDataIsZero() bool {
+	if x != nil {
+		return x.DataIsZero
+	}
+	return false
+}
+
 func (x *CallData) GetComplete() bool {
 	if x != nil {
 		return x.Complete
@@ -315,33 +268,31 @@ var file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_rawDesc = []byte
 	0x0a, 0x36, 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, 0x73, 0x72, 0x70, 0x63, 0x2f, 0x72, 0x70, 0x63, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x72, 0x70, 0x63, 0x22, 0xb0,
-	0x01, 0x0a, 0x06, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x30, 0x0a, 0x0a, 0x63, 0x61, 0x6c,
-	0x6c, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
-	0x73, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x72, 0x74, 0x48, 0x00,
-	0x52, 0x09, 0x63, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x72, 0x74, 0x12, 0x3d, 0x0a, 0x0f, 0x63,
-	0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c,
-	0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x61, 0x6c,
-	0x6c, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x61,
-	0x6c, 0x6c, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
+	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x72, 0x70, 0x63, 0x22, 0x71,
+	0x0a, 0x06, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x30, 0x0a, 0x0a, 0x63, 0x61, 0x6c, 0x6c,
+	0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73,
+	0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x72, 0x74, 0x48, 0x00, 0x52,
+	0x09, 0x63, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x72, 0x74, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x61,
+	0x6c, 0x6c, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
 	0x73, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52,
 	0x08, 0x63, 0x61, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x42, 0x06, 0x0a, 0x04, 0x62, 0x6f, 0x64,
-	0x79, 0x22, 0x5f, 0x0a, 0x09, 0x43, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x72, 0x74, 0x12, 0x1f,
-	0x0a, 0x0b, 0x72, 0x70, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12,
-	0x1d, 0x0a, 0x0a, 0x72, 0x70, 0x63, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x70, 0x63, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x12,
-	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x22, 0x25, 0x0a, 0x0d, 0x43, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x50, 0x0a, 0x08, 0x43, 0x61, 0x6c,
-	0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d,
-	0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d,
-	0x70, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x79, 0x22, 0x81, 0x01, 0x0a, 0x09, 0x43, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x72, 0x74, 0x12,
+	0x1f, 0x0a, 0x0b, 0x72, 0x70, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x70, 0x63, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x70, 0x63, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12,
+	0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64,
+	0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0c, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x69, 0x73, 0x5f, 0x7a,
+	0x65, 0x72, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x49,
+	0x73, 0x5a, 0x65, 0x72, 0x6f, 0x22, 0x72, 0x0a, 0x08, 0x43, 0x61, 0x6c, 0x6c, 0x44, 0x61, 0x74,
+	0x61, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0c, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x69, 0x73,
+	0x5f, 0x7a, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x64, 0x61, 0x74,
+	0x61, 0x49, 0x73, 0x5a, 0x65, 0x72, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c,
+	0x65, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c,
+	0x65, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -356,22 +307,20 @@ func file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_rawDescGZIP() [
 	return file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_rawDescData
 }
 
-var file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_goTypes = []interface{}{
-	(*Packet)(nil),        // 0: srpc.Packet
-	(*CallStart)(nil),     // 1: srpc.CallStart
-	(*CallStartResp)(nil), // 2: srpc.CallStartResp
-	(*CallData)(nil),      // 3: srpc.CallData
+	(*Packet)(nil),    // 0: srpc.Packet
+	(*CallStart)(nil), // 1: srpc.CallStart
+	(*CallData)(nil),  // 2: srpc.CallData
 }
 var file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_depIdxs = []int32{
 	1, // 0: srpc.Packet.call_start:type_name -> srpc.CallStart
-	2, // 1: srpc.Packet.call_start_resp:type_name -> srpc.CallStartResp
-	3, // 2: srpc.Packet.call_data:type_name -> srpc.CallData
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	3, // [3:3] is the sub-list for extension extendee
-	0, // [0:3] is the sub-list for field type_name
+	2, // 1: srpc.Packet.call_data:type_name -> srpc.CallData
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_init() }
@@ -405,18 +354,6 @@ func file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_init() {
 			}
 		}
 		file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CallStartResp); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CallData); i {
 			case 0:
 				return &v.state
@@ -431,7 +368,6 @@ func file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_init() {
 	}
 	file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*Packet_CallStart)(nil),
-		(*Packet_CallStartResp)(nil),
 		(*Packet_CallData)(nil),
 	}
 	type x struct{}
@@ -440,7 +376,7 @@ func file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_github_com_aperturerobotics_starpc_srpc_rpcproto_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

package/srpc/rpcproto.proto

@@ -7,10 +7,8 @@ message Packet {
   oneof body {
     // CallStart initiates a new call.
     CallStart call_start = 1;
-    // CallStartResp is the response to CallStart.
-    CallStartResp call_start_resp = 2;
     // CallData is a message in a streaming RPC sequence.
-    CallData call_data = 3;
+    CallData call_data = 2;
   }
 }
 
@@ -25,22 +23,19 @@ message CallStart {
   // Data contains the request or the first message in the stream.
   // Optional if streaming.
   bytes data = 3;
-}
-
-// CallStartResp is the response to CallStart.
-message CallStartResp {
-  // Error contains any error starting the RPC call.
-  // Empty if successful.
-  string error = 1;
+  // DataIsZero indicates Data is set with an empty message.
+  bool data_is_zero = 4;
 }
 
 // CallData contains a message in a streaming RPC sequence.
 message CallData {
   // Data contains the packet in the sequence.
   bytes data = 1;
+  // DataIsZero indicates Data is set with an empty message.
+  bool data_is_zero = 2;
   // Complete indicates the RPC call is completed.
-  bool complete = 2;
+  bool complete = 3;
   // Error contains any error that caused the RPC to fail.
   // If set, implies complete=true.
-  string error = 3;
+  string error = 4;
 }