starpc 0.48.0 → 0.49.1

package/echo/echo_srpc.pb.cpp

@@ -1,7 +1,7 @@
 //go:build deps_only
 
 // Code generated by protoc-gen-starpc-cpp. DO NOT EDIT.
-// protoc-gen-starpc-cpp version: v0.45.1-0.20260203090429-3e915608d4e8
+// protoc-gen-starpc-cpp version: v0.46.1
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 #include "echo_srpc.pb.hpp"

package/echo/echo_srpc.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-srpc. DO NOT EDIT.
-// protoc-gen-srpc version: v0.45.1-0.20260203090429-3e915608d4e8
+// protoc-gen-srpc version: v0.46.1
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 package echo

package/echo/echo_srpc.pb.hpp

@@ -1,7 +1,7 @@
 //go:build deps_only && cgo
 
 // Code generated by protoc-gen-starpc-cpp. DO NOT EDIT.
-// protoc-gen-starpc-cpp version: v0.45.1-0.20260203090429-3e915608d4e8
+// protoc-gen-starpc-cpp version: v0.46.1
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 #pragma once

package/echo/echo_srpc.pb.rs

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-starpc-rust. DO NOT EDIT.
-// protoc-gen-starpc-rust version: v0.45.1-0.20260203090429-3e915608d4e8
+// protoc-gen-starpc-rust version: v0.46.1
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 #[allow(unused_imports)]

package/go.mod

@@ -3,32 +3,32 @@ module github.com/aperturerobotics/starpc
 go 1.25
 
 require (
-	github.com/aperturerobotics/common v0.30.7 // latest
+	github.com/aperturerobotics/common v0.32.0 // latest
 	github.com/aperturerobotics/protobuf-go-lite v0.12.2 // latest
-	github.com/aperturerobotics/util v1.32.4 // latest
+	github.com/aperturerobotics/util v1.32.5 // latest
 )
 
 require (
 	github.com/aperturerobotics/abseil-cpp v0.0.0-20260131110040-4bb56e2f9017 // aperture-2
 	github.com/aperturerobotics/cli v1.1.0 // indirect
-	github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260131050911-b5f94b044584 // indirect
+	github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260219012250-c573f70e4509 // indirect
 	github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20251104042408-0c9eb8a3f726 // indirect
 	github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4 // wasi
 )
 
 require (
-	github.com/aperturerobotics/go-websocket v1.8.15-0.20260228104546-35e37959349c // master
+	github.com/aperturerobotics/go-websocket v1.8.15-0.20260228132212-c5f88237fdf8 // master
 	github.com/libp2p/go-yamux/v4 v4.0.2 // latest
 	github.com/pkg/errors v0.9.1 // latest
-	github.com/sirupsen/logrus v1.9.5-0.20260226151524-34027eac4204 // latest
+	github.com/sirupsen/logrus v1.9.5-0.20260309202648-9f0600962f75 // latest
 	google.golang.org/protobuf v1.36.11 // latest
 )
 
 require (
-	github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260204215916-dc1f0fed8cfc // indirect
+	github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260219012250-e75aa9f430a2 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
 	github.com/tetratelabs/wazero v1.11.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
 	golang.org/x/mod v0.33.0 // indirect
-	golang.org/x/sys v0.40.0 // indirect
+	golang.org/x/sys v0.41.0 // indirect
 )

package/go.sum

