documentation: Bump version

Co-authored-by: anytls <anytls>

.github/goreleaser/README.md

@@ -1,3 +0,0 @@
-# goreleaser
-
-I'm sorry for this, but I can't afford to renew for now because the subscription is too expensive for an open source project.

.github/goreleaser/config.json

@@ -1,87 +0,0 @@
-{
-  "dns": {
-    "servers": [
-      {
-        "type": "tls",
-        "server": "8.8.8.8"
-      }
-    ]
-  },
-  "inbounds": [
-    {
-      "type": "tun",
-      "address": [
-        "172.19.0.1/30",
-        "fdfe:dcba:9876::1/126"
-      ],
-      "auto_route": true,
-      "auto_redirect": true
-    }
-  ],
-  "certificate": {
-    "tls_decryption": {
-      "enabled": true,
-      "key_pair_p12": "MIIKYQIBAzCCChEGCSqGSIb3DQEHAaCCCgIEggn+MIIJ+jCCBGgGCSqGSIb3DQEHBqCCBFkwggRVAgEAMIIETgYJKoZIhvcNAQcBMF0GCSqGSIb3DQEFDTBQMC8GCSqGSIb3DQEFDDAiBBBxLjkB6wrMHpRNPnq8KUnXAgIIADAKBggqhkiG9w0CCTAdBglghkgBZQMEASoEEHFou8IR0ZPb9O4NaLDC5LKAggPgL/7EoJRMEx5ZDVm2ZUQRuGyjS+lMB4JDZiykYfvfzMtQ2LZ+aO90rLxYFh4uBpbu+mmA0WDF/HU3GbE0nyY9beo0RAh0/u2Ak2kkfDSntRPVTl5zNBrT9hEtH9oSlN7tok9SMhWEJlsoIRhGinJwsDnDbXcIqkIj/oqtXlSJc6gA7CYf6AJRrVjP1Wtk80GMrMfYNvQw9bich5fs4biddf0xtR13YFV80rCPb+HtTT4KYa7Rzo5qR/cNHsMP/3v5BT2UszpaSIokPoW8ta1RWcQNXuH3OHjG4GMjg88w6xtyudIKrTyP0BTRfIJ2S2EtsWGHU2Gmr/MUY0a7abbtG+LVdSCRTgDoNeiY4C7lkQEOpefoZHWa3+jeGu17812YZHxfCZuhFy33rZgqngWRN1cdxoAbhozChtKmn0Uhdox7jqUw5M/Sj4DWHm0RNB8Ffvf39i/zvlfORzljIiwAKiB26FwpcKKRfx7rrjx4xRLkTLWl0DnJKxOcVz/oXSjglpHJvUSMgbpzXEHHQ7+d+K/WTnoj+dONifxiWBt1hQA8qoPiQceYWGY37oeWvGZI/Qv3ZSO5Mm/yVAuAFyOzJdpW5aC3Kq3gwNVbKNeeV5fWDtvP2K9XcgZFv8OqpNnvLmaL+iWHTPg5wYGvf0iWPr8NVU6OQpSZCOTodwOGfcpQ2YlCnkBgkjkJFLNuM4mi1U9kyTZWAYyZ6zVort0eezJcBoQGBBV2/GkFmwDNa9Q8mT8S7QTf7ZqAtyMnM9rBch7zIscBk6swG/KhgFRtUmDLpY6tpMb6vHHueu4duaUvIXvdjgTe4oE2Ou36VZ1+dC+RswmGCMwFlHqsZiIfU26SDiC3G9wH0iIg6th3LrDJYYD57l5Ps0pVjS7RAYYzu1lA2d2wGEFBJ3UEpJp257Wv2I6foeoTYXSX/XM1JUuFv1516qSqwPk4a1E6N6J+d+iWvM7BBcwakMG1XSUT4zhHrBzPPxXCCBeJHTcOoiaqXwaqsBBButSxViysvGZcBbyAxZNtmXCDh33a760XF4tb1f0mb2jW13CMARGOeubM3Z21eoc16tFkoKSD3wlzT2VlxVuUIgBT+wx4GOWgldngn2aXWInOkaEFdwABBLh5egxNBAI2tzirk6ijpRCq+gquTbEhxIwJavCfdYc0lqMevsEiZxqjoZHEf1EoId/rd3TEdclRf5OzLjbSbDICtFI82S5A+wDMXltVmB+Rw1mBZZUhvbUUOC7ARQ0pkE8DfwgPviFo2z8/i++3Mb02D57V1Mz1k6PB56QzlEOTJrmaBXSQs7U8Aiuln6CA+McwggWKBgkqhkiG9w0BBwGgggV7BIIFdzCCBXMwggVvBgsqhkiG9w0BDAoBAqCCBTcwggUzMF0GCSqGSIb3DQEFDTBQMC8GCSqGSIb3DQEFDDAiBBCl+G6epsuiNjP2afUFOwazAgIIADAKBggqhkiG9w0CCTAdBglghkgBZQMEASoEEG2FLRo+Ud+dbzCVbrer71YEggTQ81fiT0+gLnYWZpNq0MV/kPma4P+sws4wRd5CVG5rCMwmmr3JUCVk66uYLZTBXqHJ0qy3CPE2K1siImQJNS3DMD1q9WVCLPFEPLbO1ycsV73AOMc2UNJMkY7AgGCMpK+u/afMewsnAk/fmwjTw5qOm21TeesahwVvIMb3pQrkFu8FSIWK9IPRX7VCiYSa/KajiFKi0/lWEk9/LJEfikqGOB3FWYQkrV4jhhh+SNMm5LATgNgZ3FyhleruJZup0PN25W2IrpjcEBr9gHVU6gsCyB4PTTrVfopLq7goDWnOQeeAa4Y98QN6nT0EyqkfKU678/JeLz0gW8zijgdqzLwwucLg6cGE379d/2igE7/SJO8qa/JAjD3RDe88N97ysKW7vOOvIH6DnmkgQc8Cq/KKOyVlrDNx65YEft1oqVE3L5IfnmHT5ycbzyMJpdB6uL6OT9KqVLB2bHWDH47XfI8I8z56mzmKSXrWGm93beYV8u908Rokj82LHGEf9th6ttBZykWZgS+hQjc3jIU8xpa2/7mpPVFBCTiphBtp3+fCEVKmnubiiwe28Lw+xEvX8oAEGXhi5fNIGrAXvMk/rgpoh44wQwET6WnyiO8Ad8hOxvPtwgGD0m0FNFlv+yIGzY1PZeevquLKEwtvllo/A3g0OUbeGC2qC5s8VGkv11FRQPdUnOV2oXvosAWqxh6SnVrG8xbxc5L2xjJuUH8b70ne4iXzcfXo5FubtLuuJ6WNFWO9UasmvKaMqFZDlMK8FMcNTq6X0m8ilRZf056C3FDQAMxIa9mKyWebm3+4+LfxjgWo1dxvXR5HnMpzCbcoz/TIbSiUzSTaihxpzMi7Cvkc/JqPTTSkqjR+jLw7tOZucP8VtpQmQvqg2fd1hBgqam37qVC45D2765/V5v74+gtn5nc6HrGOEwpLlqcy5kojrjhQkNUkS7x5vg1KOFP/9uoC67qRFaGH5EM0XAdTVAyt1gn+StXVCXsNKvX93BPaNwL7we/zYZPpERFHaVD9R1Fw2Bz0+RzcdNQqP9yiq3mmmGNZHS0KSAKP3cmA3pwt9gPjpt/L1VNFgkVti2/YIDF37c3yuU9ZBI6kA7LhkcH5j0APr1ppS+Zxw6UKhsZDSGySqPyz3C2k4wy+R2+8mO1dN9haRW0smWWnziHWh8OFGhG+ghvc2HiX1tg2dTrByIFr9wixs4Kn9wDg0Qc1mS0+2+KacO8todl3jVYsLhcSTt5d2b/ZHuyAx4UPFtWPPF1vFdRMnf1jq83q/OEcTSfqkiEpEzs6NXpDEy1E0neq+LVHXi37IHzTGjjIvBnE2KZUoUdiFYitfDoUQpdhSpWKZTsmpqVXi/b7TZ20scvt5Qb6nfEWNds7hyGhnzAGQIV64xaDhKDB1p3QpDYxsJHvAGC1Yj9CY5w+sYpOjsfUo0qKeaFmu0fWX44s388GjZbid92/UvIxN9Lt/jri2xq+XPjJR194hc2ITUDrZvaaqeZ4odH4HXUC7FMqL6NVeX6MIv4g2QQkrt9DO35LokztOQCeuaA4rOZiM7mR3JJZIXf2jFNwElU0bvUJY2eYcQwTSQPXBzMz0AvhXxJiOFx3IQHHl55j4KMpab/NNbHChDUWJ7ptLX0/x8R3scJjCqwxJTAjBgkqhkiG9w0BCRUxFgQU6W6dFe0wnwEJqyaK7H5cUfUvxzQwRzAvMAsGCWCGSAFlAwQCAQQghQoDpo4gS46c+xoCeAykL69ZRT3zYrgNkgvL6s2UIVsEEHkNJl2cMvSFmZ8gi+cS/vQCAggA",
-      "key_pair_p12_password": "D173A3D9"
-    }
-  },
-  "mitm": {
-    "enabled": true,
-    "http2_enabled": true
-  },
-  "outbounds": [
-    {
-      "type": "direct",
-      "tag": "direct"
-    }
-  ],
-  "route": {
-    "rules": [
-      {
-        "action": "sniff"
-      },
-      {
-        "type": "logical",
-        "mode": "or",
-        "rules": [
-          {
-            "network": "udp",
-            "port": 53
-          },
-          {
-            "protocol": "dns"
-          }
-        ],
-        "action": "hijack-dns"
-      },
-      {
-        "ip_is_private": true,
-        "outbound": "direct"
-      },
-      {
-        "action": "resolve"
-      },
-      {
-        "domain": "goreleaser.com",
-        "action": "route-options",
-        "mitm": {
-          "enabled": true,
-          "surge_map_local": [
-            "^https://goreleaser\\.com/static/latest-pro data-type=text data=\"(update check disabled)\""
-          ]
-        }
-      },
-      {
-        "domain": "api.gumroad.com",
-        "action": "route-options",
-        "mitm": {
-          "enabled": true,
-          "surge_map_local": [
-            "^https://api\\.gumroad\\.com/v2/licenses/verify data-type=file data=.github/goreleaser/response.json header=\"Content-Type:application/json\""
-          ]
-        }
-      }
-    ],
-    "auto_detect_interface": true
-  }
-}

.github/goreleaser/configure.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -e -o pipefail
-
-release/local/install_minimal.sh
-sudo cp .github/goreleaser/config.json /usr/local/etc/sing-box/config.json
-sudo mkdir -p /var/lib/sing-box/.github/goreleaser
-sudo cp .github/goreleaser/response.json /var/lib/sing-box/.github/goreleaser/response.json
-go run -v ./cmd/sing-box tools install-ca .github/goreleaser/ca.crt
-sudo systemctl start sing-box
-sleep 5

.github/goreleaser/response.json

@@ -1,12 +0,0 @@
-{
-  "success": true,
-  "purchase": {
-    "license_key": "fake-key",
-    "subscription_id": "fake-id",
-    "product_id": "7ev6hHL7RZc753daE5bRNw==",
-    "product_permalink": "https:\/\/beckersoft.gumroad.com\/l\/goreleaser",
-    "seller_id": "A2wDalJj66fJdFU_jwy_oA==",
-    "short_product_id": "CadfZ",
-    "permalink": "goreleaser"
-  }
-}

.gitignore

