starpc 0.1.7 → 0.2.0

package/srpc/rpcproto.ts

@@ -8,7 +8,6 @@ export const protobufPackage = 'srpc'
 export interface Packet {
   body?:
     | { $case: 'callStart'; callStart: CallStart }
-    | { $case: 'callStartResp'; callStartResp: CallStartResp }
     | { $case: 'callData'; callData: CallData }
 }
 
@@ -29,21 +28,16 @@ export interface CallStart {
    * Optional if streaming.
    */
   data: Uint8Array
-}
-
-/** CallStartResp is the response to CallStart. */
-export interface CallStartResp {
-  /**
-   * Error contains any error starting the RPC call.
-   * Empty if successful.
-   */
-  error: string
+  /** DataIsZero indicates Data is set with an empty message. */
+  dataIsZero: boolean
 }
 
 /** CallData contains a message in a streaming RPC sequence. */
 export interface CallData {
   /** Data contains the packet in the sequence. */
   data: Uint8Array
+  /** DataIsZero indicates Data is set with an empty message. */
+  dataIsZero: boolean
   /** Complete indicates the RPC call is completed. */
   complete: boolean
   /**
@@ -68,14 +62,8 @@ export const Packet = {
         writer.uint32(10).fork()
       ).ldelim()
     }
-    if (message.body?.$case === 'callStartResp') {
-      CallStartResp.encode(
-        message.body.callStartResp,
-        writer.uint32(18).fork()
-      ).ldelim()
-    }
     if (message.body?.$case === 'callData') {
-      CallData.encode(message.body.callData, writer.uint32(26).fork()).ldelim()
+      CallData.encode(message.body.callData, writer.uint32(18).fork()).ldelim()
     }
     return writer
   },
@@ -94,12 +82,6 @@ export const Packet = {
           }
           break
         case 2:
-          message.body = {
-            $case: 'callStartResp',
-            callStartResp: CallStartResp.decode(reader, reader.uint32()),
-          }
-          break
-        case 3:
           message.body = {
             $case: 'callData',
             callData: CallData.decode(reader, reader.uint32()),
@@ -120,11 +102,6 @@ export const Packet = {
             $case: 'callStart',
             callStart: CallStart.fromJSON(object.callStart),
           }
-        : isSet(object.callStartResp)
-        ? {
-            $case: 'callStartResp',
-            callStartResp: CallStartResp.fromJSON(object.callStartResp),
-          }
         : isSet(object.callData)
         ? { $case: 'callData', callData: CallData.fromJSON(object.callData) }
         : undefined,
@@ -137,10 +114,6 @@ export const Packet = {
       (obj.callStart = message.body?.callStart
         ? CallStart.toJSON(message.body?.callStart)
         : undefined)
-    message.body?.$case === 'callStartResp' &&
-      (obj.callStartResp = message.body?.callStartResp
-        ? CallStartResp.toJSON(message.body?.callStartResp)
-        : undefined)
     message.body?.$case === 'callData' &&
       (obj.callData = message.body?.callData
         ? CallData.toJSON(message.body?.callData)
@@ -160,16 +133,6 @@ export const Packet = {
         callStart: CallStart.fromPartial(object.body.callStart),
       }
     }
-    if (
-      object.body?.$case === 'callStartResp' &&
-      object.body?.callStartResp !== undefined &&
-      object.body?.callStartResp !== null
-    ) {
-      message.body = {
-        $case: 'callStartResp',
-        callStartResp: CallStartResp.fromPartial(object.body.callStartResp),
-      }
-    }
     if (
       object.body?.$case === 'callData' &&
       object.body?.callData !== undefined &&
@@ -185,7 +148,12 @@ export const Packet = {
 }
 
 function createBaseCallStart(): CallStart {
-  return { rpcService: '', rpcMethod: '', data: new Uint8Array() }
+  return {
+    rpcService: '',
+    rpcMethod: '',
+    data: new Uint8Array(),
+    dataIsZero: false,
+  }
 }
 
 export const CallStart = {
@@ -202,6 +170,9 @@ export const CallStart = {
     if (message.data.length !== 0) {
       writer.uint32(26).bytes(message.data)
     }
+    if (message.dataIsZero === true) {
+      writer.uint32(32).bool(message.dataIsZero)
+    }
     return writer
   },
 
@@ -221,6 +192,9 @@ export const CallStart = {
         case 3:
           message.data = reader.bytes()
           break
+        case 4:
+          message.dataIsZero = reader.bool()
+          break
         default:
           reader.skipType(tag & 7)
           break
@@ -236,6 +210,7 @@ export const CallStart = {
       data: isSet(object.data)
         ? bytesFromBase64(object.data)
         : new Uint8Array(),
+      dataIsZero: isSet(object.dataIsZero) ? Boolean(object.dataIsZero) : false,
     }
   },
 
@@ -247,6 +222,7 @@ export const CallStart = {
       (obj.data = base64FromBytes(
         message.data !== undefined ? message.data : new Uint8Array()
       ))
+    message.dataIsZero !== undefined && (obj.dataIsZero = message.dataIsZero)
     return obj
   },
 
@@ -257,66 +233,18 @@ export const CallStart = {
     message.rpcService = object.rpcService ?? ''
     message.rpcMethod = object.rpcMethod ?? ''
     message.data = object.data ?? new Uint8Array()
-    return message
-  },
-}
-
-function createBaseCallStartResp(): CallStartResp {
-  return { error: '' }
-}
-
-export const CallStartResp = {
-  encode(
-    message: CallStartResp,
-    writer: _m0.Writer = _m0.Writer.create()
-  ): _m0.Writer {
-    if (message.error !== '') {
-      writer.uint32(10).string(message.error)
-    }
-    return writer
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): CallStartResp {
-    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input)
-    let end = length === undefined ? reader.len : reader.pos + length
-    const message = createBaseCallStartResp()
-    while (reader.pos < end) {
-      const tag = reader.uint32()
-      switch (tag >>> 3) {
-        case 1:
-          message.error = reader.string()
-          break
-        default:
-          reader.skipType(tag & 7)
-          break
-      }
-    }
-    return message
-  },
-
-  fromJSON(object: any): CallStartResp {
-    return {
-      error: isSet(object.error) ? String(object.error) : '',
-    }
-  },
-
-  toJSON(message: CallStartResp): unknown {
-    const obj: any = {}
-    message.error !== undefined && (obj.error = message.error)
-    return obj
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CallStartResp>, I>>(
-    object: I
-  ): CallStartResp {
-    const message = createBaseCallStartResp()
-    message.error = object.error ?? ''
+    message.dataIsZero = object.dataIsZero ?? false
     return message
   },
 }
 
 function createBaseCallData(): CallData {
-  return { data: new Uint8Array(), complete: false, error: '' }
+  return {
+    data: new Uint8Array(),
+    dataIsZero: false,
+    complete: false,
+    error: '',
+  }
 }
 
 export const CallData = {
@@ -327,11 +255,14 @@ export const CallData = {
     if (message.data.length !== 0) {
       writer.uint32(10).bytes(message.data)
     }
+    if (message.dataIsZero === true) {
+      writer.uint32(16).bool(message.dataIsZero)
+    }
     if (message.complete === true) {
-      writer.uint32(16).bool(message.complete)
+      writer.uint32(24).bool(message.complete)
     }
     if (message.error !== '') {
-      writer.uint32(26).string(message.error)
+      writer.uint32(34).string(message.error)
     }
     return writer
   },
@@ -347,9 +278,12 @@ export const CallData = {
           message.data = reader.bytes()
           break
         case 2:
-          message.complete = reader.bool()
+          message.dataIsZero = reader.bool()
           break
         case 3:
+          message.complete = reader.bool()
+          break
+        case 4:
           message.error = reader.string()
           break
         default:
@@ -365,6 +299,7 @@ export const CallData = {
       data: isSet(object.data)
         ? bytesFromBase64(object.data)
         : new Uint8Array(),
+      dataIsZero: isSet(object.dataIsZero) ? Boolean(object.dataIsZero) : false,
       complete: isSet(object.complete) ? Boolean(object.complete) : false,
       error: isSet(object.error) ? String(object.error) : '',
     }
@@ -376,6 +311,7 @@ export const CallData = {
       (obj.data = base64FromBytes(
         message.data !== undefined ? message.data : new Uint8Array()
       ))
+    message.dataIsZero !== undefined && (obj.dataIsZero = message.dataIsZero)
     message.complete !== undefined && (obj.complete = message.complete)
     message.error !== undefined && (obj.error = message.error)
     return obj
@@ -384,6 +320,7 @@ export const CallData = {
   fromPartial<I extends Exact<DeepPartial<CallData>, I>>(object: I): CallData {
     const message = createBaseCallData()
     message.data = object.data ?? new Uint8Array()
+    message.dataIsZero = object.dataIsZero ?? false
     message.complete = object.complete ?? false
     message.error = object.error ?? ''
     return message

package/srpc/rpcproto_vtproto.pb.go

@@ -34,9 +34,6 @@ func (this *Packet) EqualVT(that *Packet) bool {
 		if !this.GetCallStart().EqualVT(that.GetCallStart()) {
 			return false
 		}
-		if !this.GetCallStartResp().EqualVT(that.GetCallStartResp()) {
-			return false
-		}
 		if !this.GetCallData().EqualVT(that.GetCallData()) {
 			return false
 		}
@@ -59,16 +56,7 @@ func (this *CallStart) EqualVT(that *CallStart) bool {
 	if string(this.Data) != string(that.Data) {
 		return false
 	}
-	return string(this.unknownFields) == string(that.unknownFields)
-}
-
-func (this *CallStartResp) EqualVT(that *CallStartResp) bool {
-	if this == nil {
-		return that == nil || that.String() == ""
-	} else if that == nil {
-		return this.String() == ""
-	}
-	if this.Error != that.Error {
+	if this.DataIsZero != that.DataIsZero {
 		return false
 	}
 	return string(this.unknownFields) == string(that.unknownFields)
@@ -83,6 +71,9 @@ func (this *CallData) EqualVT(that *CallData) bool {
 	if string(this.Data) != string(that.Data) {
 		return false
 	}
+	if this.DataIsZero != that.DataIsZero {
+		return false
+	}
 	if this.Complete != that.Complete {
 		return false
 	}
@@ -153,25 +144,6 @@ func (m *Packet_CallStart) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
 	}
 	return len(dAtA) - i, nil
 }
-func (m *Packet_CallStartResp) MarshalToVT(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVT(dAtA[:size])
-}
-
-func (m *Packet_CallStartResp) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	if m.CallStartResp != nil {
-		size, err := m.CallStartResp.MarshalToSizedBufferVT(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = encodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x12
-	}
-	return len(dAtA) - i, nil
-}
 func (m *Packet_CallData) MarshalToVT(dAtA []byte) (int, error) {
 	size := m.SizeVT()
 	return m.MarshalToSizedBufferVT(dAtA[:size])
@@ -187,7 +159,7 @@ func (m *Packet_CallData) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
 		i -= size
 		i = encodeVarint(dAtA, i, uint64(size))
 		i--
-		dAtA[i] = 0x1a
+		dAtA[i] = 0x12
 	}
 	return len(dAtA) - i, nil
 }
@@ -221,6 +193,16 @@ func (m *CallStart) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
+	if m.DataIsZero {
+		i--
+		if m.DataIsZero {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x20
+	}
 	if len(m.Data) > 0 {
 		i -= len(m.Data)
 		copy(dAtA[i:], m.Data)
@@ -245,46 +227,6 @@ func (m *CallStart) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *CallStartResp) MarshalVT() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVT(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *CallStartResp) MarshalToVT(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVT(dAtA[:size])
-}
-
-func (m *CallStartResp) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if len(m.Error) > 0 {
-		i -= len(m.Error)
-		copy(dAtA[i:], m.Error)
-		i = encodeVarint(dAtA, i, uint64(len(m.Error)))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
 func (m *CallData) MarshalVT() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil
@@ -320,7 +262,7 @@ func (m *CallData) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
 		copy(dAtA[i:], m.Error)
 		i = encodeVarint(dAtA, i, uint64(len(m.Error)))
 		i--
-		dAtA[i] = 0x1a
+		dAtA[i] = 0x22
 	}
 	if m.Complete {
 		i--
@@ -330,6 +272,16 @@ func (m *CallData) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
 			dAtA[i] = 0
 		}
 		i--
+		dAtA[i] = 0x18
+	}
+	if m.DataIsZero {
+		i--
+		if m.DataIsZero {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
 		dAtA[i] = 0x10
 	}
 	if len(m.Data) > 0 {
@@ -378,18 +330,6 @@ func (m *Packet_CallStart) SizeVT() (n int) {
 	}
 	return n
 }
-func (m *Packet_CallStartResp) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.CallStartResp != nil {
-		l = m.CallStartResp.SizeVT()
-		n += 1 + l + sov(uint64(l))
-	}
-	return n
-}
 func (m *Packet_CallData) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -420,19 +360,8 @@ func (m *CallStart) SizeVT() (n int) {
 	if l > 0 {
 		n += 1 + l + sov(uint64(l))
 	}
-	n += len(m.unknownFields)
-	return n
-}
-
-func (m *CallStartResp) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.Error)
-	if l > 0 {
-		n += 1 + l + sov(uint64(l))
+	if m.DataIsZero {
+		n += 2
 	}
 	n += len(m.unknownFields)
 	return n
@@ -448,6 +377,9 @@ func (m *CallData) SizeVT() (n int) {
 	if l > 0 {
 		n += 1 + l + sov(uint64(l))
 	}
+	if m.DataIsZero {
+		n += 2
+	}
 	if m.Complete {
 		n += 2
 	}
@@ -536,47 +468,6 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
 			}
 			iNdEx = postIndex
 		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field CallStartResp", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflow
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLength
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLength
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if oneof, ok := m.Body.(*Packet_CallStartResp); ok {
-				if err := oneof.CallStartResp.UnmarshalVT(dAtA[iNdEx:postIndex]); err != nil {
-					return err
-				}
-			} else {
-				v := &CallStartResp{}
-				if err := v.UnmarshalVT(dAtA[iNdEx:postIndex]); err != nil {
-					return err
-				}
-				m.Body = &Packet_CallStartResp{v}
-			}
-			iNdEx = postIndex
-		case 3:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field CallData", wireType)
 			}
@@ -766,62 +657,11 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
 				m.Data = []byte{}
 			}
 			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skip(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLength
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.unknownFields = append(m.unknownFields, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *CallStartResp) UnmarshalVT(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflow
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: CallStartResp: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: CallStartResp: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType)
+		case 4:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DataIsZero", wireType)
 			}
-			var stringLen uint64
+			var v int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflow
@@ -831,24 +671,12 @@ func (m *CallStartResp) UnmarshalVT(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
+				v |= int(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLength
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLength
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Error = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
+			m.DataIsZero = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skip(dAtA[iNdEx:])
@@ -935,6 +763,26 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
 			}
 			iNdEx = postIndex
 		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DataIsZero", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflow
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.DataIsZero = bool(v != 0)
+		case 3:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Complete", wireType)
 			}
@@ -954,7 +802,7 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
 				}
 			}
 			m.Complete = bool(v != 0)
-		case 3:
+		case 4:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType)
 			}

package/srpc/server-rpc.go

@@ -66,8 +66,6 @@ func (r *ServerRPC) HandlePacket(msg *Packet) error {
 		return r.HandleCallStart(b.CallStart)
 	case *Packet_CallData:
 		return r.HandleCallData(b.CallData)
-	case *Packet_CallStartResp:
-		return r.HandleCallStartResp(b.CallStartResp)
 	default:
 		return nil
 	}
@@ -85,7 +83,10 @@ func (r *ServerRPC) HandleCallStart(pkt *CallStart) error {
 	r.method, r.service = pkt.GetRpcMethod(), pkt.GetRpcService()
 
 	// process first data packet, if included
-	if data := pkt.GetData(); len(data) != 0 {
+	if data := pkt.GetData(); len(data) != 0 || pkt.GetDataIsZero() {
+		if data == nil {
+			data = []byte{}
+		}
 		select {
 		case r.dataCh <- data:
 		default:
@@ -106,7 +107,7 @@ func (r *ServerRPC) HandleCallData(pkt *CallData) error {
 		return ErrCompleted
 	}
 
-	if data := pkt.GetData(); len(data) != 0 {
+	if data := pkt.GetData(); len(data) != 0 || pkt.GetDataIsZero() {
 		select {
 		case <-r.ctx.Done():
 			return context.Canceled
@@ -128,12 +129,6 @@ func (r *ServerRPC) HandleCallData(pkt *CallData) error {
 	return nil
 }
 
-// HandleCallStartResp handles the CallStartResp packet.
-func (r *ServerRPC) HandleCallStartResp(resp *CallStartResp) error {
-	// client-side calls not supported
-	return errors.Wrap(ErrUnrecognizedPacket, "call start resp packet unexpected")
-}
-
 // invoke invokes the RPC after CallStart is received.
 func (r *ServerRPC) invokeRPC() {
 	// ctx := r.ctx