@@ -2,22 +2,22 @@ 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.30.7 h1:MfbgBHwRnCFPCWVXjKiqEBkFGpMf8Nk2pRsUiSuzxSc=
-github.com/aperturerobotics/common v0.30.7/go.mod h1:rdhYmixjslfBT0lEMADQHWjgRKIDxZ+8Paxv4lGZfp0=
-github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260204215916-dc1f0fed8cfc h1:MQKYvrnue6iT6DlQdGbaBYvyY/WuR63cbhUtRZjx4OM=
-github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260204215916-dc1f0fed8cfc/go.mod h1:OBb/beWmr/pDIZAUfi86j/4tBh2v5ctTxKMqSnh9c/4=
-github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260131050911-b5f94b044584 h1:ER8DYYL71cTg39uZ+Gi699tL/hZoscUWDOw4DbizqhI=
-github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260131050911-b5f94b044584/go.mod h1:vEq8i7EKb32+KXGtIEZjjhNns+BdsL2dUMw4uhy3578=
-github.com/aperturerobotics/go-websocket v1.8.15-0.20260228104546-35e37959349c h1:JATtwVM+rTNr0cwQhr9GtDRdi0EsLmfQ0dIT8SlhGMk=
-github.com/aperturerobotics/go-websocket v1.8.15-0.20260228104546-35e37959349c/go.mod h1:9KnSGuqxSXbdB/Oi0I6vvfPLkclfJwMGAQaDDGVgGow=
+github.com/aperturerobotics/common v0.32.0 h1:wKKKUMGs8HZC2exPGVNtj81zqW687mf/rhSbme45CFs=
+github.com/aperturerobotics/common v0.32.0/go.mod h1:m46OxaMDdhPjsWBSdIwkPPCmuFVMuJiRc8/DvC0wStM=
+github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260219012250-e75aa9f430a2 h1:DbLHhYu2wdFvwQ02KE3rxBE1vSc+ecMxLEyTwv8Ci00=
+github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260219012250-e75aa9f430a2/go.mod h1:OBb/beWmr/pDIZAUfi86j/4tBh2v5ctTxKMqSnh9c/4=
+github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260219012250-c573f70e4509 h1:2O8djle14ujtze1xQb9MVXAdEepumxhoBJPEdf+kNnA=
+github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260219012250-c573f70e4509/go.mod h1:vEq8i7EKb32+KXGtIEZjjhNns+BdsL2dUMw4uhy3578=
+github.com/aperturerobotics/go-websocket v1.8.15-0.20260228132212-c5f88237fdf8 h1:OWYqCKoDoPGXgkD1y465qb8L5odv3nGabeN9wF50GxU=
+github.com/aperturerobotics/go-websocket v1.8.15-0.20260228132212-c5f88237fdf8/go.mod h1:9KnSGuqxSXbdB/Oi0I6vvfPLkclfJwMGAQaDDGVgGow=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20251104042408-0c9eb8a3f726 h1:4B1F0DzuqPzb6WqgCjWaqDD7JU9RDsevQG5OP0DFBgs=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20251104042408-0c9eb8a3f726/go.mod h1:SvGGBv3OVxUyqO0ZxA/nvs6z3cg7NIbZ64TnbV2OISo=
 github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4 h1:4Dy3BAHh2kgVdHAqtlwcFsgY0kAwUe2m3rfFcaGwGQg=
 github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4/go.mod h1:tMgO7y6SJo/d9ZcvrpNqIQtdYT9de+QmYaHOZ4KnhOg=
 github.com/aperturerobotics/protobuf-go-lite v0.12.2 h1:ujwTKgpIYAVsv8VljB6PPMY5SI8i8m/NlIHAkkuxQcU=
 github.com/aperturerobotics/protobuf-go-lite v0.12.2/go.mod h1:lGH3s5ArCTXKI4wJdlNpaybUtwSjfAG0vdWjxOfMcF8=
-github.com/aperturerobotics/util v1.32.4 h1:+f4rZuGC0AfgvA6bEwxSiW3Px9awyqr/CB2ltHyX4a8=
-github.com/aperturerobotics/util v1.32.4/go.mod h1:qfRZZUDn0sEfc43JRA6rKP8bwFxliqGqJZX+p1jeOnQ=
+github.com/aperturerobotics/util v1.32.5 h1:5gr2Ft1rYGFA5yrSm3n18Ghu5Al2uyg7DTtljh1wLHI=
+github.com/aperturerobotics/util v1.32.5/go.mod h1:jXVTz1OQqM3VSrjy06qiCmJLaUm80NxVuKgweaRs5dg=
 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=
