starpc 0.12.2 → 0.13.0

package/Makefile

@@ -2,7 +2,7 @@
 
 PROTOWRAP=hack/bin/protowrap
 PROTOC_GEN_GO=hack/bin/protoc-gen-go
-PROTOC_GEN_GO_STARPC=hack/bin/protoc-gen-go-starpc
+PROTOC_GEN_STARPC=hack/bin/protoc-gen-go-starpc
 PROTOC_GEN_VTPROTO=hack/bin/protoc-gen-go-vtproto
 GOIMPORTS=hack/bin/goimports
 GOLANGCI_LINT=hack/bin/golangci-lint
@@ -24,18 +24,18 @@ $(PROTOC_GEN_GO):
 		-o ./bin/protoc-gen-go \
 		google.golang.org/protobuf/cmd/protoc-gen-go
 
-$(PROTOC_GEN_GO_STARPC):
-	cd ./hack; \
-	go build -v \
-		-o ./bin/protoc-gen-go-starpc \
-		github.com/aperturerobotics/starpc/cmd/protoc-gen-go-starpc
-
 $(PROTOC_GEN_VTPROTO):
 	cd ./hack; \
 	go build -v \
 		-o ./bin/protoc-gen-go-vtproto \
 		github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto
 
+$(PROTOC_GEN_STARPC):
+	cd ./hack; \
+	go build -v \
+		-o ./bin/protoc-gen-go-starpc \
+		github.com/aperturerobotics/starpc/cmd/protoc-gen-go-starpc
+
 $(GOIMPORTS):
 	cd ./hack; \
 	go build -v \
@@ -46,7 +46,7 @@ $(PROTOWRAP):
 	cd ./hack; \
 	go build -v \
 		-o ./bin/protowrap \
-		github.com/square/goprotowrap/cmd/protowrap
+		github.com/aperturerobotics/goprotowrap/cmd/protowrap
 
 $(GOLANGCI_LINT):
 	cd ./hack; \
@@ -61,7 +61,7 @@ $(GO_MOD_OUTDATED):
 		github.com/psampaz/go-mod-outdated
 
 .PHONY: gengo
-gengo: $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTOC_GEN_GO_STARPC) $(PROTOC_GEN_VTPROTO)
+gengo: $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTOC_GEN_VTPROTO) $(PROTOC_GEN_STARPC)
 	go mod vendor
 	shopt -s globstar; \
 	set -eo pipefail; \