@@ -1,7 +1,6 @@
 /.idea/
 /vendor/
 /*.json
-/*.js
 /*.srs
 /*.db
 /site/

.golangci.yml

@@ -31,7 +31,6 @@ run:
     - with_reality_server
     - with_acme
     - with_clash_api
-    - with_script
 
 issues:
   exclude-dirs:

.goreleaser.yaml

@@ -21,7 +21,6 @@ builds:
       - with_acme
       - with_clash_api
       - with_tailscale
-      - with_script
     env:
       - CGO_ENABLED=0
       - GOTOOLCHAIN=local
@@ -52,7 +51,6 @@ builds:
       - with_acme
       - with_clash_api
       - with_tailscale
-      - with_script
     env:
       - CGO_ENABLED=0
       - GOROOT={{ .Env.GOPATH }}/go_legacy

Makefile

@@ -1,7 +1,7 @@
 NAME = sing-box
 COMMIT = $(shell git rev-parse --short HEAD)
 TAGS_GO120 = with_gvisor,with_dhcp,with_wireguard,with_reality_server,with_clash_api,with_quic,with_utls
-TAGS_GO123 = with_tailscale,with_script
+TAGS_GO123 = with_tailscale
 TAGS ?= $(TAGS_GO120),$(TAGS_GO123)
 TAGS_TEST ?= with_gvisor,with_quic,with_wireguard,with_grpc,with_utls,with_reality_server
 
@@ -233,8 +233,8 @@ lib:
 	go run ./cmd/internal/build_libbox -target ios
 
 lib_install:
-	go install -v github.com/sagernet/gomobile/cmd/gomobile@v0.1.5
-	go install -v github.com/sagernet/gomobile/cmd/gobind@v0.1.5
+	go install -v github.com/sagernet/gomobile/cmd/gomobile@v0.1.4
+	go install -v github.com/sagernet/gomobile/cmd/gobind@v0.1.4
 
 docs:
 	venv/bin/mkdocs serve

adapter/certificate.go

@@ -10,9 +10,6 @@ import (
 type CertificateStore interface {
 	LifecycleService
 	Pool() *x509.CertPool
-	TLSDecryptionEnabled() bool
-	TLSDecryptionCertificate() *x509.Certificate
-	TLSDecryptionPrivateKey() any
 }
 
 func RootPoolFromContext(ctx context.Context) *x509.CertPool {

adapter/dns.go

@@ -45,10 +45,10 @@ type RDRCStore interface {
 }
 
 type DNSTransport interface {
-	Lifecycle
 	Type() string
 	Tag() string
 	Dependencies() []string
+	Reset()
 	Exchange(ctx context.Context, message *dns.Msg) (*dns.Msg, error)
 }
 

adapter/experimental.go

@@ -52,10 +52,6 @@ type CacheFile interface {
 	StoreGroupExpand(group string, expand bool) error
 	LoadRuleSet(tag string) *SavedBinary
 	SaveRuleSet(tag string, set *SavedBinary) error
-	LoadScript(tag string) *SavedBinary
-	SaveScript(tag string, script *SavedBinary) error
-	SurgePersistentStoreRead(key string) string
-	SurgePersistentStoreWrite(key string, value string) error
 }
 
 type SavedBinary struct {

adapter/inbound.go

@@ -2,8 +2,6 @@ package adapter
 
 import (
 	"context"
-	"crypto/tls"
-	"net/http"
 	"net/netip"
 	"time"
 
@@ -60,8 +58,6 @@ type InboundContext struct {
 	Client           string
 	SniffContext     any
 	PacketSniffError error
-	HTTPRequest      *http.Request
-	ClientHello      *tls.ClientHelloInfo
 
 	// cache
 
@@ -78,7 +74,6 @@ type InboundContext struct {
 	UDPTimeout                time.Duration
 	TLSFragment               bool
 	TLSFragmentFallbackDelay  time.Duration
-	MITM                      *option.MITMRouteOptions
 
 	NetworkStrategy     *C.NetworkStrategy
 	NetworkType         []C.InterfaceType

adapter/lifecycle.go

@@ -1,8 +1,6 @@
 package adapter
 
-import (
-	E "github.com/sagernet/sing/common/exceptions"
-)
+import E "github.com/sagernet/sing/common/exceptions"
 
 type StartStage uint8
 
@@ -47,9 +45,6 @@ type LifecycleService interface {
 
 func Start(stage StartStage, services ...Lifecycle) error {
 	for _, service := range services {
-		if service == nil {
-			continue
-		}
 		err := service.Start(stage)
 		if err != nil {
 			return err

adapter/mitm.go

@@ -1,13 +0,0 @@
-package adapter
-
-import (
-	"context"
-	"net"
-
-	N "github.com/sagernet/sing/common/network"
-)
-
-type MITMEngine interface {
-	Lifecycle
-	NewConnection(ctx context.Context, this N.Dialer, conn net.Conn, metadata InboundContext, onClose N.CloseHandlerFunc)
-}

adapter/script.go

@@ -1,54 +0,0 @@
-package adapter
-
-import (
-	"context"
-	"net/http"
-	"sync"
-	"time"
-)
-
-type ScriptManager interface {
-	Lifecycle
-	Scripts() []Script
-	Script(name string) (Script, bool)
-	SurgeCache() *SurgeInMemoryCache
-}
-
-type SurgeInMemoryCache struct {
-	sync.RWMutex
-	Data map[string]string
-}
-
-type Script interface {
-	Type() string
-	Tag() string
-	StartContext(ctx context.Context, startContext *HTTPStartContext) error
-	PostStart() error
-	Close() error
-}
-
-type SurgeScript interface {
-	Script
-	ExecuteGeneric(ctx context.Context, scriptType string, timeout time.Duration, arguments []string) error
-	ExecuteHTTPRequest(ctx context.Context, timeout time.Duration, request *http.Request, body []byte, binaryBody bool, arguments []string) (*HTTPRequestScriptResult, error)
-	ExecuteHTTPResponse(ctx context.Context, timeout time.Duration, request *http.Request, response *http.Response, body []byte, binaryBody bool, arguments []string) (*HTTPResponseScriptResult, error)
-}
-
-type HTTPRequestScriptResult struct {
-	URL      string
-	Headers  http.Header
-	Body     []byte
-	Response *HTTPRequestScriptResponse
-}
-
-type HTTPRequestScriptResponse struct {
-	Status  int
-	Headers http.Header
-	Body    []byte
-}
-
-type HTTPResponseScriptResult struct {
-	Status  int
-	Headers http.Header
-	Body    []byte
-}

box.go

@@ -23,11 +23,9 @@ import (
 	"github.com/sagernet/sing-box/experimental/cachefile"
 	"github.com/sagernet/sing-box/experimental/libbox/platform"
 	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/mitm"
 	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing-box/protocol/direct"
 	"github.com/sagernet/sing-box/route"
-	"github.com/sagernet/sing-box/script"
 	"github.com/sagernet/sing/common"
 	E "github.com/sagernet/sing/common/exceptions"
 	F "github.com/sagernet/sing/common/format"
@@ -50,8 +48,6 @@ type Box struct {
 	dnsRouter    *dns.Router
 	connection   *route.ConnectionManager
 	router       *route.Router
-	script       *script.Manager
-	mitm         adapter.MITMEngine //*mitm.Engine
 	services     []adapter.LifecycleService
 	done         chan struct{}
 }
@@ -147,12 +143,18 @@ func New(options Options) (*Box, error) {
 	}
 
 	var services []adapter.LifecycleService
-	certificateStore, err := certificate.NewStore(ctx, logFactory.NewLogger("certificate"), common.PtrValueOrDefault(options.Certificate))
-	if err != nil {
-		return nil, err
+	certificateOptions := common.PtrValueOrDefault(options.Certificate)
+	if C.IsAndroid || certificateOptions.Store != "" && certificateOptions.Store != C.CertificateStoreSystem ||
+		len(certificateOptions.Certificate) > 0 ||
+		len(certificateOptions.CertificatePath) > 0 ||
+		len(certificateOptions.CertificateDirectoryPath) > 0 {
+		certificateStore, err := certificate.NewStore(ctx, logFactory.NewLogger("certificate"), certificateOptions)
+		if err != nil {
+			return nil, err
+		}
+		service.MustRegister[adapter.CertificateStore](ctx, certificateStore)
+		services = append(services, certificateStore)
 	}
-	service.MustRegister[adapter.CertificateStore](ctx, certificateStore)
-	services = append(services, certificateStore)
 
 	routeOptions := common.PtrValueOrDefault(options.Route)
 	dnsOptions := common.PtrValueOrDefault(options.DNS)
@@ -171,7 +173,7 @@ func New(options Options) (*Box, error) {
 		return nil, E.Cause(err, "initialize network manager")
 	}
 	service.MustRegister[adapter.NetworkManager](ctx, networkManager)
-	connectionManager := route.NewConnectionManager(ctx, logFactory.NewLogger("connection"))
+	connectionManager := route.NewConnectionManager(logFactory.NewLogger("connection"))
 	service.MustRegister[adapter.ConnectionManager](ctx, connectionManager)
 	router := route.NewRouter(ctx, logFactory, routeOptions, dnsOptions)
 	service.MustRegister[adapter.Router](ctx, router)
@@ -179,8 +181,8 @@ func New(options Options) (*Box, error) {
 	if err != nil {
 		return nil, E.Cause(err, "initialize router")
 	}
-	var timeService *tls.TimeServiceWrapper
 	ntpOptions := common.PtrValueOrDefault(options.NTP)
+	var timeService *tls.TimeServiceWrapper
 	if ntpOptions.Enabled {
 		timeService = new(tls.TimeServiceWrapper)
 		service.MustRegister[ntp.TimeService](ctx, timeService)
@@ -294,11 +296,6 @@ func New(options Options) (*Box, error) {
 			"local",
 			option.LocalDNSServerOptions{},
 		)))
-	scriptManager, err := script.NewManager(ctx, logFactory, options.Scripts)
-	if err != nil {
-		return nil, E.Cause(err, "initialize script manager")
-	}
-	service.MustRegister[adapter.ScriptManager](ctx, scriptManager)
 	if platformInterface != nil {
 		err = platformInterface.Initialize(networkManager)
 		if err != nil {
@@ -348,16 +345,6 @@ func New(options Options) (*Box, error) {
 		timeService.TimeService = ntpService
 		services = append(services, adapter.NewLifecycleService(ntpService, "ntp service"))
 	}
-	mitmOptions := common.PtrValueOrDefault(options.MITM)
-	var mitmEngine adapter.MITMEngine
-	if mitmOptions.Enabled {
-		engine, err := mitm.NewEngine(ctx, logFactory.NewLogger("mitm"), mitmOptions)
-		if err != nil {
-			return nil, E.Cause(err, "create MITM engine")
-		}
-		service.MustRegister[adapter.MITMEngine](ctx, engine)
-		mitmEngine = engine
-	}
 	return &Box{
 		network:      networkManager,
 		endpoint:     endpointManager,
@@ -367,8 +354,6 @@ func New(options Options) (*Box, error) {
 		dnsRouter:    dnsRouter,
 		connection:   connectionManager,
 		router:       router,
-		script:       scriptManager,
-		mitm:         mitmEngine,
 		createdAt:    createdAt,
 		logFactory:   logFactory,
 		logger:       logFactory.Logger(),
@@ -427,11 +412,11 @@ func (s *Box) preStart() error {
 	if err != nil {
 		return err
 	}
-	err = adapter.Start(adapter.StartStateInitialize, s.network, s.dnsTransport, s.dnsRouter, s.connection, s.router, s.script, s.mitm, s.outbound, s.inbound, s.endpoint)
+	err = adapter.Start(adapter.StartStateInitialize, s.network, s.dnsTransport, s.dnsRouter, s.connection, s.router, s.outbound, s.inbound, s.endpoint)
 	if err != nil {
 		return err
 	}
-	err = adapter.Start(adapter.StartStateStart, s.outbound, s.dnsTransport, s.dnsRouter, s.network, s.connection, s.router, s.script, s.mitm)
+	err = adapter.Start(adapter.StartStateStart, s.outbound, s.dnsTransport, s.dnsRouter, s.network, s.connection, s.router)
 	if err != nil {
 		return err
 	}
@@ -455,7 +440,7 @@ func (s *Box) start() error {
 	if err != nil {
 		return err
 	}
-	err = adapter.Start(adapter.StartStatePostStart, s.outbound, s.network, s.dnsTransport, s.dnsRouter, s.connection, s.router, s.script, s.mitm, s.inbound, s.endpoint)
+	err = adapter.Start(adapter.StartStatePostStart, s.outbound, s.network, s.dnsTransport, s.dnsRouter, s.connection, s.router, s.inbound, s.endpoint)
 	if err != nil {
 		return err
 	}
@@ -463,7 +448,7 @@ func (s *Box) start() error {
 	if err != nil {
 		return err
 	}
-	err = adapter.Start(adapter.StartStateStarted, s.network, s.dnsTransport, s.dnsRouter, s.connection, s.router, s.script, s.mitm, s.outbound, s.inbound, s.endpoint)
+	err = adapter.Start(adapter.StartStateStarted, s.network, s.dnsTransport, s.dnsRouter, s.connection, s.router, s.outbound, s.inbound, s.endpoint)
 	if err != nil {
 		return err
 	}
@@ -482,7 +467,7 @@ func (s *Box) Close() error {
 		close(s.done)
 	}
 	err := common.Close(
-		s.inbound, s.outbound, s.endpoint, s.mitm, s.script, s.router, s.connection, s.dnsRouter, s.dnsTransport, s.network,
+		s.inbound, s.outbound, s.endpoint, s.router, s.connection, s.dnsRouter, s.dnsTransport, s.network,
 	)
 	for _, lifecycleService := range s.services {
 		err = E.Append(err, lifecycleService.Close(), func(err error) error {

cmd/internal/build_libbox/main.go

@@ -45,7 +45,6 @@ var (
 	debugFlags  []string
 	sharedTags  []string
 	iosTags     []string
-	memcTags    []string
 	debugTags   []string
 )
 
@@ -59,9 +58,8 @@ func init() {
 	sharedFlags = append(sharedFlags, "-ldflags", "-X github.com/sagernet/sing-box/constant.Version="+currentTag+" -s -w -buildid=")
 	debugFlags = append(debugFlags, "-ldflags", "-X github.com/sagernet/sing-box/constant.Version="+currentTag)
 
-	sharedTags = append(sharedTags, "with_gvisor", "with_quic", "with_wireguard", "with_utls", "with_clash_api", "with_script")
+	sharedTags = append(sharedTags, "with_gvisor", "with_quic", "with_wireguard", "with_utls", "with_clash_api", "with_tailscale")
 	iosTags = append(iosTags, "with_dhcp", "with_low_memory", "with_conntrack")
-	memcTags = append(memcTags, "with_tailscale")
 	debugTags = append(debugTags, "debug")
 }
 
@@ -101,19 +99,18 @@ func buildAndroid() {
 		"-javapkg=io.nekohasekai",
 		"-libname=box",
 	}
-
 	if !debugEnabled {
 		args = append(args, sharedFlags...)
 	} else {
 		args = append(args, debugFlags...)
 	}
 
-	tags := append(sharedTags, memcTags...)
-	if debugEnabled {
-		tags = append(tags, debugTags...)
+	args = append(args, "-tags")
+	if !debugEnabled {
+		args = append(args, strings.Join(sharedTags, ","))
+	} else {
+		args = append(args, strings.Join(append(sharedTags, debugTags...), ","))
 	}
-
-	args = append(args, "-tags", strings.Join(tags, ","))
 	args = append(args, "./experimental/libbox")
 
 	command := exec.Command(build_shared.GoBinPath+"/gomobile", args...)
@@ -151,9 +148,7 @@ func buildApple() {
 		"-v",
 		"-target", bindTarget,
 		"-libname=box",
-		"-tags-macos=" + strings.Join(memcTags, ","),
 	}
-
 	if !debugEnabled {
 		args = append(args, sharedFlags...)
 	} else {
@@ -161,11 +156,12 @@ func buildApple() {
 	}
 
 	tags := append(sharedTags, iosTags...)
-	if debugEnabled {
-		tags = append(tags, debugTags...)
+	args = append(args, "-tags")
+	if !debugEnabled {
+		args = append(args, strings.Join(tags, ","))
+	} else {
+		args = append(args, strings.Join(append(tags, debugTags...), ","))
 	}
-
-	args = append(args, "-tags", strings.Join(tags, ","))
 	args = append(args, "./experimental/libbox")
 
 	command := exec.Command(build_shared.GoBinPath+"/gomobile", args...)

cmd/sing-box/cmd_generate_ca.go

@@ -1,121 +0,0 @@
-package main
-
-import (
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha1"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-	"encoding/base64"
-	"encoding/hex"
-	"encoding/pem"
-	"math/big"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing/common/json"
-
-	"github.com/spf13/cobra"
-	"software.sslmate.com/src/go-pkcs12"
-)
-
-var (
-	flagGenerateCAName           string
-	flagGenerateCAPKCS12Password string
-	flagGenerateOutput           string
-)
-
-var commandGenerateCAKeyPair = &cobra.Command{
-	Use:   "ca-keypair",
-	Short: "Generate CA key pair",
-	Args:  cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
-		err := generateCAKeyPair()
-		if err != nil {
-			log.Fatal(err)
-		}
-	},
-}
-
-func init() {
-	commandGenerateCAKeyPair.Flags().StringVarP(&flagGenerateCAName, "name", "n", "", "Set custom CA name")
-	commandGenerateCAKeyPair.Flags().StringVarP(&flagGenerateCAPKCS12Password, "p12-password", "p", "", "Set custom PKCS12 password")
-	commandGenerateCAKeyPair.Flags().StringVarP(&flagGenerateOutput, "output", "o", ".", "Set output directory")
-	commandGenerate.AddCommand(commandGenerateCAKeyPair)
-}
-
-func generateCAKeyPair() error {
-	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	if err != nil {
-		return err
-	}
-	serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
-	serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
-	if err != nil {
-		return err
-	}
-	spkiASN1, err := x509.MarshalPKIXPublicKey(privateKey.Public())
-	var spki struct {
-		Algorithm        pkix.AlgorithmIdentifier
-		SubjectPublicKey asn1.BitString
-	}
-	_, err = asn1.Unmarshal(spkiASN1, &spki)
-	if err != nil {
-		return err
-	}
-	skid := sha1.Sum(spki.SubjectPublicKey.Bytes)
-	var caName string
-	if flagGenerateCAName != "" {
-		caName = flagGenerateCAName
-	} else {
-		caName = "sing-box Generated CA " + strings.ToUpper(hex.EncodeToString(skid[:4]))
-	}
-	caTpl := &x509.Certificate{
-		SerialNumber: serialNumber,
-		Subject: pkix.Name{
-			Organization: []string{caName},
-			CommonName:   caName,
-		},
-		SubjectKeyId:          skid[:],
-		NotAfter:              time.Now().AddDate(10, 0, 0),
-		NotBefore:             time.Now(),
-		KeyUsage:              x509.KeyUsageCertSign,
-		BasicConstraintsValid: true,
-		IsCA:                  true,
-		MaxPathLenZero:        true,
-	}
-	publicDer, err := x509.CreateCertificate(rand.Reader, caTpl, caTpl, privateKey.Public(), privateKey)
-	var caPassword string
-	if flagGenerateCAPKCS12Password != "" {
-		caPassword = flagGenerateCAPKCS12Password
-	} else {
-		caPassword = strings.ToUpper(hex.EncodeToString(skid[:4]))
-	}
-	caTpl.Raw = publicDer
-	p12Bytes, err := pkcs12.Modern.Encode(privateKey, caTpl, nil, caPassword)
-	if err != nil {
-		return err
-	}
-	privateDer, err := x509.MarshalPKCS8PrivateKey(privateKey)
-	if err != nil {
-		return err
-	}
-	os.WriteFile(filepath.Join(flagGenerateOutput, caName+".pem"), pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: publicDer}), 0o644)
-	os.WriteFile(filepath.Join(flagGenerateOutput, caName+".private.pem"), pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: privateDer}), 0o644)
-	os.WriteFile(filepath.Join(flagGenerateOutput, caName+".crt"), publicDer, 0o644)
-	os.WriteFile(filepath.Join(flagGenerateOutput, caName+".p12"), p12Bytes, 0o644)
-	var tlsDecryptionOptions option.TLSDecryptionOptions
-	tlsDecryptionOptions.Enabled = true
-	tlsDecryptionOptions.KeyPair = base64.StdEncoding.EncodeToString(p12Bytes)
-	tlsDecryptionOptions.KeyPairPassword = caPassword
-	var certificateOptions option.CertificateOptions
-	certificateOptions.TLSDecryption = &tlsDecryptionOptions
-	encoder := json.NewEncoder(os.Stdout)
-	encoder.SetIndent("", "  ")
-	return encoder.Encode(certificateOptions)
-}

cmd/sing-box/cmd_tools.go

@@ -1,6 +1,13 @@
 package main
 
 import (
+	"errors"
+	"os"
+
+	"github.com/sagernet/sing-box"
+	E "github.com/sagernet/sing/common/exceptions"
+	N "github.com/sagernet/sing/common/network"
+
 	"github.com/spf13/cobra"
 )
 
@@ -12,5 +19,36 @@ var commandTools = &cobra.Command{
 }
 
 func init() {
+	commandTools.PersistentFlags().StringVarP(&commandToolsFlagOutbound, "outbound", "o", "", "Use specified tag instead of default outbound")
 	mainCommand.AddCommand(commandTools)
 }
+
+func createPreStartedClient() (*box.Box, error) {
+	options, err := readConfigAndMerge()
+	if err != nil {
+		if !(errors.Is(err, os.ErrNotExist) && len(configDirectories) == 0 && len(configPaths) == 1) || configPaths[0] != "config.json" {
+			return nil, err
+		}
+	}
+	instance, err := box.New(box.Options{Context: globalCtx, Options: options})
+	if err != nil {
+		return nil, E.Cause(err, "create service")
+	}
+	err = instance.PreStart()
+	if err != nil {
+		return nil, E.Cause(err, "start service")
+	}
+	return instance, nil
+}
+
+func createDialer(instance *box.Box, outboundTag string) (N.Dialer, error) {
+	if outboundTag == "" {
+		return instance.Outbound().Default(), nil
+	} else {
+		outbound, loaded := instance.Outbound().Outbound(outboundTag)
+		if !loaded {
+			return nil, E.New("outbound not found: ", outboundTag)
+		}
+		return outbound, nil
+	}
+}

cmd/sing-box/cmd_tools_connect.go

@@ -0,0 +1,73 @@
+package main
+
+import (
+	"context"
+	"os"
+
+	"github.com/sagernet/sing-box/log"
+	"github.com/sagernet/sing/common"
+	"github.com/sagernet/sing/common/bufio"
+	E "github.com/sagernet/sing/common/exceptions"
+	M "github.com/sagernet/sing/common/metadata"
+	N "github.com/sagernet/sing/common/network"
+	"github.com/sagernet/sing/common/task"
+
+	"github.com/spf13/cobra"
+)
+
+var commandConnectFlagNetwork string
+
+var commandConnect = &cobra.Command{
+	Use:   "connect <address>",
+	Short: "Connect to an address",
+	Args:  cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		err := connect(args[0])
+		if err != nil {
+			log.Fatal(err)
+		}
+	},
+}
+
+func init() {
+	commandConnect.Flags().StringVarP(&commandConnectFlagNetwork, "network", "n", "tcp", "network type")
+	commandTools.AddCommand(commandConnect)
+}
+
+func connect(address string) error {
+	switch N.NetworkName(commandConnectFlagNetwork) {
+	case N.NetworkTCP, N.NetworkUDP:
+	default:
+		return E.Cause(N.ErrUnknownNetwork, commandConnectFlagNetwork)
+	}
+	instance, err := createPreStartedClient()
+	if err != nil {
+		return err
+	}
+	defer instance.Close()
+	dialer, err := createDialer(instance, commandToolsFlagOutbound)
+	if err != nil {
+		return err
+	}
+	conn, err := dialer.DialContext(context.Background(), commandConnectFlagNetwork, M.ParseSocksaddr(address))
+	if err != nil {
+		return E.Cause(err, "connect to server")
+	}
+	var group task.Group
+	group.Append("upload", func(ctx context.Context) error {
+		return common.Error(bufio.Copy(conn, os.Stdin))
+	})
+	group.Append("download", func(ctx context.Context) error {
+		return common.Error(bufio.Copy(os.Stdout, conn))
+	})
+	group.Cleanup(func() {
+		conn.Close()
+	})
+	err = group.Run(context.Background())
+	if E.IsClosed(err) {
+		log.Info(err)
+	} else {
+		log.Error(err)
+	}
+	return nil
+}

cmd/sing-box/cmd_tools_fetch.go

@@ -0,0 +1,115 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"os"
+
+	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/log"
+	"github.com/sagernet/sing/common/bufio"
+	E "github.com/sagernet/sing/common/exceptions"
+	M "github.com/sagernet/sing/common/metadata"
+
+	"github.com/spf13/cobra"
+)
+
+var commandFetch = &cobra.Command{
+	Use:   "fetch",
+	Short: "Fetch an URL",
+	Args:  cobra.MinimumNArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		err := fetch(args)
+		if err != nil {
+			log.Fatal(err)
+		}
+	},
+}
+
+func init() {
+	commandTools.AddCommand(commandFetch)
+}
+
+var (
+	httpClient  *http.Client
+	http3Client *http.Client
+)
+
+func fetch(args []string) error {
+	instance, err := createPreStartedClient()
+	if err != nil {
+		return err
+	}
+	defer instance.Close()
+	httpClient = &http.Client{
+		Transport: &http.Transport{
+			DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
+				dialer, err := createDialer(instance, commandToolsFlagOutbound)
+				if err != nil {
+					return nil, err
+				}
+				return dialer.DialContext(ctx, network, M.ParseSocksaddr(addr))
+			},
+			ForceAttemptHTTP2: true,
+		},
+	}
+	defer httpClient.CloseIdleConnections()
+	if C.WithQUIC {
+		err = initializeHTTP3Client(instance)
+		if err != nil {
+			return err
+		}
+		defer http3Client.CloseIdleConnections()
+	}
+	for _, urlString := range args {
+		var parsedURL *url.URL
+		parsedURL, err = url.Parse(urlString)
+		if err != nil {
+			return err
+		}
+		switch parsedURL.Scheme {
+		case "":
+			parsedURL.Scheme = "http"
+			fallthrough
+		case "http", "https":
+			err = fetchHTTP(httpClient, parsedURL)
+			if err != nil {
+				return err
+			}
+		case "http3":
+			if !C.WithQUIC {
+				return C.ErrQUICNotIncluded
+			}
+			parsedURL.Scheme = "https"
+			err = fetchHTTP(http3Client, parsedURL)
+			if err != nil {
+				return err
+			}
+		default:
+			return E.New("unsupported scheme: ", parsedURL.Scheme)
+		}
+	}
+	return nil
+}
+
+func fetchHTTP(httpClient *http.Client, parsedURL *url.URL) error {
+	request, err := http.NewRequest("GET", parsedURL.String(), nil)
+	if err != nil {
+		return err
+	}
+	request.Header.Add("User-Agent", "curl/7.88.0")
+	response, err := httpClient.Do(request)
+	if err != nil {
+		return err
+	}
+	defer response.Body.Close()
+	_, err = bufio.Copy(os.Stdout, response.Body)
+	if errors.Is(err, io.EOF) {
+		return nil
+	}
+	return err
+}

cmd/sing-box/cmd_tools_fetch_http3.go

@@ -0,0 +1,36 @@
+//go:build with_quic
+
+package main
+
+import (
+	"context"
+	"crypto/tls"
+	"net/http"
+
+	"github.com/sagernet/quic-go"
+	"github.com/sagernet/quic-go/http3"
+	box "github.com/sagernet/sing-box"
+	"github.com/sagernet/sing/common/bufio"
+	M "github.com/sagernet/sing/common/metadata"
+	N "github.com/sagernet/sing/common/network"
+)
+
+func initializeHTTP3Client(instance *box.Box) error {
+	dialer, err := createDialer(instance, commandToolsFlagOutbound)
+	if err != nil {
+		return err
+	}
+	http3Client = &http.Client{
+		Transport: &http3.Transport{
+			Dial: func(ctx context.Context, addr string, tlsCfg *tls.Config, cfg *quic.Config) (quic.EarlyConnection, error) {
+				destination := M.ParseSocksaddr(addr)
+				udpConn, dErr := dialer.DialContext(ctx, N.NetworkUDP, destination)
+				if dErr != nil {
+					return nil, dErr
+				}
+				return quic.DialEarly(ctx, bufio.NewUnbindPacketConn(udpConn), udpConn.RemoteAddr(), tlsCfg, cfg)
+			},
+		},
+	}
+	return nil
+}

cmd/sing-box/cmd_tools_fetch_http3_stub.go

@@ -0,0 +1,18 @@
+//go:build !with_quic
+
+package main
+
+import (
+	"net/url"
+	"os"
+
+	box "github.com/sagernet/sing-box"
+)
+
+func initializeHTTP3Client(instance *box.Box) error {
+	return os.ErrInvalid
+}
+
+func fetchHTTP3(parsedURL *url.URL) error {
+	return os.ErrInvalid
+}

cmd/sing-box/cmd_tools_install_ca.go

@@ -1,108 +0,0 @@
-package main
-
-import (
-	"encoding/pem"
-	"errors"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-
-	"github.com/sagernet/sing-box/log"
-	E "github.com/sagernet/sing/common/exceptions"
-	"github.com/sagernet/sing/common/shell"
-
-	"github.com/spf13/cobra"
-)
-
-var commandInstallCACertificate = &cobra.Command{
-	Use:   "install-ca <path to certificate>",
-	Short: "Install CA certificate to system",
-	Args:  cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		err := installCACertificate(args[0])
-		if err != nil {
-			log.Fatal(err)
-		}
-	},
-}
-
-func init() {
-	commandTools.AddCommand(commandInstallCACertificate)
-}
-
-func installCACertificate(path string) error {
-	switch runtime.GOOS {
-	case "windows":
-		return shell.Exec("powershell", "-Command", "Import-Certificate -FilePath \""+path+"\" -CertStoreLocation Cert:\\LocalMachine\\Root").Attach().Run()
-	case "darwin":
-		return shell.Exec("sudo", "security", "add-trusted-cert", "-d", "-r", "trustRoot", "-k", "/Library/Keychains/System.keychain", path).Attach().Run()
-	case "linux":
-		updateCertPath, updateCertPathNotFoundErr := exec.LookPath("update-ca-certificates")
-		if updateCertPathNotFoundErr == nil {
-			publicDer, err := os.ReadFile(path)
-			if err != nil {
-				return err
-			}
-			err = os.MkdirAll("/usr/local/share/ca-certificates", 0o755)
-			if err != nil {
-				if errors.Is(err, os.ErrPermission) {
-					log.Info("Try running with sudo")
-					return shell.Exec("sudo", os.Args...).Attach().Run()
-				}
-				return err
-			}
-			fileName := filepath.Base(updateCertPath)
-			if !strings.HasSuffix(fileName, ".crt") {
-				fileName = fileName + ".crt"
-			}
-			filePath, _ := filepath.Abs(filepath.Join("/usr/local/share/ca-certificates", fileName))
-			err = os.WriteFile(filePath, pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: publicDer}), 0o644)
-			if err != nil {
-				if errors.Is(err, os.ErrPermission) {
-					log.Info("Try running with sudo")
-					return shell.Exec("sudo", os.Args...).Attach().Run()
-				}
-				return err
-			}
-			log.Info("certificate written to " + filePath + "\n")
-			err = shell.Exec(updateCertPath).Attach().Run()
-			if err != nil {
-				return err
-			}
-			log.Info("certificate installed")
-			return nil
-		}
-		updateTrustPath, updateTrustPathNotFoundErr := exec.LookPath("update-ca-trust")
-		if updateTrustPathNotFoundErr == nil {
-			publicDer, err := os.ReadFile(path)
-			if err != nil {
-				return err
-			}
-			fileName := filepath.Base(updateTrustPath)
-			fileExt := filepath.Ext(path)
-			if fileExt != "" {
-				fileName = fileName[:len(fileName)-len(fileExt)]
-			}
-			filePath, _ := filepath.Abs(filepath.Join("/etc/pki/ca-trust/source/anchors/", fileName+".pem"))
-			err = os.WriteFile(filePath, pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: publicDer}), 0o644)
-			if err != nil {
-				if errors.Is(err, os.ErrPermission) {
-					log.Info("Try running with sudo")
-					return shell.Exec("sudo", os.Args...).Attach().Run()
-				}
-				return err
-			}
-			log.Info("certificate written to " + filePath + "\n")
-			err = shell.Exec(updateTrustPath, "extract").Attach().Run()
-			if err != nil {
-				return err
-			}
-			log.Info("certificate installed")
-		}
-		return E.New("update-ca-certificates or update-ca-trust not found")
-	default:
-		return E.New("unsupported operating system: ", runtime.GOOS)
-	}
-}

cmd/sing-box/cmd_tools_synctime.go

@@ -8,7 +8,6 @@ import (
 	"github.com/sagernet/sing-box/log"
 	E "github.com/sagernet/sing/common/exceptions"
 	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/sagernet/sing/common/network"
 	"github.com/sagernet/sing/common/ntp"
 
 	"github.com/spf13/cobra"
@@ -40,11 +39,20 @@ func init() {
 }
 
 func syncTime() error {
+	instance, err := createPreStartedClient()
+	if err != nil {
+		return err
+	}
+	dialer, err := createDialer(instance, commandToolsFlagOutbound)
+	if err != nil {
+		return err
+	}
+	defer instance.Close()
 	serverAddress := M.ParseSocksaddr(commandSyncTimeFlagServer)
 	if serverAddress.Port == 0 {
 		serverAddress.Port = 123
 	}
-	response, err := ntp.Exchange(context.Background(), N.SystemDialer, serverAddress)
+	response, err := ntp.Exchange(context.Background(), dialer, serverAddress)
 	if err != nil {
 		return err
 	}

common/certificate/store.go

@@ -3,7 +3,6 @@ package certificate
 import (
 	"context"
 	"crypto/x509"
-	"encoding/base64"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -17,8 +16,6 @@ import (
 	E "github.com/sagernet/sing/common/exceptions"
 	"github.com/sagernet/sing/common/logger"
 	"github.com/sagernet/sing/service"
-
-	"software.sslmate.com/src/go-pkcs12"
 )
 
 var _ adapter.CertificateStore = (*Store)(nil)
@@ -30,9 +27,6 @@ type Store struct {
 	certificatePaths          []string
 	certificateDirectoryPaths []string
 	watcher                   *fswatch.Watcher
-	tlsDecryptionEnabled      bool
-	tlsDecryptionPrivateKey   any
-	tlsDecryptionCertificate  *x509.Certificate
 }
 
 func NewStore(ctx context.Context, logger logger.Logger, options option.CertificateOptions) (*Store, error) {
@@ -96,19 +90,6 @@ func NewStore(ctx context.Context, logger logger.Logger, options option.Certific
 	if err != nil {
 		return nil, E.Cause(err, "initializing certificate store")
 	}
-	if options.TLSDecryption != nil && options.TLSDecryption.Enabled {
-		pfxBytes, err := base64.StdEncoding.DecodeString(options.TLSDecryption.KeyPair)
-		if err != nil {
-			return nil, E.Cause(err, "decode key pair base64 bytes")
-		}
-		privateKey, certificate, err := pkcs12.Decode(pfxBytes, options.TLSDecryption.KeyPairPassword)
-		if err != nil {
-			return nil, E.Cause(err, "decode key pair")
-		}
-		store.tlsDecryptionEnabled = true
-		store.tlsDecryptionPrivateKey = privateKey
-		store.tlsDecryptionCertificate = certificate
-	}
 	return store, nil
 }
 
@@ -202,15 +183,3 @@ func isSameDirSymlink(f fs.DirEntry, dir string) bool {
 	target, err := os.Readlink(filepath.Join(dir, f.Name()))
 	return err == nil && !strings.Contains(target, "/")
 }
-
-func (s *Store) TLSDecryptionEnabled() bool {
-	return s.tlsDecryptionEnabled
-}
-
-func (s *Store) TLSDecryptionCertificate() *x509.Certificate {
-	return s.tlsDecryptionCertificate
-}
-
-func (s *Store) TLSDecryptionPrivateKey() any {
-	return s.tlsDecryptionPrivateKey
-}

common/dialer/default.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/sagernet/sing-box/adapter"
 	"github.com/sagernet/sing-box/common/conntrack"
-	"github.com/sagernet/sing-box/common/listener"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/experimental/libbox/platform"
 	"github.com/sagernet/sing-box/option"
@@ -36,7 +35,6 @@ type DefaultDialer struct {
 	udpListener            net.ListenConfig
 	udpAddr4               string
 	udpAddr6               string
-	netns                  string
 	networkManager         adapter.NetworkManager
 	networkStrategy        *C.NetworkStrategy
 	defaultNetworkStrategy bool
@@ -200,7 +198,6 @@ func NewDefault(ctx context.Context, options option.DialerOptions) (*DefaultDial
 		udpListener:            listener,
 		udpAddr4:               udpAddr4,
 		udpAddr6:               udpAddr6,
-		netns:                  options.NetNs,
 		networkManager:         networkManager,
 		networkStrategy:        networkStrategy,
 		defaultNetworkStrategy: defaultNetworkStrategy,
@@ -217,21 +214,19 @@ func (d *DefaultDialer) DialContext(ctx context.Context, network string, address
 		return nil, E.New("domain not resolved")
 	}
 	if d.networkStrategy == nil {
-		return trackConn(listener.ListenNetworkNamespace[net.Conn](d.netns, func() (net.Conn, error) {
-			switch N.NetworkName(network) {
-			case N.NetworkUDP:
-				if !address.IsIPv6() {
-					return d.udpDialer4.DialContext(ctx, network, address.String())
-				} else {
-					return d.udpDialer6.DialContext(ctx, network, address.String())
-				}
-			}
+		switch N.NetworkName(network) {
+		case N.NetworkUDP:
 			if !address.IsIPv6() {
-				return DialSlowContext(&d.dialer4, ctx, network, address)
+				return trackConn(d.udpDialer4.DialContext(ctx, network, address.String()))
 			} else {
-				return DialSlowContext(&d.dialer6, ctx, network, address)
+				return trackConn(d.udpDialer6.DialContext(ctx, network, address.String()))
 			}
-		}))
+		}
+		if !address.IsIPv6() {
+			return trackConn(DialSlowContext(&d.dialer4, ctx, network, address))
+		} else {
+			return trackConn(DialSlowContext(&d.dialer6, ctx, network, address))
+		}
 	} else {
 		return d.DialParallelInterface(ctx, network, address, d.networkStrategy, d.networkType, d.fallbackNetworkType, d.networkFallbackDelay)
 	}
@@ -287,15 +282,13 @@ func (d *DefaultDialer) DialParallelInterface(ctx context.Context, network strin
 
 func (d *DefaultDialer) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
 	if d.networkStrategy == nil {
-		return trackPacketConn(listener.ListenNetworkNamespace[net.PacketConn](d.netns, func() (net.PacketConn, error) {
-			if destination.IsIPv6() {
-				return d.udpListener.ListenPacket(ctx, N.NetworkUDP, d.udpAddr6)
-			} else if destination.IsIPv4() && !destination.Addr.IsUnspecified() {
-				return d.udpListener.ListenPacket(ctx, N.NetworkUDP+"4", d.udpAddr4)
-			} else {
-				return d.udpListener.ListenPacket(ctx, N.NetworkUDP, d.udpAddr4)
-			}
-		}))
+		if destination.IsIPv6() {
+			return trackPacketConn(d.udpListener.ListenPacket(ctx, N.NetworkUDP, d.udpAddr6))
+		} else if destination.IsIPv4() && !destination.Addr.IsUnspecified() {
+			return trackPacketConn(d.udpListener.ListenPacket(ctx, N.NetworkUDP+"4", d.udpAddr4))
+		} else {
+			return trackPacketConn(d.udpListener.ListenPacket(ctx, N.NetworkUDP, d.udpAddr4))
+		}
 	} else {
 		return d.ListenSerialInterfacePacket(ctx, destination, d.networkStrategy, d.networkType, d.fallbackNetworkType, d.networkFallbackDelay)
 	}

common/dialer/detour.go

@@ -6,20 +6,14 @@ import (
 	"sync"
 
 	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing/common"
 	E "github.com/sagernet/sing/common/exceptions"
 	M "github.com/sagernet/sing/common/metadata"
 	N "github.com/sagernet/sing/common/network"
 )
 
-type DirectDialer interface {
-	IsEmpty() bool
-}
-
 type DetourDialer struct {
 	outboundManager adapter.OutboundManager
 	detour          string
-	directResolver  bool
 	dialer          N.Dialer
 	initOnce        sync.Once
 	initErr         error
@@ -29,12 +23,9 @@ func NewDetour(outboundManager adapter.OutboundManager, detour string) N.Dialer
 	return &DetourDialer{outboundManager: outboundManager, detour: detour}
 }
 
-func InitializeDetour(dialer N.Dialer) error {
-	detourDialer, isDetour := common.Cast[*DetourDialer](dialer)
-	if !isDetour {
-		return nil
-	}
-	return common.Error(detourDialer.Dialer())
+func (d *DetourDialer) Start() error {
+	_, err := d.Dialer()
+	return err
 }
 
 func (d *DetourDialer) Dialer() (N.Dialer, error) {
@@ -43,18 +34,11 @@ func (d *DetourDialer) Dialer() (N.Dialer, error) {
 }
 
 func (d *DetourDialer) init() {
-	dialer, loaded := d.outboundManager.Outbound(d.detour)
+	var loaded bool
+	d.dialer, loaded = d.outboundManager.Outbound(d.detour)
 	if !loaded {
 		d.initErr = E.New("outbound detour not found: ", d.detour)
-		return
 	}
-	if directDialer, isDirect := dialer.(DirectDialer); isDirect {
-		if directDialer.IsEmpty() {
-			d.initErr = E.New("detour to an empty direct outbound makes no sense")
-			return
-		}
-	}
-	d.dialer = dialer
 }
 
 func (d *DetourDialer) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {

common/listener/listener.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"net"
 	"net/netip"
-	"runtime"
-	"strings"
 	"sync/atomic"
 
 	"github.com/sagernet/sing-box/adapter"
@@ -16,8 +14,6 @@ import (
 	"github.com/sagernet/sing/common/logger"
 	M "github.com/sagernet/sing/common/metadata"
 	N "github.com/sagernet/sing/common/network"
-
-	"github.com/vishvananda/netns"
 )
 
 type Listener struct {
@@ -139,30 +135,3 @@ func (l *Listener) UDPConn() *net.UDPConn {
 func (l *Listener) ListenOptions() option.ListenOptions {
 	return l.listenOptions
 }
-
-func ListenNetworkNamespace[T any](nameOrPath string, block func() (T, error)) (T, error) {
-	if nameOrPath != "" {
-		runtime.LockOSThread()
-		defer runtime.UnlockOSThread()
-		currentNs, err := netns.Get()
-		if err != nil {
-			return common.DefaultValue[T](), E.Cause(err, "get current netns")
-		}
-		defer netns.Set(currentNs)
-		var targetNs netns.NsHandle
-		if strings.HasPrefix(nameOrPath, "/") {
-			targetNs, err = netns.GetFromPath(nameOrPath)
-		} else {
-			targetNs, err = netns.GetFromName(nameOrPath)
-		}
-		if err != nil {
-			return common.DefaultValue[T](), E.Cause(err, "get netns ", nameOrPath)
-		}
-		defer targetNs.Close()
-		err = netns.Set(targetNs)
-		if err != nil {
-			return common.DefaultValue[T](), E.Cause(err, "set netns to ", nameOrPath)
-		}
-	}
-	return block()
-}

common/listener/listener_tcp.go

@@ -16,12 +16,9 @@ import (
 )
 
 func (l *Listener) ListenTCP() (net.Listener, error) {
-	//nolint:staticcheck
-	if l.listenOptions.ProxyProtocol || l.listenOptions.ProxyProtocolAcceptNoHeader {
-		return nil, E.New("Proxy Protocol is deprecated and removed in sing-box 1.6.0")
-	}
 	var err error
 	bindAddr := M.SocksaddrFrom(l.listenOptions.Listen.Build(netip.AddrFrom4([4]byte{127, 0, 0, 1})), l.listenOptions.ListenPort)
+	var tcpListener net.Listener
 	var listenConfig net.ListenConfig
 	if l.listenOptions.TCPKeepAlive >= 0 {
 		keepIdle := time.Duration(l.listenOptions.TCPKeepAlive)
@@ -40,19 +37,20 @@ func (l *Listener) ListenTCP() (net.Listener, error) {
 		}
 		setMultiPathTCP(&listenConfig)
 	}
-	tcpListener, err := ListenNetworkNamespace[net.Listener](l.listenOptions.NetNs, func() (net.Listener, error) {
-		if l.listenOptions.TCPFastOpen {
-			var tfoConfig tfo.ListenConfig
-			tfoConfig.ListenConfig = listenConfig
-			return tfoConfig.Listen(l.ctx, M.NetworkFromNetAddr(N.NetworkTCP, bindAddr.Addr), bindAddr.String())
-		} else {
-			return listenConfig.Listen(l.ctx, M.NetworkFromNetAddr(N.NetworkTCP, bindAddr.Addr), bindAddr.String())
-		}
-	})
-	if err != nil {
-		return nil, err
+	if l.listenOptions.TCPFastOpen {
+		var tfoConfig tfo.ListenConfig
+		tfoConfig.ListenConfig = listenConfig
+		tcpListener, err = tfoConfig.Listen(l.ctx, M.NetworkFromNetAddr(N.NetworkTCP, bindAddr.Addr), bindAddr.String())
+	} else {
+		tcpListener, err = listenConfig.Listen(l.ctx, M.NetworkFromNetAddr(N.NetworkTCP, bindAddr.Addr), bindAddr.String())
+	}
+	if err == nil {
+		l.logger.Info("tcp server started at ", tcpListener.Addr())
+	}
+	//nolint:staticcheck
+	if l.listenOptions.ProxyProtocol || l.listenOptions.ProxyProtocolAcceptNoHeader {
+		return nil, E.New("Proxy Protocol is deprecated and removed in sing-box 1.6.0")
 	}
-	l.logger.Info("tcp server started at ", tcpListener.Addr())
 	l.tcpListener = tcpListener
 	return tcpListener, err
 }

common/listener/listener_udp.go

@@ -1,7 +1,6 @@
 package listener
 
 import (
-	"context"
 	"net"
 	"net/netip"
 	"os"
@@ -25,9 +24,7 @@ func (l *Listener) ListenUDP() (net.PacketConn, error) {
 	if !udpFragment {
 		lc.Control = control.Append(lc.Control, control.DisableUDPFragment())
 	}
-	udpConn, err := ListenNetworkNamespace[net.PacketConn](l.listenOptions.NetNs, func() (net.PacketConn, error) {
-		return lc.ListenPacket(l.ctx, M.NetworkFromNetAddr(N.NetworkUDP, bindAddr.Addr), bindAddr.String())
-	})
+	udpConn, err := lc.ListenPacket(l.ctx, M.NetworkFromNetAddr(N.NetworkUDP, bindAddr.Addr), bindAddr.String())
 	if err != nil {
 		return nil, err
 	}
@@ -37,13 +34,6 @@ func (l *Listener) ListenUDP() (net.PacketConn, error) {
 	return udpConn, err
 }
 
-func (l *Listener) ListenPacket(ctx context.Context, network string, address string) (net.PacketConn, error) {
-	return ListenNetworkNamespace[net.PacketConn](l.listenOptions.NetNs, func() (net.PacketConn, error) {
-		var listenConfig net.ListenConfig
-		return listenConfig.ListenPacket(ctx, network, address)
-	})
-}
-
 func (l *Listener) UDPAddr() M.Socksaddr {
 	return l.udpAddr
 }

common/sniff/http.go

@@ -18,6 +18,5 @@ func HTTPHost(_ context.Context, metadata *adapter.InboundContext, reader io.Rea
 	}
 	metadata.Protocol = C.ProtocolHTTP
 	metadata.Domain = M.ParseSocksaddr(request.Host).AddrString()
-	metadata.HTTPRequest = request
 	return nil
 }

common/sniff/tls.go

@@ -21,7 +21,6 @@ func TLSClientHello(ctx context.Context, metadata *adapter.InboundContext, reade
 	if clientHello != nil {
 		metadata.Protocol = C.ProtocolTLS
 		metadata.Domain = clientHello.ServerName
-		metadata.ClientHello = clientHello
 		return nil
 	}
 	return err

common/tls/mkcert.go

@@ -8,10 +8,7 @@ import (
 	"crypto/x509/pkix"
 	"encoding/pem"
 	"math/big"
-	"net"
 	"time"
-
-	M "github.com/sagernet/sing/common/metadata"
 )
 
 func GenerateKeyPair(parent *x509.Certificate, parentKey any, timeFunc func() time.Time, serverName string) (*tls.Certificate, error) {
@@ -38,30 +35,17 @@ func GenerateCertificate(parent *x509.Certificate, parentKey any, timeFunc func(
 	if err != nil {
 		return
 	}
-	var template *x509.Certificate
-	if serverAddress := M.ParseAddr(serverName); serverAddress.IsValid() {
-		template = &x509.Certificate{
-			SerialNumber:          serialNumber,
-			IPAddresses:           []net.IP{serverAddress.AsSlice()},
-			NotBefore:             timeFunc().Add(time.Hour * -1),
-			NotAfter:              expire,
-			KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
-			ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-			BasicConstraintsValid: true,
-		}
-	} else {
-		template = &x509.Certificate{
-			SerialNumber:          serialNumber,
-			NotBefore:             timeFunc().Add(time.Hour * -1),
-			NotAfter:              expire,
-			KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
-			ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-			BasicConstraintsValid: true,
-			Subject: pkix.Name{
-				CommonName: serverName,
-			},
-			DNSNames: []string{serverName},
-		}
+	template := &x509.Certificate{
+		SerialNumber:          serialNumber,
+		NotBefore:             timeFunc().Add(time.Hour * -1),
+		NotAfter:              expire,
+		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		BasicConstraintsValid: true,
+		Subject: pkix.Name{
+			CommonName: serverName,
+		},
+		DNSNames: []string{serverName},
 	}
 	if parent == nil {
 		parent = template

constant/script.go

@@ -1,7 +0,0 @@
-package constant
-
-const (
-	ScriptTypeSurge        = "surge"
-	ScriptSourceTypeLocal  = "local"
-	ScriptSourceTypeRemote = "remote"
-)

dns/router.go

@@ -263,7 +263,20 @@ func (r *Router) Exchange(ctx context.Context, message *mDNS.Msg, options adapte
 							return nil, tun.ErrDrop
 						}
 					case *R.RuleActionPredefined:
-						return action.Response(message), nil
+						return &mDNS.Msg{
+							MsgHdr: mDNS.MsgHdr{
+								Id:                 message.Id,
+								Response:           true,
+								Authoritative:      true,
+								RecursionDesired:   true,
+								RecursionAvailable: true,
+								Rcode:              action.Rcode,
+							},
+							Question: message.Question,
+							Answer:   action.Answer,
+							Ns:       action.Ns,
+							Extra:    action.Extra,
+						}, nil
 					}
 				}
 				var responseCheck func(responseAddrs []netip.Addr) bool
@@ -449,6 +462,6 @@ func (r *Router) LookupReverseMapping(ip netip.Addr) (string, bool) {
 func (r *Router) ResetNetwork() {
 	r.ClearCache()
 	for _, transport := range r.transport.Transports() {
-		transport.Close()
+		transport.Reset()
 	}
 }

dns/transport/dhcp/dhcp.go

@@ -81,7 +81,7 @@ func (t *Transport) Start(stage adapter.StartStage) error {
 
 func (t *Transport) Close() error {
 	for _, transport := range t.transports {
-		transport.Close()
+		transport.Reset()
 	}
 	if t.interfaceCallback != nil {
 		t.networkManager.InterfaceMonitor().UnregisterCallback(t.interfaceCallback)
@@ -89,6 +89,12 @@ func (t *Transport) Close() error {
 	return nil
 }
 
+func (t *Transport) Reset() {
+	for _, transport := range t.transports {
+		transport.Reset()
+	}
+}
+
 func (t *Transport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, error) {
 	err := t.fetchServers()
 	if err != nil {
@@ -246,7 +252,7 @@ func (t *Transport) recreateServers(iface *control.Interface, serverAddrs []M.So
 		transports = append(transports, transport.NewUDPRaw(t.logger, t.TransportAdapter, serverDialer, serverAddr))
 	}
 	for _, transport := range t.transports {
-		transport.Close()
+		transport.Reset()
 	}
 	t.transports = transports
 	return nil

dns/transport/hosts/hosts.go

@@ -51,12 +51,7 @@ func NewTransport(ctx context.Context, logger log.ContextLogger, tag string, opt
 	}, nil
 }
 
-func (t *Transport) Start(stage adapter.StartStage) error {
-	return nil
-}
-
-func (t *Transport) Close() error {
-	return nil
+func (t *Transport) Reset() {
 }
 
 func (t *Transport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, error) {

dns/transport/https.go

@@ -10,7 +10,6 @@ import (
 	"strconv"
 
 	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing-box/common/dialer"
 	"github.com/sagernet/sing-box/common/tls"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/dns"
@@ -150,17 +149,9 @@ func NewHTTPSRaw(
 	}
 }
 
-func (t *HTTPSTransport) Start(stage adapter.StartStage) error {
-	if stage != adapter.StartStateStart {
-		return nil
-	}
-	return dialer.InitializeDetour(t.dialer)
-}
-
-func (t *HTTPSTransport) Close() error {
+func (t *HTTPSTransport) Reset() {
 	t.transport.CloseIdleConnections()
 	t.transport = t.transport.Clone()
-	return nil
 }
 
 func (t *HTTPSTransport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, error) {

dns/transport/local/local.go

@@ -40,12 +40,7 @@ func NewTransport(ctx context.Context, logger log.ContextLogger, tag string, opt
 	}, nil
 }
 
-func (t *Transport) Start(stage adapter.StartStage) error {
-	return nil
-}
-
-func (t *Transport) Close() error {
-	return nil
+func (t *Transport) Reset() {
 }
 
 func (t *Transport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, error) {

dns/transport/quic/http3.go

@@ -111,12 +111,8 @@ func NewHTTP3(ctx context.Context, logger log.ContextLogger, tag string, options
 	}, nil
 }
 
-func (t *HTTP3Transport) Start(stage adapter.StartStage) error {
-	return nil
-}
-
-func (t *HTTP3Transport) Close() error {
-	return t.transport.Close()
+func (t *HTTP3Transport) Reset() {
+	t.transport.Close()
 }
 
 func (t *HTTP3Transport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, error) {

dns/transport/quic/quic.go

@@ -68,18 +68,13 @@ func NewQUIC(ctx context.Context, logger log.ContextLogger, tag string, options
 	}, nil
 }
 
-func (t *Transport) Start(stage adapter.StartStage) error {
-	return nil
-}
-
-func (t *Transport) Close() error {
+func (t *Transport) Reset() {
 	t.access.Lock()
 	defer t.access.Unlock()
 	connection := t.connection
 	if connection != nil {
 		connection.CloseWithError(0, "")
 	}
-	return nil
 }
 
 func (t *Transport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, error) {

dns/transport/tcp.go

@@ -6,7 +6,6 @@ import (
 	"io"
 
 	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing-box/common/dialer"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/dns"
 	"github.com/sagernet/sing-box/log"
@@ -47,15 +46,7 @@ func NewTCP(ctx context.Context, logger log.ContextLogger, tag string, options o
 	}, nil
 }
 
-func (t *TCPTransport) Start(stage adapter.StartStage) error {
-	if stage != adapter.StartStateStart {
-		return nil
-	}
-	return dialer.InitializeDetour(t.dialer)
-}
-
-func (t *TCPTransport) Close() error {
-	return nil
+func (t *TCPTransport) Reset() {
 }
 
 func (t *TCPTransport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, error) {

dns/transport/tls.go

@@ -5,7 +5,6 @@ import (
 	"sync"
 
 	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing-box/common/dialer"
 	"github.com/sagernet/sing-box/common/tls"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/dns"
@@ -66,21 +65,13 @@ func NewTLS(ctx context.Context, logger log.ContextLogger, tag string, options o
 	}, nil
 }
 
-func (t *TLSTransport) Start(stage adapter.StartStage) error {
-	if stage != adapter.StartStateStart {
-		return nil
-	}
-	return dialer.InitializeDetour(t.dialer)
-}
-
-func (t *TLSTransport) Close() error {
+func (t *TLSTransport) Reset() {
 	t.access.Lock()
 	defer t.access.Unlock()
 	for connection := t.connections.Front(); connection != nil; connection = connection.Next() {
 		connection.Value.Close()
 	}
 	t.connections.Init()
-	return nil
 }
 
 func (t *TLSTransport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, error) {

dns/transport/udp.go

@@ -7,7 +7,6 @@ import (
 	"sync"
 
 	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing-box/common/dialer"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/dns"
 	"github.com/sagernet/sing-box/log"
@@ -65,19 +64,11 @@ func NewUDPRaw(logger logger.ContextLogger, adapter dns.TransportAdapter, dialer
 	}
 }
 
-func (t *UDPTransport) Start(stage adapter.StartStage) error {
-	if stage != adapter.StartStateStart {
-		return nil
-	}
-	return dialer.InitializeDetour(t.dialer)
-}
-
-func (t *UDPTransport) Close() error {
+func (t *UDPTransport) Reset() {
 	t.access.Lock()
 	defer t.access.Unlock()
 	close(t.done)
 	t.done = make(chan struct{})
-	return nil
 }
 
 func (t *UDPTransport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, error) {

dns/transport_manager.go

@@ -225,7 +225,7 @@ func (m *TransportManager) Remove(tag string) error {
 		}
 	}
 	if started {
-		transport.Close()
+		transport.Reset()
 	}
 	return nil
 }

docs/changelog.md

@@ -2,10 +2,6 @@
 icon: material/alert-decagram
 ---
 
-#### 1.12.0-beta.1
-
-* Fixes and improvements
-
 #### 1.12.0-alpha.18
 
 * Add wildcard SNI support for ShadowTLS inbound **1**

docs/configuration/shared/dial.md

@@ -5,8 +5,7 @@ icon: material/new-box
 !!! quote "Changes in sing-box 1.12.0"
 
     :material-plus: [domain_resolver](#domain_resolver)  
-    :material-delete-clock: [domain_strategy](#domain_strategy)  
-    :material-plus: [netns](#netns)
+    :material-delete-clock: [domain_strategy](#domain_strategy)
 
 !!! quote "Changes in sing-box 1.11.0"
 
@@ -19,25 +18,24 @@ icon: material/new-box
 
 ```json
 {
-  "detour": "",
-  "bind_interface": "",
-  "inet4_bind_address": "",
-  "inet6_bind_address": "",
-  "routing_mark": 0,
+  "detour": "upstream-out",
+  "bind_interface": "en0",
+  "inet4_bind_address": "0.0.0.0",
+  "inet6_bind_address": "::",
+  "routing_mark": 1234,
   "reuse_addr": false,
-  "connect_timeout": "",
+  "connect_timeout": "5s",
   "tcp_fast_open": false,
   "tcp_multi_path": false,
   "udp_fragment": false,
-  "netns": "",
   "domain_resolver": "", // or {}
-  "network_strategy": "",
+  "network_strategy": "default",
   "network_type": [],
   "fallback_network_type": [],
-  "fallback_delay": "",
+  "fallback_delay": "300ms",
 
   // Deprecated
-  "domain_strategy": ""
+  "domain_strategy": "prefer_ipv6"
 }
 ```
 
@@ -77,15 +75,6 @@ Set netfilter routing mark.
 
 Reuse listener address.
 
-#### connect_timeout
-
-Connect timeout, in golang's Duration format.
-
-A duration string is a possibly signed sequence of
-decimal numbers, each with optional fraction and a unit suffix,
-such as "300ms", "-1.5h" or "2h45m".
-Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-
 #### tcp_fast_open
 
 Enable TCP Fast Open.
@@ -102,15 +91,14 @@ Enable TCP Multi Path.
 
 Enable UDP fragmentation.
 
-#### netns
+#### connect_timeout
 
-!!! question "Since sing-box 1.12.0"
+Connect timeout, in golang's Duration format.
 
-!!! quote ""
-
-    Only supported on Linux.
-
-Set network namespace, name or path.
+A duration string is a possibly signed sequence of
+decimal numbers, each with optional fraction and a unit suffix,
+such as "300ms", "-1.5h" or "2h45m".
+Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
 
 #### domain_resolver
 

docs/configuration/shared/dial.zh.md

@@ -5,8 +5,7 @@ icon: material/new-box
 !!! quote "sing-box 1.12.0 中的更改"
 
     :material-plus: [domain_resolver](#domain_resolver)  
-    :material-delete-clock: [domain_strategy](#domain_strategy)  
-    :material-plus: [netns](#netns)
+    :material-delete-clock: [domain_strategy](#domain_strategy)
 
 !!! quote "sing-box 1.11.0 中的更改"
 
@@ -19,26 +18,25 @@ icon: material/new-box
 
 ```json
 {
-  "detour": "",
-  "bind_interface": "",
-  "inet4_bind_address": "",
-  "inet6_bind_address": "",
-  "routing_mark": 0,
+  "detour": "upstream-out",
+  "bind_interface": "en0",
+  "inet4_bind_address": "0.0.0.0",
+  "inet6_bind_address": "::",
+  "routing_mark": 1234,
   "reuse_addr": false,
-  "connect_timeout": "",
+  "connect_timeout": "5s",
   "tcp_fast_open": false,
   "tcp_multi_path": false,
   "udp_fragment": false,
-  "netns": "",
   "domain_resolver": "", // 或 {}
   "network_strategy": "",
   "network_type": [],
   "fallback_network_type": [],
-  "fallback_delay": "",
+  "fallback_delay": "300ms",
   
   // 废弃的
 
-  "domain_strategy": ""
+  "domain_strategy": "prefer_ipv6"
 }
 ```
 
@@ -78,13 +76,6 @@ icon: material/new-box
 
 重用监听地址。
 
-#### connect_timeout
-
-连接超时，采用 golang 的 Duration 格式。
-
-持续时间字符串是一个可能有符号的序列十进制数，每个都有可选的分数和单位后缀， 例如 "300ms"、"-1.5h" 或 "2h45m"。
-有效时间单位为 "ns"、"us"（或 "µs"）、"ms"、"s"、"m"、"h"。
-
 #### tcp_fast_open
 
 启用 TCP Fast Open。
@@ -101,15 +92,12 @@ icon: material/new-box
 
 启用 UDP 分段。
 
-#### netns
+#### connect_timeout
 
-!!! question "自 sing-box 1.12.0 起"
+连接超时，采用 golang 的 Duration 格式。
 
-!!! quote ""
-
-    仅支持 Linux。
-
-设置网络命名空间，名称或路径。
+持续时间字符串是一个可能有符号的序列十进制数，每个都有可选的分数和单位后缀， 例如 "300ms"、"-1.5h" 或 "2h45m"。
+有效时间单位为 "ns"、"us"（或 "µs"）、"ms"、"s"、"m"、"h"。
 
 #### domain_resolver
 

docs/configuration/shared/listen.md

@@ -1,11 +1,7 @@
 ---
-icon: material/new-box
+icon: material/delete-clock
 ---
 
-!!! quote "Changes in sing-box 1.12.0"
-
-    :material-plus: [netns](#netns)
-
 !!! quote "Changes in sing-box 1.11.0"
 
     :material-delete-clock: [sniff](#sniff)  
@@ -18,18 +14,17 @@ icon: material/new-box
 
 ```json
 {
-  "listen": "",
-  "listen_port": 0,
+  "listen": "::",
+  "listen_port": 5353,
   "tcp_fast_open": false,
   "tcp_multi_path": false,
   "udp_fragment": false,
-  "udp_timeout": "",
-  "netns": "",
-  "detour": "",
+  "udp_timeout": "5m",
+  "detour": "another-in",
   "sniff": false,
   "sniff_override_destination": false,
-  "sniff_timeout": "",
-  "domain_strategy": "",
+  "sniff_timeout": "300ms",
+  "domain_strategy": "prefer_ipv6",
   "udp_disable_domain_unmapping": false
 }
 ```
@@ -77,16 +72,6 @@ UDP NAT expiration time.
 
 `5m` will be used by default.
 
-#### netns
-
-!!! question "Since sing-box 1.12.0"
-
-!!! quote ""
-
-    Only supported on Linux.
-
-Set network namespace, name or path.
-
 #### detour
 
 If set, connections will be forwarded to the specified inbound.

docs/configuration/shared/listen.zh.md

@@ -1,11 +1,7 @@
 ---
-icon: material/new-box
+icon: material/delete-clock
 ---
 
-!!! quote "Changes in sing-box 1.12.0"
-
-    :material-plus: [netns](#netns)
-
 !!! quote "sing-box 1.11.0 中的更改"
 
     :material-delete-clock: [sniff](#sniff)  
@@ -18,18 +14,17 @@ icon: material/new-box
 
 ```json
 {
-  "listen": "",
-  "listen_port": 0,
+  "listen": "::",
+  "listen_port": 5353,
   "tcp_fast_open": false,
   "tcp_multi_path": false,
   "udp_fragment": false,
-  "udp_timeout": "",
-  "netns": "",
-  "detour": "",
+  "udp_timeout": "5m",
+  "detour": "another-in",
   "sniff": false,
   "sniff_override_destination": false,
-  "sniff_timeout": "",
-  "domain_strategy": "",
+  "sniff_timeout": "300ms",
+  "domain_strategy": "prefer_ipv6",
   "udp_disable_domain_unmapping": false
 }
 ```
@@ -78,16 +73,6 @@ UDP NAT 过期时间。
 
 默认使用 `5m`。
 
-#### netns
-
-!!! question "自 sing-box 1.12.0 起"
-
-!!! quote ""
-
-    仅支持 Linux。
-
-设置网络命名空间，名称或路径。
-
 #### detour
 
 如果设置，连接将被转发到指定的入站。

experimental/cachefile/cache.go

@@ -19,12 +19,10 @@ import (
 )
 
 var (
-	bucketSelected          = []byte("selected")
-	bucketExpand            = []byte("group_expand")
-	bucketMode              = []byte("clash_mode")
-	bucketRuleSet           = []byte("rule_set")
-	bucketScript            = []byte("script")
-	bucketSgPersistentStore = []byte("sg_persistent_store")
+	bucketSelected = []byte("selected")
+	bucketExpand   = []byte("group_expand")
+	bucketMode     = []byte("clash_mode")
+	bucketRuleSet  = []byte("rule_set")
 
 	bucketNameList = []string{
 		string(bucketSelected),
@@ -318,70 +316,3 @@ func (c *CacheFile) SaveRuleSet(tag string, set *adapter.SavedBinary) error {
 		return bucket.Put([]byte(tag), setBinary)
 	})
 }
-
-func (c *CacheFile) LoadScript(tag string) *adapter.SavedBinary {
-	var savedSet adapter.SavedBinary
-	err := c.DB.View(func(t *bbolt.Tx) error {
-		bucket := c.bucket(t, bucketScript)
-		if bucket == nil {
-			return os.ErrNotExist
-		}
-		scriptBinary := bucket.Get([]byte(tag))
-		if len(scriptBinary) == 0 {
-			return os.ErrInvalid
-		}
-		return savedSet.UnmarshalBinary(scriptBinary)
-	})
-	if err != nil {
-		return nil
-	}
-	return &savedSet
-}
-
-func (c *CacheFile) SaveScript(tag string, set *adapter.SavedBinary) error {
-	return c.DB.Batch(func(t *bbolt.Tx) error {
-		bucket, err := c.createBucket(t, bucketScript)
-		if err != nil {
-			return err
-		}
-		scriptBinary, err := set.MarshalBinary()
-		if err != nil {
-			return err
-		}
-		return bucket.Put([]byte(tag), scriptBinary)
-	})
-}
-
-func (c *CacheFile) SurgePersistentStoreRead(key string) string {
-	var value string
-	_ = c.DB.View(func(t *bbolt.Tx) error {
-		bucket := c.bucket(t, bucketSgPersistentStore)
-		if bucket == nil {
-			return nil
-		}
-		valueBinary := bucket.Get([]byte(key))
-		if len(valueBinary) > 0 {
-			value = string(valueBinary)
-		}
-		return nil
-	})
-	return value
-}
-
-func (c *CacheFile) SurgePersistentStoreWrite(key string, value string) error {
-	return c.DB.Batch(func(t *bbolt.Tx) error {
-		if value != "" {
-			bucket, err := c.createBucket(t, bucketSgPersistentStore)
-			if err != nil {
-				return err
-			}
-			return bucket.Put([]byte(key), []byte(value))
-		} else {
-			bucket := c.bucket(t, bucketSgPersistentStore)
-			if bucket == nil {
-				return nil
-			}
-			return bucket.Delete([]byte(key))
-		}
-	})
-}

experimental/clashapi/mitm.go

@@ -1,73 +0,0 @@
-package clashapi
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing/common"
-	"github.com/sagernet/sing/service"
-
-	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/render"
-	"github.com/gofrs/uuid/v5"
-	"howett.net/plist"
-)
-
-func mitmRouter(ctx context.Context) http.Handler {
-	r := chi.NewRouter()
-	r.Get("/mobileconfig", getMobileConfig(ctx))
-	r.Get("/certificate", getCertificate(ctx))
-	return r
-}
-
-func getMobileConfig(ctx context.Context) http.HandlerFunc {
-	return func(writer http.ResponseWriter, request *http.Request) {
-		store := service.FromContext[adapter.CertificateStore](ctx)
-		if !store.TLSDecryptionEnabled() {
-			http.NotFound(writer, request)
-			render.PlainText(writer, request, "TLS decryption not enabled")
-			return
-		}
-		certificate := store.TLSDecryptionCertificate()
-		writer.Header().Set("Content-Type", "application/x-apple-aspen-config")
-		uuidGen := common.Must1(uuid.NewV4()).String()
-		mobileConfig := map[string]interface{}{
-			"PayloadContent": []interface{}{
-				map[string]interface{}{
-					"PayloadCertificateFileName": "Certificates.cer",
-					"PayloadContent":             certificate.Raw,
-					"PayloadDescription":         "Adds a root certificate",
-					"PayloadDisplayName":         certificate.Subject.CommonName,
-					"PayloadIdentifier":          "com.apple.security.root." + uuidGen,
-					"PayloadType":                "com.apple.security.root",
-					"PayloadUUID":                uuidGen,
-					"PayloadVersion":             1,
-				},
-			},
-			"PayloadDisplayName":       certificate.Subject.CommonName,
-			"PayloadIdentifier":        "io.nekohasekai.sfa.ca.profile." + uuidGen,
-			"PayloadRemovalDisallowed": false,
-			"PayloadType":              "Configuration",
-			"PayloadUUID":              uuidGen,
-			"PayloadVersion":           1,
-		}
-		encoder := plist.NewEncoder(writer)
-		encoder.Indent("\t")
-		encoder.Encode(mobileConfig)
-	}
-}
-
-func getCertificate(ctx context.Context) http.HandlerFunc {
-	return func(writer http.ResponseWriter, request *http.Request) {
-		store := service.FromContext[adapter.CertificateStore](ctx)
-		if !store.TLSDecryptionEnabled() {
-			http.NotFound(writer, request)
-			render.PlainText(writer, request, "TLS decryption not enabled")
-			return
-		}
-		writer.Header().Set("Content-Type", "application/x-x509-ca-cert")
-		writer.Header().Set("Content-Disposition", "attachment; filename=Certificate.crt")
-		writer.Write(store.TLSDecryptionCertificate().Raw)
-	}
-}

experimental/clashapi/server.go

@@ -124,7 +124,6 @@ func NewServer(ctx context.Context, logFactory log.ObservableFactory, options op
 		r.Mount("/profile", profileRouter())
 		r.Mount("/cache", cacheRouter(ctx))
 		r.Mount("/dns", dnsRouter(s.dnsRouter))
-		r.Mount("/mitm", mitmRouter(ctx))
 
 		s.setupMetaAPI(r)
 	})

experimental/libbox/dns.go

@@ -38,12 +38,7 @@ func newPlatformTransport(iif LocalDNSTransport, tag string, options option.Loca
 	}
 }
 
-func (p *platformTransport) Start(stage adapter.StartStage) error {
-	return nil
-}
-
-func (p *platformTransport) Close() error {
-	return nil
+func (p *platformTransport) Reset() {
 }
 
 func (p *platformTransport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, error) {

experimental/libbox/platform/interface.go

@@ -32,9 +32,4 @@ type Notification struct {
 	Subtitle   string
 	Body       string
 	OpenURL    string
-	Clipboard  string
-	MediaURL   string
-	MediaData  []byte
-	MediaType  string
-	Timeout    int
 }

go.mod

@@ -3,12 +3,10 @@ module github.com/sagernet/sing-box
 go 1.23.1
 
 require (
-	github.com/adhocore/gronx v1.19.5
 	github.com/anytls/sing-anytls v0.0.6
 	github.com/caddyserver/certmagic v0.21.7
 	github.com/cloudflare/circl v1.6.0
 	github.com/cretz/bine v0.2.0
-	github.com/dop251/goja v0.0.0-20250125213203-5ef83b82af17
 	github.com/go-chi/chi/v5 v5.2.1
 	github.com/go-chi/render v1.0.3
 	github.com/gofrs/uuid/v5 v5.3.1
@@ -28,13 +26,13 @@ require (
 	github.com/sagernet/gvisor v0.0.0-20241123041152-536d05261cff
 	github.com/sagernet/quic-go v0.49.0-beta.1
 	github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691
-	github.com/sagernet/sing v0.6.4-0.20250319121229-11d8838dc56d
+	github.com/sagernet/sing v0.6.4-0.20250316065121-38f666955109
 	github.com/sagernet/sing-mux v0.3.1
 	github.com/sagernet/sing-quic v0.4.1-beta.1
 	github.com/sagernet/sing-shadowsocks v0.2.7
 	github.com/sagernet/sing-shadowsocks2 v0.2.0
 	github.com/sagernet/sing-shadowtls v0.2.1-0.20250316154757-6f9e732e5056
-	github.com/sagernet/sing-tun v0.6.2-0.20250319123703-35b5747b44ec
+	github.com/sagernet/sing-tun v0.6.1
 	github.com/sagernet/sing-vmess v0.2.0
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7
 	github.com/sagernet/tailscale v1.80.3-mod.0
@@ -43,7 +41,6 @@ require (
 	github.com/sagernet/ws v0.0.0-20231204124109-acfe8907c854
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.10.0
-	github.com/vishvananda/netns v0.0.4
 	go.uber.org/zap v1.27.0
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
 	golang.org/x/crypto v0.33.0
@@ -55,7 +52,6 @@ require (
 	google.golang.org/grpc v1.70.0
 	google.golang.org/protobuf v1.36.5
 	howett.net/plist v1.0.1
-	software.sslmate.com/src/go-pkcs12 v0.4.0
 )
 
 //replace github.com/sagernet/sing => ../sing
@@ -75,14 +71,12 @@ require (
 	github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa // indirect
 	github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 // indirect
 	github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e // indirect
-	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/gaissmai/bart v0.11.1 // indirect
 	github.com/go-json-experiment/json v0.0.0-20250103232110-6a9a0fde9288 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
-	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect
@@ -91,7 +85,7 @@ require (
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/nftables v0.2.1-0.20240414091927-5e242ec57806 // indirect
-	github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
+	github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/csrf v1.7.3-0.20250123201450-9dd6af1f6d30 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
@@ -109,7 +103,7 @@ require (
 	github.com/mdlayher/sdnotify v1.0.0 // indirect
 	github.com/mdlayher/socket v0.5.1 // indirect
 	github.com/mitchellh/go-ps v1.0.0 // indirect
-	github.com/onsi/ginkgo/v2 v2.9.7 // indirect
+	github.com/onsi/ginkgo/v2 v2.17.2 // indirect
 	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus-community/pro-bing v0.4.0 // indirect
@@ -128,6 +122,7 @@ require (
 	github.com/tailscale/peercred v0.0.0-20250107143737-35a0c7bd7edc // indirect
 	github.com/tailscale/web-client-prebuilt v0.0.0-20250124233751-d4cd19a26976 // indirect
 	github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/zeebo/blake3 v0.2.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
@@ -144,3 +139,5 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 )
+
+//replace github.com/sagernet/sing => ../sing

go.sum

@@ -1,9 +1,5 @@
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
-github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
-github.com/adhocore/gronx v1.19.5 h1:cwIG4nT1v9DvadxtHBe6MzE+FZ1JDvAUC45U2fl4eSQ=
-github.com/adhocore/gronx v1.19.5/go.mod h1:7oUY1WAU8rEJWmAxXR2DN0JaO4gi9khSgKjiRypqteg=
 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/akutz/memconn v0.1.0 h1:NawI0TORU4hcOMsMr11g7vwlCdkYeLKXBcxWu2W/P8A=
@@ -34,7 +30,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
 github.com/cretz/bine v0.2.0 h1:8GiDRGlTgz+o8H9DSnsl+5MeBK4HsExxgl6WgzOCuZo=
 github.com/cretz/bine v0.2.0/go.mod h1:WU4o9QR9wWp8AVKtTM1XD5vUHkEqnf2vVSo6dBqbetI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa h1:h8TfIT1xc8FWbwwpmHn1J5i43Y0uZP97GqasGCzSRJk=
@@ -43,10 +38,6 @@ github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 h1:CaO/zOnF8VvUfEbhRatPcwKVWamvbY
 github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod h1:+hnT3ywWDTAFrW5aE+u2Sa/wT555ZqwoCS+pk3p6ry4=
 github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e h1:vUmf0yezR0y7jJ5pceLHthLaYf4bA5T14B6q39S4q2Q=
 github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e/go.mod h1:YTIHhz/QFSYnu/EhlF2SpU2Uk+32abacUYA5ZPljz1A=
-github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
-github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dop251/goja v0.0.0-20250125213203-5ef83b82af17 h1:spJaibPy2sZNwo6Q0HjBVufq7hBUj5jNFOKRoogCBow=
-github.com/dop251/goja v0.0.0-20250125213203-5ef83b82af17/go.mod h1:MxLav0peU43GgvwVgNbLAj1s/bSGboKkhuULvq/7hx4=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
@@ -67,10 +58,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
-github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
-github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
@@ -94,8 +83,8 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/nftables v0.2.1-0.20240414091927-5e242ec57806 h1:wG8RYIyctLhdFk6Vl1yPGtSRtwGpVkWyZww1OCil2MI=
 github.com/google/nftables v0.2.1-0.20240414091927-5e242ec57806/go.mod h1:Beg6V6zZ3oEn0JuiUQ4wqwuyqqzasOltcoXPtgLbFp4=
-github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a h1:fEBsGL/sjAuJrgah5XqmmYsTLzJp/TO9Lhy39gkverk=
-github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
+github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg=
+github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/csrf v1.7.3-0.20250123201450-9dd6af1f6d30 h1:fiJdrgVBkjZ5B1HJ2WQwNOaXB+QyYcNXTA3t1XYLz0M=
@@ -148,10 +137,10 @@ github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc
 github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss=
-github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+M/1uw0=
-github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
-github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4=
+github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g=
+github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc=
+github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE=
+github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY=
 github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5MbwsmL4MRQE=
 github.com/oschwald/maxminddb-golang v1.13.1/go.mod h1:K4pgV9N/GcK694KSTmVSDTODk4IsCNThNdTmnaBZ/F8=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
@@ -189,8 +178,8 @@ github.com/sagernet/quic-go v0.49.0-beta.1/go.mod h1:uesWD1Ihrldq1M3XtjuEvIUqi8W
 github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byLGkEnIYp6grlXfo1QYUfiYFGjewIdc=
 github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU=
 github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
-github.com/sagernet/sing v0.6.4-0.20250319121229-11d8838dc56d h1:8GJnvXlOBdgCa0spumUzPbMamkEbud4sfNTd8+1YaEg=
-github.com/sagernet/sing v0.6.4-0.20250319121229-11d8838dc56d/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
+github.com/sagernet/sing v0.6.4-0.20250316065121-38f666955109 h1:clwEzQu0oiapGllEDtbGQjcmQaIAt8DH3EeOHAWyiKs=
+github.com/sagernet/sing v0.6.4-0.20250316065121-38f666955109/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/sagernet/sing-mux v0.3.1 h1:kvCc8HyGAskDHDQ0yQvoTi/7J4cZPB/VJMsAM3MmdQI=
 github.com/sagernet/sing-mux v0.3.1/go.mod h1:Mkdz8LnDstthz0HWuA/5foncnDIdcNN5KZ6AdJX+x78=
 github.com/sagernet/sing-quic v0.4.1-beta.1 h1:V2VfMckT3EQR3ZdfSzJgZZDsvfZZH42QAZpnOnHKa0s=
@@ -201,8 +190,8 @@ github.com/sagernet/sing-shadowsocks2 v0.2.0 h1:wpZNs6wKnR7mh1wV9OHwOyUr21VkS3wK
 github.com/sagernet/sing-shadowsocks2 v0.2.0/go.mod h1:RnXS0lExcDAovvDeniJ4IKa2IuChrdipolPYWBv9hWQ=
 github.com/sagernet/sing-shadowtls v0.2.1-0.20250316154757-6f9e732e5056 h1:GFNJQAHhSXqAfxAw1wDG/QWbdpGH5Na3k8qUynqWnEA=
 github.com/sagernet/sing-shadowtls v0.2.1-0.20250316154757-6f9e732e5056/go.mod h1:HyacBPIFiKihJQR8LQp56FM4hBtd/7MZXnRxxQIOPsc=
-github.com/sagernet/sing-tun v0.6.2-0.20250319123703-35b5747b44ec h1:9/OYGb9qDmUFIhqd3S+3eni62EKRQR1rSmRH18baA/M=
-github.com/sagernet/sing-tun v0.6.2-0.20250319123703-35b5747b44ec/go.mod h1:fisFCbC4Vfb6HqQNcwPJi2CDK2bf0Xapyz3j3t4cnHE=
+github.com/sagernet/sing-tun v0.6.1 h1:4l0+gnEKcGjlWfUVTD+W0BRApqIny/lU2ZliurE+VMo=
+github.com/sagernet/sing-tun v0.6.1/go.mod h1:fisFCbC4Vfb6HqQNcwPJi2CDK2bf0Xapyz3j3t4cnHE=
 github.com/sagernet/sing-vmess v0.2.0 h1:pCMGUXN2k7RpikQV65/rtXtDHzb190foTfF9IGTMZrI=
 github.com/sagernet/sing-vmess v0.2.0/go.mod h1:jDAZ0A0St1zVRkyvhAPRySOFfhC+4SQtO5VYyeFotgA=
 github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
@@ -220,7 +209,6 @@ github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3k
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
@@ -333,8 +321,6 @@ google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

log/log.go

@@ -10,10 +10,6 @@ import (
 	E "github.com/sagernet/sing/common/exceptions"
 )
 
-const (
-	DefaultTimeFormat = "-0700 2006-01-02 15:04:05"
-)
-
 type Options struct {
 	Context        context.Context
 	Options        option.LogOptions
@@ -51,7 +47,7 @@ func New(options Options) (Factory, error) {
 		DisableColors:    logOptions.DisableColor || logFilePath != "",
 		DisableTimestamp: !logOptions.Timestamp && logFilePath != "",
 		FullTimestamp:    logOptions.Timestamp,
-		TimestampFormat:  DefaultTimeFormat,
+		TimestampFormat:  "-0700 2006-01-02 15:04:05",
 	}
 	factory := NewDefaultFactory(
 		options.Context,

mitm/constants.go

@@ -1,11 +0,0 @@
-package mitm
-
-import (
-	"encoding/base64"
-
-	"github.com/sagernet/sing/common"
-)
-
-var surgeTinyGif = common.OnceValue(func() []byte {
-	return common.Must1(base64.StdEncoding.DecodeString("R0lGODlhAQABAAAAACH5BAEAAAAALAAAAAABAAEAAAIBAAA="))
-})

option/certificate.go

@@ -11,13 +11,6 @@ type _CertificateOptions struct {
 	Certificate              badoption.Listable[string] `json:"certificate,omitempty"`
 	CertificatePath          badoption.Listable[string] `json:"certificate_path,omitempty"`
 	CertificateDirectoryPath badoption.Listable[string] `json:"certificate_directory_path,omitempty"`
-	TLSDecryption            *TLSDecryptionOptions      `json:"tls_decryption,omitempty"`
-}
-
-type TLSDecryptionOptions struct {
-	Enabled         bool   `json:"enabled,omitempty"`
-	KeyPair         string `json:"key_pair_p12,omitempty"`
-	KeyPairPassword string `json:"key_pair_p12_password,omitempty"`
 }
 
 type CertificateOptions _CertificateOptions

option/inbound.go

@@ -68,7 +68,6 @@ type ListenOptions struct {
 	UDPFragment          *bool              `json:"udp_fragment,omitempty"`
 	UDPFragmentDefault   bool               `json:"-"`
 	UDPTimeout           UDPTimeoutCompat   `json:"udp_timeout,omitempty"`
-	NetNs                string             `json:"netns,omitempty"`
 
 	// Deprecated: removed
 	ProxyProtocol bool `json:"proxy_protocol,omitempty"`

option/mitm.go

@@ -1,31 +0,0 @@
-package option
-
-import (
-	"github.com/sagernet/sing/common/json/badoption"
-)
-
-type MITMOptions struct {
-	Enabled      bool `json:"enabled,omitempty"`
-	HTTP2Enabled bool `json:"http2_enabled,omitempty"`
-}
-
-type MITMRouteOptions struct {
-	Enabled            bool                                            `json:"enabled,omitempty"`
-	Print              bool                                            `json:"print,omitempty"`
-	Script             badoption.Listable[MITMRouteSurgeScriptOptions] `json:"surge_script,omitempty"`
-	SurgeURLRewrite    badoption.Listable[SurgeURLRewriteLine]         `json:"surge_url_rewrite,omitempty"`
-	SurgeHeaderRewrite badoption.Listable[SurgeHeaderRewriteLine]      `json:"surge_header_rewrite,omitempty"`
-	SurgeBodyRewrite   badoption.Listable[SurgeBodyRewriteLine]        `json:"surge_body_rewrite,omitempty"`
-	SurgeMapLocal      badoption.Listable[SurgeMapLocalLine]           `json:"surge_map_local,omitempty"`
-}
-
-type MITMRouteSurgeScriptOptions struct {
-	Tag            string                                `json:"tag"`
-	Type           badoption.Listable[string]            `json:"type"`
-	Pattern        badoption.Listable[*badoption.Regexp] `json:"pattern"`
-	Timeout        badoption.Duration                    `json:"timeout,omitempty"`
-	RequiresBody   bool                                  `json:"requires_body,omitempty"`
-	MaxSize        int64                                 `json:"max_size,omitempty"`
-	BinaryBodyMode bool                                  `json:"binary_body_mode,omitempty"`
-	Arguments      badoption.Listable[string]            `json:"arguments,omitempty"`
-}

option/mitm_surge_urlrewrite.go

@@ -1,449 +0,0 @@
-package option
-
-import (
-	"encoding/base64"
-	"net/http"
-	"net/url"
-	"regexp"
-	"strconv"
-	"strings"
-	"unicode"
-
-	"github.com/sagernet/sing/common"
-	E "github.com/sagernet/sing/common/exceptions"
-	F "github.com/sagernet/sing/common/format"
-	"github.com/sagernet/sing/common/json"
-)
-
-type SurgeURLRewriteLine struct {
-	Pattern     *regexp.Regexp
-	Destination *url.URL
-	Redirect    bool
-	Reject      bool
-}
-
-func (l SurgeURLRewriteLine) String() string {
-	var fields []string
-	fields = append(fields, l.Pattern.String())
-	if l.Reject {
-		fields = append(fields, "_")
-	} else {
-		fields = append(fields, l.Destination.String())
-	}
-	switch {
-	case l.Redirect:
-		fields = append(fields, "302")
-	case l.Reject:
-		fields = append(fields, "reject")
-	default:
-		fields = append(fields, "header")
-	}
-	return encodeSurgeKeys(fields)
-}
-
-func (l SurgeURLRewriteLine) MarshalJSON() ([]byte, error) {
-	return json.Marshal(l.String())
-}
-
-func (l *SurgeURLRewriteLine) UnmarshalJSON(bytes []byte) error {
-	var stringValue string
-	err := json.Unmarshal(bytes, &stringValue)
-	if err != nil {
-		return err
-	}
-	fields, err := surgeFields(stringValue)
-	if err != nil {
-		return E.Cause(err, "invalid surge_url_rewrite line: ", stringValue)
-	} else if len(fields) < 2 || len(fields) > 3 {
-		return E.New("invalid surge_url_rewrite line: ", stringValue)
-	}
-	pattern, err := regexp.Compile(fields[0].Key)
-	if err != nil {
-		return E.Cause(err, "invalid surge_url_rewrite line: invalid pattern: ", stringValue)
-	}
-	l.Pattern = pattern
-	l.Destination, err = url.Parse(fields[1].Key)
-	if err != nil {
-		return E.Cause(err, "invalid surge_url_rewrite line: invalid destination: ", stringValue)
-	}
-	if len(fields) == 3 {
-		switch fields[2].Key {
-		case "header":
-		case "302":
-			l.Redirect = true
-		case "reject":
-			l.Reject = true
-		default:
-			return E.New("invalid surge_url_rewrite line: invalid action: ", stringValue)
-		}
-	}
-	return nil
-}
-
-type SurgeHeaderRewriteLine struct {
-	Response     bool
-	Pattern      *regexp.Regexp
-	Add          bool
-	Delete       bool
-	Replace      bool
-	ReplaceRegex bool
-	Key          string
-	Match        *regexp.Regexp
-	Value        string
-}
-
-func (l SurgeHeaderRewriteLine) String() string {
-	var fields []string
-	if !l.Response {
-		fields = append(fields, "http-request")
-	} else {
-		fields = append(fields, "http-response")
-	}
-	fields = append(fields, l.Pattern.String())
-	if l.Add {
-		fields = append(fields, "header-add")
-	} else if l.Delete {
-		fields = append(fields, "header-del")
-	} else if l.Replace {
-		fields = append(fields, "header-replace")
-	} else if l.ReplaceRegex {
-		fields = append(fields, "header-replace-regex")
-	}
-	fields = append(fields, l.Key)
-	if l.Add || l.Replace {
-		fields = append(fields, l.Value)
-	} else if l.ReplaceRegex {
-		fields = append(fields, l.Match.String(), l.Value)
-	}
-	return encodeSurgeKeys(fields)
-}
-
-func (l SurgeHeaderRewriteLine) MarshalJSON() ([]byte, error) {
-	return json.Marshal(l.String())
-}
-
-func (l *SurgeHeaderRewriteLine) UnmarshalJSON(bytes []byte) error {
-	var stringValue string
-	err := json.Unmarshal(bytes, &stringValue)
-	if err != nil {
-		return err
-	}
-	fields, err := surgeFields(stringValue)
-	if err != nil {
-		return E.Cause(err, "invalid surge_header_rewrite line: ", stringValue)
-	} else if len(fields) < 4 {
-		return E.New("invalid surge_header_rewrite line: ", stringValue)
-	}
-	switch fields[0].Key {
-	case "http-request":
-	case "http-response":
-		l.Response = true
-	default:
-		return E.New("invalid surge_header_rewrite line: invalid type: ", stringValue)
-	}
-	l.Pattern, err = regexp.Compile(fields[1].Key)
-	if err != nil {
-		return E.Cause(err, "invalid surge_header_rewrite line: invalid pattern: ", stringValue)
-	}
-	switch fields[2].Key {
-	case "header-add":
-		l.Add = true
-		if len(fields) != 5 {
-			return E.New("invalid surge_header_rewrite line: " + stringValue)
-		}
-		l.Key = fields[3].Key
-		l.Value = fields[4].Key
-	case "header-del":
-		l.Delete = true
-		l.Key = fields[3].Key
-	case "header-replace":
-		l.Replace = true
-		if len(fields) != 5 {
-			return E.New("invalid surge_header_rewrite line: " + stringValue)
-		}
-		l.Key = fields[3].Key
-		l.Value = fields[4].Key
-	case "header-replace-regex":
-		l.ReplaceRegex = true
-		if len(fields) != 6 {
-			return E.New("invalid surge_header_rewrite line: " + stringValue)
-		}
-		l.Key = fields[3].Key
-		l.Match, err = regexp.Compile(fields[4].Key)
-		if err != nil {
-			return E.Cause(err, "invalid surge_header_rewrite line: invalid match: ", stringValue)
-		}
-		l.Value = fields[5].Key
-	default:
-		return E.New("invalid surge_header_rewrite line: invalid action: ", stringValue)
-	}
-	return nil
-}
-
-type SurgeBodyRewriteLine struct {
-	Response bool
-	Pattern  *regexp.Regexp
-	Match    []*regexp.Regexp
-	Replace  []string
-}
-
-func (l SurgeBodyRewriteLine) String() string {
-	var fields []string
-	if !l.Response {
-		fields = append(fields, "http-request")
-	} else {
-		fields = append(fields, "http-response")
-	}
-	for i := 0; i < len(l.Match); i += 2 {
-		fields = append(fields, l.Match[i].String(), l.Replace[i])
-	}
-	return strings.Join(fields, " ")
-}
-
-func (l SurgeBodyRewriteLine) MarshalJSON() ([]byte, error) {
-	return json.Marshal(l.String())
-}
-
-func (l *SurgeBodyRewriteLine) UnmarshalJSON(bytes []byte) error {
-	var stringValue string
-	err := json.Unmarshal(bytes, &stringValue)
-	if err != nil {
-		return err
-	}
-	fields, err := surgeFields(stringValue)
-	if err != nil {
-		return E.Cause(err, "invalid surge_body_rewrite line: ", stringValue)
-	} else if len(fields) < 4 {
-		return E.New("invalid surge_body_rewrite line: ", stringValue)
-	} else if len(fields)%2 != 0 {
-		return E.New("invalid surge_body_rewrite line: ", stringValue)
-	}
-	switch fields[0].Key {
-	case "http-request":
-	case "http-response":
-		l.Response = true
-	default:
-		return E.New("invalid surge_body_rewrite line: invalid type: ", stringValue)
-	}
-	l.Pattern, err = regexp.Compile(fields[1].Key)
-	for i := 2; i < len(fields); i += 2 {
-		var match *regexp.Regexp
-		match, err = regexp.Compile(fields[i].Key)
-		if err != nil {
-			return E.Cause(err, "invalid surge_body_rewrite line: invalid match: ", stringValue)
-		}
-		l.Match = append(l.Match, match)
-		l.Replace = append(l.Replace, fields[i+1].Key)
-	}
-	return nil
-}
-
-type SurgeMapLocalLine struct {
-	Pattern    *regexp.Regexp
-	StatusCode int
-	File       bool
-	Text       bool
-	TinyGif    bool
-	Base64     bool
-	Data       string
-	Base64Data []byte
-	Headers    http.Header
-}
-
-func (l SurgeMapLocalLine) String() string {
-	var fields []surgeField
-	fields = append(fields, surgeField{Key: l.Pattern.String()})
-	if l.File {
-		fields = append(fields, surgeField{Key: "data-type", Value: "file"})
-		fields = append(fields, surgeField{Key: "data", Value: l.Data})
-	} else if l.Text {
-		fields = append(fields, surgeField{Key: "data-type", Value: "text"})
-		fields = append(fields, surgeField{Key: "data", Value: l.Data})
-	} else if l.TinyGif {
-		fields = append(fields, surgeField{Key: "data-type", Value: "tiny-gif"})
-	} else if l.Base64 {
-		fields = append(fields, surgeField{Key: "data-type", Value: "base64"})
-		fields = append(fields, surgeField{Key: "data-type", Value: base64.StdEncoding.EncodeToString(l.Base64Data)})
-	}
-	if l.StatusCode != 0 {
-		fields = append(fields, surgeField{Key: "status-code", Value: F.ToString(l.StatusCode), ValueSet: true})
-	}
-	if len(l.Headers) > 0 {
-		var headers []string
-		for key, values := range l.Headers {
-			for _, value := range values {
-				headers = append(headers, key+":"+value)
-			}
-		}
-		fields = append(fields, surgeField{Key: "headers", Value: strings.Join(headers, "|")})
-	}
-	return encodeSurgeFields(fields)
-}
-
-func (l SurgeMapLocalLine) MarshalJSON() ([]byte, error) {
-	return json.Marshal(l.String())
-}
-
-func (l *SurgeMapLocalLine) UnmarshalJSON(bytes []byte) error {
-	var stringValue string
-	err := json.Unmarshal(bytes, &stringValue)
-	if err != nil {
-		return err
-	}
-	fields, err := surgeFields(stringValue)
-	if err != nil {
-		return E.Cause(err, "invalid surge_map_local line: ", stringValue)
-	} else if len(fields) < 1 {
-		return E.New("invalid surge_map_local line: ", stringValue)
-	}
-	l.Pattern, err = regexp.Compile(fields[0].Key)
-	if err != nil {
-		return E.Cause(err, "invalid surge_map_local line: invalid pattern: ", stringValue)
-	}
-	dataTypeField := common.Find(fields, func(it surgeField) bool {
-		return it.Key == "data-type"
-	})
-	if !dataTypeField.ValueSet {
-		return E.New("invalid surge_map_local line: missing data-type: ", stringValue)
-	}
-	switch dataTypeField.Value {
-	case "file":
-		l.File = true
-	case "text":
-		l.Text = true
-	case "tiny-gif":
-		l.TinyGif = true
-	case "base64":
-		l.Base64 = true
-	default:
-		return E.New("unsupported data-type ", dataTypeField.Value)
-	}
-	for i := 1; i < len(fields); i++ {
-		switch fields[i].Key {
-		case "data-type":
-			continue
-		case "data":
-			if l.File {
-				l.Data = fields[i].Value
-			} else if l.Text {
-				l.Data = fields[i].Value
-			} else if l.Base64 {
-				l.Base64Data, err = base64.StdEncoding.DecodeString(fields[i].Value)
-				if err != nil {
-					return E.New("invalid surge_map_local line: invalid base64 data: ", stringValue)
-				}
-			}
-		case "status-code":
-			statusCode, err := strconv.ParseInt(fields[i].Value, 10, 16)
-			if err != nil {
-				return E.New("invalid surge_map_local line: invalid status code: ", stringValue)
-			}
-			l.StatusCode = int(statusCode)
-		case "header":
-			headers := make(http.Header)
-			for _, headerLine := range strings.Split(fields[i].Value, "|") {
-				if !strings.Contains(headerLine, ":") {
-					return E.New("invalid surge_map_local line: headers: missing `:` in item: ", stringValue, ": ", headerLine)
-				}
-				headers.Add(common.SubstringBefore(headerLine, ":"), common.SubstringAfter(headerLine, ":"))
-			}
-			l.Headers = headers
-		default:
-			return E.New("invalid surge_map_local line: unknown options: ", fields[i].Key)
-		}
-	}
-	return nil
-}
-
-type surgeField struct {
-	Key      string
-	Value    string
-	ValueSet bool
-}
-
-func encodeSurgeKeys(keys []string) string {
-	keys = common.Map(keys, func(it string) string {
-		if strings.ContainsFunc(it, unicode.IsSpace) {
-			return "\"" + it + "\""
-		} else {
-			return it
-		}
-	})
-	return strings.Join(keys, " ")
-}
-
-func encodeSurgeFields(fields []surgeField) string {
-	return strings.Join(common.Map(fields, func(it surgeField) string {
-		if !it.ValueSet {
-			if strings.ContainsFunc(it.Key, unicode.IsSpace) {
-				return "\"" + it.Key + "\""
-			} else {
-				return it.Key
-			}
-		} else {
-			if strings.ContainsFunc(it.Value, unicode.IsSpace) {
-				return it.Key + "=\"" + it.Value + "\""
-			} else {
-				return it.Key + "=" + it.Value
-			}
-		}
-	}), " ")
-}
-
-func surgeFields(s string) ([]surgeField, error) {
-	var (
-		fields       []surgeField
-		currentField *surgeField
-	)
-	for _, field := range strings.Fields(s) {
-		if currentField != nil {
-			field = " " + field
-			if strings.HasSuffix(field, "\"") {
-				field = field[:len(field)-1]
-				if !currentField.ValueSet {
-					currentField.Key += field
-				} else {
-					currentField.Value += field
-				}
-				fields = append(fields, *currentField)
-				currentField = nil
-			} else {
-				if !currentField.ValueSet {
-					currentField.Key += field
-				} else {
-					currentField.Value += field
-				}
-			}
-			continue
-		}
-		if !strings.Contains(field, "=") {
-			if strings.HasPrefix(field, "\"") {
-				field = field[1:]
-				if strings.HasSuffix(field, "\"") {
-					field = field[:len(field)-1]
-				} else {
-					currentField = &surgeField{Key: field}
-					continue
-				}
-			}
-			fields = append(fields, surgeField{Key: field})
-		} else {
-			key := common.SubstringBefore(field, "=")
-			value := common.SubstringAfter(field, "=")
-			if strings.HasPrefix(value, "\"") {
-				value = value[1:]
-				if strings.HasSuffix(field, "\"") {
-					value = value[:len(value)-1]
-				} else {
-					currentField = &surgeField{Key: key, Value: value, ValueSet: true}
-					continue
-				}
-			}
-			fields = append(fields, surgeField{Key: key, Value: value, ValueSet: true})
-		}
-	}
-	if currentField != nil {
-		return nil, E.New("invalid surge fields line: ", s)
-	}
-	return fields, nil
-}

option/options.go

@@ -12,15 +12,13 @@ type _Options struct {
 	Schema       string               `json:"$schema,omitempty"`
 	Log          *LogOptions          `json:"log,omitempty"`
 	DNS          *DNSOptions          `json:"dns,omitempty"`
+	NTP          *NTPOptions          `json:"ntp,omitempty"`
+	Certificate  *CertificateOptions  `json:"certificate,omitempty"`
 	Endpoints    []Endpoint           `json:"endpoints,omitempty"`
 	Inbounds     []Inbound            `json:"inbounds,omitempty"`
 	Outbounds    []Outbound           `json:"outbounds,omitempty"`
 	Route        *RouteOptions        `json:"route,omitempty"`
 	Experimental *ExperimentalOptions `json:"experimental,omitempty"`
-	NTP          *NTPOptions          `json:"ntp,omitempty"`
-	Certificate  *CertificateOptions  `json:"certificate,omitempty"`
-	MITM         *MITMOptions         `json:"mitm,omitempty"`
-	Scripts      []Script             `json:"scripts,omitempty"`
 }
 
 type Options _Options

option/outbound.go

@@ -77,7 +77,6 @@ type DialerOptions struct {
 	TCPMultiPath        bool                              `json:"tcp_multi_path,omitempty"`
 	UDPFragment         *bool                             `json:"udp_fragment,omitempty"`
 	UDPFragmentDefault  bool                              `json:"-"`
-	NetNs               string                            `json:"netns,omitempty"`
 	DomainResolver      *DomainResolveOptions             `json:"domain_resolver,omitempty"`
 	NetworkStrategy     *NetworkStrategy                  `json:"network_strategy,omitempty"`
 	NetworkType         badoption.Listable[InterfaceType] `json:"network_type,omitempty"`

option/rule.go

@@ -125,9 +125,10 @@ func (r *DefaultRule) UnmarshalJSON(data []byte) error {
 	return badjson.UnmarshallExcluded(data, &r.RawDefaultRule, &r.RuleAction)
 }
 
-func (r DefaultRule) IsValid() bool {
+func (r *DefaultRule) IsValid() bool {
 	var defaultValue DefaultRule
 	defaultValue.Invert = r.Invert
+	defaultValue.Action = r.Action
 	return !reflect.DeepEqual(r, defaultValue)
 }
 

option/rule_action.go

@@ -158,8 +158,6 @@ type RawRouteOptionsActionOptions struct {
 
 	TLSFragment              bool               `json:"tls_fragment,omitempty"`
 	TLSFragmentFallbackDelay badoption.Duration `json:"tls_fragment_fallback_delay,omitempty"`
-
-	MITM *MITMRouteOptions `json:"mitm,omitempty"`
 }
 
 type RouteOptionsActionOptions RawRouteOptionsActionOptions

option/rule_dns.go

@@ -132,6 +132,7 @@ func (r *DefaultDNSRule) UnmarshalJSONContext(ctx context.Context, data []byte)
 func (r DefaultDNSRule) IsValid() bool {
 	var defaultValue DefaultDNSRule
 	defaultValue.Invert = r.Invert
+	defaultValue.DNSRuleAction = r.DNSRuleAction
 	return !reflect.DeepEqual(r, defaultValue)
 }
 

option/script.go

@@ -1,128 +0,0 @@
-package option
-
-import (
-	C "github.com/sagernet/sing-box/constant"
-	E "github.com/sagernet/sing/common/exceptions"
-	"github.com/sagernet/sing/common/json"
-	"github.com/sagernet/sing/common/json/badjson"
-	"github.com/sagernet/sing/common/json/badoption"
-)
-
-type _ScriptSourceOptions struct {
-	Source        string             `json:"source"`
-	LocalOptions  LocalScriptSource  `json:"-"`
-	RemoteOptions RemoteScriptSource `json:"-"`
-}
-
-type LocalScriptSource struct {
-	Path string `json:"path"`
-}
-
-type RemoteScriptSource struct {
-	URL            string             `json:"url"`
-	DownloadDetour string             `json:"download_detour,omitempty"`
-	UpdateInterval badoption.Duration `json:"update_interval,omitempty"`
-}
-
-type ScriptSourceOptions _ScriptSourceOptions
-
-func (o ScriptSourceOptions) MarshalJSON() ([]byte, error) {
-	var source any
-	switch o.Source {
-	case C.ScriptSourceTypeLocal:
-		source = o.LocalOptions
-	case C.ScriptSourceTypeRemote:
-		source = o.RemoteOptions
-	default:
-		return nil, E.New("unknown script source: ", o.Source)
-	}
-	return badjson.MarshallObjects((_ScriptSourceOptions)(o), source)
-}
-
-func (o *ScriptSourceOptions) UnmarshalJSON(bytes []byte) error {
-	err := json.Unmarshal(bytes, (*_ScriptSourceOptions)(o))
-	if err != nil {
-		return err
-	}
-	var source any
-	switch o.Source {
-	case C.ScriptSourceTypeLocal:
-		source = &o.LocalOptions
-	case C.ScriptSourceTypeRemote:
-		source = &o.RemoteOptions
-	default:
-		return E.New("unknown script source: ", o.Source)
-	}
-	return json.Unmarshal(bytes, source)
-}
-
-// TODO: make struct in order
-type Script struct {
-	ScriptSourceOptions
-	ScriptOptions
-}
-
-func (s Script) MarshalJSON() ([]byte, error) {
-	return badjson.MarshallObjects(s.ScriptSourceOptions, s.ScriptOptions)
-}
-
-func (s *Script) UnmarshalJSON(bytes []byte) error {
-	err := json.Unmarshal(bytes, &s.ScriptSourceOptions)
-	if err != nil {
-		return err
-	}
-	return badjson.UnmarshallExcluded(bytes, &s.ScriptSourceOptions, &s.ScriptOptions)
-}
-
-type _ScriptOptions struct {
-	Type         string             `json:"type"`
-	Tag          string             `json:"tag"`
-	SurgeOptions SurgeScriptOptions `json:"-"`
-}
-
-type ScriptOptions _ScriptOptions
-
-func (o ScriptOptions) MarshalJSON() ([]byte, error) {
-	var v any
-	switch o.Type {
-	case C.ScriptTypeSurge:
-		v = &o.SurgeOptions
-	default:
-		return nil, E.New("unknown script type: ", o.Type)
-	}
-	if v == nil {
-		return badjson.MarshallObjects((_ScriptOptions)(o))
-	}
-	return badjson.MarshallObjects((_ScriptOptions)(o), v)
-}
-
-func (o *ScriptOptions) UnmarshalJSON(bytes []byte) error {
-	err := json.Unmarshal(bytes, (*_ScriptOptions)(o))
-	if err != nil {
-		return err
-	}
-	var v any
-	switch o.Type {
-	case C.ScriptTypeSurge:
-		v = &o.SurgeOptions
-	case "":
-		return E.New("missing script type")
-	default:
-		return E.New("unknown script type: ", o.Type)
-	}
-	if v == nil {
-		// check unknown fields
-		return json.UnmarshalDisallowUnknownFields(bytes, &_ScriptOptions{})
-	}
-	return badjson.UnmarshallExcluded(bytes, (*_ScriptOptions)(o), v)
-}
-
-type SurgeScriptOptions struct {
-	CronOptions *CronScriptOptions `json:"cron,omitempty"`
-}
-
-type CronScriptOptions struct {
-	Expression string             `json:"expression"`
-	Arguments  []string           `json:"arguments,omitempty"`
-	Timeout    badoption.Duration `json:"timeout,omitempty"`
-}

option/shadowtls.go

@@ -4,18 +4,17 @@ import (
 	"encoding/json"
 
 	E "github.com/sagernet/sing/common/exceptions"
-	"github.com/sagernet/sing/common/json/badjson"
 )
 
 type ShadowTLSInboundOptions struct {
 	ListenOptions
-	Version                int                                                  `json:"version,omitempty"`
-	Password               string                                               `json:"password,omitempty"`
-	Users                  []ShadowTLSUser                                      `json:"users,omitempty"`
-	Handshake              ShadowTLSHandshakeOptions                            `json:"handshake,omitempty"`
-	HandshakeForServerName *badjson.TypedMap[string, ShadowTLSHandshakeOptions] `json:"handshake_for_server_name,omitempty"`
-	StrictMode             bool                                                 `json:"strict_mode,omitempty"`
-	WildcardSNI            WildcardSNI                                          `json:"wildcard_sni,omitempty"`
+	Version                int                                  `json:"version,omitempty"`
+	Password               string                               `json:"password,omitempty"`
+	Users                  []ShadowTLSUser                      `json:"users,omitempty"`
+	Handshake              ShadowTLSHandshakeOptions            `json:"handshake,omitempty"`
+	HandshakeForServerName map[string]ShadowTLSHandshakeOptions `json:"handshake_for_server_name,omitempty"`
+	StrictMode             bool                                 `json:"strict_mode,omitempty"`
+	WildcardSNI            WildcardSNI                          `json:"wildcard_sni,omitempty"`
 }
 
 type WildcardSNI int

option/simple.go

@@ -7,15 +7,13 @@ import (
 
 type SocksInboundOptions struct {
 	ListenOptions
-	Users          []auth.User           `json:"users,omitempty"`
-	DomainResolver *DomainResolveOptions `json:"domain_resolver,omitempty"`
+	Users []auth.User `json:"users,omitempty"`
 }
 
 type HTTPMixedInboundOptions struct {
 	ListenOptions
-	Users          []auth.User           `json:"users,omitempty"`
-	DomainResolver *DomainResolveOptions `json:"domain_resolver,omitempty"`
-	SetSystemProxy bool                  `json:"set_system_proxy,omitempty"`
+	Users          []auth.User `json:"users,omitempty"`
+	SetSystemProxy bool        `json:"set_system_proxy,omitempty"`
 	InboundTLSOptionsContainer
 }
 

protocol/direct/outbound.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"net"
 	"net/netip"
-	"reflect"
 	"time"
 
 	"github.com/sagernet/sing-box/adapter"
@@ -28,7 +27,6 @@ func RegisterOutbound(registry *outbound.Registry) {
 var (
 	_ N.ParallelDialer             = (*Outbound)(nil)
 	_ dialer.ParallelNetworkDialer = (*Outbound)(nil)
-	_ dialer.DirectDialer          = (*Outbound)(nil)
 )
 
 type Outbound struct {
@@ -39,7 +37,6 @@ type Outbound struct {
 	fallbackDelay       time.Duration
 	overrideOption      int
 	overrideDestination M.Socksaddr
-	isEmpty             bool
 	// loopBack *loopBackDetector
 }
 
@@ -59,8 +56,6 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
 		domainStrategy: C.DomainStrategy(options.DomainStrategy),
 		fallbackDelay:  time.Duration(options.FallbackDelay),
 		dialer:         outboundDialer.(dialer.ParallelInterfaceDialer),
-		//nolint:staticcheck
-		isEmpty: reflect.DeepEqual(options.DialerOptions, option.DialerOptions{UDPFragmentDefault: true}) && options.OverrideAddress == "" && options.OverridePort == 0,
 		// loopBack:       newLoopBackDetector(router),
 	}
 	//nolint:staticcheck
@@ -247,10 +242,6 @@ func (h *Outbound) ListenSerialNetworkPacket(ctx context.Context, destination M.
 	return conn, newDestination, nil
 }
 
-func (h *Outbound) IsEmpty() bool {
-	return h.isEmpty
-}
-
 /*func (h *Outbound) NewConnection(ctx context.Context, conn net.Conn, metadata adapter.InboundContext) error {
 	if h.loopBack.CheckConn(metadata.Source.AddrPort(), M.AddrPortFromNet(conn.LocalAddr())) {
 		return E.New("reject loopback connection to ", metadata.Destination)

protocol/mixed/inbound.go

@@ -85,7 +85,7 @@ func (h *Inbound) newConnection(ctx context.Context, conn net.Conn, metadata ada
 	}
 	switch headerBytes[0] {
 	case socks4.Version, socks5.Version:
-		return socks.HandleConnectionEx(ctx, conn, reader, h.authenticator, adapter.NewUpstreamHandlerEx(metadata, h.newUserConnection, h.streamUserPacketConnection), h.listener, metadata.Source, onClose)
+		return socks.HandleConnectionEx(ctx, conn, reader, h.authenticator, adapter.NewUpstreamHandlerEx(metadata, h.newUserConnection, h.streamUserPacketConnection), metadata.Source, onClose)
 	default:
 		return http.HandleConnectionEx(ctx, conn, reader, h.authenticator, adapter.NewUpstreamHandlerEx(metadata, h.newUserConnection, h.streamUserPacketConnection), metadata.Source, onClose)
 	}

protocol/shadowtls/inbound.go

@@ -46,16 +46,14 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo
 	var handshakeForServerName map[string]shadowtls.HandshakeConfig
 	if options.Version > 1 {
 		handshakeForServerName = make(map[string]shadowtls.HandshakeConfig)
-		if options.HandshakeForServerName != nil {
-			for _, entry := range options.HandshakeForServerName.Entries() {
-				handshakeDialer, err := dialer.New(ctx, entry.Value.DialerOptions, entry.Value.ServerIsDomain())
-				if err != nil {
-					return nil, err
-				}
-				handshakeForServerName[entry.Key] = shadowtls.HandshakeConfig{
-					Server: entry.Value.ServerOptions.Build(),
-					Dialer: handshakeDialer,
-				}
+		for serverName, serverOptions := range options.HandshakeForServerName {
+			handshakeDialer, err := dialer.New(ctx, serverOptions.DialerOptions, serverOptions.ServerIsDomain())
+			if err != nil {
+				return nil, err
+			}
+			handshakeForServerName[serverName] = shadowtls.HandshakeConfig{
+				Server: serverOptions.ServerOptions.Build(),
+				Dialer: handshakeDialer,
 			}
 		}
 	}

protocol/socks/inbound.go

@@ -62,7 +62,7 @@ func (h *Inbound) Close() error {
 }
 
 func (h *Inbound) NewConnectionEx(ctx context.Context, conn net.Conn, metadata adapter.InboundContext, onClose N.CloseHandlerFunc) {
-	err := socks.HandleConnectionEx(ctx, conn, std_bufio.NewReader(conn), h.authenticator, adapter.NewUpstreamHandlerEx(metadata, h.newUserConnection, h.streamUserPacketConnection), h.listener, metadata.Source, onClose)
+	err := socks.HandleConnectionEx(ctx, conn, std_bufio.NewReader(conn), h.authenticator, adapter.NewUpstreamHandlerEx(metadata, h.newUserConnection, h.streamUserPacketConnection), metadata.Source, onClose)
 	N.CloseOnHandshakeFailure(conn, onClose, err)
 	if err != nil {
 		if E.IsClosedOrCanceled(err) {

protocol/tor/proxy.go

@@ -99,7 +99,7 @@ func (l *ProxyListener) acceptLoop() {
 }
 
 func (l *ProxyListener) accept(ctx context.Context, conn *net.TCPConn) error {
-	return socks.HandleConnectionEx(ctx, conn, std_bufio.NewReader(conn), l.authenticator, l, nil, M.SocksaddrFromNet(conn.RemoteAddr()), nil)
+	return socks.HandleConnectionEx(ctx, conn, std_bufio.NewReader(conn), l.authenticator, l, M.SocksaddrFromNet(conn.RemoteAddr()), nil)
 }
 
 func (l *ProxyListener) NewConnectionEx(ctx context.Context, conn net.Conn, source M.Socksaddr, destination M.Socksaddr, onClose N.CloseHandlerFunc) {

release/local/install_minimal.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-set -e -o pipefail
-
-if [ -d /usr/local/go ]; then
-  export PATH="$PATH:/usr/local/go/bin"
-fi
-
-DIR=$(dirname "$0")
-PROJECT=$DIR/../..
-
-pushd $PROJECT
-go install -v -trimpath -ldflags "-s -w -buildid=" ./cmd/sing-box
-popd
-
-sudo cp $(go env GOPATH)/bin/sing-box /usr/local/bin/
-sudo mkdir -p /usr/local/etc/sing-box
-sudo cp $PROJECT/release/config/config.json /usr/local/etc/sing-box/config.json
-sudo cp $DIR/sing-box.service /etc/systemd/system
-sudo systemctl daemon-reload

route/conn.go

@@ -2,7 +2,6 @@ package route
 
 import (
 	"context"
-	"errors"
 	"io"
 	"net"
 	"net/netip"
@@ -24,31 +23,23 @@ import (
 	M "github.com/sagernet/sing/common/metadata"
 	N "github.com/sagernet/sing/common/network"
 	"github.com/sagernet/sing/common/x/list"
-	"github.com/sagernet/sing/service"
 )
 
 var _ adapter.ConnectionManager = (*ConnectionManager)(nil)
 
 type ConnectionManager struct {
-	ctx         context.Context
 	logger      logger.ContextLogger
-	mitm        adapter.MITMEngine
 	access      sync.Mutex
 	connections list.List[io.Closer]
 }
 
-func NewConnectionManager(ctx context.Context, logger logger.ContextLogger) *ConnectionManager {
+func NewConnectionManager(logger logger.ContextLogger) *ConnectionManager {
 	return &ConnectionManager{
-		ctx:    ctx,
 		logger: logger,
 	}
 }
 
 func (m *ConnectionManager) Start(stage adapter.StartStage) error {
-	switch stage {
-	case adapter.StartStateInitialize:
-		m.mitm = service.FromContext[adapter.MITMEngine](m.ctx)
-	}
 	return nil
 }
 
@@ -63,14 +54,6 @@ func (m *ConnectionManager) Close() error {
 }
 
 func (m *ConnectionManager) NewConnection(ctx context.Context, this N.Dialer, conn net.Conn, metadata adapter.InboundContext, onClose N.CloseHandlerFunc) {
-	if metadata.MITM != nil && metadata.MITM.Enabled {
-		if m.mitm == nil {
-			m.logger.WarnContext(ctx, "MITM disabled")
-		} else {
-			m.mitm.NewConnection(ctx, this, conn, metadata, onClose)
-			return
-		}
-	}
 	ctx = adapter.WithContext(ctx, &metadata)
 	var (
 		remoteConn net.Conn
@@ -323,7 +306,7 @@ func (m *ConnectionManager) connectionCopyEarly(source net.Conn, destination io.
 		return err
 	}
 	_, err = payload.ReadOnceFrom(source)
-	if err != nil && !(E.IsTimeout(err) || errors.Is(err, io.EOF)) {
+	if err != nil && !E.IsTimeout(err) {
 		return E.Cause(err, "read payload")
 	}
 	_ = source.SetReadDeadline(time.Time{})

route/route.go

@@ -458,9 +458,6 @@ match:
 				metadata.TLSFragment = true
 				metadata.TLSFragmentFallbackDelay = routeOptions.TLSFragmentFallbackDelay
 			}
-			if routeOptions.MITM != nil && routeOptions.MITM.Enabled {
-				metadata.MITM = routeOptions.MITM
-			}
 		}
 		switch action := currentRule.Action().(type) {
 		case *rule.RuleActionSniff:

route/rule/rule_action.go

@@ -40,7 +40,6 @@ func NewRuleAction(ctx context.Context, logger logger.ContextLogger, action opti
 				UDPConnect:                action.RouteOptions.UDPConnect,
 				TLSFragment:               action.RouteOptions.TLSFragment,
 				TLSFragmentFallbackDelay:  time.Duration(action.RouteOptions.TLSFragmentFallbackDelay),
-				MITM:                      action.RouteOptions.MITM,
 			},
 		}, nil
 	case C.RuleActionTypeRouteOptions:
@@ -54,7 +53,6 @@ func NewRuleAction(ctx context.Context, logger logger.ContextLogger, action opti
 			UDPTimeout:                time.Duration(action.RouteOptionsOptions.UDPTimeout),
 			TLSFragment:               action.RouteOptionsOptions.TLSFragment,
 			TLSFragmentFallbackDelay:  time.Duration(action.RouteOptionsOptions.TLSFragmentFallbackDelay),
-			MITM:                      action.RouteOptionsOptions.MITM,
 		}, nil
 	case C.RuleActionTypeDirect:
 		directDialer, err := dialer.New(ctx, option.DialerOptions(action.DirectOptions), false)
@@ -154,7 +152,15 @@ func (r *RuleActionRoute) Type() string {
 func (r *RuleActionRoute) String() string {
 	var descriptions []string
 	descriptions = append(descriptions, r.Outbound)
-	descriptions = append(descriptions, r.Descriptions()...)
+	if r.UDPDisableDomainUnmapping {
+		descriptions = append(descriptions, "udp-disable-domain-unmapping")
+	}
+	if r.UDPConnect {
+		descriptions = append(descriptions, "udp-connect")
+	}
+	if r.TLSFragment {
+		descriptions = append(descriptions, "tls-fragment")
+	}
 	return F.ToString("route(", strings.Join(descriptions, ","), ")")
 }
 
@@ -170,14 +176,13 @@ type RuleActionRouteOptions struct {
 	UDPTimeout                time.Duration
 	TLSFragment               bool
 	TLSFragmentFallbackDelay  time.Duration
-	MITM                      *option.MITMRouteOptions
 }
 
 func (r *RuleActionRouteOptions) Type() string {
 	return C.RuleActionTypeRouteOptions
 }
 
-func (r *RuleActionRouteOptions) Descriptions() []string {
+func (r *RuleActionRouteOptions) String() string {
 	var descriptions []string
 	if r.OverrideAddress.IsValid() {
 		descriptions = append(descriptions, F.ToString("override-address=", r.OverrideAddress.AddrString()))
@@ -204,22 +209,9 @@ func (r *RuleActionRouteOptions) Descriptions() []string {
 		descriptions = append(descriptions, "udp-connect")
 	}
 	if r.UDPTimeout > 0 {
-		descriptions = append(descriptions, F.ToString("udp-timeout=", r.UDPTimeout))
+		descriptions = append(descriptions, "udp-timeout")
 	}
-	if r.TLSFragment {
-		descriptions = append(descriptions, "tls-fragment")
-		if r.TLSFragmentFallbackDelay > 0 {
-			descriptions = append(descriptions, F.ToString("tls-fragment-fallbac-delay=", r.TLSFragmentFallbackDelay.String()))
-		}
-	}
-	if r.MITM != nil && r.MITM.Enabled {
-		descriptions = append(descriptions, "mitm")
-	}
-	return descriptions
-}
-
-func (r *RuleActionRouteOptions) String() string {
-	return F.ToString("route-options(", strings.Join(r.Descriptions(), ","), ")")
+	return F.ToString("route-options(", strings.Join(descriptions, ","), ")")
 }
 
 type RuleActionDNSRoute struct {
@@ -452,32 +444,3 @@ func (r *RuleActionPredefined) String() string {
 	options = append(options, common.Map(r.Extra, dns.RR.String)...)
 	return F.ToString("predefined(", strings.Join(options, ","), ")")
 }
-
-func (r *RuleActionPredefined) Response(request *dns.Msg) *dns.Msg {
-	return &dns.Msg{
-		MsgHdr: dns.MsgHdr{
-			Id:                 request.Id,
-			Response:           true,
-			Authoritative:      true,
-			RecursionDesired:   true,
-			RecursionAvailable: true,
-			Rcode:              r.Rcode,
-		},
-		Question: request.Question,
-		Answer:   rewriteRecords(r.Answer, request.Question[0]),
-		Ns:       rewriteRecords(r.Ns, request.Question[0]),
-		Extra:    rewriteRecords(r.Extra, request.Question[0]),
-	}
-}
-
-func rewriteRecords(records []dns.RR, question dns.Question) []dns.RR {
-	return common.Map(records, func(it dns.RR) dns.RR {
-		if strings.HasPrefix(it.Header().Name, "*") {
-			if strings.HasSuffix(question.Name, it.Header().Name[1:]) {
-				it = dns.Copy(it)
-				it.Header().Name = question.Name
-			}
-		}
-		return it
-	})
-}

script/jsc/array.go

@@ -1,23 +0,0 @@
-package jsc
-
-import (
-	_ "unsafe"
-
-	"github.com/dop251/goja"
-)
-
-func NewUint8Array(runtime *goja.Runtime, data []byte) goja.Value {
-	buffer := runtime.NewArrayBuffer(data)
-	ctor, loaded := goja.AssertConstructor(runtimeGetUint8Array(runtime))
-	if !loaded {
-		panic(runtime.NewTypeError("missing UInt8Array constructor"))
-	}
-	array, err := ctor(nil, runtime.ToValue(buffer))
-	if err != nil {
-		panic(runtime.NewGoError(err))
-	}
-	return array
-}
-
-//go:linkname runtimeGetUint8Array github.com/dop251/goja.(*Runtime).getUint8Array
-func runtimeGetUint8Array(r *goja.Runtime) *goja.Object

script/jsc/array_test.go

@@ -1,18 +0,0 @@
-package jsc_test
-
-import (
-	"testing"
-
-	"github.com/sagernet/sing-box/script/jsc"
-
-	"github.com/dop251/goja"
-	"github.com/stretchr/testify/require"
-)
-
-func TestNewUInt8Array(t *testing.T) {
-	runtime := goja.New()
-	runtime.Set("hello", jsc.NewUint8Array(runtime, []byte("world")))
-	result, err := runtime.RunString("hello instanceof Uint8Array")
-	require.NoError(t, err)
-	require.True(t, result.ToBoolean())
-}

script/jsc/assert.go

@@ -1,124 +0,0 @@
-package jsc
-
-import (
-	"net/http"
-
-	F "github.com/sagernet/sing/common/format"
-
-	"github.com/dop251/goja"
-)
-
-func IsNil(value goja.Value) bool {
-	return value == nil || goja.IsUndefined(value) || goja.IsNull(value)
-}
-
-func AssertObject(vm *goja.Runtime, value goja.Value, name string, nilable bool) *goja.Object {
-	if IsNil(value) {
-		if nilable {
-			return nil
-		}
-		panic(vm.NewTypeError(F.ToString("invalid argument: missing ", name)))
-	}
-	objectValue, isObject := value.(*goja.Object)
-	if !isObject {
-		panic(vm.NewTypeError(F.ToString("invalid argument: ", name, ": expected object, but got ", value)))
-	}
-	return objectValue
-}
-
-func AssertString(vm *goja.Runtime, value goja.Value, name string, nilable bool) string {
-	if IsNil(value) {
-		if nilable {
-			return ""
-		}
-		panic(vm.NewTypeError(F.ToString("invalid argument: missing ", name)))
-	}
-	stringValue, isString := value.Export().(string)
-	if !isString {
-		panic(vm.NewTypeError(F.ToString("invalid argument: ", name, ": expected string, but got ", value)))
-	}
-	return stringValue
-}
-
-func AssertInt(vm *goja.Runtime, value goja.Value, name string, nilable bool) int64 {
-	if IsNil(value) {
-		if nilable {
-			return 0
-		}
-		panic(vm.NewTypeError(F.ToString("invalid argument: missing ", name)))
-	}
-	integerValue, isNumber := value.Export().(int64)
-	if !isNumber {
-		panic(vm.NewTypeError(F.ToString("invalid argument: ", name, ": expected integer, but got ", value)))
-	}
-	return integerValue
-}
-
-func AssertBool(vm *goja.Runtime, value goja.Value, name string, nilable bool) bool {
-	if IsNil(value) {
-		if nilable {
-			return false
-		}
-		panic(vm.NewTypeError(F.ToString("invalid argument: missing ", name)))
-	}
-	boolValue, isBool := value.Export().(bool)
-	if !isBool {
-		panic(vm.NewTypeError(F.ToString("invalid argument: ", name, ": expected boolean, but got ", value)))
-	}
-	return boolValue
-}
-
-func AssertBinary(vm *goja.Runtime, value goja.Value, name string, nilable bool) []byte {
-	if IsNil(value) {
-		if nilable {
-			return nil
-		}
-		panic(vm.NewTypeError(F.ToString("invalid argument: missing ", name)))
-	}
-	switch exportedValue := value.Export().(type) {
-	case []byte:
-		return exportedValue
-	case goja.ArrayBuffer:
-		return exportedValue.Bytes()
-	default:
-		panic(vm.NewTypeError(F.ToString("invalid argument: ", name, ": expected Uint8Array or ArrayBuffer, but got ", value)))
-	}
-}
-
-func AssertStringBinary(vm *goja.Runtime, value goja.Value, name string, nilable bool) []byte {
-	if IsNil(value) {
-		if nilable {
-			return nil
-		}
-		panic(vm.NewTypeError(F.ToString("invalid argument: missing ", name)))
-	}
-	switch exportedValue := value.Export().(type) {
-	case string:
-		return []byte(exportedValue)
-	case []byte:
-		return exportedValue
-	case goja.ArrayBuffer:
-		return exportedValue.Bytes()
-	default:
-		panic(vm.NewTypeError(F.ToString("invalid argument: ", name, ": expected string, Uint8Array or ArrayBuffer, but got ", value)))
-	}
-}
-
-func AssertFunction(vm *goja.Runtime, value goja.Value, name string) goja.Callable {
-	if IsNil(value) {
-		panic(vm.NewTypeError(F.ToString("invalid argument: missing ", name)))
-	}
-	functionValue, isFunction := goja.AssertFunction(value)
-	if !isFunction {
-		panic(vm.NewTypeError(F.ToString("invalid argument: ", name, ": expected function, but got ", value)))
-	}
-	return functionValue
-}
-
-func AssertHTTPHeader(vm *goja.Runtime, value goja.Value, name string) http.Header {
-	headersObject := AssertObject(vm, value, name, true)
-	if headersObject == nil {
-		return nil
-	}
-	return ObjectToHeaders(vm, headersObject, name)
-}

script/jsc/class.go

@@ -1,192 +0,0 @@
-package jsc
-
-import (
-	"time"
-
-	"github.com/sagernet/sing/common"
-
-	"github.com/dop251/goja"
-)
-
-type Module interface {
-	Runtime() *goja.Runtime
-}
-
-type Class[M Module, C any] interface {
-	Module() M
-	Runtime() *goja.Runtime
-	DefineField(name string, getter func(this C) any, setter func(this C, value goja.Value))
-	DefineMethod(name string, method func(this C, call goja.FunctionCall) any)
-	DefineStaticMethod(name string, method func(c Class[M, C], call goja.FunctionCall) any)
-	DefineConstructor(constructor func(c Class[M, C], call goja.ConstructorCall) C)
-	ToValue() goja.Value
-	New(instance C) *goja.Object
-	Prototype() *goja.Object
-	Is(value goja.Value) bool
-	As(value goja.Value) C
-}
-
-func GetClass[M Module, C any](runtime *goja.Runtime, exports *goja.Object, className string) Class[M, C] {
-	objectValue := exports.Get(className)
-	if objectValue == nil {
-		panic(runtime.NewTypeError("Missing class: " + className))
-	}
-	object, isObject := objectValue.(*goja.Object)
-	if !isObject {
-		panic(runtime.NewTypeError("Invalid class: " + className))
-	}
-	classObject, isClass := object.Get("_class").(*goja.Object)
-	if !isClass {
-		panic(runtime.NewTypeError("Invalid class: " + className))
-	}
-	class, isClass := classObject.Export().(Class[M, C])
-	if !isClass {
-		panic(runtime.NewTypeError("Invalid class: " + className))
-	}
-	return class
-}
-
-type goClass[M Module, C any] struct {
-	m           M
-	prototype   *goja.Object
-	constructor goja.Value
-}
-
-func NewClass[M Module, C any](module M) Class[M, C] {
-	class := &goClass[M, C]{
-		m:         module,
-		prototype: module.Runtime().NewObject(),
-	}
-	clazz := module.Runtime().ToValue(class).(*goja.Object)
-	clazz.Set("toString", module.Runtime().ToValue(func(call goja.FunctionCall) goja.Value {
-		return module.Runtime().ToValue("[sing-box Class]")
-	}))
-	class.prototype.DefineAccessorProperty("_class", class.Runtime().ToValue(func(call goja.FunctionCall) goja.Value { return clazz }), nil, goja.FLAG_FALSE, goja.FLAG_TRUE)
-	return class
-}
-
-func (c *goClass[M, C]) Module() M {
-	return c.m
-}
-
-func (c *goClass[M, C]) Runtime() *goja.Runtime {
-	return c.m.Runtime()
-}
-
-func (c *goClass[M, C]) DefineField(name string, getter func(this C) any, setter func(this C, value goja.Value)) {
-	var (
-		getterValue goja.Value
-		setterValue goja.Value
-	)
-	if getter != nil {
-		getterValue = c.Runtime().ToValue(func(call goja.FunctionCall) goja.Value {
-			this, isThis := call.This.Export().(C)
-			if !isThis {
-				panic(c.Runtime().NewTypeError("Illegal this value: " + call.This.ExportType().String()))
-			}
-			return c.toValue(getter(this), goja.Null())
-		})
-	}
-	if setter != nil {
-		setterValue = c.Runtime().ToValue(func(call goja.FunctionCall) goja.Value {
-			this, isThis := call.This.Export().(C)
-			if !isThis {
-				panic(c.Runtime().NewTypeError("Illegal this value: " + call.This.String()))
-			}
-			setter(this, call.Argument(0))
-			return goja.Undefined()
-		})
-	}
-	c.prototype.DefineAccessorProperty(name, getterValue, setterValue, goja.FLAG_FALSE, goja.FLAG_TRUE)
-}
-
-func (c *goClass[M, C]) DefineMethod(name string, method func(this C, call goja.FunctionCall) any) {
-	methodValue := c.Runtime().ToValue(func(call goja.FunctionCall) goja.Value {
-		this, isThis := call.This.Export().(C)
-		if !isThis {
-			panic(c.Runtime().NewTypeError("Illegal this value: " + call.This.String()))
-		}
-		return c.toValue(method(this, call), goja.Undefined())
-	})
-	c.prototype.Set(name, methodValue)
-	if name == "entries" {
-		c.prototype.DefineDataPropertySymbol(goja.SymIterator, methodValue, goja.FLAG_TRUE, goja.FLAG_FALSE, goja.FLAG_TRUE)
-	}
-}
-
-func (c *goClass[M, C]) DefineStaticMethod(name string, method func(c Class[M, C], call goja.FunctionCall) any) {
-	c.prototype.Set(name, c.Runtime().ToValue(func(call goja.FunctionCall) goja.Value {
-		return c.toValue(method(c, call), goja.Undefined())
-	}))
-}
-
-func (c *goClass[M, C]) DefineConstructor(constructor func(c Class[M, C], call goja.ConstructorCall) C) {
-	constructorObject := c.Runtime().ToValue(func(call goja.ConstructorCall) *goja.Object {
-		value := constructor(c, call)
-		object := c.toValue(value, goja.Undefined()).(*goja.Object)
-		object.SetPrototype(call.This.Prototype())
-		return object
-	}).(*goja.Object)
-	constructorObject.SetPrototype(c.prototype)
-	c.prototype.DefineDataProperty("constructor", constructorObject, goja.FLAG_FALSE, goja.FLAG_FALSE, goja.FLAG_FALSE)
-	c.constructor = constructorObject
-}
-
-func (c *goClass[M, C]) toValue(rawValue any, defaultValue goja.Value) goja.Value {
-	switch value := rawValue.(type) {
-	case nil:
-		return defaultValue
-	case time.Time:
-		return TimeToValue(c.Runtime(), value)
-	default:
-		return c.Runtime().ToValue(value)
-	}
-}
-
-func (c *goClass[M, C]) ToValue() goja.Value {
-	if c.constructor == nil {
-		constructorObject := c.Runtime().ToValue(func(call goja.ConstructorCall) *goja.Object {
-			panic(c.Runtime().NewTypeError("Illegal constructor call"))
-		}).(*goja.Object)
-		constructorObject.SetPrototype(c.prototype)
-		c.prototype.DefineDataProperty("constructor", constructorObject, goja.FLAG_FALSE, goja.FLAG_FALSE, goja.FLAG_FALSE)
-		c.constructor = constructorObject
-	}
-	return c.constructor
-}
-
-func (c *goClass[M, C]) New(instance C) *goja.Object {
-	object := c.Runtime().ToValue(instance).(*goja.Object)
-	object.SetPrototype(c.prototype)
-	return object
-}
-
-func (c *goClass[M, C]) Prototype() *goja.Object {
-	return c.prototype
-}
-
-func (c *goClass[M, C]) Is(value goja.Value) bool {
-	object, isObject := value.(*goja.Object)
-	if !isObject {
-		return false
-	}
-	prototype := object.Prototype()
-	for prototype != nil {
-		if prototype == c.prototype {
-			return true
-		}
-		prototype = prototype.Prototype()
-	}
-	return false
-}
-
-func (c *goClass[M, C]) As(value goja.Value) C {
-	object, isObject := value.(*goja.Object)
-	if !isObject {
-		return common.DefaultValue[C]()
-	}
-	if !c.Is(object) {
-		return common.DefaultValue[C]()
-	}
-	return object.Export().(C)
-}

script/jsc/headers.go

@@ -1,56 +0,0 @@
-package jsc
-
-import (
-	"net/http"
-	"reflect"
-
-	"github.com/sagernet/sing/common"
-	F "github.com/sagernet/sing/common/format"
-
-	"github.com/dop251/goja"
-)
-
-func HeadersToValue(runtime *goja.Runtime, headers http.Header) goja.Value {
-	object := runtime.NewObject()
-	for key, value := range headers {
-		if len(value) == 1 {
-			object.Set(key, value[0])
-		} else {
-			object.Set(key, ArrayToValue(runtime, value))
-		}
-	}
-	return object
-}
-
-func ArrayToValue[T any](runtime *goja.Runtime, values []T) goja.Value {
-	return runtime.NewArray(common.Map(values, func(it T) any { return it })...)
-}
-
-func ObjectToHeaders(vm *goja.Runtime, object *goja.Object, name string) http.Header {
-	headers := make(http.Header)
-	for _, key := range object.Keys() {
-		valueObject := object.Get(key)
-		switch headerValue := valueObject.(type) {
-		case goja.String:
-			headers.Set(key, headerValue.String())
-		case *goja.Object:
-			values := headerValue.Export()
-			valueArray, isArray := values.([]any)
-			if !isArray {
-				panic(vm.NewTypeError(F.ToString("invalid value: ", name, ".", key, "expected string or string array, got ", valueObject.String())))
-			}
-			newValues := make([]string, 0, len(valueArray))
-			for _, value := range valueArray {
-				stringValue, isString := value.(string)
-				if !isString {
-					panic(vm.NewTypeError(F.ToString("invalid value: ", name, ".", key, " expected string or string array, got array item type: ", reflect.TypeOf(value))))
-				}
-				newValues = append(newValues, stringValue)
-			}
-			headers[key] = newValues
-		default:
-			panic(vm.NewTypeError(F.ToString("invalid value: ", name, ".", key, " expected string or string array, got ", valueObject.String())))
-		}
-	}
-	return headers
-}

script/jsc/headers_test.go

@@ -1,31 +0,0 @@
-package jsc_test
-
-import (
-	"fmt"
-	"net/http"
-	"reflect"
-	"testing"
-
-	"github.com/sagernet/sing-box/script/jsc"
-
-	"github.com/dop251/goja"
-	"github.com/stretchr/testify/require"
-)
-
-func TestHeaders(t *testing.T) {
-	runtime := goja.New()
-	runtime.Set("headers", jsc.HeadersToValue(runtime, http.Header{
-		"My-Header": []string{"My-Value1", "My-Value2"},
-	}))
-	headers := runtime.Get("headers").(*goja.Object).Get("My-Header").(*goja.Object)
-	fmt.Println(reflect.ValueOf(headers.Export()).Type().String())
-}
-
-func TestBody(t *testing.T) {
-	runtime := goja.New()
-	_, err := runtime.RunString(`
-var responseBody = new Uint8Array([1, 2, 3, 4, 5])
-`)
-	require.NoError(t, err)
-	fmt.Println(reflect.TypeOf(runtime.Get("responseBody").Export()))
-}

script/jsc/iterator.go

@@ -1,36 +0,0 @@
-package jsc
-
-import "github.com/dop251/goja"
-
-type Iterator[M Module, T any] struct {
-	c      Class[M, *Iterator[M, T]]
-	values []T
-	block  func(this T) any
-}
-
-func NewIterator[M Module, T any](class Class[M, *Iterator[M, T]], values []T, block func(this T) any) goja.Value {
-	return class.New(&Iterator[M, T]{class, values, block})
-}
-
-func CreateIterator[M Module, T any](module M) Class[M, *Iterator[M, T]] {
-	class := NewClass[M, *Iterator[M, T]](module)
-	class.DefineMethod("next", (*Iterator[M, T]).next)
-	class.DefineMethod("toString", (*Iterator[M, T]).toString)
-	return class
-}
-
-func (i *Iterator[M, T]) next(call goja.FunctionCall) any {
-	result := i.c.Runtime().NewObject()
-	if len(i.values) == 0 {
-		result.Set("done", true)
-	} else {
-		result.Set("done", false)
-		result.Set("value", i.block(i.values[0]))
-		i.values = i.values[1:]
-	}
-	return result
-}
-
-func (i *Iterator[M, T]) toString(call goja.FunctionCall) any {
-	return "[sing-box Iterator]"
-}

script/jsc/time.go

@@ -1,18 +0,0 @@
-package jsc
-
-import (
-	"time"
-	_ "unsafe"
-
-	"github.com/dop251/goja"
-)
-
-func TimeToValue(runtime *goja.Runtime, time time.Time) goja.Value {
-	return runtimeNewDateObject(runtime, time, true, runtimeGetDatePrototype(runtime))
-}
-
-//go:linkname runtimeNewDateObject github.com/dop251/goja.(*Runtime).newDateObject
-func runtimeNewDateObject(r *goja.Runtime, t time.Time, isSet bool, proto *goja.Object) *goja.Object
-
-//go:linkname runtimeGetDatePrototype github.com/dop251/goja.(*Runtime).getDatePrototype
-func runtimeGetDatePrototype(r *goja.Runtime) *goja.Object

script/jsc/time_test.go

@@ -1,20 +0,0 @@
-package jsc_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/sagernet/sing-box/script/jsc"
-
-	"github.com/dop251/goja"
-	"github.com/stretchr/testify/require"
-)
-
-func TestTimeToValue(t *testing.T) {
-	t.Parallel()
-	runtime := goja.New()
-	now := time.Now()
-	err := runtime.Set("now", jsc.TimeToValue(runtime, now))
-	require.NoError(t, err)
-	println(runtime.Get("now").String())
-}

script/jstest/assert.js

@@ -1,83 +0,0 @@
-'use strict';
-
-const assert = {
-    _isSameValue(a, b) {
-        if (a === b) {
-            // Handle +/-0 vs. -/+0
-            return a !== 0 || 1 / a === 1 / b;
-        }
-
-        // Handle NaN vs. NaN
-        return a !== a && b !== b;
-    },
-
-    _toString(value) {
-        try {
-            if (value === 0 && 1 / value === -Infinity) {
-                return '-0';
-            }
-
-            return String(value);
-        } catch (err) {
-            if (err.name === 'TypeError') {
-                return Object.prototype.toString.call(value);
-            }
-
-            throw err;
-        }
-    },
-
-    sameValue(actual, expected, message) {
-        if (assert._isSameValue(actual, expected)) {
-            return;
-        }
-        if (message === undefined) {
-            message = '';
-        } else {
-            message += ' ';
-        }
-
-        message += 'Expected SameValue(«' + assert._toString(actual) + '», «' + assert._toString(expected) + '») to be true';
-
-        throw new Error(message);
-    },
-
-    throws(f, ctor, message) {
-        if (message === undefined) {
-            message = '';
-        } else {
-            message += ' ';
-        }
-        try {
-            f();
-        } catch (e) {
-            if (e.constructor !== ctor) {
-                throw new Error(message + "Wrong exception type was thrown: " + e.constructor.name);
-            }
-            return;
-        }
-        throw new Error(message + "No exception was thrown");
-    },
-
-    throwsNodeError(f, ctor, code, message) {
-        if (message === undefined) {
-            message = '';
-        } else {
-            message += ' ';
-        }
-        try {
-            f();
-        } catch (e) {
-            if (e.constructor !== ctor) {
-                throw new Error(message + "Wrong exception type was thrown: " + e.constructor.name);
-            }
-            if (e.code !== code) {
-                throw new Error(message + "Wrong exception code was thrown: " + e.code);
-            }
-            return;
-        }
-        throw new Error(message + "No exception was thrown");
-    }
-}
-
-module.exports = assert;

script/jstest/test.go

@@ -1,21 +0,0 @@
-package jstest
-
-import (
-	_ "embed"
-
-	"github.com/sagernet/sing-box/script/modules/require"
-)
-
-//go:embed assert.js
-var assertJS []byte
-
-func NewRegistry() *require.Registry {
-	return require.NewRegistry(require.WithFsEnable(true), require.WithLoader(func(path string) ([]byte, error) {
-		switch path {
-		case "assert.js":
-			return assertJS, nil
-		default:
-			return require.DefaultSourceLoader(path)
-		}
-	}))
-}

script/manager.go

@@ -1,118 +0,0 @@
-//go:build with_script
-
-package script
-
-import (
-	"context"
-
-	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing-box/common/taskmonitor"
-	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
-	E "github.com/sagernet/sing/common/exceptions"
-	F "github.com/sagernet/sing/common/format"
-	"github.com/sagernet/sing/common/logger"
-	"github.com/sagernet/sing/common/task"
-)
-
-var _ adapter.ScriptManager = (*Manager)(nil)
-
-type Manager struct {
-	ctx          context.Context
-	logger       logger.ContextLogger
-	scripts      []adapter.Script
-	scriptByName map[string]adapter.Script
-	surgeCache   *adapter.SurgeInMemoryCache
-}
-
-func NewManager(ctx context.Context, logFactory log.Factory, scripts []option.Script) (*Manager, error) {
-	manager := &Manager{
-		ctx:          ctx,
-		logger:       logFactory.NewLogger("script"),
-		scriptByName: make(map[string]adapter.Script),
-	}
-	for _, scriptOptions := range scripts {
-		script, err := NewScript(ctx, logFactory.NewLogger(F.ToString("script/", scriptOptions.Type, "[", scriptOptions.Tag, "]")), scriptOptions)
-		if err != nil {
-			return nil, E.Cause(err, "initialize script: ", scriptOptions.Tag)
-		}
-		manager.scripts = append(manager.scripts, script)
-		manager.scriptByName[scriptOptions.Tag] = script
-	}
-	return manager, nil
-}
-
-func (m *Manager) Start(stage adapter.StartStage) error {
-	monitor := taskmonitor.New(m.logger, C.StartTimeout)
-	switch stage {
-	case adapter.StartStateStart:
-		var cacheContext *adapter.HTTPStartContext
-		if len(m.scripts) > 0 {
-			monitor.Start("initialize rule-set")
-			cacheContext = adapter.NewHTTPStartContext(m.ctx)
-			var scriptStartGroup task.Group
-			for _, script := range m.scripts {
-				scriptInPlace := script
-				scriptStartGroup.Append0(func(ctx context.Context) error {
-					err := scriptInPlace.StartContext(ctx, cacheContext)
-					if err != nil {
-						return E.Cause(err, "initialize script/", scriptInPlace.Type(), "[", scriptInPlace.Tag(), "]")
-					}
-					return nil
-				})
-			}
-			scriptStartGroup.Concurrency(5)
-			scriptStartGroup.FastFail()
-			err := scriptStartGroup.Run(m.ctx)
-			monitor.Finish()
-			if err != nil {
-				return err
-			}
-		}
-		if cacheContext != nil {
-			cacheContext.Close()
-		}
-	case adapter.StartStatePostStart:
-		for _, script := range m.scripts {
-			monitor.Start(F.ToString("post start script/", script.Type(), "[", script.Tag(), "]"))
-			err := script.PostStart()
-			monitor.Finish()
-			if err != nil {
-				return E.Cause(err, "post start script/", script.Type(), "[", script.Tag(), "]")
-			}
-		}
-	}
-	return nil
-}
-
-func (m *Manager) Close() error {
-	monitor := taskmonitor.New(m.logger, C.StopTimeout)
-	var err error
-	for _, script := range m.scripts {
-		monitor.Start(F.ToString("close start script/", script.Type(), "[", script.Tag(), "]"))
-		err = E.Append(err, script.Close(), func(err error) error {
-			return E.Cause(err, "close script/", script.Type(), "[", script.Tag(), "]")
-		})
-		monitor.Finish()
-	}
-	return err
-}
-
-func (m *Manager) Scripts() []adapter.Script {
-	return m.scripts
-}
-
-func (m *Manager) Script(name string) (adapter.Script, bool) {
-	script, loaded := m.scriptByName[name]
-	return script, loaded
-}
-
-func (m *Manager) SurgeCache() *adapter.SurgeInMemoryCache {
-	if m.surgeCache == nil {
-		m.surgeCache = &adapter.SurgeInMemoryCache{
-			Data: make(map[string]string),
-		}
-	}
-	return m.surgeCache
-}

script/manager_stub.go

@@ -1,43 +0,0 @@
-//go:build !with_script
-
-package script
-
-import (
-	"context"
-
-	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
-	E "github.com/sagernet/sing/common/exceptions"
-)
-
-var _ adapter.ScriptManager = (*Manager)(nil)
-
-type Manager struct{}
-
-func NewManager(ctx context.Context, logFactory log.Factory, scripts []option.Script) (*Manager, error) {
-	if len(scripts) > 0 {
-		return nil, E.New(`script is not included in this build, rebuild with -tags with_script`)
-	}
-	return (*Manager)(nil), nil
-}
-
-func (m *Manager) Start(stage adapter.StartStage) error {
-	return nil
-}
-
-func (m *Manager) Close() error {
-	return nil
-}
-
-func (m *Manager) Scripts() []adapter.Script {
-	return nil
-}
-
-func (m *Manager) Script(name string) (adapter.Script, bool) {
-	return nil, false
-}
-
-func (m *Manager) SurgeCache() *adapter.SurgeInMemoryCache {
-	return nil
-}

script/modules/boxctx/context.go

@@ -1,50 +0,0 @@
-package boxctx
-
-import (
-	"context"
-	"time"
-
-	"github.com/sagernet/sing-box/script/jsc"
-	"github.com/sagernet/sing/common/logger"
-
-	"github.com/dop251/goja"
-)
-
-type Context struct {
-	class        jsc.Class[*Module, *Context]
-	Context      context.Context
-	Logger       logger.ContextLogger
-	Tag          string
-	StartedAt    time.Time
-	ErrorHandler func(error)
-}
-
-func FromRuntime(runtime *goja.Runtime) *Context {
-	contextValue := runtime.Get("context")
-	if contextValue == nil {
-		return nil
-	}
-	context, isContext := contextValue.Export().(*Context)
-	if !isContext {
-		return nil
-	}
-	return context
-}
-
-func MustFromRuntime(runtime *goja.Runtime) *Context {
-	context := FromRuntime(runtime)
-	if context == nil {
-		panic(runtime.NewTypeError("Missing sing-box context"))
-	}
-	return context
-}
-
-func createContext(module *Module) jsc.Class[*Module, *Context] {
-	class := jsc.NewClass[*Module, *Context](module)
-	class.DefineMethod("toString", (*Context).toString)
-	return class
-}
-
-func (c *Context) toString(call goja.FunctionCall) any {
-	return "[sing-box Context]"
-}

script/modules/boxctx/module.go

@@ -1,35 +0,0 @@
-package boxctx
-
-import (
-	"github.com/sagernet/sing-box/script/jsc"
-	"github.com/sagernet/sing-box/script/modules/require"
-
-	"github.com/dop251/goja"
-)
-
-const ModuleName = "context"
-
-type Module struct {
-	runtime      *goja.Runtime
-	classContext jsc.Class[*Module, *Context]
-}
-
-func Require(runtime *goja.Runtime, module *goja.Object) {
-	m := &Module{
-		runtime: runtime,
-	}
-	m.classContext = createContext(m)
-	exports := module.Get("exports").(*goja.Object)
-	exports.Set("Context", m.classContext.ToValue())
-}
-
-func Enable(runtime *goja.Runtime, context *Context) {
-	exports := require.Require(runtime, ModuleName).ToObject(runtime)
-	classContext := jsc.GetClass[*Module, *Context](runtime, exports, "Context")
-	context.class = classContext
-	runtime.Set("context", classContext.New(context))
-}
-
-func (m *Module) Runtime() *goja.Runtime {
-	return m.runtime
-}

script/modules/console/console.go

@@ -1,281 +0,0 @@
-package console
-
-import (
-	"bytes"
-	"context"
-	"encoding/xml"
-	"sync"
-	"time"
-
-	sLog "github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/script/jsc"
-	"github.com/sagernet/sing-box/script/modules/boxctx"
-	F "github.com/sagernet/sing/common/format"
-	"github.com/sagernet/sing/common/logger"
-
-	"github.com/dop251/goja"
-)
-
-type Console struct {
-	class    jsc.Class[*Module, *Console]
-	access   sync.Mutex
-	countMap map[string]int
-	timeMap  map[string]time.Time
-}
-
-func NewConsole(class jsc.Class[*Module, *Console]) goja.Value {
-	return class.New(&Console{
-		class:    class,
-		countMap: make(map[string]int),
-		timeMap:  make(map[string]time.Time),
-	})
-}
-
-func createConsole(m *Module) jsc.Class[*Module, *Console] {
-	class := jsc.NewClass[*Module, *Console](m)
-	class.DefineMethod("assert", (*Console).assert)
-	class.DefineMethod("clear", (*Console).clear)
-	class.DefineMethod("count", (*Console).count)
-	class.DefineMethod("countReset", (*Console).countReset)
-	class.DefineMethod("debug", (*Console).debug)
-	class.DefineMethod("dir", (*Console).dir)
-	class.DefineMethod("dirxml", (*Console).dirxml)
-	class.DefineMethod("error", (*Console).error)
-	class.DefineMethod("group", (*Console).stub)
-	class.DefineMethod("groupCollapsed", (*Console).stub)
-	class.DefineMethod("groupEnd", (*Console).stub)
-	class.DefineMethod("info", (*Console).info)
-	class.DefineMethod("log", (*Console)._log)
-	class.DefineMethod("profile", (*Console).stub)
-	class.DefineMethod("profileEnd", (*Console).profileEnd)
-	class.DefineMethod("table", (*Console).table)
-	class.DefineMethod("time", (*Console).time)
-	class.DefineMethod("timeEnd", (*Console).timeEnd)
-	class.DefineMethod("timeLog", (*Console).timeLog)
-	class.DefineMethod("timeStamp", (*Console).stub)
-	class.DefineMethod("trace", (*Console).trace)
-	class.DefineMethod("warn", (*Console).warn)
-	return class
-}
-
-func (c *Console) stub(call goja.FunctionCall) any {
-	return goja.Undefined()
-}
-
-func (c *Console) assert(call goja.FunctionCall) any {
-	assertion := call.Argument(0).ToBoolean()
-	if !assertion {
-		return c.log(logger.ContextLogger.ErrorContext, call.Arguments[1:])
-	}
-	return goja.Undefined()
-}
-
-func (c *Console) clear(call goja.FunctionCall) any {
-	return nil
-}
-
-func (c *Console) count(call goja.FunctionCall) any {
-	label := jsc.AssertString(c.class.Runtime(), call.Argument(0), "label", true)
-	if label == "" {
-		label = "default"
-	}
-	c.access.Lock()
-	newValue := c.countMap[label] + 1
-	c.countMap[label] = newValue
-	c.access.Unlock()
-	writeLog(c.class.Runtime(), logger.ContextLogger.InfoContext, F.ToString(label, ": ", newValue))
-	return goja.Undefined()
-}
-
-func (c *Console) countReset(call goja.FunctionCall) any {
-	label := jsc.AssertString(c.class.Runtime(), call.Argument(0), "label", true)
-	if label == "" {
-		label = "default"
-	}
-	c.access.Lock()
-	delete(c.countMap, label)
-	c.access.Unlock()
-	return goja.Undefined()
-}
-
-func (c *Console) log(logFunc func(logger.ContextLogger, context.Context, ...any), args []goja.Value) any {
-	var buffer bytes.Buffer
-	var formatString string
-	if len(args) > 0 {
-		formatString = args[0].String()
-	}
-	format(c.class.Runtime(), &buffer, formatString, args[1:]...)
-	writeLog(c.class.Runtime(), logFunc, buffer.String())
-	return goja.Undefined()
-}
-
-func (c *Console) debug(call goja.FunctionCall) any {
-	return c.log(logger.ContextLogger.DebugContext, call.Arguments)
-}
-
-func (c *Console) dir(call goja.FunctionCall) any {
-	object := jsc.AssertObject(c.class.Runtime(), call.Argument(0), "object", false)
-	var buffer bytes.Buffer
-	for _, key := range object.Keys() {
-		value := object.Get(key)
-		buffer.WriteString(key)
-		buffer.WriteString(": ")
-		buffer.WriteString(value.String())
-		buffer.WriteString("\n")
-	}
-	writeLog(c.class.Runtime(), logger.ContextLogger.InfoContext, buffer.String())
-	return goja.Undefined()
-}
-
-func (c *Console) dirxml(call goja.FunctionCall) any {
-	var buffer bytes.Buffer
-	encoder := xml.NewEncoder(&buffer)
-	encoder.Indent("", "  ")
-	encoder.Encode(call.Argument(0).Export())
-	writeLog(c.class.Runtime(), logger.ContextLogger.InfoContext, buffer.String())
-	return goja.Undefined()
-}
-
-func (c *Console) error(call goja.FunctionCall) any {
-	return c.log(logger.ContextLogger.ErrorContext, call.Arguments)
-}
-
-func (c *Console) info(call goja.FunctionCall) any {
-	return c.log(logger.ContextLogger.InfoContext, call.Arguments)
-}
-
-func (c *Console) _log(call goja.FunctionCall) any {
-	return c.log(logger.ContextLogger.InfoContext, call.Arguments)
-}
-
-func (c *Console) profileEnd(call goja.FunctionCall) any {
-	return goja.Undefined()
-}
-
-func (c *Console) table(call goja.FunctionCall) any {
-	return c.dir(call)
-}
-
-func (c *Console) time(call goja.FunctionCall) any {
-	label := jsc.AssertString(c.class.Runtime(), call.Argument(0), "label", true)
-	if label == "" {
-		label = "default"
-	}
-	c.access.Lock()
-	c.timeMap[label] = time.Now()
-	c.access.Unlock()
-	return goja.Undefined()
-}
-
-func (c *Console) timeEnd(call goja.FunctionCall) any {
-	label := jsc.AssertString(c.class.Runtime(), call.Argument(0), "label", true)
-	if label == "" {
-		label = "default"
-	}
-	c.access.Lock()
-	startTime, ok := c.timeMap[label]
-	if !ok {
-		c.access.Unlock()
-		return goja.Undefined()
-	}
-	delete(c.timeMap, label)
-	c.access.Unlock()
-	writeLog(c.class.Runtime(), logger.ContextLogger.InfoContext, F.ToString(label, ": ", time.Since(startTime).String(), " - - timer ended"))
-	return goja.Undefined()
-}
-
-func (c *Console) timeLog(call goja.FunctionCall) any {
-	label := jsc.AssertString(c.class.Runtime(), call.Argument(0), "label", true)
-	if label == "" {
-		label = "default"
-	}
-	c.access.Lock()
-	startTime, ok := c.timeMap[label]
-	c.access.Unlock()
-	if !ok {
-		writeLog(c.class.Runtime(), logger.ContextLogger.ErrorContext, F.ToString("Timer \"", label, "\" doesn't exist."))
-		return goja.Undefined()
-	}
-	writeLog(c.class.Runtime(), logger.ContextLogger.InfoContext, F.ToString(label, ": ", time.Since(startTime)))
-	return goja.Undefined()
-}
-
-func (c *Console) trace(call goja.FunctionCall) any {
-	return c.log(logger.ContextLogger.TraceContext, call.Arguments)
-}
-
-func (c *Console) warn(call goja.FunctionCall) any {
-	return c.log(logger.ContextLogger.WarnContext, call.Arguments)
-}
-
-func writeLog(runtime *goja.Runtime, logFunc func(logger.ContextLogger, context.Context, ...any), message string) {
-	var (
-		ctx     context.Context
-		sLogger logger.ContextLogger
-	)
-	boxCtx := boxctx.FromRuntime(runtime)
-	if boxCtx != nil {
-		ctx = boxCtx.Context
-		sLogger = boxCtx.Logger
-	} else {
-		ctx = context.Background()
-		sLogger = sLog.StdLogger()
-	}
-	logFunc(sLogger, ctx, message)
-}
-
-func format(runtime *goja.Runtime, b *bytes.Buffer, f string, args ...goja.Value) {
-	pct := false
-	argNum := 0
-	for _, chr := range f {
-		if pct {
-			if argNum < len(args) {
-				if format1(runtime, chr, args[argNum], b) {
-					argNum++
-				}
-			} else {
-				b.WriteByte('%')
-				b.WriteRune(chr)
-			}
-			pct = false
-		} else {
-			if chr == '%' {
-				pct = true
-			} else {
-				b.WriteRune(chr)
-			}
-		}
-	}
-
-	for _, arg := range args[argNum:] {
-		b.WriteByte(' ')
-		b.WriteString(arg.String())
-	}
-}
-
-func format1(runtime *goja.Runtime, f rune, val goja.Value, w *bytes.Buffer) bool {
-	switch f {
-	case 's':
-		w.WriteString(val.String())
-	case 'd':
-		w.WriteString(val.ToNumber().String())
-	case 'j':
-		if json, ok := runtime.Get("JSON").(*goja.Object); ok {
-			if stringify, ok := goja.AssertFunction(json.Get("stringify")); ok {
-				res, err := stringify(json, val)
-				if err != nil {
-					panic(err)
-				}
-				w.WriteString(res.String())
-			}
-		}
-	case '%':
-		w.WriteByte('%')
-		return false
-	default:
-		w.WriteByte('%')
-		w.WriteRune(f)
-		return false
-	}
-	return true
-}

script/modules/console/context.go

@@ -1,3 +0,0 @@
-package console
-
-type Context struct{}