starpc 0.8.2 → 0.8.3

package/package.json

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

package/srpc/accept.go

@@ -0,0 +1,29 @@
+package srpc
+
+import (
+	"context"
+	"net"
+)
+
+// AcceptMuxedListener accepts incoming connections from a net.Listener.
+//
+// Uses the default mplex muxer.
+func AcceptMuxedListener(ctx context.Context, lis net.Listener, srv *Server) error {
+	for {
+		nc, err := lis.Accept()
+		if err != nil {
+			return err
+		}
+
+		mc, err := NewMuxedConn(nc, true)
+		if err != nil {
+			_ = nc.Close()
+			continue
+		}
+
+		if err := srv.AcceptMuxedConn(ctx, mc); err != nil {
+			_ = nc.Close()
+			continue
+		}
+	}
+}

package/srpc/packet-rw.go

@@ -2,6 +2,7 @@ package srpc
 
 import (
 	"bytes"
+	"context"
 	"encoding/binary"
 	"io"
 
@@ -54,15 +55,18 @@ func (r *PacketReaderWriter) ReadPump(cb PacketHandler, closed CloseHandler) {
 func (r *PacketReaderWriter) ReadToHandler(cb PacketHandler) error {
 	var currLen uint32
 	buf := make([]byte, 2048)
-	for {
+	isOpen := true
+	for isOpen {
 		// read some data into the buffer
 		n, err := r.rw.Read(buf)
 		if err != nil {
-			if err == io.EOF {
-				err = nil
+			if err == io.EOF || err == context.Canceled {
+				isOpen = false
+			} else {
+				return err
 			}
-			return err
 		}
+
 		// push the data to r.buf
 		_, err = r.buf.Write(buf[:n])
 		if err != nil {
@@ -99,6 +103,9 @@ func (r *PacketReaderWriter) ReadToHandler(cb PacketHandler) error {
 			}
 		}
 	}
+
+	// closed
+	return nil
 }
 
 // Close closes the packet rw.