starpc 0.22.4 → 0.22.6

package/go.mod

@@ -1,17 +1,17 @@
 module github.com/aperturerobotics/starpc
 
-go 1.19
+go 1.21
 
 require (
 	github.com/pkg/errors v0.9.1 // latest
 	google.golang.org/protobuf v1.32.0 // latest
-	nhooyr.io/websocket v1.8.10 // master
+	nhooyr.io/websocket v1.8.10 // latest
 )
 
 require (
-	github.com/aperturerobotics/util v1.8.3 // latest
+	github.com/aperturerobotics/util v1.11.3 // latest
 	github.com/libp2p/go-libp2p v0.32.2 // latest
-	github.com/libp2p/go-yamux/v4 v4.0.1 // master
+	github.com/libp2p/go-yamux/v4 v4.0.2-0.20231213140704-4c5812896512 // master
 	github.com/sirupsen/logrus v1.9.3 // latest
 )
 
@@ -31,8 +31,8 @@ require (
 	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
-	golang.org/x/crypto v0.14.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.13.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 )

package/go.sum

@@ -1,5 +1,7 @@
-github.com/aperturerobotics/util v1.8.3 h1:P+nU185SJKSzXXYTc1kdnzt6KNvxgV1ke0jbxltfwaI=
-github.com/aperturerobotics/util v1.8.3/go.mod h1:idhGuFuAatygqticAnPcSZhef8yV7TYufLUw1Qfj4Cg=
+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/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=
@@ -16,8 +18,8 @@ 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.1 h1:FfDR4S1wj6Bw2Pqbc8Uz7pCxeRBPbwsBbEdfwiCypkQ=
-github.com/libp2p/go-yamux/v4 v4.0.1/go.mod h1:NWjl8ZTLOGlozrXSOZ/HlfG++39iKNnM5wwmtQP1YB4=
+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/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=
@@ -49,14 +51,14 @@ 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=
-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+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=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.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=
 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=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.22.4",
+  "version": "0.22.6",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -61,18 +61,14 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@aperturerobotics/ts-common": "^0.8.0",
-    "@typescript-eslint/eslint-plugin": "^6.15.0",
-    "@typescript-eslint/parser": "^6.15.0",
+    "@aperturerobotics/ts-common": "^0.8.2",
     "bufferutil": "^4.0.7",
     "depcheck": "^1.4.6",
-    "esbuild": "^0.19.10",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.0.0",
+    "esbuild": "^0.19.11",
     "prettier": "^3.0.3",
     "rimraf": "^5.0.1",
     "ts-poet": "6.6.0",
-    "ts-proto": "^1.165.0",
+    "ts-proto": "^1.166.1",
     "typescript": "^5.3.2",
     "utf-8-validate": "^6.0.3"
   },
@@ -84,7 +80,7 @@
     "is-promise": "^4.0.0",
     "isomorphic-ws": "^5.0.0",
     "it-first": "^3.0.3",
-    "it-length-prefixed": "^9.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/invoker.go

