starpc 0.46.2 → 0.47.1

package/dist/echo/client-test.js

@@ -48,7 +48,7 @@ export async function runAbortControllerTest(client) {
             const errMsg = err.message;
             errorReturned = true;
             if (errMsg !== ERR_RPC_ABORT) {
-                throw new Error('unexpected error: ' + errMsg);
+                throw new Error('unexpected error: ' + errMsg, { cause: err });
             }
         }
         if (!errorReturned) {
@@ -69,7 +69,9 @@ export async function runAbortControllerTest(client) {
         }
         catch (err) {
             if (msgs.length < 3) {
-                throw new Error('expected at least three messages before error');
+                throw new Error('expected at least three messages before error', {
+                    cause: err,
+                });
             }
             throw err;
         }

package/echo/client-test.ts

@@ -58,7 +58,7 @@ export async function runAbortControllerTest(client: Client) {
       const errMsg = (err as Error).message
       errorReturned = true
       if (errMsg !== ERR_RPC_ABORT) {
-        throw new Error('unexpected error: ' + errMsg)
+        throw new Error('unexpected error: ' + errMsg, { cause: err })
       }
     }
     if (!errorReturned) {
@@ -80,7 +80,9 @@ export async function runAbortControllerTest(client: Client) {
       }
     } catch (err) {
       if (msgs.length < 3) {
-        throw new Error('expected at least three messages before error')
+        throw new Error('expected at least three messages before error', {
+          cause: err,
+        })
       }
       throw err
     }

package/echo/server.go

@@ -37,7 +37,7 @@ func (*EchoServer) EchoServerStream(msg *EchoMsg, strm SRPCEchoer_EchoServerStre
 	responses := 5
 	tkr := time.NewTicker(time.Millisecond * 200)
 	defer tkr.Stop()
-	for i := 0; i < responses; i++ {
+	for range responses {
 		if err := strm.MsgSend(msg); err != nil {
 			return err
 		}

package/go.mod

@@ -2,23 +2,22 @@ module github.com/aperturerobotics/starpc
 
 go 1.25
 
-replace (
-	// This fork uses go-protobuf-lite and adds post-quantum crypto support.
-	github.com/libp2p/go-libp2p => github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0 // aperture
-
-	// This fork uses go-protobuf-lite.
-	github.com/libp2p/go-msgio => github.com/aperturerobotics/go-libp2p-msgio v0.0.0-20240511033615-1b69178aa5c8 // aperture
+require (
+	github.com/aperturerobotics/common v0.30.7 // latest
+	github.com/aperturerobotics/protobuf-go-lite v0.12.2 // latest
+	github.com/aperturerobotics/util v1.32.4 // latest
 )
 
 require (
-	github.com/aperturerobotics/common v0.30.1-0.20260203095300-e0754eb22a37 // latest
-	github.com/aperturerobotics/protobuf-go-lite v0.12.1 // latest
-	github.com/aperturerobotics/util v1.32.3 // latest
+	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/json-iterator-lite v1.0.1-0.20251104042408-0c9eb8a3f726 // indirect
+	github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4 // wasi
 )
 
 require (
 	github.com/coder/websocket v1.8.14 // latest
-	github.com/libp2p/go-libp2p v0.47.0 // latest
 	github.com/libp2p/go-yamux/v4 v4.0.2 // latest
 	github.com/pkg/errors v0.9.1 // latest
 	github.com/sirupsen/logrus v1.9.4 // latest
@@ -26,33 +25,10 @@ require (
 )
 
 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/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-protoc-gen-prost v0.0.0-20260203094828-3faf47d2c868 // indirect
-	github.com/ipfs/go-cid v0.4.1 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260204215916-dc1f0fed8cfc // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/minio/sha256-simd v1.0.1 // indirect
-	github.com/mr-tron/base58 v1.2.0 // indirect
-	github.com/multiformats/go-base32 v0.1.0 // indirect
-	github.com/multiformats/go-base36 v0.2.0 // indirect
-	github.com/multiformats/go-multiaddr v0.13.0 // indirect
-	github.com/multiformats/go-multibase v0.2.0 // indirect
-	github.com/multiformats/go-multihash v0.2.3 // indirect
-	github.com/multiformats/go-multistream v0.5.0 // indirect
-	github.com/multiformats/go-varint v0.0.7 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/tetratelabs/wazero v1.11.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
-	golang.org/x/mod v0.32.0 // indirect
+	golang.org/x/mod v0.33.0 // indirect
 	golang.org/x/sys v0.40.0 // indirect
-	lukechampine.com/blake3 v1.3.0 // indirect
 )

package/go.sum

@@ -2,82 +2,47 @@ 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.1-0.20260203095300-e0754eb22a37 h1:ia/PiOkGovJUA2Evo3Qjn6mARVbpeACO5ENs5EKH3aQ=
-github.com/aperturerobotics/common v0.30.1-0.20260203095300-e0754eb22a37/go.mod h1:o3LkfVkdyNtWz31nGkCKuMP7H2dxarmYCYgXmy1zjtg=
-github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0 h1:tGwbeDoEeQCrUQL+ClUywldqvz9eRmhcVrGwGxz2xJg=
-github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0/go.mod h1:FJkAtQcP9XxqG1NNLNHKm+wLVIGSCQX2s6CEoD+w97g=
-github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260203094828-3faf47d2c868 h1:r2j7F1tGHkchPBLL55e44g/DfYqK2JV0Ed8suMAxmlU=
-github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260203094828-3faf47d2c868/go.mod h1:OBb/beWmr/pDIZAUfi86j/4tBh2v5ctTxKMqSnh9c/4=
+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/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.1 h1:o9of87F/LFS2p5xfq32CrU99dvfqIAalTP7ZzoZK6Kg=
-github.com/aperturerobotics/protobuf-go-lite v0.12.1/go.mod h1:lGH3s5ArCTXKI4wJdlNpaybUtwSjfAG0vdWjxOfMcF8=
-github.com/aperturerobotics/util v1.32.3 h1:wBc6L2guYMgLEzFwORH3CLMoMpfEqbV6pDqYervo3S0=
-github.com/aperturerobotics/util v1.32.3/go.mod h1:qfRZZUDn0sEfc43JRA6rKP8bwFxliqGqJZX+p1jeOnQ=
+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/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g=
 github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
 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=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
-github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk=
-github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
-github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
-github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
-github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg=
 github.com/libp2p/go-yamux/v4 v4.0.2 h1:nrLh89LN/LEiqcFiqdKDRHjGstN300C1269K/EX0CPU=
 github.com/libp2p/go-yamux/v4 v4.0.2/go.mod h1:C808cCRgOs1iBwY4S71T5oxgMxgLmqUw56qh4AeBW2o=
-github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
-github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
-github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
-github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
-github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE=
-github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI=
-github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0=
-github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4=
-github.com/multiformats/go-multiaddr v0.13.0 h1:BCBzs61E3AGHcYYTv8dqRH43ZfyrqM8RXVPT8t13tLQ=
-github.com/multiformats/go-multiaddr v0.13.0/go.mod h1:sBXrNzucqkFJhvKOiwwLyqamGa/P5EIXNPLovyhQCII=
-github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g=
-github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk=
-github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U=
-github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM=
-github.com/multiformats/go-multistream v0.5.0 h1:5htLSLl7lvJk3xx3qT/8Zm9J4K8vEOf/QGkvOGQAyiE=
-github.com/multiformats/go-multistream v0.5.0/go.mod h1:n6tMZiwiP2wUsR8DgfDWw1dydlEqV3l6N3/GBsX6ILA=
-github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8=
-github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
 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.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
 github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
-github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
-github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 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=
 github.com/tetratelabs/wazero v1.11.0/go.mod h1:eV28rsN8Q+xwjogd7f4/Pp4xFxO7uOGbLcD/LzB1wiU=
 github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 h1:FnBeRrxr7OU4VvAzt5X7s6266i6cSVkkFPS0TuXWbIg=
 github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
-golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
-golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+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=
 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=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
-lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=

package/integration/cross-language/run.bash

@@ -57,6 +57,9 @@ echo "Building TypeScript server/client..."
 echo "Building Rust server/client..."
 cargo build --release --bin integration-server --bin integration-client 2>&1 | grep -v "^warning:" || true
 
+echo "Vendoring Go dependencies (needed for C++ build)..."
+go mod vendor
+
 echo "Building C++ server/client..."
 mkdir -p "$REPO_DIR/build"
 pushd "$REPO_DIR/build" > /dev/null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.46.2",
+  "version": "0.47.1",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -90,8 +90,8 @@
     "integration:rust:cpp": "bash ./integration/cross-language/run.bash rust:cpp",
     "lint": "bun run lint:go && bun run lint:js",
     "lint:go": "bun run go:aptre -- lint",
-    "lint:js": "ESLINT_USE_FLAT_CONFIG=false eslint -c .eslintrc.cjs --ignore-pattern *.js --ignore-pattern *.d.ts ./",
-    "prepare": "husky",
+    "lint:js": "eslint ./",
+    "prepare": "husky && go mod vendor",
     "go:aptre": "go run -mod=mod github.com/aperturerobotics/common/cmd/aptre",
     "precommit": "lint-staged",
     "release": "npm run release:version && npm run release:commit",
@@ -107,12 +107,15 @@
     "./{srpc,echo,e2e,integration,rpcstream,cmd}/**/(*.ts|*.tsx|*.html|*.css)": "prettier --config .prettierrc.yaml --write"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^8.54.0",
-    "@typescript-eslint/parser": "^8.54.0",
+    "@eslint/js": "^10.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.55.0",
+    "@typescript-eslint/parser": "^8.55.0",
     "depcheck": "^1.4.6",
     "esbuild": "^0.27.0",
-    "eslint": "^9.39.1",
-    "eslint-config-prettier": "^10.0.2",
+    "eslint": "^10.0.0",
+    "eslint-config-prettier": "^10.0.0",
+    "eslint-plugin-unused-imports": "^4.4.1",
+    "globals": "^17.0.0",
     "happy-dom": "^20.5.0",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
@@ -125,7 +128,7 @@
   },
   "dependencies": {
     "@aptre/it-ws": "^1.1.2",
-    "@aptre/protobuf-es-lite": "^0.5.3",
+    "@aptre/protobuf-es-lite": "^1.0.1",
     "@chainsafe/libp2p-yamux": "^7.0.1",
     "@libp2p/interface": "^2.6.1",
     "event-iterator": "^2.0.0",
@@ -138,6 +141,6 @@
     "ws": "^8.18.1"
   },
   "resolutions": {
-    "@aptre/protobuf-es-lite": "0.5.3"
+    "@aptre/protobuf-es-lite": "1.0.1"
   }
 }

package/srpc/client-invoker.go

@@ -65,10 +65,6 @@ func proxyStreamTo(src, dst Stream, errCh chan error) {
 		}
 	}()
 
-	srcErr := src.Close()
-	if rerr == nil && srcErr != nil {
-		rerr = srcErr
-	}
 	if rerr != nil && rerr != io.EOF {
 		if errCh != nil {
 			errCh <- rerr

package/srpc/errors.go

@@ -3,6 +3,8 @@ package srpc
 import "errors"
 
 var (
+	// ErrReset is returned when a stream is reset.
+	ErrReset = errors.New("stream reset")
 	// ErrUnimplemented is returned if the RPC method was not implemented.
 	ErrUnimplemented = errors.New("unimplemented")
 	// ErrCompleted is returned if a message is received after the rpc was completed.

package/srpc/mux.go

@@ -1,6 +1,9 @@
 package srpc
 
-import "sync"
+import (
+	"slices"
+	"sync"
+)
 
 // Mux contains a set of <service, method> handlers.
 type Mux interface {
@@ -86,10 +89,8 @@ func (m *mux) HasServiceMethod(serviceID, methodID string) bool {
 
 	handlers := m.services[serviceID]
 	for _, mh := range handlers {
-		for _, mhMethodID := range mh.GetMethodIDs() {
-			if mhMethodID == methodID {
-				return true
-			}
+		if slices.Contains(mh.GetMethodIDs(), methodID) {
+			return true
 		}
 	}
 

package/srpc/muxed-conn.go

@@ -3,26 +3,28 @@ package srpc
 import (
 	"context"
 	"io"
+	"math"
 	"net"
 
-	"github.com/libp2p/go-libp2p/core/network"
-	ymuxer "github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	yamux "github.com/libp2p/go-yamux/v4"
 )
 
 // NewYamuxConfig builds the default yamux configuration.
 func NewYamuxConfig() *yamux.Config {
-	// Configuration options from go-libp2p-yamux:
-	config := *ymuxer.DefaultTransport.Config()
+	config := yamux.DefaultConfig()
+	config.MaxStreamWindowSize = 16 * 1024 * 1024
+	config.LogOutput = io.Discard
+	config.ReadBufSize = 0
+	config.MaxIncomingStreams = math.MaxUint32
 	config.AcceptBacklog = 512
 	config.EnableKeepAlive = false
-	return &config
+	return config
 }
 
 // NewMuxedConn constructs a new MuxedConn from a net.Conn.
 //
 // If yamuxConf is nil, uses defaults.
-func NewMuxedConn(conn net.Conn, outbound bool, yamuxConf *yamux.Config) (network.MuxedConn, error) {
+func NewMuxedConn(conn net.Conn, outbound bool, yamuxConf *yamux.Config) (MuxedConn, error) {
 	if yamuxConf == nil {
 		yamuxConf = NewYamuxConfig()
 	}
@@ -38,7 +40,7 @@ func NewMuxedConn(conn net.Conn, outbound bool, yamuxConf *yamux.Config) (networ
 		return nil, err
 	}
 
-	return ymuxer.NewMuxedConn(sess), nil
+	return newYamuxConn(sess), nil
 }
 
 // NewMuxedConnWithRwc builds a new MuxedConn with a io.ReadWriteCloser.
@@ -49,7 +51,7 @@ func NewMuxedConnWithRwc(
 	rwc io.ReadWriteCloser,
 	outbound bool,
 	yamuxConf *yamux.Config,
-) (network.MuxedConn, error) {
+) (MuxedConn, error) {
 	return NewMuxedConn(NewRwcConn(ctx, rwc, nil, nil, 10), outbound, yamuxConf)
 }
 
@@ -65,13 +67,13 @@ func NewClientWithConn(conn net.Conn, outbound bool, yamuxConf *yamux.Config) (C
 }
 
 // NewClientWithMuxedConn constructs a new client with a MuxedConn.
-func NewClientWithMuxedConn(conn network.MuxedConn) Client {
+func NewClientWithMuxedConn(conn MuxedConn) Client {
 	openStreamFn := NewOpenStreamWithMuxedConn(conn)
 	return NewClient(openStreamFn)
 }
 
 // NewOpenStreamWithMuxedConn constructs a OpenStream func with a MuxedConn.
-func NewOpenStreamWithMuxedConn(conn network.MuxedConn) OpenStreamFunc {
+func NewOpenStreamWithMuxedConn(conn MuxedConn) OpenStreamFunc {
 	return func(ctx context.Context, msgHandler PacketDataHandler, closeHandler CloseHandler) (PacketWriter, error) {
 		mstrm, err := conn.OpenStream(ctx)
 		if err != nil {

package/srpc/muxed-yamux.go

@@ -0,0 +1,51 @@
+package srpc
+
+import (
+	"context"
+
+	yamux "github.com/libp2p/go-yamux/v4"
+)
+
+// yamuxConn wraps a yamux.Session to implement MuxedConn.
+type yamuxConn yamux.Session
+
+// newYamuxConn wraps a yamux.Session as a MuxedConn.
+func newYamuxConn(sess *yamux.Session) MuxedConn {
+	return (*yamuxConn)(sess)
+}
+
+// yamux returns the underlying yamux.Session.
+func (c *yamuxConn) yamux() *yamux.Session {
+	return (*yamux.Session)(c)
+}
+
+// Close closes the underlying yamux session.
+func (c *yamuxConn) Close() error {
+	return c.yamux().Close()
+}
+
+// IsClosed returns whether the connection is closed.
+func (c *yamuxConn) IsClosed() bool {
+	return c.yamux().IsClosed()
+}
+
+// OpenStream creates a new stream.
+func (c *yamuxConn) OpenStream(ctx context.Context) (MuxedStream, error) {
+	s, err := c.yamux().OpenStream(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return (*yamuxStream)(s), nil
+}
+
+// AcceptStream accepts an incoming stream.
+func (c *yamuxConn) AcceptStream() (MuxedStream, error) {
+	s, err := c.yamux().AcceptStream()
+	if err != nil {
+		return nil, err
+	}
+	return (*yamuxStream)(s), nil
+}
+
+// _ is a type assertion
+var _ MuxedConn = (*yamuxConn)(nil)

package/srpc/muxed.go

@@ -0,0 +1,46 @@
+package srpc
+
+import (
+	"context"
+	"io"
+	"time"
+)
+
+// MuxedConn represents a connection which has been multiplexed.
+type MuxedConn interface {
+	io.Closer
+
+	// IsClosed returns whether a connection is fully closed.
+	IsClosed() bool
+
+	// OpenStream creates a new stream.
+	OpenStream(context.Context) (MuxedStream, error)
+
+	// AcceptStream accepts a stream opened by the other side.
+	AcceptStream() (MuxedStream, error)
+}
+
+// MuxedStream is a bidirectional io pipe within a connection.
+type MuxedStream interface {
+	io.Reader
+	io.Writer
+	io.Closer
+
+	// CloseWrite closes the stream for writing but leaves it open for reading.
+	CloseWrite() error
+
+	// CloseRead closes the stream for reading but leaves it open for writing.
+	CloseRead() error
+
+	// Reset closes both ends of the stream, telling the remote side to hang up.
+	Reset() error
+
+	// SetDeadline sets the read and write deadlines.
+	SetDeadline(time.Time) error
+
+	// SetReadDeadline sets the read deadline.
+	SetReadDeadline(time.Time) error
+
+	// SetWriteDeadline sets the write deadline.
+	SetWriteDeadline(time.Time) error
+}

package/srpc/server.go

@@ -3,8 +3,6 @@ package srpc
 import (
 	"context"
 	"io"
-
-	"github.com/libp2p/go-libp2p/core/network"
 )
 
 // Server handles incoming RPC streams with a mux.
@@ -39,7 +37,7 @@ func (s *Server) HandleStream(ctx context.Context, rwc io.ReadWriteCloser) {
 //
 // Starts HandleStream in a separate goroutine to handle the stream.
 // Returns context.Canceled or io.EOF when the loop is complete / closed.
-func (s *Server) AcceptMuxedConn(ctx context.Context, mc network.MuxedConn) error {
+func (s *Server) AcceptMuxedConn(ctx context.Context, mc MuxedConn) error {
 	for {
 		if err := ctx.Err(); err != nil {
 			return context.Canceled

package/srpc/stream-yamux.go

@@ -0,0 +1,72 @@
+package srpc
+
+import (
+	"errors"
+	"time"
+
+	yamux "github.com/libp2p/go-yamux/v4"
+)
+
+// yamuxStream wraps a yamux.Stream to implement MuxedStream.
+type yamuxStream yamux.Stream
+
+// yamux returns the underlying yamux.Stream.
+func (s *yamuxStream) yamux() *yamux.Stream {
+	return (*yamux.Stream)(s)
+}
+
+// Read reads from the stream, translating stream reset errors.
+func (s *yamuxStream) Read(b []byte) (int, error) {
+	n, err := s.yamux().Read(b)
+	if errors.Is(err, yamux.ErrStreamReset) {
+		err = ErrReset
+	}
+	return n, err
+}
+
+// Write writes to the stream, translating stream reset errors.
+func (s *yamuxStream) Write(b []byte) (int, error) {
+	n, err := s.yamux().Write(b)
+	if errors.Is(err, yamux.ErrStreamReset) {
+		err = ErrReset
+	}
+	return n, err
+}
+
+// Close closes the stream.
+func (s *yamuxStream) Close() error {
+	return s.yamux().Close()
+}
+
+// CloseWrite closes the stream for writing.
+func (s *yamuxStream) CloseWrite() error {
+	return s.yamux().CloseWrite()
+}
+
+// CloseRead closes the stream for reading.
+func (s *yamuxStream) CloseRead() error {
+	return s.yamux().CloseRead()
+}
+
+// Reset closes both ends of the stream.
+func (s *yamuxStream) Reset() error {
+	return s.yamux().Reset()
+}
+
+// SetDeadline sets the read and write deadlines.
+func (s *yamuxStream) SetDeadline(t time.Time) error {
+	return s.yamux().SetDeadline(t)
+}
+
+// SetReadDeadline sets the read deadline.
+func (s *yamuxStream) SetReadDeadline(t time.Time) error {
+	return s.yamux().SetReadDeadline(t)
+}
+
+// SetWriteDeadline sets the write deadline.
+func (s *yamuxStream) SetWriteDeadline(t time.Time) error {
+	return s.yamux().SetWriteDeadline(t)
+}
+
+// _ is a type assertion
+var _ MuxedStream = (*yamuxStream)(nil)

package/srpc/websocket.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/coder/websocket"
-	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-yamux/v4"
 )
 
@@ -15,7 +14,7 @@ func NewWebSocketConn(
 	conn *websocket.Conn,
 	isServer bool,
 	yamuxConf *yamux.Config,
-) (network.MuxedConn, error) {
+) (MuxedConn, error) {
 	nc := websocket.NetConn(ctx, conn, websocket.MessageBinary)
 	return NewMuxedConn(nc, !isServer, yamuxConf)
 }