starpc 0.8.3 → 0.8.4

package/echo/server.go

@@ -21,6 +21,11 @@ func NewEchoServer(rpcStreamMux srpc.Mux) *EchoServer {
 	return &EchoServer{rpcStreamMux: rpcStreamMux}
 }
 
+// Register registers the Echo server with the Mux.
+func (e *EchoServer) Register(mux srpc.Mux) error {
+	return SRPCRegisterEchoer(mux, e)
+}
+
 // Echo implements echo.SRPCEchoerServer
 func (*EchoServer) Echo(ctx context.Context, msg *EchoMsg) (*EchoMsg, error) {
 	return proto.Clone(msg).(*EchoMsg), nil

package/package.json

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

package/srpc/server-rpc.go

@@ -2,6 +2,9 @@ package srpc
 
 import (
 	"context"
+	"io"
+	"runtime"
+	"time"
 
 	"github.com/pkg/errors"
 )
@@ -66,12 +69,19 @@ func (r *ServerRPC) Wait(ctx context.Context) error {
 
 // HandleStreamClose handles the incoming stream closing w/ optional error.
 func (r *ServerRPC) HandleStreamClose(closeErr error) {
+	if r.dataChClosed {
+		return
+	}
 	if closeErr != nil {
 		if r.clientErr == nil {
 			r.clientErr = closeErr
 		}
-		r.Close()
+		if closeErr != io.EOF && closeErr != context.Canceled {
+			r.Close()
+		}
 	}
+	r.dataChClosed = true
+	close(r.dataCh)
 }
 
 // HandlePacket handles an incoming parsed message packet.
@@ -163,8 +173,16 @@ func (r *ServerRPC) invokeRPC() {
 	}
 	outPkt := NewCallDataPacket(nil, false, true, err)
 	_ = r.writer.WritePacket(outPkt)
-	r.ctxCancel()
+
+	// HACK: some multiplexers will drop the last packet if Close is called too
+	// soon after Write. Add a brief delay to ensure the packet is written.
+	//
+	// See: https://github.com/lucas-clemente/quic-go/issues/3472
+	runtime.Gosched()
+	time.Sleep(time.Millisecond)
+
 	_ = r.writer.Close()
+	r.ctxCancel()
 }
 
 // Close releases any resources held by the ServerRPC.
@@ -173,9 +191,9 @@ func (r *ServerRPC) Close() {
 	if r.clientErr == nil {
 		r.clientErr = context.Canceled
 	}
-	r.ctxCancel()
 	if r.service == "" {
 		// invokeRPC has not been called, otherwise it would call Close()
 		_ = r.writer.Close()
 	}
+	r.ctxCancel()
 }