Merge branch 'extended' of https://github.com/shtorm-7/sing-box-extended into extended

Signed-off-by: Shtorm <108103062+shtorm-7@users.noreply.github.com>

Dockerfile

@@ -1,18 +1,23 @@
-FROM --platform=$BUILDPLATFORM golang:1.26-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.26 AS builder
 LABEL maintainer="shtorm-7"
 COPY . /go/src/github.com/sagernet/sing-box
 WORKDIR /go/src/github.com/sagernet/sing-box
 ARG TARGETOS TARGETARCH
 ARG GOPROXY=""
-ENV GOPROXY ${GOPROXY}
+ARG CRONET_GO_PATH=/go/src/github.com/sagernet/sing-box/cronet-go
-ENV CGO_ENABLED=0
+ENV GOPROXY=${GOPROXY}
+ENV CGO_ENABLED=1
 ENV GOOS=$TARGETOS
 ENV GOARCH=$TARGETARCH
+ENV CRONET_GO_PATH=${CRONET_GO_PATH}
 RUN set -ex \
-    && apk add git build-base \
+    && git config --global --add safe.directory /go/src/github.com/sagernet/sing-box \
-    && export COMMIT=$(git rev-parse --short HEAD) \
+    && export GOTOOLCHAIN=local \
-    && export VERSION=$(go run ./cmd/internal/read_tag) \
+    && export CGO_ENABLED=1 GOOS=$TARGETOS GOARCH=$TARGETARCH \
-    && export TAGS=$(cat release/DEFAULT_BUILD_TAGS_OTHERS) \
+    && eval "$(CGO_ENABLED=0 GOOS= GOARCH= go run -C "$CRONET_GO_PATH" ./cmd/build-naive --target=$GOOS/$GOARCH --libc=musl env --export)" \
+    && export CGO_LDFLAGS="$CGO_LDFLAGS -Wl,-z,notext -Wl,-z,execstack" \
+    && export VERSION=$(CGO_ENABLED=0 GOOS= GOARCH= go run ./cmd/internal/read_tag) \
+    && export TAGS=$(cat release/DEFAULT_BUILD_TAGS_DOCKER) \
     && export LDFLAGS_SHARED=$(cat release/LDFLAGS) \
     && go build -v -trimpath -tags "$TAGS" \
         -o /go/bin/sing-box \

README.md