@@ -30,8 +30,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.9.5-0.20260226151524-34027eac4204 h1:YnveTg6h00DNa0rUaIImUk3icr3BIMedAbJparp1bVM=
-github.com/sirupsen/logrus v1.9.5-0.20260226151524-34027eac4204/go.mod h1:FXZFonkDAnFozmO+5hGAFvB0Yg9/j2SIhA/QuIkP180=
+github.com/sirupsen/logrus v1.9.5-0.20260309202648-9f0600962f75 h1:JeSpp4dH/b6DwynjIVL8YDlOSNrEtfhhPajrT3CUUTI=
+github.com/sirupsen/logrus v1.9.5-0.20260309202648-9f0600962f75/go.mod h1:FXZFonkDAnFozmO+5hGAFvB0Yg9/j2SIhA/QuIkP180=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/tetratelabs/wazero v1.11.0 h1:+gKemEuKCTevU4d7ZTzlsvgd1uaToIDtlQlmNbwqYhA=
@@ -40,8 +40,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.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
 golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
-golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
-golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 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/mock/mock_srpc.pb.cpp

@@ -1,7 +1,7 @@
 //go:build deps_only
 
 // Code generated by protoc-gen-starpc-cpp. DO NOT EDIT.
-// protoc-gen-starpc-cpp version: v0.45.1-0.20260203090429-3e915608d4e8
+// protoc-gen-starpc-cpp version: v0.46.1
 // source: github.com/aperturerobotics/starpc/mock/mock.proto
 
 #include "mock_srpc.pb.hpp"

package/mock/mock_srpc.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-srpc. DO NOT EDIT.
-// protoc-gen-srpc version: v0.45.1-0.20260203090429-3e915608d4e8
+// protoc-gen-srpc version: v0.46.1
 // source: github.com/aperturerobotics/starpc/mock/mock.proto
 
 package e2e_mock

package/mock/mock_srpc.pb.hpp

@@ -1,7 +1,7 @@
 //go:build deps_only && cgo
 
 // Code generated by protoc-gen-starpc-cpp. DO NOT EDIT.
-// protoc-gen-starpc-cpp version: v0.45.1-0.20260203090429-3e915608d4e8
+// protoc-gen-starpc-cpp version: v0.46.1
 // source: github.com/aperturerobotics/starpc/mock/mock.proto
 
 #pragma once

package/mock/mock_srpc.pb.rs

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-starpc-rust. DO NOT EDIT.
-// protoc-gen-starpc-rust version: v0.45.1-0.20260203090429-3e915608d4e8
+// protoc-gen-starpc-rust version: v0.46.1
 // source: github.com/aperturerobotics/starpc/mock/mock.proto
 
 #[allow(unused_imports)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.48.0",
+  "version": "0.49.1",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -96,9 +96,10 @@
     "precommit": "lint-staged",
     "release": "npm run release:version && npm run release:commit",
     "release:minor": "npm run release:version:minor && npm run release:commit",
-    "release:version": "npm version patch -m \"release: v%s\" --no-git-tag-version",
-    "release:version:minor": "npm version minor -m \"release: v%s\" --no-git-tag-version",
-    "release:commit": "git reset && git add package.json && git commit -s -m \"release: v$(node -p \"require('./package.json').version\")\" && git tag v$(node -p \"require('./package.json').version\")",
+    "release:version": "npm version patch -m \"release: v%s\" --no-git-tag-version && npm run release:sync-cargo",
+    "release:version:minor": "npm version minor -m \"release: v%s\" --no-git-tag-version && npm run release:sync-cargo",
+    "release:sync-cargo": "node -e \"const v=require('./package.json').version,f='Cargo.toml',c=require('fs').readFileSync(f,'utf8');require('fs').writeFileSync(f,c.replace(/^version = \\\".*?\\\"/m,'version = \\\"'+v+'\\\"'))\"",
+    "release:commit": "git reset && git add package.json Cargo.toml && git commit -s -m \"release: v$(node -p \"require('./package.json').version\")\" && git tag v$(node -p \"require('./package.json').version\")",
     "release:publish": "git push && git push --tags"
   },
   "preferUnplugged": true,
@@ -141,6 +142,6 @@
     "ws": "^8.18.1"
   },
   "resolutions": {
-    "@aptre/protobuf-es-lite": "1.0.1"
+    "@aptre/protobuf-es-lite": "1.0.2"
   }
 }

package/srpc/rwc-conn.go

