starpc 0.27.0 → 0.27.2

package/go.mod

@@ -9,7 +9,7 @@ require (
 )
 
 require (
-	github.com/aperturerobotics/util v1.13.8 // latest
+	github.com/aperturerobotics/util v1.14.3 // latest
 	github.com/libp2p/go-libp2p v0.33.0 // latest
 	github.com/libp2p/go-yamux/v4 v4.0.2-0.20240206065824-7222fbc3459d // master
 	github.com/sirupsen/logrus v1.9.3 // latest
@@ -34,7 +34,7 @@ require (
 	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	golang.org/x/crypto v0.19.0 // indirect
-	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
+	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/sys v0.17.0 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 )

package/go.sum

@@ -1,5 +1,7 @@
-github.com/aperturerobotics/util v1.13.8 h1:hpBfvD+afJg4Ox4iXpCRA+0LsOyftmV6/mAVU0uiG2w=
-github.com/aperturerobotics/util v1.13.8/go.mod h1:8AfpGb9RJqUItLBb5ec3sprpl9swYyHlgOw0HzkE+S8=
+github.com/aperturerobotics/util v1.14.2 h1:AghqzGgZoufsdQstY6cCssHHMB/uCv8+BjysAE55S98=
+github.com/aperturerobotics/util v1.14.2/go.mod h1:1+G2THhT7VCmR7xeRlqDnyEtRFvONWoPft19xTHvbyk=
+github.com/aperturerobotics/util v1.14.3 h1:tn8eET9vlFwnveFY+rt4VbbMertQW8dcd+V5fK7SyHo=
+github.com/aperturerobotics/util v1.14.3/go.mod h1:1+G2THhT7VCmR7xeRlqDnyEtRFvONWoPft19xTHvbyk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -57,8 +59,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
-golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
+golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
+golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=

package/package.json

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

package/srpc/client-prefix.go

@@ -54,12 +54,5 @@ func (i *PrefixClient) stripCheckServiceIDPrefix(service string) (string, error)
 	return service, nil
 }
 
-// NewRawStream opens a new raw stream with the remote.
-// Implements OpenStreamFunc.
-// msgHandler must not be called concurrently.
-func (i *PrefixClient) NewRawStream(ctx context.Context, msgHandler PacketDataHandler, closeHandler CloseHandler) (PacketWriter, error) {
-	return i.client.NewRawStream(ctx, msgHandler, closeHandler)
-}
-
 // _ is a type assertion
 var _ Client = ((*PrefixClient)(nil))

package/srpc/client-set.go

@@ -41,23 +41,6 @@ func (c *ClientSet) NewStream(
 	return strm, err
 }
 
-// NewRawStream opens a new raw stream with the remote.
-// Implements OpenStreamFunc.
-// msgHandler must not be called concurrently.
-func (c *ClientSet) NewRawStream(
-	ctx context.Context,
-	msgHandler PacketDataHandler,
-	closeHandler CloseHandler,
-) (PacketWriter, error) {
-	for _, client := range c.clients {
-		if client == nil {
-			continue
-		}
-		return client.NewRawStream(ctx, msgHandler, closeHandler)
-	}
-	return nil, ErrNoAvailableClients
-}
-
 // execCall executes the call conditionally retrying against subsequent client handles.
 func (c *ClientSet) execCall(ctx context.Context, doCall func(client Client) error) error {
 	var any bool

package/srpc/client-verbose.go

@@ -61,21 +61,3 @@ func (c *VClient) NewStream(ctx context.Context, service, method string, firstMs
 	stream, err = c.client.NewStream(ctx, service, method, firstMsg)
 	return stream, err
 }
-
-// NewRawStream opens a new raw stream with the remote.
-// Implements OpenStreamFunc.
-// msgHandler must not be called concurrently.
-func (c *VClient) NewRawStream(ctx context.Context, msgHandler PacketDataHandler, closeHandler CloseHandler) (writer PacketWriter, err error) {
-	t1 := time.Now()
-
-	defer func() {
-		c.le.Debugf(
-			"NewRawStream() => dur(%v) writer(%v) err(%v)",
-			time.Since(t1).String(),
-			writer,
-			err,
-		)
-	}()
-	writer, err = c.client.NewRawStream(ctx, msgHandler, closeHandler)
-	return writer, err
-}

package/srpc/client.go

@@ -14,11 +14,6 @@ type Client interface {
 	// NewStream starts a streaming RPC with the remote & returns the stream.
 	// firstMsg is optional.
 	NewStream(ctx context.Context, service, method string, firstMsg Message) (Stream, error)
-
-	// NewRawStream opens a new raw stream with the remote.
-	// Implements OpenStreamFunc.
-	// msgHandler must not be called concurrently.
-	NewRawStream(ctx context.Context, msgHandler PacketDataHandler, closeHandler CloseHandler) (PacketWriter, error)
 }
 
 // OpenStreamFunc opens a stream with a remote.
@@ -95,16 +90,5 @@ func (c *client) NewStream(ctx context.Context, service, method string, firstMsg
 	return NewMsgStream(ctx, clientRPC, clientRPC.ctxCancel), nil
 }
 
-// NewRawStream opens a new raw stream with the remote.
-// Implements OpenStreamFunc.
-// msgHandler must not be called concurrently.
-func (c *client) NewRawStream(
-	ctx context.Context,
-	msgHandler PacketDataHandler,
-	closeHandler CloseHandler,
-) (PacketWriter, error) {
-	return c.openStream(ctx, msgHandler, closeHandler)
-}
-
 // _ is a type assertion
 var _ Client = ((*client)(nil))

package/srpc/stream.go

@@ -47,3 +47,27 @@ type StreamSendAndClose[T any] interface {
 	StreamSend[T]
 	SendAndClose(T) error
 }
+
+// streamWithClose is a Stream with a wrapped Close function.
+type streamWithClose struct {
+	Stream
+	closeFn func() error
+}
+
+// NewStreamWithClose wraps a Stream with a close function to call when Close is called.
+func NewStreamWithClose(strm Stream, close func() error) Stream {
+	return &streamWithClose{Stream: strm, closeFn: close}
+}
+
+// Close closes the stream for reading and writing.
+func (s *streamWithClose) Close() error {
+	err := s.Stream.Close()
+	err2 := s.closeFn()
+	if err != nil {
+		return err
+	}
+	return err2
+}
+
+// _ is a type assertion
+var _ Stream = (*streamWithClose)(nil)

package/srpc/writer.go

@@ -7,3 +7,27 @@ type PacketWriter interface {
 	// Close closes the writer.
 	Close() error
 }
+
+// packetWriterWithClose is a PacketWriter with a wrapped Close function.
+type packetWriterWithClose struct {
+	PacketWriter
+	closeFn func() error
+}
+
+// NewPacketWriterWithClose wraps a PacketWriter with a close function to call when Close is called.
+func NewPacketWriterWithClose(prw PacketWriter, close func() error) PacketWriter {
+	return &packetWriterWithClose{PacketWriter: prw, closeFn: close}
+}
+
+// Close closes the stream for reading and writing.
+func (s *packetWriterWithClose) Close() error {
+	err := s.PacketWriter.Close()
+	err2 := s.closeFn()
+	if err != nil {
+		return err
+	}
+	return err2
+}
+
+// _ is a type assertion
+var _ PacketWriter = (*packetWriterWithClose)(nil)