starpc 0.22.7 → 0.23.0

package/echo/echo_vtproto.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.4.0
+// protoc-gen-go-vtproto version: v0.6.0
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 package echo
@@ -7,8 +7,8 @@ package echo
 import (
 	fmt "fmt"
 	io "io"
-	bits "math/bits"
 
+	protohelpers "github.com/planetscale/vtprotobuf/protohelpers"
 	proto "google.golang.org/protobuf/proto"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
@@ -24,9 +24,8 @@ func (m *EchoMsg) CloneVT() *EchoMsg {
 	if m == nil {
 		return (*EchoMsg)(nil)
 	}
-	r := &EchoMsg{
-		Body: m.Body,
-	}
+	r := new(EchoMsg)
+	r.Body = m.Body
 	if len(m.unknownFields) > 0 {
 		r.unknownFields = make([]byte, len(m.unknownFields))
 		copy(r.unknownFields, m.unknownFields)
@@ -90,24 +89,13 @@ func (m *EchoMsg) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
 	if len(m.Body) > 0 {
 		i -= len(m.Body)
 		copy(dAtA[i:], m.Body)
-		i = encodeVarint(dAtA, i, uint64(len(m.Body)))
+		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Body)))
 		i--
 		dAtA[i] = 0xa
 	}
 	return len(dAtA) - i, nil
 }
 
