starpc 0.33.7 → 0.33.9

package/go.mod

@@ -17,12 +17,12 @@ require (
 )
 
 require (
-	github.com/libp2p/go-libp2p v0.35.4 // latest
+	github.com/libp2p/go-libp2p v0.36.1 // latest
 	github.com/libp2p/go-yamux/v4 v4.0.2-0.20240322071716-53ef5820bd48 // master
 	github.com/pkg/errors v0.9.1 // latest
 	github.com/sirupsen/logrus v1.9.3 // latest
 	google.golang.org/protobuf v1.34.2 // latest
-	nhooyr.io/websocket v1.8.11 // latest
+	nhooyr.io/websocket v1.8.17 // latest
 )
 
 require (

package/package.json

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

package/srpc/client-rpc.go

@@ -26,6 +26,10 @@ func NewClientRPC(ctx context.Context, service, method string) *ClientRPC {
 // Start sets the writer and writes the MsgSend message.
 // must only be called once!
 func (r *ClientRPC) Start(writer PacketWriter, writeFirstMsg bool, firstMsg []byte) error {
+	if writer == nil {
+		return ErrNilWriter
+	}
+
 	if err := r.ctx.Err(); err != nil {
 		r.ctxCancel()
 		_ = writer.Close()
@@ -104,11 +108,11 @@ func (r *ClientRPC) HandleCallStart(pkt *CallStart) error {
 
 // Close releases any resources held by the ClientRPC.
 func (r *ClientRPC) Close() {
-	if r.writer != nil {
-		_ = r.WriteCallCancel()
-	}
-
 	r.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {
-		r.closeLocked(broadcast)
+		// call did not start yet if writer is nil.
+		if r.writer != nil {
+			_ = r.WriteCallCancel()
+			r.closeLocked(broadcast)
+		}
 	})
 }

package/srpc/client.go

@@ -51,6 +51,7 @@ func (c *client) ExecCall(ctx context.Context, service, method string, in, out M
 	if err != nil {
 		return err
 	}
+
 	if err := clientRPC.Start(writer, true, firstMsg); err != nil {
 		return err
 	}
@@ -63,6 +64,7 @@ func (c *client) ExecCall(ctx context.Context, service, method string, in, out M
 	if err := out.UnmarshalVT(msg); err != nil {
 		return errors.Wrap(ErrInvalidMessage, err.Error())
 	}
+
 	return nil
 }
 
@@ -83,11 +85,15 @@ func (c *client) NewStream(ctx context.Context, service, method string, firstMsg
 	if err != nil {
 		return nil, err
 	}
+
 	if err := clientRPC.Start(writer, firstMsg != nil, firstMsgData); err != nil {
 		return nil, err
 	}
 
-	return NewMsgStream(ctx, clientRPC, clientRPC.ctxCancel), nil
+	return NewMsgStream(ctx, clientRPC, func() {
+		clientRPC.ctxCancel()
+		_ = writer.Close()
+	}), nil
 }
 
 // _ is a type assertion

package/srpc/common-rpc.go

@@ -116,9 +116,6 @@ func (c *commonRPC) ReadOne() ([]byte, error) {
 
 // WriteCallData writes a call data packet.
 func (c *commonRPC) WriteCallData(data []byte, complete bool, err error) error {
-	if c.writer == nil {
-		return ErrCompleted
-	}
 	outPkt := NewCallDataPacket(data, len(data) == 0, false, nil)
 	return c.writer.WritePacket(outPkt)
 }
@@ -131,9 +128,7 @@ func (c *commonRPC) HandleStreamClose(closeErr error) {
 		}
 		c.dataClosed = true
 		c.ctxCancel()
-		if c.writer != nil {
-			_ = c.writer.Close()
-		}
+		_ = c.writer.Close()
 		broadcast()
 	})
 }
@@ -175,10 +170,7 @@ func (c *commonRPC) HandleCallData(pkt *CallData) error {
 
 // WriteCallCancel writes a call cancel packet.
 func (c *commonRPC) WriteCallCancel() error {
-	if c.writer != nil {
-		return c.writer.WritePacket(NewCallCancelPacket())
-	}
-	return nil
+	return c.writer.WritePacket(NewCallCancelPacket())
 }
 
 // closeLocked releases resources held by the RPC.
@@ -187,9 +179,7 @@ func (c *commonRPC) closeLocked(broadcast func()) {
 	if c.remoteErr == nil {
 		c.remoteErr = context.Canceled
 	}
-	if c.writer != nil {
-		_ = c.writer.Close()
-	}
+	_ = c.writer.Close()
 	broadcast()
 	c.ctxCancel()
 }

package/srpc/errors.go

@@ -19,4 +19,6 @@ var (
 	ErrEmptyServiceID = errors.New("service id empty")
 	// ErrNoAvailableClients is returned if no clients were available.
 	ErrNoAvailableClients = errors.New("no available rpc clients")
+	// ErrNilWriter is returned if the rpc writer is nil.
+	ErrNilWriter = errors.New("writer cannot be nil")
 )

package/srpc/server-rpc.go

@@ -88,6 +88,7 @@ func (r *ServerRPC) HandleCallStart(pkt *CallStart) error {
 
 // invokeRPC invokes the RPC after CallStart is received.
 func (r *ServerRPC) invokeRPC(serviceID, methodID string) {
+	// on the server side, the writer is closed by invokeRPC.
 	strm := NewMsgStream(r.ctx, r, r.ctxCancel)
 	ok, err := r.invoker.InvokeMethod(serviceID, methodID, strm)
 	if err == nil && !ok {