@@ -12,27 +12,56 @@ import (
 // connPktSize is the size of the buffers to use for packets for the RwcConn.
 const connPktSize = 2048
 
-// RwcConn implements a Conn with a buffered ReadWriteCloser.
+// bufPool is a channel-based buffer pool with predictable reuse behavior.
+type bufPool struct {
+	ch   chan []byte
+	size int
+}
+
+func newBufPool(poolSize, bufSize int) *bufPool {
+	return &bufPool{
+		ch:   make(chan []byte, poolSize),
+		size: bufSize,
+	}
+}
+
+func (p *bufPool) get() []byte {
+	select {
+	case b := <-p.ch:
+		return b[:p.size]
+	default:
+		return make([]byte, p.size)
+	}
+}
+
+func (p *bufPool) put(b []byte) {
+	select {
+	case p.ch <- b:
+	default:
+	}
+}
+
+// RwcConn implements a net.Conn with a buffered ReadWriteCloser.
 type RwcConn struct {
-	// ctx is the context
-	ctx context.Context
-	// ctxCancel is the context canceler
+	ctx       context.Context
 	ctxCancel context.CancelFunc
-	// rwc is the read-write-closer
-	rwc io.ReadWriteCloser
-	// laddr is the local addr
-	laddr net.Addr
-	// raddr is the remote addr
-	raddr net.Addr
-
-	ar       sync.Pool   // packet arena
-	rd       time.Time   // read deadline
-	wd       time.Time   // write deadline
-	packetCh chan []byte // packet ch
+	rwc       io.ReadWriteCloser
+	laddr     net.Addr
+	raddr     net.Addr
+
+	pool     *bufPool
+	packetCh chan []byte
+
+	mu       sync.Mutex
+	rd       time.Time
+	wd       time.Time
 	closeErr error
+
+	pendingMu sync.Mutex
+	pending   []byte
 }
 
-// NewRwcConn constructs a new packet conn and starts the rx pump.
+// NewRwcConn constructs a new RwcConn and starts the rx pump.
 func NewRwcConn(
 	ctx context.Context,
 	rwc io.ReadWriteCloser,
@@ -50,11 +79,10 @@ func NewRwcConn(
 		rwc:       rwc,
 		laddr:     laddr,
 		raddr:     raddr,
+		pool:      newBufPool(bufferPacketN, connPktSize),
 		packetCh:  make(chan []byte, bufferPacketN),
 	}
-	go func() {
-		_ = c.rxPump()
-	}()
+	go c.rxPump()
 	return c
 }
 
@@ -68,54 +96,91 @@ func (p *RwcConn) RemoteAddr() net.Addr {
 	return p.raddr
 }
 
+// readDeadline returns the current read deadline under the mutex.
+func (p *RwcConn) readDeadline() time.Time {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	return p.rd
+}
+
+// getCloseErr returns the close error under the mutex.
+func (p *RwcConn) getCloseErr() error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	return p.closeErr
+}
+
+// setCloseErr stores the close error under the mutex.
+func (p *RwcConn) setCloseErr(err error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	p.closeErr = err
+}
+
 // Read reads data from the connection.
 // Read can be made to time out and return an error after a fixed
 // time limit; see SetDeadline and SetReadDeadline.
