fix: xray fragment and add loglevel for xray

hiddify · Jul 30, 2024 · 288c87c · 288c87c
1 parent aeb0c78
commit 288c87c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/option/xray.go b/option/xray.go
@@ -8,4 +8,5 @@ type XrayOutboundOptions struct {
 	UDPOverTCP       *UDPOverTCPOptions `json:"udp_over_tcp,omitempty"`
 	XrayOutboundJson *map[string]any    `json:"xray_outbound_raw"`
 	Fragment         *conf.Fragment     `json:"xray_fragment"`
+	LogLevel         string             `json:"xray_loglevel"`
 }
diff --git a/outbound/xray.go b/outbound/xray.go
@@ -111,7 +111,7 @@ func NewXray(ctx context.Context, router adapter.Router, logger log.ContextLogge
 	outbounds := []map[string]any{}
 	if options.XrayOutboundJson != nil {
 		xrayconf := *options.XrayOutboundJson
-		if options.Fragment == nil {
+		if options.Fragment == nil || options.Fragment.Packets == "" {
 			xrayconf["sockopt"] = map[string]any{}
 		} else {
 			xrayconf["sockopt"] = map[string]any{
@@ -123,7 +123,7 @@ func NewXray(ctx context.Context, router adapter.Router, logger log.ContextLogge
 		outbounds = append(outbounds, xrayconf)
 	}
 
-	if options.Fragment != nil {
+	if options.Fragment != nil && options.Fragment.Packets != "" {
 		outbounds = append(outbounds, map[string]any{
 			"tag":      "fragment",
 			"protocol": "freedom",
@@ -139,7 +139,11 @@ func NewXray(ctx context.Context, router adapter.Router, logger log.ContextLogge
 			},
 		})
 	}
+
 	xray := map[string]any{
+		"log": map[string]any{
+			"loglevel": options.LogLevel,
+		},
 		"inbounds": []any{
 			map[string]any{
 				"listen":   "127.0.0.1",