Prepare v2ray client/server transport

inbound/default.go

@@ -113,6 +113,22 @@ func (a *myInboundAdapter) Start() error {
 	return nil
 }
 
+func (a *myInboundAdapter) ListenTCP() (*net.TCPListener, error) {
+	var err error
+	bindAddr := M.SocksaddrFrom(netip.Addr(a.listenOptions.Listen), a.listenOptions.ListenPort)
+	var tcpListener *net.TCPListener
+	if !a.listenOptions.TCPFastOpen {
+		tcpListener, err = net.ListenTCP(M.NetworkFromNetAddr(N.NetworkTCP, bindAddr.Addr), bindAddr.TCPAddr())
+	} else {
+		tcpListener, err = tfo.ListenTCP(M.NetworkFromNetAddr(N.NetworkTCP, bindAddr.Addr), bindAddr.TCPAddr())
+	}
+	if err == nil {
+		a.logger.Info("tcp server started at ", tcpListener.Addr())
+	}
+	a.tcpListener = tcpListener
+	return tcpListener, err
+}
+
 func (a *myInboundAdapter) Close() error {
 	var err error
 	if a.clearSystemProxy != nil {
@@ -156,24 +172,31 @@ func (a *myInboundAdapter) loopTCPIn() {
 		if err != nil {
 			return
 		}
-		go func() {
-			ctx := log.ContextWithNewID(a.ctx)
-			var metadata adapter.InboundContext
-			metadata.Inbound = a.tag
-			metadata.InboundType = a.protocol
-			metadata.SniffEnabled = a.listenOptions.SniffEnabled
-			metadata.SniffOverrideDestination = a.listenOptions.SniffOverrideDestination
-			metadata.DomainStrategy = dns.DomainStrategy(a.listenOptions.DomainStrategy)
-			metadata.Network = N.NetworkTCP
-			metadata.Source = M.SocksaddrFromNet(conn.RemoteAddr())
-			metadata.OriginDestination = M.SocksaddrFromNet(conn.LocalAddr())
-			a.logger.InfoContext(ctx, "inbound connection from ", metadata.Source)
-			hErr := a.connHandler.NewConnection(ctx, conn, metadata)
-			if hErr != nil {
-				conn.Close()
-				a.NewError(ctx, E.Cause(hErr, "process connection from ", metadata.Source))
-			}
-		}()
+		go a.injectTCP(conn)
+	}
+}
+
+func (a *myInboundAdapter) createMetadata(conn net.Conn) adapter.InboundContext {
+	var metadata adapter.InboundContext
+	metadata.Inbound = a.tag
+	metadata.InboundType = a.protocol
+	metadata.SniffEnabled = a.listenOptions.SniffEnabled
+	metadata.SniffOverrideDestination = a.listenOptions.SniffOverrideDestination
+	metadata.DomainStrategy = dns.DomainStrategy(a.listenOptions.DomainStrategy)
+	metadata.Network = N.NetworkTCP
+	metadata.Source = M.SocksaddrFromNet(conn.RemoteAddr())
+	metadata.OriginDestination = M.SocksaddrFromNet(conn.LocalAddr())
+	return metadata
+}
+
+func (a *myInboundAdapter) injectTCP(conn net.Conn) {
+	ctx := log.ContextWithNewID(a.ctx)
+	metadata := a.createMetadata(conn)
+	a.logger.InfoContext(ctx, "inbound connection from ", metadata.Source)
+	hErr := a.connHandler.NewConnection(ctx, conn, metadata)
+	if hErr != nil {
+		conn.Close()
+		a.NewError(ctx, E.Cause(hErr, "process connection from ", metadata.Source))
 	}
 }
 

inbound/vmess.go

@@ -10,6 +10,7 @@ import (
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
+	"github.com/sagernet/sing-box/transport/v2ray"
 	"github.com/sagernet/sing-vmess"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/auth"
@@ -22,9 +23,11 @@ var _ adapter.Inbound = (*VMess)(nil)
 
 type VMess struct {
 	myInboundAdapter
+	ctx       context.Context
 	service   *vmess.Service[int]
 	users     []option.VMessUser
 	tlsConfig *TLSConfig
+	transport adapter.V2RayServerTransport
 }
 
 func NewVMess(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.VMessInboundOptions) (*VMess, error) {
@@ -38,9 +41,11 @@ func NewVMess(ctx context.Context, router adapter.Router, logger log.ContextLogg
 			tag:           tag,
 			listenOptions: options.ListenOptions,
 		},
+		ctx:   ctx,
 		users: options.Users,
 	}
 	service := vmess.NewService[int](adapter.NewUpstreamContextHandler(inbound.newConnection, inbound.newPacketConnection, inbound))
+	inbound.service = service
 	err := service.UpdateUsers(common.MapIndexed(options.Users, func(index int, it option.VMessUser) int {
 		return index
 	}), common.Map(options.Users, func(it option.VMessUser) string {
@@ -52,28 +57,43 @@ func NewVMess(ctx context.Context, router adapter.Router, logger log.ContextLogg
 		return nil, err
 	}
 	if options.TLS != nil {
-		tlsConfig, err := NewTLSConfig(ctx, logger, common.PtrValueOrDefault(options.TLS))
+		inbound.tlsConfig, err = NewTLSConfig(ctx, logger, common.PtrValueOrDefault(options.TLS))
+		if err != nil {
+			return nil, err
+		}
+	}
+	if options.Transport != nil {
+		inbound.transport, err = v2ray.NewServerTransport(ctx, common.PtrValueOrDefault(options.Transport), inbound.tlsConfig.Config(), adapter.NewUpstreamHandler(adapter.InboundContext{}, inbound.newTransportConnection, nil, nil))
 		if err != nil {
 			return nil, err
 		}
-		inbound.tlsConfig = tlsConfig
 	}
-	inbound.service = service
 	inbound.connHandler = inbound
 	return inbound, nil
 }
 
 func (h *VMess) Start() error {
-	if h.tlsConfig != nil {
-		err := h.tlsConfig.Start()
-		if err != nil {
-			return E.Cause(err, "create TLS config")
-		}
-	}
-	return common.Start(
+	err := common.Start(
 		h.service,
-		&h.myInboundAdapter,
+		h.tlsConfig,
 	)
+	if err != nil {
+		return err
+	}
+	if h.transport == nil {
+		return h.myInboundAdapter.Start()
+	}
+	tcpListener, err := h.myInboundAdapter.ListenTCP()
+	if err != nil {
+		return err
+	}
+	go func() {
+		sErr := h.transport.Serve(tcpListener)
+		if sErr != nil && !E.IsClosed(sErr) {
+			h.logger.Error("transport serve error: ", sErr)
+		}
+	}()
+	return nil
 }
 
 func (h *VMess) Close() error {
@@ -81,6 +101,7 @@ func (h *VMess) Close() error {
 		h.service,
 		&h.myInboundAdapter,
 		common.PtrOrNil(h.tlsConfig),
+		h.transport,
 	)
 }
 
@@ -91,6 +112,11 @@ func (h *VMess) NewConnection(ctx context.Context, conn net.Conn, metadata adapt
 	return h.service.NewConnection(adapter.WithContext(log.ContextWithNewID(ctx), &metadata), conn, adapter.UpstreamMetadata(metadata))
 }
 
+func (h *VMess) newTransportConnection(ctx context.Context, conn net.Conn, metadata adapter.InboundContext) error {
+	metadata = h.createMetadata(conn)
+	return h.service.NewConnection(adapter.WithContext(log.ContextWithNewID(ctx), &metadata), conn, adapter.UpstreamMetadata(metadata))
+}
+
 func (h *VMess) newConnection(ctx context.Context, conn net.Conn, metadata adapter.InboundContext) error {
 	userIndex, loaded := auth.UserFromContext[int](ctx)
 	if !loaded {