starpc 0.18.0 → 0.18.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {

package/srpc/client-rpc.go

@@ -58,7 +58,7 @@ func (r *ClientRPC) HandlePacketData(data []byte) error {
 	return r.HandlePacket(pkt)
 }
 
-// HandleStreamClose handles the incoming stream closing w/ optional error.
+// HandleStreamClose handles the stream closing optionally w/ an error.
 func (r *ClientRPC) HandleStreamClose(closeErr error) {
 	r.mtx.Lock()
 	defer r.mtx.Unlock()

package/srpc/net.go

@@ -0,0 +1,44 @@
+package srpc
+
+import (
+	"context"
+	"net"
+)
+
+// Dial dials a remote server using TCP with the default muxed conn type.
+func Dial(addr string) (Client, error) {
+	nconn, err := net.Dial("tcp", addr)
+	if err != nil {
+		return nil, err
+	}
+	muxedConn, err := NewMuxedConn(nconn, false, nil)
+	if err != nil {
+		return nil, err
+	}
+	return NewClientWithMuxedConn(muxedConn), nil
+}
+
+// Listen listens for incoming connections with TCP on the given address with the default muxed conn type.
+// Returns on any fatal error or if ctx was canceled.
+// errCh is an optional error channel (can be nil)
+func Listen(ctx context.Context, addr string, srv *Server, errCh <-chan error) error {
+	lis, err := net.Listen("tcp", addr)
+	if err != nil {
+		return err
+	}
+
+	listenErrCh := make(chan error, 1)
+	go func() {
+		listenErrCh <- AcceptMuxedListener(ctx, lis, srv, nil)
+		_ = lis.Close()
+	}()
+
+	select {
+	case <-ctx.Done():
+		return context.Canceled
+	case err := <-errCh:
+		return err
+	case err := <-listenErrCh:
+		return err
+	}
+}