v24.12.28

XHTTP: Beyond REALITY: https://github.com/XTLS/Xray-core/discussions/4113

core/core.go

@@ -19,7 +19,7 @@ import (
 var (
 	Version_x byte = 24
 	Version_y byte = 12
-	Version_z byte = 18
+	Version_z byte = 28
 )
 
 var (

infra/conf/transport_internet.go

@@ -287,8 +287,8 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) {
 	if c.Xmux == (XmuxConfig{}) {
 		c.Xmux.MaxConcurrency.From = 16
 		c.Xmux.MaxConcurrency.To = 32
-		c.Xmux.CMaxReuseTimes.From = 64
+		c.Xmux.CMaxReuseTimes.From = 256
-		c.Xmux.CMaxReuseTimes.To = 128
+		c.Xmux.CMaxReuseTimes.To = 512
 		c.Xmux.HMaxRequestTimes.From = 800
 		c.Xmux.HMaxRequestTimes.To = 900
 	}

proxy/dokodemo/dokodemo.go

@@ -2,8 +2,8 @@ package dokodemo
 
 import (
 	"context"
+	"runtime"
 	"sync/atomic"
-	"time"
 
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"
@@ -115,14 +115,7 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn st
 
 	plcy := d.policy()
 	ctx, cancel := context.WithCancel(ctx)
-
+	timer := signal.CancelAfterInactivity(ctx, cancel, plcy.Timeouts.ConnectionIdle)
-	var timer *signal.ActivityTimer
-	// if dns req, set a short timeout value
-	if dest.Port == 53 {
-		timer = signal.CancelAfterInactivity(ctx, cancel, 10*time.Second)
-	} else {
-		timer = signal.CancelAfterInactivity(ctx, cancel, plcy.Timeouts.ConnectionIdle)
-	}
 
 	if inbound != nil {
 		inbound.Timer = timer
@@ -155,10 +148,6 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn st
 		return nil
 	}
 
-	tproxyRequest := func() error {
-		return nil
-	}
-
 	var writer buf.Writer
 	if network == net.Network_TCP {
 		writer = buf.NewWriter(conn)
@@ -188,6 +177,12 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn st
 				return err
 			}
 			writer = NewPacketWriter(pConn, &dest, mark, back)
+			defer func() {
+				runtime.Gosched()
+				common.Interrupt(link.Reader) // maybe duplicated
+				runtime.Gosched()
+				writer.(*PacketWriter).Close() // close fake UDP conns
+			}()
 			/*
 				sockopt := &internet.SocketConfig{
 					Tproxy: internet.SocketConfig_TProxy,
@@ -226,8 +221,9 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn st
 	responseDone := func() error {
 		defer timer.SetTimeout(plcy.Timeouts.UplinkOnly)
 
-		if pw, ok := writer.(*PacketWriter); ok {
+		if network == net.Network_UDP && destinationOverridden {
-			defer pw.Close()
+			buf.Copy(link.Reader, writer) // respect upload's timeout
+			return nil
 		}
 
 		if err := buf.Copy(link.Reader, writer, buf.UpdateActivity(timer)); err != nil {
@@ -236,11 +232,13 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn st
 		return nil
 	}
 
-	if err := task.Run(ctx, task.OnSuccess(func() error {
+	if err := task.Run(ctx,
-		return task.Run(ctx, requestDone, tproxyRequest)
+		task.OnSuccess(func() error { return task.Run(ctx, requestDone) }, task.Close(link.Writer)),
-	}, task.Close(link.Writer)), responseDone); err != nil {
+		responseDone); err != nil {
-		common.Interrupt(link.Reader)
+		runtime.Gosched()
 		common.Interrupt(link.Writer)
+		runtime.Gosched()
+		common.Interrupt(link.Reader)
 		return errors.New("connection ends").Base(err)
 	}