starpc 0.49.10 → 0.49.11

package/go.mod

@@ -3,9 +3,9 @@ module github.com/aperturerobotics/starpc
 go 1.25.0
 
 require (
-	github.com/aperturerobotics/common v0.33.0 // latest
+	github.com/aperturerobotics/common v0.33.1-0.20260516193515-675cfc5a0c12 // latest
 	github.com/aperturerobotics/protobuf-go-lite v0.13.0 // latest
-	github.com/aperturerobotics/util v1.34.5-0.20260516103104-cbfc6d6a0589 // latest
+	github.com/aperturerobotics/util v1.34.5 // latest
 )
 
 require (

package/go.sum

@@ -2,8 +2,8 @@ github.com/aperturerobotics/abseil-cpp v0.0.0-20260131110040-4bb56e2f9017 h1:3U7
 github.com/aperturerobotics/abseil-cpp v0.0.0-20260131110040-4bb56e2f9017/go.mod h1:lNSJTKECIUFAnfeSqy01kXYTYe1BHubW7198jNX3nEw=
 github.com/aperturerobotics/cli v1.1.0 h1:7a+YRC+EY3npAnTzhHV5gLCiw91KS0Ts3XwLILGOsT8=
 github.com/aperturerobotics/cli v1.1.0/go.mod h1:M7BFP9wow5ytTzMyJQOOO991fGfsUqdTI7gGEsHfTQ8=
-github.com/aperturerobotics/common v0.33.0 h1:IheETbaQPmvUpkm6Z+/1jbuAQOXZF5REnRRMXTaIeVk=
-github.com/aperturerobotics/common v0.33.0/go.mod h1:xabIJydWovkzjs5YZD8ru/BgFTAXekgHwV8DrTl3R2w=
+github.com/aperturerobotics/common v0.33.1-0.20260516193515-675cfc5a0c12 h1:KQiFEDyu5//G8JZ3yTN92kF2P3F+LHjSKsQikgROncU=
+github.com/aperturerobotics/common v0.33.1-0.20260516193515-675cfc5a0c12/go.mod h1:pW7BhBpKzVrTxN8XIz6jb3MJERZ15GDxaGQ7jcIl0Xg=
 github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260329113538-218ccd8f20e0 h1:6/3RSSlPEQ6LeidslB1ZCJkxW+MnfYDkvdWMDklDXw4=
 github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260329113538-218ccd8f20e0/go.mod h1:OBb/beWmr/pDIZAUfi86j/4tBh2v5ctTxKMqSnh9c/4=
 github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260329113540-600516012db3 h1:lp+V8RYcBwTX1p81swkpZn5fhw1wn2xLorzETIxRyZQ=
@@ -16,10 +16,8 @@ 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.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/aperturerobotics/util v1.34.5 h1:007MaOJrrsiGm5o1c8Tt7p8nVwUAxkM6pmGflrBww/U=
+github.com/aperturerobotics/util v1.34.5/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=

package/package.json

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

package/srpc/client-rpc.go

@@ -38,22 +38,22 @@ func (r *ClientRPC) Start(writer PacketWriter, writeFirstMsg bool, firstMsg []by
 
 	var firstMsgEmpty bool
 	var err error
-	r.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {
-		r.writer = writer
+	locked := r.bcast.Lock()
+	r.writer = writer
 
-		if writeFirstMsg {
-			firstMsgEmpty = len(firstMsg) == 0
-		}
+	if writeFirstMsg {
+		firstMsgEmpty = len(firstMsg) == 0
+	}
 
-		pkt := NewCallStartPacket(r.service, r.method, firstMsg, firstMsgEmpty)
-		err = writer.WritePacket(pkt)
-		if err != nil {
-			r.ctxCancel()
-			_ = writer.Close()
-		}
+	pkt := NewCallStartPacket(r.service, r.method, firstMsg, firstMsgEmpty)
+	err = writer.WritePacket(pkt)
+	if err != nil {
+		r.ctxCancel()
+		_ = writer.Close()
+	}
 
-		broadcast()
-	})
+	locked.Broadcast()
+	locked.Unlock()
 
 	return err
 }
@@ -69,14 +69,14 @@ func (r *ClientRPC) HandlePacketData(data []byte) error {
 
 // HandleStreamClose handles the stream closing optionally w/ an error.
 func (r *ClientRPC) HandleStreamClose(closeErr error) {
-	r.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {
-		if closeErr != nil && r.remoteErr == nil {
-			r.remoteErr = closeErr
-		}
-		r.dataClosed = true
-		r.ctxCancel()
-		broadcast()
-	})
+	locked := r.bcast.Lock()
+	if closeErr != nil && r.remoteErr == nil {
+		r.remoteErr = closeErr
+	}
+	r.dataClosed = true
+	r.ctxCancel()
+	locked.Broadcast()
+	locked.Unlock()
 }
 
 // HandlePacket handles an incoming parsed message packet.
