starpc 0.13.1 → 0.13.2

package/e2e/e2e_test.go

@@ -30,7 +30,7 @@ func RunE2E(t *testing.T, cb func(client echo.SRPCEchoerClient) error) {
 	clientPipe, serverPipe := net.Pipe()
 
 	// outbound=true
-	clientMp, err := srpc.NewMuxedConn(clientPipe, true)
+	clientMp, err := srpc.NewMuxedConn(clientPipe, true, nil)
 	if err != nil {
 		t.Fatal(err.Error())
 	}
@@ -38,7 +38,7 @@ func RunE2E(t *testing.T, cb func(client echo.SRPCEchoerClient) error) {
 
 	ctx := context.Background()
 	// outbound=false
-	serverMp, err := srpc.NewMuxedConn(serverPipe, false)
+	serverMp, err := srpc.NewMuxedConn(serverPipe, false, nil)
 	if err != nil {
 		t.Fatal(err.Error())
 	}

package/echo/echo_srpc.pb.go

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -63,8 +63,8 @@
     "@typescript-eslint/parser": "^5.42.0",
     "bufferutil": "^4.0.7",
     "depcheck": "^1.4.3",
-    "esbuild": "^0.15.12",
-    "eslint": "^8.26.0",
+    "esbuild": "^0.15.13",
+    "eslint": "^8.27.0",
     "eslint-config-prettier": "^8.5.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
@@ -73,9 +73,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",
+    "@chainsafe/libp2p-yamux": "^3.0.3",
+    "@libp2p/interface-connection": "^3.0.3",
+    "@libp2p/interface-stream-muxer": "^3.0.1",
     "event-iterator": "^2.0.0",
     "is-promise": "^4.0.0",
     "isomorphic-ws": "^5.0.0",
@@ -85,10 +85,10 @@
     "it-pushable": "^3.1.0",
     "it-stream-types": "^1.0.4",
     "it-ws": "^5.0.3",
-    "long": "^5.2.0",
+    "long": "^5.2.1",
     "patch-package": "^6.5.0",
     "protobufjs": "^7.1.2",
     "uint8arraylist": "^2.3.3",
-    "ws": "^8.10.0"
+    "ws": "^8.11.0"
   }
 }

package/srpc/accept.go

@@ -3,19 +3,22 @@ package srpc
 import (
 	"context"
 	"net"
+
+	"github.com/libp2p/go-yamux/v4"
 )
 
 // AcceptMuxedListener accepts incoming connections from a net.Listener.
 //
 // Uses the default yamux muxer.
-func AcceptMuxedListener(ctx context.Context, lis net.Listener, srv *Server) error {
+// If yamux conf is nil, uses the defaults.
+func AcceptMuxedListener(ctx context.Context, lis net.Listener, srv *Server, yamuxConf *yamux.Config) error {
 	for {
 		nc, err := lis.Accept()
 		if err != nil {
 			return err
 		}
 
-		mc, err := NewMuxedConn(nc, false)
+		mc, err := NewMuxedConn(nc, false, yamuxConf)
 		if err != nil {
 			_ = nc.Close()
 			continue

package/srpc/muxed-conn.go

@@ -20,8 +20,12 @@ func NewYamuxConfig() *yamux.Config {
 }
 
 // NewMuxedConn constructs a new MuxedConn from a net.Conn.
-func NewMuxedConn(conn net.Conn, outbound bool) (network.MuxedConn, error) {
-	yamuxConf := NewYamuxConfig()
+//
+// If yamuxConf is nil, uses defaults.
+func NewMuxedConn(conn net.Conn, outbound bool, yamuxConf *yamux.Config) (network.MuxedConn, error) {
+	if yamuxConf == nil {
+		yamuxConf = NewYamuxConfig()
+	}
 
 	var sess *yamux.Session
 	var err error
@@ -38,13 +42,22 @@ func NewMuxedConn(conn net.Conn, outbound bool) (network.MuxedConn, error) {
 }
 
 // NewMuxedConnWithRwc builds a new MuxedConn with a io.ReadWriteCloser.
-func NewMuxedConnWithRwc(ctx context.Context, rwc io.ReadWriteCloser, outbound bool) (network.MuxedConn, error) {
-	return NewMuxedConn(NewRwcConn(ctx, rwc, nil, nil, 10), outbound)
+//
+// If yamuxConf is nil, uses defaults.
+func NewMuxedConnWithRwc(
+	ctx context.Context,
+	rwc io.ReadWriteCloser,
+	outbound bool,
+	yamuxConf *yamux.Config,
+) (network.MuxedConn, error) {
+	return NewMuxedConn(NewRwcConn(ctx, rwc, nil, nil, 10), outbound, yamuxConf)
 }
 
 // NewClientWithConn constructs the muxer and the client.
-func NewClientWithConn(conn net.Conn, outbound bool) (Client, error) {
-	mconn, err := NewMuxedConn(conn, outbound)
+//
+// if yamuxConf is nil, uses defaults.
+func NewClientWithConn(conn net.Conn, outbound bool, yamuxConf *yamux.Config) (Client, error) {
+	mconn, err := NewMuxedConn(conn, outbound, yamuxConf)
 	if err != nil {
 		return nil, err
 	}

package/srpc/server-http.go

@@ -32,16 +32,15 @@ func (s *HTTPServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	c, err := websocket.Accept(w, r, &websocket.AcceptOptions{})
 	if err != nil {
-		// TODO: handle / log error?
-		_ = err
+		w.WriteHeader(500)
+		w.Write([]byte(err.Error() + "\n"))
 		return
 	}
 	defer c.Close(websocket.StatusInternalError, "closed")
 
 	ctx := r.Context()
-	wsConn, err := NewWebSocketConn(ctx, c, true)
+	wsConn, err := NewWebSocketConn(ctx, c, true, nil)
 	if err != nil {
-		// TODO: handle / log error?
 		c.Close(websocket.StatusInternalError, err.Error())
 		return
 	}

package/srpc/websocket.go

@@ -5,6 +5,7 @@ import (
 	"io"
 
 	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-yamux/v4"
 	"nhooyr.io/websocket"
 )
 
@@ -17,9 +18,11 @@ type WebSocketConn struct {
 }
 
 // NewWebSocketConn constructs a new WebSocket connection.
-func NewWebSocketConn(ctx context.Context, conn *websocket.Conn, isServer bool) (*WebSocketConn, error) {
+//
+// if yamuxConf is unset, uses the defaults.
+func NewWebSocketConn(ctx context.Context, conn *websocket.Conn, isServer bool, yamuxConf *yamux.Config) (*WebSocketConn, error) {
 	nc := websocket.NetConn(ctx, conn, websocket.MessageBinary)
-	muxedConn, err := NewMuxedConn(nc, !isServer)
+	muxedConn, err := NewMuxedConn(nc, !isServer, yamuxConf)
 	if err != nil {
 		return nil, err
 	}