starpc 0.13.2 → 0.14.0

package/srpc/rpcproto.proto

@@ -9,6 +9,8 @@ message Packet {
     CallStart call_start = 1;
     // CallData is a message in a streaming RPC sequence.
     CallData call_data = 2;
+    // CallCancel cancels the call.
+    bool call_cancel = 3;
   }
 }
 

package/srpc/rpcproto_vtproto.pb.go

@@ -59,6 +59,16 @@ func (m *Packet_CallData) CloneVT() isPacket_Body {
 	return r
 }
 
+func (m *Packet_CallCancel) CloneVT() isPacket_Body {
+	if m == nil {
+		return (*Packet_CallCancel)(nil)
+	}
+	r := &Packet_CallCancel{
+		CallCancel: m.CallCancel,
+	}
+	return r
+}
+
 func (m *CallStart) CloneVT() *CallStart {
 	if m == nil {
 		return (*CallStart)(nil)
@@ -178,6 +188,23 @@ func (this *Packet_CallData) EqualVT(thatIface isPacket_Body) bool {
 	return true
 }
 
+func (this *Packet_CallCancel) EqualVT(thatIface isPacket_Body) bool {
+	that, ok := thatIface.(*Packet_CallCancel)
+	if !ok {
+		return false
+	}
+	if this == that {
+		return true
+	}
+	if this == nil && that != nil || this != nil && that == nil {
+		return false
+	}
+	if this.CallCancel != that.CallCancel {
+		return false
+	}
+	return true
+}
+
 func (this *CallStart) EqualVT(that *CallStart) bool {
 	if this == nil {
 		return that == nil
@@ -300,6 +327,23 @@ func (m *Packet_CallData) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
 	}
 	return len(dAtA) - i, nil
 }
+func (m *Packet_CallCancel) MarshalToVT(dAtA []byte) (int, error) {
+	size := m.SizeVT()
+	return m.MarshalToSizedBufferVT(dAtA[:size])
+}
+
+func (m *Packet_CallCancel) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	i--
+	if m.CallCancel {
+		dAtA[i] = 1
+	} else {
+		dAtA[i] = 0
+	}
+	i--
+	dAtA[i] = 0x18
+	return len(dAtA) - i, nil
+}
 func (m *CallStart) MarshalVT() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil
@@ -479,6 +523,15 @@ func (m *Packet_CallData) SizeVT() (n int) {
 	}
 	return n
 }
+func (m *Packet_CallCancel) SizeVT() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	n += 2
+	return n
+}
 func (m *CallStart) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -645,6 +698,27 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
 				m.Body = &Packet_CallData{CallData: v}
 			}
 			iNdEx = postIndex
+		case 3:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CallCancel", 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
+				}
+			}
+			b := bool(v != 0)
+			m.Body = &Packet_CallCancel{CallCancel: b}
 		default:
 			iNdEx = preIndex
 			skippy, err := skip(dAtA[iNdEx:])

package/srpc/server-http.go

@@ -33,7 +33,7 @@ func (s *HTTPServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	c, err := websocket.Accept(w, r, &websocket.AcceptOptions{})
 	if err != nil {
 		w.WriteHeader(500)
-		w.Write([]byte(err.Error() + "\n"))
+		_, _ = w.Write([]byte(err.Error() + "\n"))
 		return
 	}
 	defer c.Close(websocket.StatusInternalError, "closed")

package/srpc/server-rpc.go

@@ -97,6 +97,11 @@ func (r *ServerRPC) HandlePacket(msg *Packet) error {
 		return r.HandleCallStart(b.CallStart)
 	case *Packet_CallData:
 		return r.HandleCallData(b.CallData)
+	case *Packet_CallCancel:
+		if b.CallCancel {
+			r.Close()
+		}
+		return nil
 	default:
 		return nil
 	}

package/srpc/stream.go

@@ -19,6 +19,6 @@ type Stream interface {
 	// CloseSend signals to the remote that we will no longer send any messages.
 	CloseSend() error
 
-	// Close closes the stream.
+	// Close closes the stream for reading and writing.
 	Close() error
 }

package/srpc/websocket.go

@@ -41,7 +41,11 @@ func (w *WebSocketConn) GetOpenStreamFunc() OpenStreamFunc {
 
 // AcceptStream accepts an incoming stream.
 func (w *WebSocketConn) AcceptStream() (io.ReadWriteCloser, error) {
-	return w.mconn.AcceptStream()
+	strm, err := w.mconn.AcceptStream()
+	if err != nil {
+		return nil, err
+	}
+	return strm, nil
 }
 
 // OpenStream tries to open a stream with the remote.

package/srpc/websocket.ts

@@ -12,7 +12,7 @@ export class WebSocketConn extends Conn {
   private socket: WebSocket
 
   constructor(socket: WebSocket, direction: Direction, server?: Server) {
-    super(server, {direction})
+    super(server, { direction })
     this.socket = socket
     const socketDuplex = duplex(socket)
     pipe(socketDuplex, this, socketDuplex)