fix: scenario timeout

Author: M03ED

proxy/hysteria/server.go

@@ -2,7 +2,6 @@ package hysteria
 
 import (
 	"context"
-	"io"
 	"strings"
 	"time"
 
@@ -122,54 +121,30 @@ func (s *Server) Process(ctx context.Context, network net.Network, conn stat.Con
 		conn = connectiontracker.WrapConn(conn, connEntry)
 	}
 
-	if _, ok := iConn.(*hysteria.InterUdpConn); ok {
-		r := io.Reader(conn)
-		b := make([]byte, MaxUDPSize)
-		df := &Defragger{}
-		var firstMsg *UDPMessage
-		var firstDest net.Destination
-
-		for {
-			n, err := r.Read(b)
-			if err != nil {
-				return err
-			}
-
-			msg, err := ParseUDPMessage(b[:n])
-			if err != nil {
-				continue
-			}
-
-			dfMsg := df.Feed(msg)
-			if dfMsg == nil {
-				continue
-			}
-
-			firstMsg = dfMsg
-			firstDest, err = net.ParseDestination("udp:" + firstMsg.Addr)
-			if err != nil {
-				errors.LogDebug(context.Background(), dfMsg.Addr, " ParseDestination err ", err)
-				continue
-			}
-
-			break
+	if _, ok := iConn.(*hysteria.InterConn); ok {
+		reader := &UDPReader{
+			reader: conn,
+			df:     &Defragger{},
 		}
 
-		reader := &UDPReader{
-			Reader:    r,
-			buf:       b,
-			df:        df,
-			firstMsg:  firstMsg,
-			firstDest: &firstDest,
+		b := buf.New()
+		b.Resize(0, buf.Size)
+		n, addr, err := reader.ReadFrom(b.Bytes())
+		if err != nil {
+			b.Release()
+			return err
 		}
+		b.Resize(0, int32(n))
+		b.UDP = addr
+
+		reader.firstBuf = b
 
 		writer := &UDPWriter{
-			Writer: conn,
-			buf:    make([]byte, MaxUDPSize),
-			addr:   firstMsg.Addr,
+			writer: conn,
+			addr:   addr.NetAddr(),
 		}
 
-		return dispatcher.DispatchLink(ctx, firstDest, &transport.Link{
+		return dispatcher.DispatchLink(ctx, *addr, &transport.Link{
 			Reader: reader,
 			Writer: writer,
 		})

testing/scenarios/command_test.go

@@ -564,7 +564,9 @@ func TestRemoveUserClosesExistingConnections(t *testing.T) {
 		},
 		Outbound: []*core.OutboundHandlerConfig{
 			{
-				ProxySettings: serial.ToTypedMessage(&freedom.Config{}),
+				ProxySettings: serial.ToTypedMessage(&freedom.Config{
+					IpsBlocked: &freedom.IPRules{},
+				}),
 			},
 		},
 	}

testing/scenarios/common.go

@@ -98,6 +98,8 @@ var (
 	testBinaryPath    string
 	testBinaryCleanFn func()
 	testBinaryPathGen sync.Once
+	testBinaryBuild   sync.Once
+	testBinaryErr     error
 )
 
 func genTestBinaryPath() {
@@ -121,6 +123,17 @@ func genTestBinaryPath() {
 	})
 }
 
+func buildTestBinary(build func() error) error {
+	genTestBinaryPath()
+	testBinaryBuild.Do(func() {
+		if _, err := os.Stat(testBinaryPath); err == nil {
+			return
+		}
+		testBinaryErr = build()
+	})
+	return testBinaryErr
+}
+
 func GetSourcePath() string {
 	return filepath.Join("github.com", "xtls", "xray-core", "main")
 }

testing/scenarios/common_coverage.go

@@ -12,13 +12,10 @@ import (
 )
 
 func BuildXray() error {
-	genTestBinaryPath()
-	if _, err := os.Stat(testBinaryPath); err == nil {
-		return nil
-	}
-
-	cmd := exec.Command("go", "test", "-tags", "coverage coveragemain", "-coverpkg", "github.com/xtls/xray-core/...", "-c", "-o", testBinaryPath, GetSourcePath())
-	return cmd.Run()
+	return buildTestBinary(func() error {
+		cmd := exec.Command("go", "test", "-tags", "coverage coveragemain", "-coverpkg", "github.com/xtls/xray-core/...", "-c", "-o", testBinaryPath, GetSourcePath())
+		return cmd.Run()
+	})
 }
 
 func RunXrayProtobuf(config []byte) *exec.Cmd {

testing/scenarios/common_regular.go

@@ -11,16 +11,13 @@ import (
 )
 
 func BuildXray() error {
-	genTestBinaryPath()
-	if _, err := os.Stat(testBinaryPath); err == nil {
-		return nil
-	}
-
-	fmt.Printf("Building Xray into path (%s)\n", testBinaryPath)
-	cmd := exec.Command("go", "build", "-o="+testBinaryPath, GetSourcePath())
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return cmd.Run()
+	return buildTestBinary(func() error {
+		fmt.Printf("Building Xray into path (%s)\n", testBinaryPath)
+		cmd := exec.Command("go", "build", "-o="+testBinaryPath, GetSourcePath())
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		return cmd.Run()
+	})
 }
 
 func RunXrayProtobuf(config []byte) *exec.Cmd {