-func (p *RwcConn) Read(b []byte) (n int, err error) {
-	deadline := p.rd
+func (p *RwcConn) Read(b []byte) (int, error) {
+	// Drain pending data from a previous partial read first.
+	p.pendingMu.Lock()
+	if len(p.pending) > 0 {
+		n := copy(b, p.pending)
+		if n < len(p.pending) {
+			p.pending = p.pending[n:]
+		} else {
+			p.pending = nil
+		}
+		p.pendingMu.Unlock()
+		return n, nil
+	}
+	p.pendingMu.Unlock()
+
+	// Build a context with the read deadline if one is set.
 	ctx := p.ctx
+	deadline := p.readDeadline()
 	if !deadline.IsZero() {
-		var ctxCancel context.CancelFunc
-		ctx, ctxCancel = context.WithDeadline(ctx, deadline)
-		defer ctxCancel()
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithDeadline(ctx, deadline)
+		defer cancel()
 	}
 
-	var pkt []byte
-	var ok bool
 	select {
 	case <-ctx.Done():
 		if !deadline.IsZero() {
 			return 0, os.ErrDeadlineExceeded
 		}
 		return 0, context.Canceled
-	case pkt, ok = <-p.packetCh:
+	case pkt, ok := <-p.packetCh:
 		if !ok {
-			err = p.closeErr
+			err := p.getCloseErr()
 			if err == nil {
 				err = io.EOF
 			}
 			return 0, err
 		}
-	}
 
-	pl := len(pkt)
-	copy(b, pkt)
-	p.ar.Put(&pkt)
-	if len(b) < pl {
-		return len(b), io.ErrShortBuffer
+		n := copy(b, pkt)
+		if n < len(pkt) {
+			// Buffer the remaining bytes for the next Read call.
+			// Explicitly copy so the pool buffer is not aliased.
+			p.pendingMu.Lock()
+			p.pending = append(p.pending[:0], pkt[n:]...)
+			p.pendingMu.Unlock()
+		}
+		p.pool.put(pkt)
+		return n, nil
 	}
-	return pl, nil
 }
 
 // Write writes data to the connection.
-func (p *RwcConn) Write(pkt []byte) (n int, err error) {
+func (p *RwcConn) Write(pkt []byte) (int, error) {
 	if len(pkt) == 0 {
 		return 0, nil
 	}
 
 	written := 0
 	for written < len(pkt) {
-		n, err = p.rwc.Write(pkt[written:])
+		n, err := p.rwc.Write(pkt[written:])
 		written += n
 		if err != nil {
 			return written, err
@@ -124,106 +189,74 @@ func (p *RwcConn) Write(pkt []byte) (n int, err error) {
 	return written, nil
 }
 
-// SetDeadline sets the read and write deadlines associated
-// with the connection. It is equivalent to calling both
-// SetReadDeadline and SetWriteDeadline.
-//
-// A deadline is an absolute time after which I/O operations
-// fail instead of blocking. The deadline applies to all future
-// and pending I/O, not just the immediately following call to
-// Read or Write. After a deadline has been exceeded, the
-// connection can be refreshed by setting a deadline in the future.
-//
-// If the deadline is exceeded a call to Read or Write or to other
-// I/O methods will return an error that wraps os.ErrDeadlineExceeded.
-// This can be tested using errors.Is(err, os.ErrDeadlineExceeded).
-// The error's Timeout method will return true, but note that there
-// are other possible errors for which the Timeout method will
-// return true even if the deadline has not been exceeded.
-//
-// An idle timeout can be implemented by repeatedly extending
-// the deadline after successful ReadFrom or WriteTo calls.
+// SetDeadline sets the read and write deadlines associated with the
+// connection. It is equivalent to calling both SetReadDeadline and
+// SetWriteDeadline.
 //
 // A zero value for t means I/O operations will not time out.
 func (p *RwcConn) SetDeadline(t time.Time) error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
 	p.rd = t
 	p.wd = t
 	return nil
 }
 
-// SetReadDeadline sets the deadline for future ReadFrom calls
-// and any currently-blocked ReadFrom call.
-// A zero value for t means ReadFrom will not time out.
+// SetReadDeadline sets the deadline for future Read calls and any
+// currently-blocked Read call.
+// A zero value for t means Read will not time out.
 func (p *RwcConn) SetReadDeadline(t time.Time) error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
 	p.rd = t
 	return nil
 }
 
-// SetWriteDeadline sets the deadline for future WriteTo calls
-// and any currently-blocked WriteTo call.
-// Even if write times out, it may return n > 0, indicating that
-// some of the data was successfully written.
-// A zero value for t means WriteTo will not time out.
+// SetWriteDeadline sets the deadline for future Write calls and any
+// currently-blocked Write call.
+// A zero value for t means Write will not time out.
 func (p *RwcConn) SetWriteDeadline(t time.Time) error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
 	p.wd = t
 	return nil
 }
 
 // Close closes the connection.
-// Any blocked ReadFrom or WriteTo operations will be unblocked and return errors.
+// Any blocked Read or Write operations will be unblocked and return errors.
 func (p *RwcConn) Close() error {
+	p.ctxCancel()
 	return p.rwc.Close()
 }
 
-// getArenaBuf returns a buf from the packet arena with at least the given size
-func (p *RwcConn) getArenaBuf(size int) []byte {
-	var buf []byte
-	bufp := p.ar.Get()
-	if bufp != nil {
-		buf = *bufp.(*[]byte)
-	}
-	if size != 0 {
-		if cap(buf) < size {
-			buf = make([]byte, size)
-		} else {
-			buf = buf[:size]
-		}
-	} else {
-		buf = buf[:cap(buf)]
-	}
-	return buf
-}
-
 // rxPump receives messages from the underlying connection.
-func (p *RwcConn) rxPump() (rerr error) {
+func (p *RwcConn) rxPump() {
+	var rerr error
 	defer func() {
-		p.closeErr = rerr
+		p.setCloseErr(rerr)
 		close(p.packetCh)
 	}()
 
 	for {
-		select {
-		case <-p.ctx.Done():
-			return p.ctx.Err()
-		default:
-		}
-
-		pktBuf := p.getArenaBuf(int(connPktSize))
-		n, err := p.rwc.Read(pktBuf)
+		buf := p.pool.get()
+		n, err := p.rwc.Read(buf)
 		if n == 0 {
-			p.ar.Put(&pktBuf)
+			p.pool.put(buf)
 		} else {
 			select {
 			case <-p.ctx.Done():
-				return context.Canceled
-			case p.packetCh <- pktBuf[:n]:
+				p.pool.put(buf)
+				rerr = context.Canceled
+				return
+			case p.packetCh <- buf[:n]:
 			}
 		}
 		if err != nil {
-			return err
+			rerr = err
+			return
 		}
 	}
 }
 
 // _ is a type assertion
-var _ net.Conn = ((*RwcConn)(nil))
+var _ net.Conn = (*RwcConn)(nil)

package/srpc/rwc-conn_test.go

@@ -0,0 +1,51 @@
+package srpc
+
+import (
+	"bytes"
+	"context"
+	"io"
+	"testing"
+)
+
+// blockingRWC wraps a pipe for testing RwcConn.
+type blockingRWC struct {
+	r io.Reader
+	w io.Writer
+}
+
+func (b *blockingRWC) Read(p []byte) (int, error)  { return b.r.Read(p) }
+func (b *blockingRWC) Write(p []byte) (int, error) { return b.w.Write(p) }
+func (b *blockingRWC) Close() error                { return nil }
+
+// TestRwcConnReadBuffering verifies that RwcConn.Read does not drop data
+// when the caller's buffer is smaller than the received packet.
+func TestRwcConnReadBuffering(t *testing.T) {
+	pr, pw := io.Pipe()
+	rwc := &blockingRWC{r: pr, w: pw}
+
+	ctx, cancel := context.WithCancel(t.Context())
+	defer cancel()
+
+	conn := NewRwcConn(ctx, rwc, nil, nil, 10)
+
+	// Write a 100-byte message through the pipe.
+	msg := bytes.Repeat([]byte("abcdefghij"), 10) // 100 bytes
+	go func() {
+		_, _ = pw.Write(msg)
+	}()
+
+	// Read in small chunks (16 bytes at a time) to simulate bufio.Reader.
+	var got []byte
+	buf := make([]byte, 16)
+	for len(got) < len(msg) {
+		n, err := conn.Read(buf)
+		if err != nil {
+			t.Fatalf("Read error after %d bytes: %v", len(got), err)
+		}
+		got = append(got, buf[:n]...)
+	}
+
+	if !bytes.Equal(got, msg) {
+		t.Fatalf("data mismatch: got %d bytes, want %d bytes\ngot:  %q\nwant: %q", len(got), len(msg), got, msg)
+	}
+}

package/srpc/Cargo.toml

@@ -1,25 +0,0 @@
-[package]
-name = "starpc"
-version.workspace = true
-edition.workspace = true
-rust-version.workspace = true
-license.workspace = true
-repository.workspace = true
-description.workspace = true
-keywords.workspace = true
-categories.workspace = true
-
-[lib]
-path = "lib.rs"
-
-[dependencies]
-prost = { workspace = true }
-bytes = { workspace = true }
-tokio = { workspace = true }
-tokio-util = { workspace = true }
-futures = { workspace = true }
-thiserror = { workspace = true }
-async-trait = { workspace = true }
-pin-project-lite = { workspace = true }
-scopeguard = { workspace = true }
-