@@ -73,9 +73,9 @@ gengo: $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTOC_GEN_GO_STARPC) $(PROT
 	$(PROTOWRAP) \
 		-I $$(pwd)/vendor \
 		--go_out=$$(pwd)/vendor \
-		--go-starpc_out=$$(pwd)/vendor \
 		--go-vtproto_out=$$(pwd)/vendor \
-		--go-vtproto_opt=features=marshal+unmarshal+size+equal \
+		--go-vtproto_opt=features=marshal+unmarshal+size+equal+clone \
+		--go-starpc_out=$$(pwd)/vendor \
 		--proto_path $$(pwd)/vendor \
 		--print_structure \
 		--only_specified_files \
@@ -110,6 +110,7 @@ gents: $(PROTOWRAP) node_modules
 		--ts_proto_opt=forceLong=long \
 		--ts_proto_opt=oneof=unions \
 		--ts_proto_opt=outputServices=default,outputServices=generic-definitions \
+		--ts_proto_opt=useDate=true \
 		--ts_proto_opt=useAsyncIterable=true \
 		--proto_path $$(pwd)/vendor \
 		--print_structure \

package/README.md

@@ -15,14 +15,9 @@
 
 [Proto3 services]: https://developers.google.com/protocol-buffers/docs/proto3#services
 
-Supports **client-to-server streaming** RPCs in the web browser, currently not
-supported by any of the other RPC libraries.
+Supports **client-to-server and bidirectional streaming** in the web browser.
 
-The [rpcproto](./srpc/rpcproto.proto) file describes the protocol.
-
-Can use any Stream multiplexer: defaults to [libp2p-mplex] over a WebSocket.
-
-[libp2p-mplex]: https://github.com/libp2p/js-libp2p-mplex
+[rpcproto.proto](./srpc/rpcproto.proto) contains the protocol definition.
 
 [rpcstream] supports sub-streams for per-component sub-services.
 
@@ -115,11 +110,7 @@ example of TypeScript <-> TypeScript interop, see the [e2e] test.
 [e2e]: ./e2e/e2e.ts
 [integration]: ./integration/integration.ts
 
-Supports any AsyncIterable communication channel. `DuplexConn`,
-`MessagePortConn`, and `WebSocketConn` use [js-libp2p-mplex] to multiplex
-streams, but any multiplexer can be used.
-
-[js-libp2p-mplex]: https://github.com/libp2p/js-libp2p-mplex
+Supports any AsyncIterable communication channel.
 
 This example demonstrates both the server and client:
 
@@ -185,7 +176,7 @@ const result = await demoServiceClient.Echo({
 console.log('output', result.body)
 ```
 
-# Attribution
+## Attribution
 
 `protoc-gen-go-starpc` is a heavily modified version of `protoc-gen-go-drpc`.
 
@@ -199,15 +190,11 @@ Uses [vtprotobuf] to generate Protobuf marshal / unmarshal code.
 
 ## Support
 
-Starpc is built & supported by Aperture Robotics, LLC.
-
-Community contributions and discussion are welcomed!
-
-Please open a [GitHub issue] with any questions / issues.
+Please file a [GitHub issue] and/or [Join Discord] with any questions.
 
 [GitHub issue]: https://github.com/aperturerobotics/starpc/issues/new
 
-... or feel free to reach out on [Matrix Chat] or [Discord].
+... or feel free to reach out on [Matrix Chat].
 
-[Discord]: https://discord.gg/KJutMESRsT
+[Join Discord]: https://discord.gg/KJutMESRsT
 [Matrix Chat]: https://matrix.to/#/#aperturerobotics:matrix.org

package/dist/e2e/e2e.js

@@ -17,6 +17,7 @@ async function runRPC() {
 runRPC()
     .then(() => {
     console.log('finished successfully');
+    process.exit(0);
 })
     .catch((err) => {
     console.error(err);

package/dist/echo/echo.pb.d.ts

@@ -35,7 +35,9 @@ export interface Echoer {
 export declare class EchoerClientImpl implements Echoer {
     private readonly rpc;
     private readonly service;
-    constructor(rpc: Rpc, service?: string);
+    constructor(rpc: Rpc, opts?: {
+        service?: string;
+    });
     Echo(request: EchoMsg): Promise<EchoMsg>;
     EchoServerStream(request: EchoMsg): AsyncIterable<EchoMsg>;
     EchoClientStream(request: AsyncIterable<EchoMsg>): Promise<EchoMsg>;

package/dist/echo/echo.pb.js

@@ -73,8 +73,8 @@ export const EchoMsg = {
     },
 };
 export class EchoerClientImpl {
-    constructor(rpc, service) {
-        this.service = service || "echo.Echoer";
+    constructor(rpc, opts) {
+        this.service = opts?.service || "echo.Echoer";
         this.rpc = rpc;
         this.Echo = this.Echo.bind(this);
         this.EchoServerStream = this.EchoServerStream.bind(this);

package/dist/srpc/common-rpc.js

@@ -116,7 +116,7 @@ export class CommonRPC {
             }
             catch (err) {
                 const anyErr = err;
-                if (anyErr?.code !== 'ERR_MPLEX_STREAM_RESET') {
+                if (anyErr?.code !== 'ERR_STREAM_RESET' && anyErr?.code !== 'ERR_STREAM_ABORT') {
                     this.close(err);
                 }
             }

package/dist/srpc/conn.js

@@ -1,5 +1,5 @@
 import { pipe } from 'it-pipe';
-import { mplex } from '@libp2p/mplex';
+import { yamux } from '@chainsafe/libp2p-yamux';
 import isPromise from 'is-promise';
 import { Client } from './client.js';
 import { combineUint8ArrayListTransform } from './array-list.js';
@@ -21,7 +21,7 @@ export class Conn {
         }
         let muxerFactory = connParams?.muxerFactory;
         if (!muxerFactory) {
-            muxerFactory = mplex()();
+            muxerFactory = yamux()();
         }
         this.muxer = muxerFactory.createStreamMuxer({
             onIncomingStream: this.handleIncomingStream.bind(this),

package/dist/srpc/websocket.js

@@ -1,14 +1,10 @@
 import { duplex } from 'it-ws';
 import { pipe } from 'it-pipe';
-import { mplex } from '@libp2p/mplex';
 import { Conn } from './conn.js';
 // WebSocketConn implements a connection with a WebSocket and optional Server.
 export class WebSocketConn extends Conn {
     constructor(socket, direction, server) {
-        super(server, {
-            direction,
-            muxerFactory: mplex()(),
-        });
+        super(server, { direction });
         this.socket = socket;
         const socketDuplex = duplex(socket);
         pipe(socketDuplex, this, socketDuplex);

package/e2e/e2e.ts

@@ -21,6 +21,7 @@ async function runRPC() {
 runRPC()
   .then(() => {
     console.log('finished successfully')
+    process.exit(0)
   })
   .catch((err) => {
     console.error(err)

package/e2e/e2e_test.go

@@ -5,13 +5,10 @@ import (
 	"io"
 	"net"
 	"testing"
-	"time"
 
 	"github.com/aperturerobotics/starpc/echo"
 	"github.com/aperturerobotics/starpc/rpcstream"
 	"github.com/aperturerobotics/starpc/srpc"
-	"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
-	mp "github.com/libp2p/go-mplex"
 	"github.com/pkg/errors"
 )
 
@@ -25,7 +22,7 @@ func RunE2E(t *testing.T, cb func(client echo.SRPCEchoerClient) error) {
 	}
 	server := srpc.NewServer(mux)
 
-	// note: also possible to do without mplex:
+	// Alternatively:
 	// openStream := srpc.NewServerPipe(server)
 	// client := srpc.NewClient(openStream)
 
@@ -33,23 +30,22 @@ func RunE2E(t *testing.T, cb func(client echo.SRPCEchoerClient) error) {
 	clientPipe, serverPipe := net.Pipe()
 
 	// outbound=true
-	clientMp, err := mp.NewMultiplex(clientPipe, true, nil)
+	clientMp, err := srpc.NewMuxedConn(clientPipe, true)
 	if err != nil {
 		t.Fatal(err.Error())
 	}
-	client := srpc.NewClientWithMuxedConn(mplex.NewMuxedConn(clientMp))
+	client := srpc.NewClientWithMuxedConn(clientMp)
 
 	ctx := context.Background()
 	// outbound=false
-	serverMp, _ := mp.NewMultiplex(serverPipe, false, nil)
+	serverMp, err := srpc.NewMuxedConn(serverPipe, false)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
 	go func() {
-		_ = server.AcceptMuxedConn(ctx, mplex.NewMuxedConn(serverMp))
+		_ = server.AcceptMuxedConn(ctx, serverMp)
 	}()
 
-	// TODO: requires a moment for the listener to start: not sure why.
-	// the packets /should/ be buffered in the pipe.
-	<-time.After(time.Millisecond * 100)
-
 	// construct the client rpc interface
 	clientEcho := echo.NewSRPCEchoerClient(client)
 

package/echo/echo.pb.ts

@@ -106,8 +106,8 @@ export interface Echoer {
 export class EchoerClientImpl implements Echoer {
   private readonly rpc: Rpc;
   private readonly service: string;
-  constructor(rpc: Rpc, service?: string) {
-    this.service = service || "echo.Echoer";
+  constructor(rpc: Rpc, opts?: { service?: string }) {
+    this.service = opts?.service || "echo.Echoer";
     this.rpc = rpc;
     this.Echo = this.Echo.bind(this);
     this.EchoServerStream = this.EchoServerStream.bind(this);

package/echo/echo_srpc.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-srpc. DO NOT EDIT.
-// protoc-gen-srpc version: v0.9.2
+// protoc-gen-srpc version: v0.12.3-0.20221016080028-3e0cb248fdee
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 package echo

package/echo/echo_vtproto.pb.go

@@ -9,6 +9,7 @@ import (
 	io "io"
 	bits "math/bits"
 
+	proto "google.golang.org/protobuf/proto"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
@@ -19,6 +20,24 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+func (m *EchoMsg) CloneVT() *EchoMsg {
+	if m == nil {
+		return (*EchoMsg)(nil)
+	}
+	r := &EchoMsg{
+		Body: m.Body,
+	}
+	if len(m.unknownFields) > 0 {
+		r.unknownFields = make([]byte, len(m.unknownFields))
+		copy(r.unknownFields, m.unknownFields)
+	}
+	return r
+}
+
+func (m *EchoMsg) CloneGenericVT() proto.Message {
+	return m.CloneVT()
+}
+
 func (this *EchoMsg) EqualVT(that *EchoMsg) bool {
 	if this == nil {
 		return that == nil

package/go.mod

@@ -9,8 +9,8 @@ require (
 )
 
 require (
-	github.com/libp2p/go-libp2p v0.23.2
-	github.com/libp2p/go-mplex v0.7.1-0.20220919134208-b0cc3e9c41a9
+	github.com/libp2p/go-libp2p v0.23.3-0.20221025171119-7465a509d011
+	github.com/libp2p/go-yamux/v4 v4.0.1-0.20220919134236-1c09f2ab3ec1
 	github.com/sirupsen/logrus v1.9.0
 )
 
@@ -18,12 +18,10 @@ require (
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/ipfs/go-cid v0.3.2 // indirect
-	github.com/ipfs/go-log/v2 v2.5.1 // indirect
 	github.com/klauspost/compress v1.15.10 // indirect
 	github.com/klauspost/cpuid/v2 v2.1.1 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
 	github.com/libp2p/go-openssl v0.1.0 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-pointer v0.0.1 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
@@ -36,9 +34,6 @@ require (
 	github.com/multiformats/go-varint v0.0.6 // indirect
 	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.23.0 // indirect
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
 	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
 	lukechampine.com/blake3 v1.1.7 // indirect

package/go.sum

@@ -1,5 +1,3 @@
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
-github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 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=
@@ -37,8 +35,6 @@ github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/ipfs/go-cid v0.3.2 h1:OGgOd+JCFM+y1DjWPmVH+2/4POtpDzwcr7VgnB7mZXc=
 github.com/ipfs/go-cid v0.3.2/go.mod h1:gQ8pKqT/sUxGY+tIwy1RPpAojYu7jAyCp5Tz1svoupw=
-github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY=
-github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -50,24 +46,19 @@ github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.1.1 h1:t0wUqjowdm8ezddV5k0tLWVklVuvLJpoHeb4WBdydm0=
 github.com/klauspost/cpuid/v2 v2.1.1/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 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.23.2 h1:yqyTeKQJyofWXxEv/eEVUvOrGdt/9x+0PIQ4N1kaxmE=
-github.com/libp2p/go-libp2p v0.23.2/go.mod h1:s9DEa5NLR4g+LZS+md5uGU4emjMWFiqkZr6hBTY8UxI=
+github.com/libp2p/go-libp2p v0.23.3-0.20221025171119-7465a509d011 h1:HCFywK5/BqCNO8peqtP1DK52y2FKDVilZE5b5g5Gg4s=
+github.com/libp2p/go-libp2p v0.23.3-0.20221025171119-7465a509d011/go.mod h1:9lqLgktzI5Gn2bplyrZvFSuDirYRBMU+Tu/FYBIjvek=
 github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
-github.com/libp2p/go-mplex v0.7.1-0.20220919134208-b0cc3e9c41a9 h1:PolwtQpl5xZ7j59zsvFEF3oEDxXDcLH6cVYK3qAFiMc=
-github.com/libp2p/go-mplex v0.7.1-0.20220919134208-b0cc3e9c41a9/go.mod h1:bUU7Bl6gVaLs+DK8DyT4VKY2XhsgxLmafxHCesUq+j0=
 github.com/libp2p/go-openssl v0.1.0 h1:LBkKEcUv6vtZIQLVTegAil8jbNpJErQ9AnT+bWV+Ooo=
 github.com/libp2p/go-openssl v0.1.0/go.mod h1:OiOxwPpL3n4xlenjx2h7AwSGaFSC/KZvf6gNdOBQMtc=
+github.com/libp2p/go-yamux/v4 v4.0.1-0.20220919134236-1c09f2ab3ec1 h1:fxyHejZvFIBqlznQDuHUkw9BThYKyoT3DclP/C2g8Wc=
+github.com/libp2p/go-yamux/v4 v4.0.1-0.20220919134236-1c09f2ab3ec1/go.mod h1:NWjl8ZTLOGlozrXSOZ/HlfG++39iKNnM5wwmtQP1YB4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-pointer v0.0.1 h1:n+XhsuGeVO6MEAp7xyEukFINEa+Quek5psIR/ylA6o0=
 github.com/mattn/go-pointer v0.0.1/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc=
 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
@@ -92,7 +83,6 @@ github.com/multiformats/go-multihash v0.2.1 h1:aem8ZT0VA2nCHHk7bPJ1BjUbHNciqZC/d
 github.com/multiformats/go-multihash v0.2.1/go.mod h1:WxoMcYG85AZVQUyRyo9s4wULvW5qrI9vb2Lt6evduFc=
 github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
 github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 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=
@@ -114,60 +104,36 @@ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
-go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
-go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
-go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
-go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -177,12 +143,10 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0=
 lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.12.2",
+  "version": "0.13.0",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -36,7 +36,7 @@
     "build": "rimraf ./dist && tsc --project tsconfig.build.json --outDir ./dist/",
     "check": "npm run typecheck",
     "typecheck": "tsc --noEmit",
-    "deps": "depcheck --ignores 'bufferutil,utf-8-validate'",
+    "deps": "depcheck --ignores 'bufferutil,utf-8-validate,ts-proto'",
     "codegen": "npm run gen",
     "ci": "npm run build && npm run lint:js && npm run lint:go",
     "format": "prettier --write './{srpc,echo,e2e,integration,rpcstream}/**/(*.ts|*.tsx|*.html|*.css)'",
@@ -59,36 +59,36 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.40.0",
-    "@typescript-eslint/parser": "^5.40.0",
-    "bufferutil": "^4.0.6",
+    "@typescript-eslint/eslint-plugin": "^5.41.0",
+    "@typescript-eslint/parser": "^5.41.0",
+    "bufferutil": "^4.0.7",
     "depcheck": "^1.4.3",
-    "esbuild": "^0.15.11",
-    "eslint": "^8.25.0",
+    "esbuild": "^0.15.12",
+    "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.5.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "ts-proto": "^1.128.0",
+    "ts-proto": "^1.130.0",
     "typescript": "^4.8.4",
-    "utf-8-validate": "^5.0.9"
+    "utf-8-validate": "^5.0.10"
   },
   "dependencies": {
+    "@chainsafe/libp2p-yamux": "^3.0.2",
     "@libp2p/interface-connection": "^3.0.2",
     "@libp2p/interface-stream-muxer": "^3.0.0",
-    "@libp2p/mplex": "^7.0.0",
     "event-iterator": "^2.0.0",
     "is-promise": "^4.0.0",
     "isomorphic-ws": "^5.0.0",
-    "it-first": "^1.0.7",
+    "it-first": "^2.0.0",
     "it-length-prefixed": "^8.0.3",
     "it-pipe": "^2.0.4",
     "it-pushable": "^3.1.0",
     "it-stream-types": "^1.0.4",
     "it-ws": "^5.0.3",
     "long": "^5.2.0",
-    "patch-package": "^6.4.7",
+    "patch-package": "^6.5.0",
     "protobufjs": "^7.1.2",
     "uint8arraylist": "^2.3.3",
-    "ws": "^8.9.0"
+    "ws": "^8.10.0"
   }
 }

package/srpc/accept.go

@@ -7,7 +7,7 @@ import (
 
 // AcceptMuxedListener accepts incoming connections from a net.Listener.
 //
-// Uses the default mplex muxer.
+// Uses the default yamux muxer.
 func AcceptMuxedListener(ctx context.Context, lis net.Listener, srv *Server) error {
 	for {
 		nc, err := lis.Accept()

package/srpc/client-rpc.go

@@ -185,5 +185,7 @@ func (r *ClientRPC) HandleCallData(pkt *CallData) error {
 // not concurrency safe with HandlePacket.
 func (r *ClientRPC) Close() {
 	r.ctxCancel()
-	_ = r.writer.Close()
+	if r.writer != nil {
+		_ = r.writer.Close()
+	}
 }

package/srpc/client.go

@@ -87,7 +87,7 @@ func (c *client) NewStream(ctx context.Context, service, method string, firstMsg
 		return nil, err
 	}
 
-	return NewMsgStream(ctx, clientRPC.writer, clientRPC.dataCh), nil
+	return NewMsgStream(ctx, clientRPC.writer, clientRPC.dataCh, clientRPC.ctxCancel), nil
 }
 
 // _ is a type assertion

package/srpc/common-rpc.ts

@@ -159,7 +159,7 @@ export class CommonRPC {
         }
       } catch (err) {
         const anyErr = err as any
-        if (anyErr?.code !== 'ERR_MPLEX_STREAM_RESET') {
+        if (anyErr?.code !== 'ERR_STREAM_RESET' && anyErr?.code !== 'ERR_STREAM_ABORT') {
           this.close(err as Error)
         }
       }

package/srpc/conn.ts

@@ -5,7 +5,7 @@ import type {
 } from '@libp2p/interface-stream-muxer'
 import { pipe } from 'it-pipe'
 import type { Duplex } from 'it-stream-types'
-import { mplex } from '@libp2p/mplex'
+import { yamux } from '@chainsafe/libp2p-yamux'
 import { Uint8ArrayList } from 'uint8arraylist'
 import isPromise from 'is-promise'
 
@@ -15,10 +15,10 @@ import { combineUint8ArrayListTransform } from './array-list.js'
 
 // ConnParams are parameters that can be passed to the Conn constructor.
 export interface ConnParams {
-  // muxerFactory overrides using the default factory (@libp2p/mplex).
+  // muxerFactory overrides using the default yamux factory.
   muxerFactory?: StreamMuxerFactory
   // direction is the muxer connection direction.
-  // defaults to outbound.
+  // defaults to outbound (client).
   direction?: Direction
 }
 
@@ -44,7 +44,7 @@ export function streamToSRPCStream(
 // Implements the server by handling incoming streams.
 // If the server is unset, rejects any incoming streams.
 export class Conn implements Duplex<Uint8Array> {
-  // muxer is the mplex stream muxer.
+  // muxer is the stream muxer.
   private muxer: StreamMuxer
   // server is the server side, if set.
   private server?: StreamHandler
@@ -55,7 +55,7 @@ export class Conn implements Duplex<Uint8Array> {
     }
     let muxerFactory = connParams?.muxerFactory
     if (!muxerFactory) {
-      muxerFactory = mplex()()
+      muxerFactory = yamux()()
     }
     this.muxer = muxerFactory.createStreamMuxer({
       onIncomingStream: this.handleIncomingStream.bind(this),

package/srpc/msg-stream.go

@@ -3,6 +3,7 @@ package srpc
 import (
 	"context"
 	"io"
+	"sync/atomic"
 )
 
 // MsgStream implements the stream interface passed to implementations.
@@ -13,15 +14,25 @@ type MsgStream struct {
 	writer Writer
 	// dataCh is the incoming data channel.
 	dataCh chan []byte
+	// closeCb is the close callback
+	closeCb func()
+	// sendClosed indicates sending is closed.
+	sendClosed atomic.Bool
 }
 
 // NewMsgStream constructs a new Stream with a ClientRPC.
 // dataCh should be closed when no more messages will arrive.
-func NewMsgStream(ctx context.Context, writer Writer, dataCh chan []byte) *MsgStream {
+func NewMsgStream(
+	ctx context.Context,
+	writer Writer,
+	dataCh chan []byte,
+	closeCb func(),
+) *MsgStream {
 	return &MsgStream{
-		ctx:    ctx,
-		writer: writer,
-		dataCh: dataCh,
+		ctx:     ctx,
+		writer:  writer,
+		dataCh:  dataCh,
+		closeCb: closeCb,
 	}
 }
 
@@ -32,6 +43,9 @@ func (r *MsgStream) Context() context.Context {
 
 // MsgSend sends the message to the remote.
 func (r *MsgStream) MsgSend(msg Message) error {
+	if r.sendClosed.Load() {
+		return context.Canceled
+	}
 	select {
 	case <-r.ctx.Done():
 		return context.Canceled
@@ -62,14 +76,34 @@ func (r *MsgStream) MsgRecv(msg Message) error {
 
 // CloseSend signals to the remote that we will no longer send any messages.
 func (r *MsgStream) CloseSend() error {
-	outPkt := NewCallDataPacket(nil, false, true, nil)
-	return r.writer.WritePacket(outPkt)
+	// if already closed, return
+	if r.sendClosed.Swap(true) {
+		return nil
+	}
+
+	return r.closeSend()
 }
 
 // Close closes the stream.
 func (r *MsgStream) Close() error {
-	_ = r.writer.Close()
-	return nil
+	// if already closed, return
+	if r.sendClosed.Swap(true) {
+		return nil
+	}
+
+	// don't close the writer: we will need to write the call result after the
+	// RPC function returns.
+	if r.closeCb != nil {
+		r.closeCb()
+	}
+
+	return r.closeSend()
+}
+
+// closeSend writes the CloseSend packet.
+func (r *MsgStream) closeSend() error {
+	outPkt := NewCallDataPacket(nil, false, true, nil)
+	return r.writer.WritePacket(outPkt)
 }
 
 // _ is a type assertion

package/srpc/mux.go

@@ -20,6 +20,9 @@ type muxMethods map[string]Handler
 
 // mux is the default implementation of Mux.
 type mux struct {
+	// fallback is the list of fallback invokers
+	// if the mux doesn't match the service, calls the invokers.
+	fallback []Invoker
 	// rmtx guards below fields
 	rmtx sync.RWMutex
 	// services contains a mapping from services to handlers.
@@ -27,8 +30,14 @@ type mux struct {
 }
 
 // NewMux constructs a new Mux.
-func NewMux() Mux {
-	return &mux{services: make(map[string]muxMethods)}
+//
+// fallbackInvokers is the list of fallback Invokers to call in the case that
+// the service/method is not found on this mux.
+func NewMux(fallbackInvokers ...Invoker) Mux {
+	return &mux{
+		fallback: fallbackInvokers,
+		services: make(map[string]muxMethods),
+	}
 }
 
 // Register registers a new RPC method handler (service).
@@ -95,17 +104,34 @@ func (m *mux) HasServiceMethod(serviceID, methodID string) bool {
 func (m *mux) InvokeMethod(serviceID, methodID string, strm Stream) (bool, error) {
 	var handler Handler
 	m.rmtx.RLock()
-	svcMethods := m.services[serviceID]
-	if svcMethods != nil {
-		handler = svcMethods[methodID]
+	if serviceID == "" {
+		for _, svc := range m.services {
+			if handler = svc[methodID]; handler != nil {
+				break
+			}
+		}
+	} else {
+		svcMethods := m.services[serviceID]
+		if svcMethods != nil {
+			handler = svcMethods[methodID]
+		}
 	}
 	m.rmtx.RUnlock()
 
-	if handler == nil {
-		return false, nil
+	if handler != nil {
+		return handler.InvokeMethod(serviceID, methodID, strm)
+	}
+
+	for _, invoker := range m.fallback {
+		if invoker != nil {
+			handled, err := invoker.InvokeMethod(serviceID, methodID, strm)
+			if err != nil || handled {
+				return handled, err
+			}
+		}
 	}
 
-	return handler.InvokeMethod(serviceID, methodID, strm)
+	return false, nil
 }
 
 // _ is a type assertion

package/srpc/muxed-conn.go

@@ -6,17 +6,33 @@ import (
 	"net"
 
 	"github.com/libp2p/go-libp2p/core/network"
-	mplex "github.com/libp2p/go-libp2p/p2p/muxer/mplex"
-	mp "github.com/libp2p/go-mplex"
+	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()
+	return &config
+}
+
 // NewMuxedConn constructs a new MuxedConn from a net.Conn.
 func NewMuxedConn(conn net.Conn, outbound bool) (network.MuxedConn, error) {
-	m, err := mp.NewMultiplex(conn, outbound, nil)
+	yamuxConf := NewYamuxConfig()
+
+	var sess *yamux.Session
+	var err error
+	if outbound {
+		sess, err = yamux.Client(conn, yamuxConf, nil)
+	} else {
+		sess, err = yamux.Server(conn, yamuxConf, nil)
+	}
 	if err != nil {
 		return nil, err
 	}
-	return mplex.NewMuxedConn(m), nil
+
+	return ymuxer.NewMuxedConn(sess), nil
 }
 
 // NewMuxedConnWithRwc builds a new MuxedConn with a io.ReadWriteCloser.
@@ -25,8 +41,6 @@ func NewMuxedConnWithRwc(ctx context.Context, rwc io.ReadWriteCloser, outbound b
 }
 
 // NewClientWithConn constructs the muxer and the client.
-//
-// uses libp2p mplex
 func NewClientWithConn(conn net.Conn, outbound bool) (Client, error) {
 	mconn, err := NewMuxedConn(conn, outbound)
 	if err != nil {

package/srpc/packet-rw.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/binary"
 	"io"
+	"sync"
 
 	"github.com/pkg/errors"
 )
@@ -19,6 +20,8 @@ type PacketReaderWriter struct {
 	rw io.ReadWriteCloser
 	// buf is the buffered data
 	buf bytes.Buffer
+	// writeMtx is the write mutex
+	writeMtx sync.Mutex
 }
 
 // NewPacketReadWriter constructs a new read/writer.
@@ -28,6 +31,9 @@ func NewPacketReadWriter(rw io.ReadWriteCloser) *PacketReaderWriter {
 
 // WritePacket writes a packet to the writer.
 func (r *PacketReaderWriter) WritePacket(p *Packet) error {
+	r.writeMtx.Lock()
+	defer r.writeMtx.Unlock()
+
 	msgSize := p.SizeVT()
 	data := make([]byte, 4+msgSize)
 	binary.LittleEndian.PutUint32(data, uint32(msgSize))

package/srpc/rpcproto_vtproto.pb.go

@@ -9,6 +9,7 @@ import (
 	io "io"
 	bits "math/bits"
 
+	proto "google.golang.org/protobuf/proto"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
@@ -19,6 +20,95 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+func (m *Packet) CloneVT() *Packet {
+	if m == nil {
+		return (*Packet)(nil)
+	}
+	r := &Packet{}
+	if m.Body != nil {
+		r.Body = m.Body.(interface{ CloneVT() isPacket_Body }).CloneVT()
+	}
+	if len(m.unknownFields) > 0 {
+		r.unknownFields = make([]byte, len(m.unknownFields))
+		copy(r.unknownFields, m.unknownFields)
+	}
+	return r
+}
+
+func (m *Packet) CloneGenericVT() proto.Message {
+	return m.CloneVT()
+}
+
+func (m *Packet_CallStart) CloneVT() isPacket_Body {
+	if m == nil {
+		return (*Packet_CallStart)(nil)
+	}
+	r := &Packet_CallStart{
+		CallStart: m.CallStart.CloneVT(),
+	}
+	return r
+}
+
+func (m *Packet_CallData) CloneVT() isPacket_Body {
+	if m == nil {
+		return (*Packet_CallData)(nil)
+	}
+	r := &Packet_CallData{
+		CallData: m.CallData.CloneVT(),
+	}
+	return r
+}
+
+func (m *CallStart) CloneVT() *CallStart {
+	if m == nil {
+		return (*CallStart)(nil)
+	}
+	r := &CallStart{
+		RpcService: m.RpcService,
+		RpcMethod:  m.RpcMethod,
+		DataIsZero: m.DataIsZero,
+	}
+	if rhs := m.Data; rhs != nil {
+		tmpBytes := make([]byte, len(rhs))
+		copy(tmpBytes, rhs)
+		r.Data = tmpBytes
+	}
+	if len(m.unknownFields) > 0 {
+		r.unknownFields = make([]byte, len(m.unknownFields))
+		copy(r.unknownFields, m.unknownFields)
+	}
+	return r
+}
+
+func (m *CallStart) CloneGenericVT() proto.Message {
+	return m.CloneVT()
+}
+
+func (m *CallData) CloneVT() *CallData {
+	if m == nil {
+		return (*CallData)(nil)
+	}
+	r := &CallData{
+		DataIsZero: m.DataIsZero,
+		Complete:   m.Complete,
+		Error:      m.Error,
+	}
+	if rhs := m.Data; rhs != nil {
+		tmpBytes := make([]byte, len(rhs))
+		copy(tmpBytes, rhs)
+		r.Data = tmpBytes
+	}
+	if len(m.unknownFields) > 0 {
+		r.unknownFields = make([]byte, len(m.unknownFields))
+		copy(r.unknownFields, m.unknownFields)
+	}
+	return r
+}
+
+func (m *CallData) CloneGenericVT() proto.Message {
+	return m.CloneVT()
+}
+
 func (this *Packet) EqualVT(that *Packet) bool {
 	if this == nil {
 		return that == nil

package/srpc/server-rpc.go

@@ -164,7 +164,7 @@ func (r *ServerRPC) HandleCallData(pkt *CallData) error {
 func (r *ServerRPC) invokeRPC() {
 	// ctx := r.ctx
 	serviceID, methodID := r.service, r.method
-	strm := NewMsgStream(r.ctx, r.writer, r.dataCh)
+	strm := NewMsgStream(r.ctx, r.writer, r.dataCh, r.ctxCancel)
 	ok, err := r.invoker.InvokeMethod(serviceID, methodID, strm)
 	if err == nil && !ok {
 		err = ErrUnimplemented
@@ -181,7 +181,7 @@ func (r *ServerRPC) Close() {
 	if r.clientErr == nil {
 		r.clientErr = context.Canceled
 	}
-	if r.service == "" {
+	if r.writer != nil && r.service == "" {
 		// invokeRPC has not been called, otherwise it would call Close()
 		_ = r.writer.Close()
 	}

package/srpc/server.go

@@ -40,18 +40,18 @@ func (s *Server) HandleStream(ctx context.Context, rwc io.ReadWriteCloser) error
 //
 // 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, mplex network.MuxedConn) error {
+func (s *Server) AcceptMuxedConn(ctx context.Context, mc network.MuxedConn) error {
 	for {
 		select {
 		case <-ctx.Done():
 			return context.Canceled
 		default:
-			if mplex.IsClosed() {
+			if mc.IsClosed() {
 				return io.EOF
 			}
 		}
 
-		muxedStream, err := mplex.AcceptStream()
+		muxedStream, err := mc.AcceptStream()
 		if err != nil {
 			return err
 		}

package/srpc/websocket.go

@@ -5,7 +5,6 @@ import (
 	"io"
 
 	"github.com/libp2p/go-libp2p/core/network"
-	"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
 	"nhooyr.io/websocket"
 )
 
@@ -20,7 +19,7 @@ type WebSocketConn struct {
 // NewWebSocketConn constructs a new WebSocket connection.
 func NewWebSocketConn(ctx context.Context, conn *websocket.Conn, isServer bool) (*WebSocketConn, error) {
 	nc := websocket.NetConn(ctx, conn, websocket.MessageBinary)
-	muxedConn, err := mplex.DefaultTransport.NewConn(nc, isServer, network.NullScope)
+	muxedConn, err := NewMuxedConn(nc, !isServer)
 	if err != nil {
 		return nil, err
 	}

package/srpc/websocket.ts

@@ -1,6 +1,5 @@
 import { duplex } from 'it-ws'
 import { pipe } from 'it-pipe'
-import { mplex } from '@libp2p/mplex'
 import { Direction } from '@libp2p/interface-connection'
 import type WebSocket from 'isomorphic-ws'
 
@@ -13,10 +12,7 @@ export class WebSocketConn extends Conn {
   private socket: WebSocket
 
   constructor(socket: WebSocket, direction: Direction, server?: Server) {
-    super(server, {
-      direction,
-      muxerFactory: mplex()(),
-    })
+    super(server, {direction})
     this.socket = socket
     const socketDuplex = duplex(socket)
     pipe(socketDuplex, this, socketDuplex)