simplify ray stream

proxy/freedom/freedom.go

@@ -4,6 +4,7 @@ package freedom
 
 import (
 	"context"
+	"io"
 	"runtime"
 	"time"
 
@@ -112,8 +113,13 @@ func (v *Handler) Process(ctx context.Context, outboundRay ray.OutboundRay, dial
 	ctx, timer := signal.CancelAfterInactivity(ctx, timeout)
 
 	requestDone := signal.ExecuteAsync(func() error {
-		v2writer := buf.NewWriter(conn)
-		if err := buf.PipeUntilEOF(timer, input, v2writer); err != nil {
+		var writer buf.Writer
+		if destination.Network == net.Network_TCP {
+			writer = buf.NewWriter(conn)
+		} else {
+			writer = &seqWriter{writer: conn}
+		}
+		if err := buf.PipeUntilEOF(timer, input, writer); err != nil {
 			return err
 		}
 		return nil
@@ -145,3 +151,19 @@ func init() {
 		return New(ctx, config.(*Config))
 	}))
 }
+
+type seqWriter struct {
+	writer io.Writer
+}
+
+func (w *seqWriter) Write(mb buf.MultiBuffer) error {
+	defer mb.Release()
+
+	for _, b := range mb {
+		if _, err := w.writer.Write(b.Bytes()); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

proxy/shadowsocks/client.go

@@ -105,8 +105,7 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay, diale
 		}
 
 		requestDone := signal.ExecuteAsync(func() error {
-			mergedInput := buf.NewMergingReader(outboundRay.OutboundInput())
-			if err := buf.PipeUntilEOF(timer, mergedInput, bodyWriter); err != nil {
+			if err := buf.PipeUntilEOF(timer, outboundRay.OutboundInput(), bodyWriter); err != nil {
 				return err
 			}
 			return nil

proxy/shadowsocks/server.go

@@ -160,8 +160,7 @@ func (s *Server) handleConnection(ctx context.Context, conn internet.Connection,
 			return newError("failed to write response").Base(err)
 		}
 
-		mergeReader := buf.NewMergingReader(ray.InboundOutput())
-		payload, err := mergeReader.Read()
+		payload, err := ray.InboundOutput().Read()
 		if err != nil {
 			return err
 		}
@@ -174,7 +173,7 @@ func (s *Server) handleConnection(ctx context.Context, conn internet.Connection,
 			return err
 		}
 
-		if err := buf.PipeUntilEOF(timer, mergeReader, responseWriter); err != nil {
+		if err := buf.PipeUntilEOF(timer, ray.InboundOutput(), responseWriter); err != nil {
 			return newError("failed to transport all TCP response").Base(err)
 		}
 

proxy/vmess/inbound/inbound.go

@@ -140,12 +140,8 @@ func transferResponse(timer signal.ActivityTimer, session *encoding.ServerSessio
 
 	bodyWriter := session.EncodeResponseBody(request, output)
 
-	var reader buf.Reader = input
-	if request.Command == protocol.RequestCommandTCP {
-		reader = buf.NewMergingReader(input)
-	}
 	// Optimize for small response packet
-	data, err := reader.Read()
+	data, err := input.Read()
 	if err != nil {
 		return err
 	}
@@ -161,7 +157,7 @@ func transferResponse(timer signal.ActivityTimer, session *encoding.ServerSessio
 		}
 	}
 
-	if err := buf.PipeUntilEOF(timer, reader, bodyWriter); err != nil {
+	if err := buf.PipeUntilEOF(timer, input, bodyWriter); err != nil {
 		return err
 	}
 

proxy/vmess/outbound/outbound.go

@@ -123,12 +123,7 @@ func (v *Handler) Process(ctx context.Context, outboundRay ray.OutboundRay, dial
 			return err
 		}
 
-		var inputReader buf.Reader = input
-		if request.Command == protocol.RequestCommandTCP {
-			inputReader = buf.NewMergingReader(input)
-		}
-
-		if err := buf.PipeUntilEOF(timer, inputReader, bodyWriter); err != nil {
+		if err := buf.PipeUntilEOF(timer, input, bodyWriter); err != nil {
 			return err
 		}