starpc 0.26.1 → 0.26.2

package/dist/srpc/message-port.d.ts

@@ -1,7 +1,7 @@
 import type { Duplex, Source } from 'it-stream-types';
 import { StreamConn, StreamConnParams } from './conn.js';
 import { Server } from './server';
-export declare class MessagePortDuplex<T extends {}> implements Duplex<AsyncGenerator<T>, Source<T>, Promise<void>> {
+export declare class MessagePortDuplex<T extends NonNullable<unknown>> implements Duplex<AsyncGenerator<T>, Source<T>, Promise<void>> {
     readonly port: MessagePort;
     sink: (source: Source<T>) => Promise<void>;
     source: AsyncGenerator<T>;
@@ -10,7 +10,7 @@ export declare class MessagePortDuplex<T extends {}> implements Duplex<AsyncGene
     private _createSink;
     private _createSource;
 }
-export declare function newMessagePortDuplex<T extends {}>(port: MessagePort): MessagePortDuplex<T>;
+export declare function newMessagePortDuplex<T extends NonNullable<unknown>>(port: MessagePort): MessagePortDuplex<T>;
 export declare class MessagePortConn extends StreamConn {
     private _messagePort;
     constructor(port: MessagePort, server?: Server, connParams?: StreamConnParams);

package/e2e/mock/mock.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.32.0-devel
-// 	protoc        v4.25.2
+// 	protoc        v4.25.3
 // source: github.com/aperturerobotics/starpc/e2e/mock/mock.proto
 
 package e2e_mock

package/echo/echo.go

@@ -1 +1,21 @@
 package echo
+
+import (
+	"github.com/aperturerobotics/starpc/rpcstream"
+	srpc "github.com/aperturerobotics/starpc/srpc"
+)
+
+// _ is a type assertion
+var (
+	_ srpc.StreamRecv[EchoMsg] = (SRPCEchoer_EchoBidiStreamClient)(nil)
+	_ srpc.StreamRecv[EchoMsg] = (SRPCEchoer_EchoServerStreamClient)(nil)
+
+	_ srpc.StreamSend[EchoMsg] = (SRPCEchoer_EchoBidiStreamClient)(nil)
+	_ srpc.StreamSend[EchoMsg] = (SRPCEchoer_EchoClientStreamClient)(nil)
+
+	_ srpc.StreamSendAndClose[EchoMsg] = (SRPCEchoer_EchoBidiStreamStream)(nil)
+	_ srpc.StreamSendAndClose[EchoMsg] = (SRPCEchoer_EchoServerStreamStream)(nil)
+
+	_ srpc.StreamRecv[rpcstream.RpcStreamPacket]         = (SRPCEchoer_RpcStreamStream)(nil)
+	_ srpc.StreamSendAndClose[rpcstream.RpcStreamPacket] = (SRPCEchoer_RpcStreamStream)(nil)
+)

package/echo/echo.pb.go

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

package/echo/echo_srpc.pb.go

@@ -366,6 +366,7 @@ func (x *srpcEchoer_EchoServerStreamStream) SendAndClose(m *EchoMsg) error {
 type SRPCEchoer_EchoClientStreamStream interface {
 	srpc.Stream
 	Recv() (*EchoMsg, error)
+	RecvTo(*EchoMsg) error
 }
 
 type srpcEchoer_EchoClientStreamStream struct {
@@ -389,6 +390,7 @@ type SRPCEchoer_EchoBidiStreamStream interface {
 	Send(*EchoMsg) error
 	SendAndClose(*EchoMsg) error
 	Recv() (*EchoMsg, error)
+	RecvTo(*EchoMsg) error
 }
 
 type srpcEchoer_EchoBidiStreamStream struct {
@@ -425,6 +427,7 @@ type SRPCEchoer_RpcStreamStream interface {
 	Send(*rpcstream.RpcStreamPacket) error
 	SendAndClose(*rpcstream.RpcStreamPacket) error
 	Recv() (*rpcstream.RpcStreamPacket, error)
+	RecvTo(*rpcstream.RpcStreamPacket) error
 }
 
 type srpcEchoer_RpcStreamStream struct {

package/go.mod

@@ -9,8 +9,8 @@ require (
 )
 
 require (
-	github.com/aperturerobotics/util v1.13.6 // latest
-	github.com/libp2p/go-libp2p v0.32.2 // latest
+	github.com/aperturerobotics/util v1.13.8 // latest
+	github.com/libp2p/go-libp2p v0.33.0 // latest
 	github.com/libp2p/go-yamux/v4 v4.0.2-0.20240206065824-7222fbc3459d // master
 	github.com/sirupsen/logrus v1.9.3 // latest
 )
@@ -20,21 +20,21 @@ 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
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // 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.12.0 // indirect
+	github.com/multiformats/go-multiaddr v0.12.2 // indirect
 	github.com/multiformats/go-multibase v0.2.0 // indirect
 	github.com/multiformats/go-multicodec v0.9.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
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 )

package/go.sum

@@ -1,11 +1,5 @@
-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/aperturerobotics/util v1.13.5 h1:g8Q9VKBUYR5Nu5Ee/ZygVbe0JkGXeNq1fBkT0ipLBMY=
-github.com/aperturerobotics/util v1.13.5/go.mod h1:8AfpGb9RJqUItLBb5ec3sprpl9swYyHlgOw0HzkE+S8=
-github.com/aperturerobotics/util v1.13.6 h1:8FKBjj+vs23QZBiwkGod5WUY19Cisda48Rbg1zaqzZU=
-github.com/aperturerobotics/util v1.13.6/go.mod h1:8AfpGb9RJqUItLBb5ec3sprpl9swYyHlgOw0HzkE+S8=
+github.com/aperturerobotics/util v1.13.8 h1:hpBfvD+afJg4Ox4iXpCRA+0LsOyftmV6/mAVU0uiG2w=
+github.com/aperturerobotics/util v1.13.8/go.mod h1:8AfpGb9RJqUItLBb5ec3sprpl9swYyHlgOw0HzkE+S8=
 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=
@@ -17,12 +11,12 @@ 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=
-github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
+github.com/klauspost/cpuid/v2 v2.2.7/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 v0.32.2 h1:s8GYN4YJzgUoyeYNPdW7JZeZ5Ee31iNaIBfGYMAY4FQ=
-github.com/libp2p/go-libp2p v0.32.2/go.mod h1:E0LKe+diV/ZVJVnOJby8VC5xzHF0660osg71skcxJvk=
+github.com/libp2p/go-libp2p v0.33.0 h1:yTPSr8sJRbfeEYXyeN8VPVSlTlFjtMUwGDRniwaf/xQ=
+github.com/libp2p/go-libp2p v0.33.0/go.mod h1:RIJFRQVUBKy82dnW7J5f1homqqv6NcsDJAl3e7CRGfE=
 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-0.20240206065824-7222fbc3459d h1:Lag2VlBLRAiYKMnbIJGSDFmfSIoaeQRZ3wJXt91ZWV8=
@@ -35,8 +29,8 @@ github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aG
 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.12.0 h1:1QlibTFkoXJuDjjYsMHhE73TnzJQl8FSWatk/0gxGzE=
-github.com/multiformats/go-multiaddr v0.12.0/go.mod h1:WmZXgObOQOYp9r3cslLlppkrz1FYSHmE834dfz/lWu8=
+github.com/multiformats/go-multiaddr v0.12.2 h1:9G9sTY/wCYajKa9lyfWPmpZAwe6oV+Wb1zcmMS1HG24=
+github.com/multiformats/go-multiaddr v0.12.2/go.mod h1:GKyaTYjZRdcUhyOetrxTk9z0cW+jA/YrnqTOvKgi44M=
 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-multicodec v0.9.0 h1:pb/dlPnzee/Sxv/j4PmkDRxCOi3hXTz3IbPKOXWJkmg=
@@ -61,16 +55,14 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 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=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
+golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
 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.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=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.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.26.1",
+  "version": "0.26.2",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -61,7 +61,7 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@aperturerobotics/ts-common": "^0.8.4",
+    "@aperturerobotics/ts-common": "^0.8.6",
     "bufferutil": "^4.0.7",
     "depcheck": "^1.4.6",
     "esbuild": "^0.20.0",

package/srpc/message-port.ts

@@ -12,7 +12,7 @@ import { combineUint8ArrayListTransform } from './array-list.js'
 // null will be written through the channel to indicate closure when the sink is closed.
 // Note: there is no way to know for sure when a MessagePort is closed!
 // You will need an additional keep-alive on top of MessagePortDuplex.
-export class MessagePortDuplex<T extends {}>
+export class MessagePortDuplex<T extends NonNullable<unknown>>
   implements Duplex<AsyncGenerator<T>, Source<T>, Promise<void>>
 {
   // port is the message port
@@ -84,7 +84,7 @@ export class MessagePortDuplex<T extends {}>
 }
 
 // newMessagePortDuplex constructs a MessagePortDuplex with a channel name.
-export function newMessagePortDuplex<T extends {}>(
+export function newMessagePortDuplex<T extends NonNullable<unknown>>(
   port: MessagePort,
 ): MessagePortDuplex<T> {
   return new MessagePortDuplex<T>(port)

package/srpc/rpcproto.pb.go

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

package/srpc/rpcproto.pb.ts

@@ -542,7 +542,7 @@ export const CallData = {
 }
 
 function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
+  if ((globalThis as any).Buffer) {
     return Uint8Array.from(globalThis.Buffer.from(b64, 'base64'))
   } else {
     const bin = globalThis.atob(b64)
@@ -555,7 +555,7 @@ function bytesFromBase64(b64: string): Uint8Array {
 }
 
 function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
+  if ((globalThis as any).Buffer) {
     return globalThis.Buffer.from(arr).toString('base64')
   } else {
     const bin: string[] = []

package/srpc/stream.go

@@ -22,3 +22,28 @@ type Stream interface {
 	// Close closes the stream for reading and writing.
 	Close() error
 }
+
+// StreamRecv is a stream that can receive typed messages.
+//
+// T is the response type.
+type StreamRecv[T any] interface {
+	Stream
+	Recv() (*T, error)
+	RecvTo(*T) error
+}
+
+// StreamSend is a stream that can send typed messages.
+//
+// T is the outgoing type.
+type StreamSend[T any] interface {
+	Stream
+	Send(*T) error
+}
+
+// StreamSendAndClose is a stream that can send typed messages, closing after.
+//
+// T is the outgoing type.
+type StreamSendAndClose[T any] interface {
+	StreamSend[T]
+	SendAndClose(*T) error
+}