starpc 0.49.9 → 0.49.10

package/go.mod

@@ -5,7 +5,7 @@ go 1.25.0
 require (
 	github.com/aperturerobotics/common v0.33.0 // latest
 	github.com/aperturerobotics/protobuf-go-lite v0.13.0 // latest
-	github.com/aperturerobotics/util v1.34.3 // latest
+	github.com/aperturerobotics/util v1.34.5-0.20260516103104-cbfc6d6a0589 // latest
 )
 
 require (
@@ -29,5 +29,5 @@ require (
 	github.com/tetratelabs/wazero v1.11.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
 	golang.org/x/mod v0.35.0 // indirect
-	golang.org/x/sys v0.43.0 // indirect
+	golang.org/x/sys v0.44.0 // indirect
 )

package/go.sum

@@ -16,8 +16,10 @@ github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4 h1:4Dy3B
 github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4/go.mod h1:tMgO7y6SJo/d9ZcvrpNqIQtdYT9de+QmYaHOZ4KnhOg=
 github.com/aperturerobotics/protobuf-go-lite v0.13.0 h1:jEvCJhHaJEikDY/va2AUnS0DOb/0n82aISLAqxSh4Sk=
 github.com/aperturerobotics/protobuf-go-lite v0.13.0/go.mod h1:lGH3s5ArCTXKI4wJdlNpaybUtwSjfAG0vdWjxOfMcF8=
-github.com/aperturerobotics/util v1.34.3 h1:9lFYJovGlAHYX66aWKVzfoVzYox13P054d/Dy8T/GRg=
-github.com/aperturerobotics/util v1.34.3/go.mod h1:xtE2hwpgKGaW0TLx01+9xLsG+rYvhygQ+JCuQeAbvME=
+github.com/aperturerobotics/util v1.34.5-0.20260515183346-68f9eac1d69f h1:xISFLs00h441uZcMVxhZbLIZsMRcjOM5Yont18i7WjA=
+github.com/aperturerobotics/util v1.34.5-0.20260515183346-68f9eac1d69f/go.mod h1:mDe7WnncVuV7yjeeVSsagyfrw4xfncu7d+f0+d70niY=
+github.com/aperturerobotics/util v1.34.5-0.20260516103104-cbfc6d6a0589 h1:8B9O13He1sz8Spr2pc+RL3hBzAMveLgUCXT7BpAfvEY=
+github.com/aperturerobotics/util v1.34.5-0.20260516103104-cbfc6d6a0589/go.mod h1:mDe7WnncVuV7yjeeVSsagyfrw4xfncu7d+f0+d70niY=
 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=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
@@ -40,8 +42,8 @@ github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 h1:FnBeRrxr7OU4VvAz
 github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
 golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
-golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
-golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
+golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

package/package.json

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

package/srpc/common-rpc.go

@@ -146,15 +146,22 @@ func (c *commonRPC) WriteCallData(data []byte, dataIsZero, complete bool, err er
 
 // HandleStreamClose handles the incoming stream closing w/ optional error.
 func (c *commonRPC) HandleStreamClose(closeErr error) {
+	var writer PacketWriter
 	c.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {
+		if c.dataClosed {
+			return
+		}
 		if closeErr != nil && c.remoteErr == nil {
 			c.remoteErr = closeErr
 		}
 		c.dataClosed = true
 		c.ctxCancel()
-		_ = c.writer.Close()
+		writer = c.writer
 		broadcast()
 	})
+	if writer != nil {
+		_ = writer.Close()
+	}
 }
 
 // HandleCallCancel handles the call cancel packet.
@@ -210,6 +217,9 @@ func (c *commonRPC) WriteCallCancel() error {
 
 // closeLocked releases resources held by the RPC.
 func (c *commonRPC) closeLocked(broadcast func()) {
+	if c.dataClosed {
+		return
+	}
 	c.dataClosed = true
 	c.localCompleted.Store(true)
 	if c.remoteErr == nil {

package/srpc/common-rpc_test.go

@@ -0,0 +1,65 @@
+package srpc
+
+import (
+	"context"
+	"io"
+	"sync/atomic"
+	"testing"
+)
+
+type closeCountingPacketWriter struct {
+	closed atomic.Int32
+}
+
+type closeCallbackPacketWriter struct {
+	closeFn func()
+}
+
+func (w *closeCountingPacketWriter) WritePacket(*Packet) error {
+	return nil
+}
+
+func (w *closeCountingPacketWriter) Close() error {
+	w.closed.Add(1)
+	return nil
+}
+
+func (w *closeCallbackPacketWriter) WritePacket(*Packet) error {
+	return nil
+}
+
+func (w *closeCallbackPacketWriter) Close() error {
+	if w.closeFn != nil {
+		w.closeFn()
+	}
+	return nil
+}
+
+func TestCommonRPCHandleStreamCloseIdempotent(t *testing.T) {
+	writer := &closeCountingPacketWriter{}
+	rpc := NewServerRPC(context.Background(), InvokerFunc(nil), writer)
+
+	rpc.HandleStreamClose(io.EOF)
+	rpc.HandleStreamClose(context.Canceled)
+
+	if got := writer.closed.Load(); got != 1 {
+		t.Fatalf("expected writer closed once, got %d", got)
+	}
+}
+
+func TestCommonRPCHandleStreamCloseClosesWriterOutsideBroadcastLock(t *testing.T) {
+	var rpc *ServerRPC
+	writerClosedOutsideLock := false
+	writer := &closeCallbackPacketWriter{
+		closeFn: func() {
+			writerClosedOutsideLock = rpc.bcast.TryHoldLock(func(func(), func() <-chan struct{}) {})
+		},
+	}
+	rpc = NewServerRPC(context.Background(), InvokerFunc(nil), writer)
+
+	rpc.HandleStreamClose(io.EOF)
+
+	if !writerClosedOutsideLock {
+		t.Fatal("expected writer close outside broadcast lock")
+	}
+}

package/srpc/packet-rw.go

@@ -10,8 +10,31 @@ import (
 	"github.com/pkg/errors"
 )
 
-// maxMessageSize is the max message size in bytes
-const maxMessageSize = 10_000_000
+const (
+	// maxMessageSize is the max message size in bytes.
+	maxMessageSize = 10_000_000
+	// readBufferSize is the packet read scratch buffer size.
+	readBufferSize = 2048
+	// pooledWriteBufferMaxSize is the largest outbound frame buffer to pool.
+	pooledWriteBufferMaxSize = 64 * 1024
+)
+
+var (
+	readBufferPool = sync.Pool{
+		New: func() any {
+			return new([readBufferSize]byte)
+		},
+	}
+	writeBufferPool = sync.Pool{
+		New: func() any {
+			return new(writeBuffer)
+		},
+	}
+)
+
+type writeBuffer struct {
+	data []byte
+}
 
 // PacketReadWriter reads and writes packets from a io.ReadWriter.
 // Uses a LittleEndian uint32 length prefix.
@@ -46,7 +69,9 @@ func (r *PacketReadWriter) WritePacket(p *Packet) error {
 		return errors.Errorf("message size %v greater than maximum %v", msgSize, maxMessageSize)
 	}
 
-	data := make([]byte, 4+msgSize)
+	writeBuf := getWriteBuffer(4 + msgSize)
+	defer putWriteBuffer(writeBuf)
+	data := writeBuf.data
 	binary.LittleEndian.PutUint32(data, uint32(msgSize)) //nolint:gosec
 
 	_, err := p.MarshalToSizedBufferVT(data[4:])
@@ -56,10 +81,13 @@ func (r *PacketReadWriter) WritePacket(p *Packet) error {
 
 	var written, n int
 	for written < len(data) {
-		n, err = r.rw.Write(data)
+		n, err = r.rw.Write(data[written:])
 		if err != nil {
 			return err
 		}
+		if n == 0 {
+			return io.ErrShortWrite
+		}
 		written += n
 	}
 
@@ -81,7 +109,9 @@ func (r *PacketReadWriter) ReadPump(cb PacketDataHandler, closed CloseHandler) {
 // Does not handle closing the stream, use ReadPump instead.
 func (r *PacketReadWriter) ReadToHandler(cb PacketDataHandler) error {
 	var currLen uint32
-	buf := make([]byte, 2048)
+	bufPtr := readBufferPool.Get().(*[readBufferSize]byte)
+	defer readBufferPool.Put(bufPtr)
+	buf := bufPtr[:]
 	isOpen := true
 
 	for isOpen {
@@ -150,5 +180,25 @@ func (r *PacketReadWriter) readLengthPrefix(b []byte) uint32 {
 	return binary.LittleEndian.Uint32(b)
 }
 
+func getWriteBuffer(size int) *writeBuffer {
+	if size > pooledWriteBufferMaxSize {
+		return &writeBuffer{data: make([]byte, size)}
+	}
+	buf := writeBufferPool.Get().(*writeBuffer)
+	if cap(buf.data) < size {
+		buf.data = make([]byte, size)
+	}
+	buf.data = buf.data[:size]
+	return buf
+}
+
+func putWriteBuffer(buf *writeBuffer) {
+	if cap(buf.data) <= pooledWriteBufferMaxSize {
+		clear(buf.data)
+		buf.data = buf.data[:0]
+		writeBufferPool.Put(buf)
+	}
+}
+
 // _ is a type assertion
 var _ PacketWriter = (*PacketReadWriter)(nil)

package/srpc/packet-rw_test.go

@@ -0,0 +1,68 @@
+package srpc
+
+import (
+	"bytes"
+	"encoding/binary"
+	"io"
+	"testing"
+)
+
+type chunkedReadWriteCloser struct {
+	bytes.Buffer
+	maxWrite int
+}
+
+func (c *chunkedReadWriteCloser) Read([]byte) (int, error) {
+	return 0, io.EOF
+}
+
+func (c *chunkedReadWriteCloser) Write(p []byte) (int, error) {
+	if len(p) > c.maxWrite {
+		p = p[:c.maxWrite]
+	}
+	return c.Buffer.Write(p)
+}
+
+func (c *chunkedReadWriteCloser) Close() error {
+	return nil
+}
+
+func TestPacketReadWriterWritePacketHandlesShortWrites(t *testing.T) {
+	pkt := NewCallDataPacket([]byte("packet payload"), false, true, nil)
+	size := pkt.SizeVT()
+	want := make([]byte, 4+size)
+	binary.LittleEndian.PutUint32(want, uint32(size)) //nolint:gosec
+	if _, err := pkt.MarshalToSizedBufferVT(want[4:]); err != nil {
+		t.Fatal(err)
+	}
+
+	rwc := &chunkedReadWriteCloser{maxWrite: 3}
+	if err := NewPacketReadWriter(rwc).WritePacket(pkt); err != nil {
+		t.Fatal(err)
+	}
+	if got := rwc.Bytes(); !bytes.Equal(got, want) {
+		t.Fatalf("written packet mismatch:\ngot  %x\nwant %x", got, want)
+	}
+}
+
+func TestPacketUnmarshalCopiesByteFields(t *testing.T) {
+	want := []byte("stable data")
+	srcPkt := NewCallDataPacket(want, false, true, nil)
+	data, err := srcPkt.MarshalVT()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var pkt Packet
+	if err := pkt.UnmarshalVT(data); err != nil {
+		t.Fatal(err)
+	}
+	for i := range data {
+		data[i] = 0xff
+	}
+
+	got := pkt.GetCallData().GetData()
+	if !bytes.Equal(got, want) {
+		t.Fatalf("unmarshal retained source bytes: got %q want %q", got, want)
+	}
+}