starpc 0.33.3 → 0.33.5

package/package.json

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

package/srpc/client-rpc.go

@@ -110,6 +110,5 @@ func (r *ClientRPC) Close() {
 
 	r.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {
 		r.closeLocked(broadcast)
-		broadcast()
 	})
 }

package/srpc/common-rpc.go

@@ -69,14 +69,13 @@ 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 msg *[]byte
+	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{}) {
-			waitCh = getWaitCh()
-
 			if ctxDone && !c.dataClosed {
 				// context must have been canceled locally
 				c.closeLocked(broadcast)
@@ -85,26 +84,26 @@ func (c *commonRPC) ReadOne() ([]byte, error) {
 			}
 
 			if len(c.dataQueue) != 0 {
-				msgb := c.dataQueue[0]
-				msg = &msgb
+				msg = c.dataQueue[0]
+				hasMsg = true
 				c.dataQueue[0] = nil
 				c.dataQueue = c.dataQueue[1:]
-			}
-
-			if c.dataClosed || c.remoteErr != nil {
+			} else if c.dataClosed || c.remoteErr != nil {
 				err = c.remoteErr
 				if err == nil {
 					err = io.EOF
 				}
 			}
+
+			waitCh = getWaitCh()
 		})
 
-		if err != nil {
-			return nil, err
+		if hasMsg {
+			return msg, nil
 		}
 
-		if msg != nil {
-			return *msg, nil
+		if err != nil {
+			return nil, err
 		}
 
 		select {