@@ -3,7 +3,7 @@
 [![license](https://img.shields.io/badge/license-GPLv3-blue.svg)](LICENSE)
 [![go](https://img.shields.io/badge/go-1.26-00ADD8.svg)](go.mod)
 [![codeberg](https://img.shields.io/badge/mirror-codeberg-2185D0.svg)](https://codeberg.org/shtorm-7/sing-box-extended)
-[![telegram](https://img.shields.io/badge/telegram-chat-26A5E4.svg)](https://t.me/sing_box_extended)
+[![telegram](https://img.shields.io/badge/telegram-chat-26A5E4.svg?logo=telegram)](https://t.me/sing_box_extended)
 
 Sing-box with extended features.
 

common/tls/reality_client.go

@@ -168,9 +168,9 @@ func (e *RealityClientConfig) ClientHandshake(ctx context.Context, conn net.Conn
 	}
 	binary.BigEndian.PutUint64(hello.SessionId, uint64(nowTime.Unix()))
 
-	hello.SessionId[0] = 1
+	hello.SessionId[0] = 26
-	hello.SessionId[1] = 8
+	hello.SessionId[1] = 7
-	hello.SessionId[2] = 1
+	hello.SessionId[2] = 11
 	binary.BigEndian.PutUint32(hello.SessionId[4:], uint32(time.Now().Unix()))
 	copy(hello.SessionId[8:], e.shortID[:])
 	if debug.Enabled {

option/group.go

@@ -23,9 +23,9 @@ type FallbackOutboundOptions struct {
 }
 
 type GroupCommonOption struct {
-	Outbounds       []string          `json:"outbounds"`
+	Outbounds       []string                   `json:"outbounds"`
-	Providers       []string          `json:"providers"`
+	Providers       badoption.Listable[string] `json:"providers,omitempty"`
-	Exclude         *badoption.Regexp `json:"exclude,omitempty"`
+	Exclude         *badoption.Regexp          `json:"exclude,omitempty"`
-	Include         *badoption.Regexp `json:"include,omitempty"`
+	Include         *badoption.Regexp          `json:"include,omitempty"`
-	UseAllProviders bool              `json:"use_all_providers,omitempty"`
+	UseAllProviders bool                       `json:"use_all_providers,omitempty"`
 }

option/v2ray_transport.go

@@ -118,13 +118,13 @@ type V2RayXHTTPBaseOptions struct {
 	Path                 string                     `json:"path,omitempty"`
 	Headers              map[string]string          `json:"headers,omitempty"`
 	DomainStrategy       DomainStrategy             `json:"domain_strategy,omitempty"`
-	XPaddingBytes        badoption.Range[int]    `json:"x_padding_bytes"`
+	XPaddingBytes        badoption.Range[int]       `json:"x_padding_bytes"`
 	NoGRPCHeader         bool                       `json:"no_grpc_header,omitempty"`
 	NoSSEHeader          bool                       `json:"no_sse_header,omitempty"`
-	ScMaxEachPostBytes   *badoption.Range[int]   `json:"sc_max_each_post_bytes"`
+	ScMaxEachPostBytes   *badoption.Range[int]      `json:"sc_max_each_post_bytes"`
-	ScMinPostsIntervalMs *badoption.Range[int]   `json:"sc_min_posts_interval_ms"`
+	ScMinPostsIntervalMs *badoption.Range[int]      `json:"sc_min_posts_interval_ms"`
 	ScMaxBufferedPosts   int64                      `json:"sc_max_buffered_posts,omitempty"`
-	ScStreamUpServerSecs *badoption.Range[int]   `json:"sc_stream_up_server_secs"`
+	ScStreamUpServerSecs *badoption.Range[int]      `json:"sc_stream_up_server_secs"`
 	ServerMaxHeaderBytes int                        `json:"server_max_header_bytes"`
 	TrustedXForwardedFor badoption.Listable[string] `json:"trusted_x_forwarded_for,omitempty"`
 	Xmux                 *V2RayXHTTPXmuxOptions     `json:"xmux"`
@@ -140,9 +140,9 @@ type V2RayXHTTPBaseOptions struct {
 	SeqKey               string                     `json:"seq_key,omitempty"`
 	UplinkDataPlacement  string                     `json:"uplink_data_placement,omitempty"`
 	UplinkDataKey        string                     `json:"uplink_data_key,omitempty"`
-	UplinkChunkSize      *badoption.Range[int]   `json:"uplink_chunk_size,omitempty"`
+	UplinkChunkSize      *badoption.Range[int]      `json:"uplink_chunk_size,omitempty"`
 	SessionIDTable       string                     `json:"session_id_table,omitempty"`
-	SessionIDLength      badoption.Range[int]    `json:"session_id_length,omitempty"`
+	SessionIDLength      badoption.Range[int]       `json:"session_id_length,omitempty"`
 	CongestionController string                     `json:"congestion_controller,omitempty"`
 	CWND                 int                        `json:"cwnd,omitempty"`
 }
@@ -497,7 +497,7 @@ type V2RayXHTTPXmuxOptions struct {
 	CMaxReuseTimes   badoption.Range[int] `json:"c_max_reuse_times"`
 	HMaxRequestTimes badoption.Range[int] `json:"h_max_request_times"`
 	HMaxReusableSecs badoption.Range[int] `json:"h_max_reusable_secs"`
-	HKeepAlivePeriod int64                   `json:"h_keep_alive_period"`
+	HKeepAlivePeriod int64                `json:"h_keep_alive_period"`
 }
 
 func (m *V2RayXHTTPXmuxOptions) GetNormalizedMaxConcurrency() badoption.Range[int] {

protocol/mtproxy/inbound.go

@@ -102,10 +102,9 @@ func (n *Inbound) Start(stage adapter.StartStage) error {
 }
 
 func (n *Inbound) Close() error {
+	err := common.Close(&n.listener)
 	n.proxy.Shutdown()
-	return common.Close(
+	return err
-		&n.listener,
-	)
 }
 
 func (h *Inbound) UpdateUsers(users []option.MTProxyUser) {

transport/trusttunnel/packet.go

@@ -94,18 +94,7 @@ func (u *clientPacketConn) writePacketToServer(buffer *buf.Buffer, source M.Sock
 	common.Must(binary.Write(header, binary.BigEndian, source.Port))
 	common.Must(binary.Write(header, binary.BigEndian, uint8(len(appName))))
 	common.Must1(header.WriteString(appName))
-	_, err := u.writer.Write(header.Bytes())
+	return u.writeChunks(header.Bytes(), buffer.Bytes())
-	if err != nil {
-		return err
-	}
-	_, err = u.writer.Write(buffer.Bytes())
-	if err != nil {
-		return err
-	}
-	if u.flusher != nil {
-		u.flusher.Flush()
-	}
-	return nil
 }
 
 var (
@@ -195,16 +184,5 @@ func (u *serverPacketConn) writePacketToClient(buffer *buf.Buffer, source M.Sock
 	common.Must1(header.Write(sourceAddress[:]))
 	common.Must(binary.Write(header, binary.BigEndian, source.Port))
 	common.Must(header.WriteZeroN(16 + 2))
-	_, err := u.writer.Write(header.Bytes())
+	return u.writeChunks(header.Bytes(), buffer.Bytes())
-	if err != nil {
-		return err
-	}
-	_, err = u.writer.Write(buffer.Bytes())
-	if err != nil {
-		return err
-	}
-	if u.flusher != nil {
-		u.flusher.Flush()
-	}
-	return nil
 }

transport/trusttunnel/protocol.go

@@ -71,6 +71,9 @@ type httpConn struct {
 	localAddr  net.Addr
 	deadline   *time.Timer
 	done       chan struct{}
+	closed     bool
+
+	mtx sync.Mutex
 }
 
 func (h *httpConn) setup(body io.ReadCloser, err error) {
@@ -93,6 +96,9 @@ func (h *httpConn) waitCreated() error {
 }
 
 func (h *httpConn) Close() error {
+	h.mtx.Lock()
+	h.closed = true
+	h.mtx.Unlock()
 	h.setup(nil, net.ErrClosed)
 	if closer, ok := h.writer.(io.Closer); ok {
 		_ = closer.Close()
@@ -117,11 +123,28 @@ func (h *httpConn) Close() error {
 }
 
 func (h *httpConn) writeFlush(p []byte) (n int, err error) {
-	n, err = h.writer.Write(p)
+	err = h.writeChunks(p)
+	if err != nil {
+		return 0, err
+	}
+	return len(p), nil
+}
+
+func (h *httpConn) writeChunks(chunks ...[]byte) error {
+	h.mtx.Lock()
+	defer h.mtx.Unlock()
+	if h.closed {
+		return net.ErrClosed
+	}
+	for _, chunk := range chunks {
+		if _, err := h.writer.Write(chunk); err != nil {
+			return err
+		}
+	}
 	if h.flusher != nil {
 		h.flusher.Flush()
 	}
-	return n, err
+	return nil
 }
 
 func (h *httpConn) RemoteAddr() net.Addr {