-func encodeVarint(dAtA []byte, offset int, v uint64) int {
-	offset -= sov(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return base
-}
 func (m *EchoMsg) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -116,18 +104,12 @@ func (m *EchoMsg) SizeVT() (n int) {
 	_ = l
 	l = len(m.Body)
 	if l > 0 {
-		n += 1 + l + sov(uint64(l))
+		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
 	}
 	n += len(m.unknownFields)
 	return n
 }
 
-func sov(x uint64) (n int) {
-	return (bits.Len64(x|1) + 6) / 7
-}
-func soz(x uint64) (n int) {
-	return sov(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
 func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -136,7 +118,7 @@ func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflow
+				return protohelpers.ErrIntOverflow
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -164,7 +146,7 @@ func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflow
+					return protohelpers.ErrIntOverflow
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -178,11 +160,11 @@ func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
 			}
 			intStringLen := int(stringLen)
 			if intStringLen < 0 {
-				return ErrInvalidLength
+				return protohelpers.ErrInvalidLength
 			}
 			postIndex := iNdEx + intStringLen
 			if postIndex < 0 {
-				return ErrInvalidLength
+				return protohelpers.ErrInvalidLength
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -191,12 +173,12 @@ func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skip(dAtA[iNdEx:])
+			skippy, err := protohelpers.Skip(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLength
+				return protohelpers.ErrInvalidLength
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -211,88 +193,3 @@ func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
 	}
 	return nil
 }
-
-func skip(dAtA []byte) (n int, err error) {
-	l := len(dAtA)
-	iNdEx := 0
-	depth := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflow
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflow
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if dAtA[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-		case 1:
-			iNdEx += 8
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflow
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if length < 0 {
-				return 0, ErrInvalidLength
-			}
-			iNdEx += length
-		case 3:
-			depth++
-		case 4:
-			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroup
-			}
-			depth--
-		case 5:
-			iNdEx += 4
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-		if iNdEx < 0 {
-			return 0, ErrInvalidLength
-		}
-		if depth == 0 {
-			return iNdEx, nil
-		}
-	}
-	return 0, io.ErrUnexpectedEOF
-}
-
-var (
-	ErrInvalidLength        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflow          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroup = fmt.Errorf("proto: unexpected end of group")
-)

package/go.mod

@@ -9,12 +9,14 @@ require (
 )
 
 require (
-	github.com/aperturerobotics/util v1.12.0 // latest
+	github.com/aperturerobotics/util v1.13.3 // latest
 	github.com/libp2p/go-libp2p v0.32.2 // latest
-	github.com/libp2p/go-yamux/v4 v4.0.2-0.20231213140704-4c5812896512 // master
+	github.com/libp2p/go-yamux/v4 v4.0.2-0.20240206065824-7222fbc3459d // master
 	github.com/sirupsen/logrus v1.9.3 // latest
 )
 
+require github.com/planetscale/vtprotobuf v0.6.0
+
 require (
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/ipfs/go-cid v0.4.1 // indirect
@@ -33,6 +35,6 @@ require (
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 )

package/go.sum

@@ -1,16 +1,16 @@
-github.com/aperturerobotics/util v1.11.0 h1:SpbpNw23DACYkiZ9cCauP98Nwg73T04YkfD4E/WZ2Hc=
-github.com/aperturerobotics/util v1.11.0/go.mod h1:d84OAQAGXCpl7JOBstnal91Lm6nKgk+vBgtHPgxBYrQ=
-github.com/aperturerobotics/util v1.11.3 h1:qg7TTe1L/rtoENssNKwz+VMeA3CCDVQ5SnYWig6WMOk=
-github.com/aperturerobotics/util v1.11.3/go.mod h1:d84OAQAGXCpl7JOBstnal91Lm6nKgk+vBgtHPgxBYrQ=
-github.com/aperturerobotics/util v1.12.0 h1:jdEU/xbApQIuc4cq2/JRnJmA21243StGsODIU5vekik=
-github.com/aperturerobotics/util v1.12.0/go.mod h1:d84OAQAGXCpl7JOBstnal91Lm6nKgk+vBgtHPgxBYrQ=
+github.com/aperturerobotics/util v1.13.2 h1:MTe8MO+Tfo9d3Z4Zi6Akm//rIymy5gyoAOIEHQdFrOU=
+github.com/aperturerobotics/util v1.13.2/go.mod h1:d84OAQAGXCpl7JOBstnal91Lm6nKgk+vBgtHPgxBYrQ=
+github.com/aperturerobotics/util v1.13.3 h1:N4JXKYql0R/A2hMuV79SZ2vaftf8tiN8DUJ8sGc7Rso=
+github.com/aperturerobotics/util v1.13.3/go.mod h1:JdziNd9tR6lWqc9bSMIe1At8Gagrg986rmtZuPCv6+w=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y=
+github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 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.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
@@ -20,8 +20,9 @@ github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QT
 github.com/libp2p/go-libp2p v0.32.2 h1:s8GYN4YJzgUoyeYNPdW7JZeZ5Ee31iNaIBfGYMAY4FQ=
 github.com/libp2p/go-libp2p v0.32.2/go.mod h1:E0LKe+diV/ZVJVnOJby8VC5xzHF0660osg71skcxJvk=
 github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
-github.com/libp2p/go-yamux/v4 v4.0.2-0.20231213140704-4c5812896512 h1:QvLt0Hr2Qmex+9wrv/tBeDsZ5AutKdy6ZF7pGTyEeQY=
-github.com/libp2p/go-yamux/v4 v4.0.2-0.20231213140704-4c5812896512/go.mod h1:OsNeDpmxccy93bUsruLEdsqIuO1VbBOFsQ4c4GfwenE=
+github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg=
+github.com/libp2p/go-yamux/v4 v4.0.2-0.20240206065824-7222fbc3459d h1:Lag2VlBLRAiYKMnbIJGSDFmfSIoaeQRZ3wJXt91ZWV8=
+github.com/libp2p/go-yamux/v4 v4.0.2-0.20240206065824-7222fbc3459d/go.mod h1:OsNeDpmxccy93bUsruLEdsqIuO1VbBOFsQ4c4GfwenE=
 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=
@@ -44,6 +45,8 @@ github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/n
 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/planetscale/vtprotobuf v0.6.0 h1:nBeETjudeJ5ZgBHUz1fVHvbqUKnYOXNhsIEabROxmNA=
+github.com/planetscale/vtprotobuf v0.6.0/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
 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.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
@@ -53,6 +56,7 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
@@ -61,11 +65,14 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 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.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI=
 lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
 nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q=

package/integration/integration.bash

@@ -6,7 +6,7 @@ unset GOARCH
 
 echo "Compiling ts..."
 # ../node_modules/.bin/tsc --out integration.js --project tsconfig.json
-../node_modules/.bin/esbuild integration.ts --bundle --platform=node --outfile=integration.js
+../node_modules/.bin/esbuild integration.ts --bundle --sourcemap --platform=node --outfile=integration.js
 
 echo "Compiling go..."
 go build -o integration -v ./

package/integration/integration.ts

@@ -13,14 +13,14 @@ async function runRPC() {
   const channel = new WebSocketConn(ws, 'outbound')
   const client = channel.buildClient()
 
-  console.log('Running RpcStream test via WebSocket..')
-  await runRpcStreamTest(client)
-
   console.log('Running client test via WebSocket..')
   await runClientTest(client)
 
   console.log('Running abort controller test via WebSocket..')
   await runAbortControllerTest(client)
+
+  console.log('Running RpcStream test via WebSocket..')
+  await runRpcStreamTest(client)
 }
 
 process.on('unhandledRejection', (ev) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.22.7",
+  "version": "0.23.0",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -61,10 +61,10 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@aperturerobotics/ts-common": "^0.8.2",
+    "@aperturerobotics/ts-common": "^0.8.3",
     "bufferutil": "^4.0.7",
     "depcheck": "^1.4.6",
-    "esbuild": "^0.19.11",
+    "esbuild": "^0.20.0",
     "prettier": "^3.2.4",
     "rimraf": "^5.0.1",
     "ts-poet": "6.6.0",
@@ -74,13 +74,13 @@
   },
   "dependencies": {
     "@aptre/it-ws": "^1.0.0",
-    "@chainsafe/libp2p-yamux": "^5.0.0",
-    "@libp2p/interface": "^0.1.2",
+    "@chainsafe/libp2p-yamux": "^6.0.2",
+    "@libp2p/interface": "^1.1.3",
+    "@libp2p/logger": "^4.0.6",
     "event-iterator": "^2.0.0",
     "is-promise": "^4.0.0",
     "isomorphic-ws": "^5.0.0",
     "it-first": "^3.0.3",
-    "it-length-prefixed": "^9.0.4",
     "it-pipe": "^3.0.1",
     "it-pushable": "^3.2.3",
     "it-stream-types": "^2.0.1",

package/srpc/client.ts

@@ -70,7 +70,7 @@ export class Client implements TsProtoRpc {
       .then(async (call) => {
         return writeToPushable(call.rpcDataSource, serverData)
       })
-      .catch(err => serverData.end(err))
+      .catch((err) => serverData.end(err))
     return serverData
   }
 
@@ -94,7 +94,7 @@ export class Client implements TsProtoRpc {
           serverData.end(err as Error)
         }
       })
-      .catch(err => serverData.end(err))
+      .catch((err) => serverData.end(err))
     return serverData
   }
 