@@ -108,11 +108,11 @@ func (r *ClientRPC) HandleCallStart(pkt *CallStart) error {
 
 // Close releases any resources held by the ClientRPC.
 func (r *ClientRPC) Close() {
-	r.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {
-		// call did not start yet if writer is nil.
-		if r.writer != nil {
-			_ = r.WriteCallCancel()
-			r.closeLocked(broadcast)
-		}
-	})
+	locked := r.bcast.Lock()
+	// call did not start yet if writer is nil.
+	if r.writer != nil {
+		_ = r.WriteCallCancel()
+		r.closeLocked(&locked)
+	}
+	locked.Unlock()
 }

package/srpc/common-rpc.go

@@ -52,10 +52,12 @@ func (c *commonRPC) Wait(ctx context.Context) error {
 		var err error
 		var waitCh <-chan struct{}
 		var rpcCtx context.Context
-		c.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {
-			rpcCtx, err = c.ctx, c.remoteErr
-			waitCh = getWaitCh()
-		})
+		locked := c.bcast.Lock()
+		rpcCtx, err = c.ctx, c.remoteErr
+		if err == nil && rpcCtx.Err() == nil {
+			waitCh = locked.WaitCh()
+		}
+		locked.Unlock()
 
 		if err != nil {
 			return err
@@ -78,43 +80,37 @@ func (c *commonRPC) Wait(ctx context.Context) error {
 //
 // returns io.EOF if the stream ended without a packet.
 func (c *commonRPC) ReadOne() ([]byte, error) {
-	var hasMsg bool
-	var msg []byte
-	var err error
 	var ctxDone bool
 	for {
 		var waitCh <-chan struct{}
-		c.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {
-			if ctxDone && !c.dataClosed {
-				// context must have been canceled locally
-				c.closeLocked(broadcast)
-				err = context.Canceled
-				return
-			}
-
-			if len(c.dataQueue) != 0 {
-				msg = c.dataQueue[0]
-				hasMsg = true
-				c.dataQueue[0] = nil
-				c.dataQueue = c.dataQueue[1:]
-			} else if c.dataClosed || c.remoteErr != nil {
-				err = c.remoteErr
-				if err == nil {
-					err = io.EOF
-				}
-			}
-
-			waitCh = getWaitCh()
-		})
+		locked := c.bcast.Lock()
+		if ctxDone && !c.dataClosed {
+			// context must have been canceled locally
+			c.closeLocked(&locked)
+			locked.Unlock()
+			return nil, context.Canceled
+		}
 
-		if hasMsg {
+		if len(c.dataQueue) != 0 {
+			msg := c.dataQueue[0]
+			c.dataQueue[0] = nil
+			c.dataQueue = c.dataQueue[1:]
+			locked.Unlock()
 			return msg, nil
 		}
 
-		if err != nil {
+		if c.dataClosed || c.remoteErr != nil {
+			err := c.remoteErr
+			if err == nil {
+				err = io.EOF
+			}
+			locked.Unlock()
 			return nil, err
 		}
 
+		waitCh = locked.WaitCh()
+		locked.Unlock()
+
 		select {
 		case <-c.ctx.Done():
 			ctxDone = true
@@ -147,18 +143,19 @@ 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()
-		writer = c.writer
-		broadcast()
-	})
+	locked := c.bcast.Lock()
+	if c.dataClosed {
+		locked.Unlock()
+		return
+	}
+	if closeErr != nil && c.remoteErr == nil {
+		c.remoteErr = closeErr
+	}
+	c.dataClosed = true
+	c.ctxCancel()
+	writer = c.writer
+	locked.Broadcast()
+	locked.Unlock()
 	if writer != nil {
 		_ = writer.Close()
 	}
@@ -173,34 +170,33 @@ func (c *commonRPC) HandleCallCancel() error {
 // HandleCallData handles the call data packet.
 func (c *commonRPC) HandleCallData(pkt *CallData) error {
 	var err error
-	c.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {
-		if c.dataClosed {
-			// If the packet is just indicating the call is complete, ignore it.
-			if pkt.GetComplete() {
-				return
-			}
-
+	locked := c.bcast.Lock()
+	if c.dataClosed {
+		// If the packet is just indicating the call is complete, ignore it.
+		if !pkt.GetComplete() {
 			// Otherwise, return ErrCompleted (unexpected packet).
 			err = ErrCompleted
-			return
 		}
+		locked.Unlock()
+		return err
+	}
 
-		if data := pkt.GetData(); len(data) != 0 || pkt.GetDataIsZero() {
-			c.dataQueue = append(c.dataQueue, data)
-		}
+	if data := pkt.GetData(); len(data) != 0 || pkt.GetDataIsZero() {
+		c.dataQueue = append(c.dataQueue, data)
+	}
 
-		complete := pkt.GetComplete()
-		if err := pkt.GetError(); len(err) != 0 {
-			complete = true
-			c.remoteErr = errors.New(err)
-		}
+	complete := pkt.GetComplete()
+	if pktErr := pkt.GetError(); len(pktErr) != 0 {
+		complete = true
+		c.remoteErr = errors.New(pktErr)
+	}
 
-		if complete {
-			c.dataClosed = true
-		}
+	if complete {
+		c.dataClosed = true
+	}
 
-		broadcast()
-	})
+	locked.Broadcast()
+	locked.Unlock()
 
 	return err
 }
@@ -216,7 +212,7 @@ func (c *commonRPC) WriteCallCancel() error {
 }
 
 // closeLocked releases resources held by the RPC.
-func (c *commonRPC) closeLocked(broadcast func()) {
+func (c *commonRPC) closeLocked(locked *broadcast.Locked) {
 	if c.dataClosed {
 		return
 	}
@@ -226,6 +222,6 @@ func (c *commonRPC) closeLocked(broadcast func()) {
 		c.remoteErr = context.Canceled
 	}
 	_ = c.writer.Close()
-	broadcast()
+	locked.Broadcast()
 	c.ctxCancel()
 }

package/srpc/common-rpc_test.go

@@ -1,6 +1,7 @@
 package srpc
 
 import (
+	"bytes"
 	"context"
 	"io"
 	"sync/atomic"
@@ -52,7 +53,11 @@ func TestCommonRPCHandleStreamCloseClosesWriterOutsideBroadcastLock(t *testing.T
 	writerClosedOutsideLock := false
 	writer := &closeCallbackPacketWriter{
 		closeFn: func() {
-			writerClosedOutsideLock = rpc.bcast.TryHoldLock(func(func(), func() <-chan struct{}) {})
+			locked, ok := rpc.bcast.TryLock()
+			if ok {
+				locked.Unlock()
+			}
+			writerClosedOutsideLock = ok
 		},
 	}
 	rpc = NewServerRPC(context.Background(), InvokerFunc(nil), writer)
@@ -63,3 +68,26 @@ func TestCommonRPCHandleStreamCloseClosesWriterOutsideBroadcastLock(t *testing.T
 		t.Fatal("expected writer close outside broadcast lock")
 	}
 }
+
+func TestCommonRPCReadOneQueuedDoesNotAllocate(t *testing.T) {
+	msg := []byte("message")
+	queue := make([][]byte, 1)
+	rpc := NewServerRPC(context.Background(), InvokerFunc(nil), &closeCountingPacketWriter{})
+
+	allocs := testing.AllocsPerRun(1000, func() {
+		queue[0] = msg
+		rpc.dataQueue = queue
+
+		got, err := rpc.ReadOne()
+		if err != nil {
+			t.Fatalf("read one: %v", err)
+		}
+		if !bytes.Equal(got, msg) {
+			t.Fatalf("expected %q, got %q", msg, got)
+		}
+	})
+
+	if allocs != 0 {
+		t.Fatalf("expected queued ReadOne to avoid allocations, got %f", allocs)
+	}
+}

package/srpc/server-rpc.go

@@ -59,29 +59,31 @@ func (r *ServerRPC) HandlePacket(msg *Packet) error {
 func (r *ServerRPC) HandleCallStart(pkt *CallStart) error {
 	var err error
 
-	r.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {
-		// process start: method and service
-		if r.method != "" || r.service != "" {
-			err = errors.New("call start must be sent only once")
-			return
-		}
-		if r.dataClosed {
-			err = ErrCompleted
-			return
-		}
+	locked := r.bcast.Lock()
+	// process start: method and service
+	if r.method != "" || r.service != "" {
+		err = errors.New("call start must be sent only once")
+		locked.Unlock()
+		return err
+	}
+	if r.dataClosed {
+		err = ErrCompleted
+		locked.Unlock()
+		return err
+	}
 
-		service, method := pkt.GetRpcService(), pkt.GetRpcMethod()
-		r.service, r.method = service, method
+	service, method := pkt.GetRpcService(), pkt.GetRpcMethod()
+	r.service, r.method = service, method
 
-		// process first data packet, if included
-		if data := pkt.GetData(); len(data) != 0 || pkt.GetDataIsZero() {
-			r.dataQueue = append(r.dataQueue, data)
-		}
+	// process first data packet, if included
+	if data := pkt.GetData(); len(data) != 0 || pkt.GetDataIsZero() {
+		r.dataQueue = append(r.dataQueue, data)
+	}
 
-		// invoke the rpc
-		broadcast()
-		go r.invokeRPC(service, method)
-	})
+	// invoke the rpc
+	locked.Broadcast()
+	go r.invokeRPC(service, method)
+	locked.Unlock()
 
 	return err
 }