@@ -30,3 +30,18 @@ func (s InvokerSlice) InvokeMethod(serviceID, methodID string, strm Stream) (boo
 
 // _ is a type assertion
 var _ Invoker = (InvokerSlice)(nil)
+
+// InvokerFunc is a function implementing InvokeMethod.
+type InvokerFunc func(serviceID, methodID string, strm Stream) (bool, error)
+
+// InvokeMethod invokes the method matching the service & method ID.
+// Returns false, nil if not found.
+// If service string is empty, ignore it.
+func (f InvokerFunc) InvokeMethod(serviceID, methodID string, strm Stream) (bool, error) {
+	if f == nil {
+		return false, nil
+	}
+	return f(serviceID, methodID, strm)
+}
+
+var _ Invoker = (InvokerFunc)(nil)

package/srpc/msg-stream.go

@@ -10,6 +10,7 @@ type MsgStreamRw interface {
 	//
 	// returns io.EOF if the stream ended.
 	ReadOne() ([]byte, error)
+
 	// WriteCallData writes a call data packet.
 	WriteCallData(data []byte, complete bool, err error) error
 }
@@ -45,16 +46,15 @@ func (r *MsgStream) Context() context.Context {
 
 // MsgSend sends the message to the remote.
 func (r *MsgStream) MsgSend(msg Message) error {
-	select {
-	case <-r.ctx.Done():
+	if err := r.ctx.Err(); err != nil {
 		return context.Canceled
-	default:
 	}
 
 	msgData, err := msg.MarshalVT()
 	if err != nil {
 		return err
 	}
+
 	return r.rw.WriteCallData(msgData, false, nil)
 }
 

package/srpc/packet-rw.go

@@ -44,10 +44,11 @@ func (r *PacketReadWriter) WritePacket(p *Packet) error {
 	msgSize := p.SizeVT()
 	data := make([]byte, 4+msgSize)
 	binary.LittleEndian.PutUint32(data, uint32(msgSize))
-	_, err := p.MarshalToVT(data[4:])
+	_, err := p.MarshalToSizedBufferVT(data[4:])
 	if err != nil {
 		return err
 	}
+
 	var written, n int
 	for written < len(data) {
 		n, err = r.rw.Write(data)
@@ -56,6 +57,7 @@ func (r *PacketReadWriter) WritePacket(p *Packet) error {
 		}
 		written += n
 	}
+
 	return nil
 }
 
@@ -76,6 +78,7 @@ func (r *PacketReadWriter) ReadToHandler(cb PacketDataHandler) error {
 	var currLen uint32
 	buf := make([]byte, 2048)
 	isOpen := true
+
 	for isOpen {
 		// read some data into the buffer
 		n, err := r.rw.Read(buf)
@@ -93,6 +96,8 @@ func (r *PacketReadWriter) ReadToHandler(cb PacketDataHandler) error {
 			return err
 		}
 
+	EmitIfEnough:
+
 		// check if we have enough data for a length prefix
 		bufLen := r.buf.Len()
 		if bufLen < 4 {
@@ -117,6 +122,9 @@ func (r *PacketReadWriter) ReadToHandler(cb PacketDataHandler) error {
 			if err := cb(pkt); err != nil {
 				return err
 			}
+
+			// check if there's still enough in the buffer
+			goto EmitIfEnough
 		}
 	}
 

package/srpc/raw-stream-rwc.go

@@ -72,21 +72,28 @@ func (r *RawStreamRwc) Read(p []byte) (n int, err error) {
 		r.mtx.Lock()
 		if len(r.readQueue) != 0 {
 			nrq := r.readQueue[0]
-			rn = len(readBuf)
-			if nrLen := len(nrq); nrLen < rn {
-				rn = nrLen
-			}
+			// rn = amount of data to read
+			// minimum of len(readBuf) (length of space remaining in p) and len(nrq) (size of next pkt in read queue)
+			rn = min(len(readBuf), len(nrq))
+			// read the contents of nrq up to rn bytes
 			read = nrq[:rn]
+			// get the remainder of the packet that we won't read this time
 			nrq = nrq[rn:]
+			// if there is no more to read drop the pkt from the queue
 			if len(nrq) == 0 {
 				r.readQueue[0] = nil
 				r.readQueue = r.readQueue[1:]
 			} else {
+				// otherwise update the queued packet to be just the remainder
 				r.readQueue[0] = nrq
 			}
 		}
+
+		// check if the stream is closed
 		closed, closedErr := r.closed, r.closeErr
 		var wait <-chan struct{}
+
+		// if we didn't read anything and !closed, wait till something changes.
 		if rn == 0 && !closed {
 			wait = r.bcast.GetWaitCh()
 		}
@@ -94,9 +101,10 @@ func (r *RawStreamRwc) Read(p []byte) (n int, err error) {
 
 		// if we read data, copy it to the output buf
 		if rn != 0 {
-			// advance readBuf by rn
+			// copy data to output buf
 			copy(readBuf, read)
 			n += rn
+			// advance readBuf by rn
 			readBuf = readBuf[rn:]
 			continue
 		}

package/srpc/server.go

@@ -41,13 +41,12 @@ func (s *Server) HandleStream(ctx context.Context, rwc io.ReadWriteCloser) {
 // Returns context.Canceled or io.EOF when the loop is complete / closed.
 func (s *Server) AcceptMuxedConn(ctx context.Context, mc network.MuxedConn) error {
 	for {
-		select {
-		case <-ctx.Done():
+		if err := ctx.Err(); err != nil {
 			return context.Canceled
-		default:
-			if mc.IsClosed() {
-				return io.EOF
-			}
+		}
+
+		if mc.IsClosed() {
+			return io.EOF
 		}
 
 		muxedStream, err := mc.AcceptStream()