package/srpc/conn.ts

@@ -1,14 +1,16 @@
 import { yamux } from '@chainsafe/libp2p-yamux'
-import type { Direction, Stream } from '@libp2p/interface/connection'
 import type {
+  Direction,
+  Stream,
   StreamMuxer,
   StreamMuxerFactory,
-} from '@libp2p/interface/stream-muxer'
+} from '@libp2p/interface'
 import { pipe } from 'it-pipe'
 import type { Duplex, Source } from 'it-stream-types'
 import { Uint8ArrayList } from 'uint8arraylist'
 import isPromise from 'is-promise'
 import { pushable, Pushable } from 'it-pushable'
+import { defaultLogger } from '@libp2p/logger'
 
 import type { OpenStreamFunc, Stream as SRPCStream } from './stream.js'
 import { Client } from './client.js'
@@ -73,7 +75,11 @@ export class Conn
     if (server) {
       this.server = server
     }
-    const muxerFactory = connParams?.muxerFactory ?? yamux()()
+    const muxerFactory =
+      connParams?.muxerFactory ??
+      yamux({ enableKeepAlive: false })({
+        logger: defaultLogger(),
+      })
     this.muxer = muxerFactory.createStreamMuxer({
       onIncomingStream: this.handleIncomingStream.bind(this),
       direction: connParams?.direction || 'outbound',

package/srpc/index.ts

@@ -32,6 +32,13 @@ export {
   prependLengthPrefixTransform,
   decodePacketSource,
   encodePacketSource,
+  uint32LEDecode,
+  uint32LEEncode,
+  decodeUint32Le,
+  encodeUint32Le,
+  lengthPrefixDecode,
+  lengthPrefixEncode,
+  prependPacketLen,
 } from './packet.js'
 export { combineUint8ArrayListTransform } from './array-list.js'
 export { ValueCtr } from './value-ctr.js'

package/srpc/message.ts

@@ -42,7 +42,7 @@ export function buildDecodeMessageTransform<T>(
   def: MessageDefinition<T>,
   memoize?: boolean,
 ): DecodeMessageTransform<T> {
-  const decode = memoize ? memoProtoDecode(def) : def.decode.bind(def)
+  const decode = !memoize ? def.decode.bind(def) : memoProtoDecode(def)
 
   // decodeMessageSource unmarshals and async yields encoded Messages.
   return async function* decodeMessageSource(
@@ -71,11 +71,11 @@ export function buildEncodeMessageTransform<T>(
   def: MessageDefinition<T>,
   memoize?: boolean,
 ): EncodeMessageTransform<T> {
-  const encode = memoize
-    ? memoProto(def)
-    : (msg: T): Uint8Array => {
+  const encode = !memoize
+    ? (msg: T): Uint8Array => {
         return def.encode(msg).finish()
       }
+    : memoProto(def)
 
   // encodeMessageSource encodes messages to byte arrays.
   return async function* encodeMessageSource(

package/srpc/packet.ts

@@ -1,15 +1,11 @@
-import {
-  encode as lengthPrefixEncode,
-  decode as lengthPrefixDecode,
-} from 'it-length-prefixed'
 import { Uint8ArrayList } from 'uint8arraylist'
+import { Source, Transform } from 'it-stream-types'
 
 import { Packet } from './rpcproto.pb.js'
 import {
   buildDecodeMessageTransform,
   buildEncodeMessageTransform,
 } from './message.js'
-import { Source, Transform } from 'it-stream-types'
 
 // decodePacketSource decodes packets from a binary data stream.
 export const decodePacketSource = buildDecodeMessageTransform<Packet>(Packet)
@@ -18,7 +14,7 @@ export const decodePacketSource = buildDecodeMessageTransform<Packet>(Packet)
 export const encodePacketSource = buildEncodeMessageTransform<Packet>(Packet)
 
 // uint32LEDecode removes the length prefix.
-const uint32LEDecode = (data: Uint8ArrayList) => {
+export const uint32LEDecode = (data: Uint8ArrayList) => {
   if (data.length < 4) {
     throw RangeError('Could not decode int32BE')
   }
@@ -28,34 +24,80 @@ const uint32LEDecode = (data: Uint8ArrayList) => {
 uint32LEDecode.bytes = 4
 
 // uint32LEEncode adds the length prefix.
-const uint32LEEncode = (value: number) => {
+export const uint32LEEncode = (value: number) => {
   const data = new Uint8ArrayList(new Uint8Array(4))
   data.setUint32(0, value, true)
   return data
 }
 uint32LEEncode.bytes = 4
 
+// lengthPrefixEncode transforms a source to a length-prefixed Uint8ArrayList stream.
+export async function* lengthPrefixEncode(
+  source: Source<Uint8Array | Uint8ArrayList>,
+  lengthEncoder: typeof uint32LEEncode,
+) {
+  for await (const chunk of source) {
+    // Encode the length of the chunk.
+    const length = chunk instanceof Uint8Array ? chunk.length : chunk.byteLength
+    const lengthEncoded = lengthEncoder(length)
+
+    // Concatenate the length prefix and the data.
+    yield new Uint8ArrayList(lengthEncoded, chunk)
+  }
+}
+
+// lengthPrefixDecode decodes a length-prefixed source to a Uint8ArrayList stream.
+export async function* lengthPrefixDecode(
+  source: Source<Uint8Array | Uint8ArrayList>,
+  lengthDecoder: typeof uint32LEDecode,
+) {
+  const buffer = new Uint8ArrayList()
+
+  for await (const chunk of source) {
+    buffer.append(chunk)
+
+    // Continue extracting messages while buffer contains enough data for decoding.
+    while (buffer.length >= lengthDecoder.bytes) {
+      const messageLength = lengthDecoder(buffer)
+      const totalLength = lengthDecoder.bytes + messageLength
+
+      if (buffer.length < totalLength) break // Wait for more data if the full message hasn't arrived.
+
+      // Extract the message excluding the length prefix.
+      const message = buffer.sublist(lengthDecoder.bytes, totalLength)
+      yield message
+
+      // Remove the processed message from the buffer.
+      buffer.consume(totalLength)
+    }
+  }
+}
+
 // prependLengthPrefixTransform adds a length prefix to a message source.
 // little-endian uint32
-export function prependLengthPrefixTransform(): Transform<
+export function prependLengthPrefixTransform(
+  lengthEncoder = uint32LEEncode,
+): Transform<
   Source<Uint8Array | Uint8ArrayList>,
-  | AsyncGenerator<Uint8Array, void, undefined>
-  | Generator<Uint8Array, void, undefined>
+  | AsyncGenerator<Uint8ArrayList, void, undefined>
+  | Generator<Uint8ArrayList, void, undefined>
 > {
   return (source: Source<Uint8Array | Uint8ArrayList>) => {
-    return lengthPrefixEncode(source, { lengthEncoder: uint32LEEncode })
+    return lengthPrefixEncode(source, lengthEncoder)
   }
 }
 
 // parseLengthPrefixTransform parses the length prefix from a message source.
 // little-endian uint32
-export function parseLengthPrefixTransform(): Transform<
-  Source<Uint8Array | Uint8ArrayList>, // Allow both AsyncIterable and Iterable
+export function parseLengthPrefixTransform(
+  lengthDecoder = uint32LEDecode,
+): Transform<
+  Source<Uint8Array | Uint8ArrayList>,
   | AsyncGenerator<Uint8ArrayList, void, unknown>
   | Generator<Uint8ArrayList, void, unknown>
 > {
   return (source: Source<Uint8Array | Uint8ArrayList>) => {
-    return lengthPrefixDecode(source, { lengthDecoder: uint32LEDecode })
+    return lengthPrefixDecode(source, lengthDecoder)
   }
 }
 

package/srpc/rpcproto.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0-devel
-// 	protoc        v4.25.1
+// 	protoc-gen-go v1.32.0-devel
+// 	protoc        v4.25.2
 // source: github.com/aperturerobotics/starpc/srpc/rpcproto.proto
 
 package srpc