chore: reformat code

adapter/adapter.go

@@ -4,9 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/Dreamacro/clash/common/queue"
-	"github.com/Dreamacro/clash/component/dialer"
-	C "github.com/Dreamacro/clash/constant"
 	"net"
 	"net/http"
 	"net/netip"
@@ -14,6 +11,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/Dreamacro/clash/common/queue"
+	"github.com/Dreamacro/clash/component/dialer"
+	C "github.com/Dreamacro/clash/constant"
 	"go.uber.org/atomic"
 )
 

adapter/outbound/base.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"github.com/gofrs/uuid"
 	"net"
 	"strings"
 
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
+	"github.com/gofrs/uuid"
 )
 
 type Base struct {

adapter/outbound/http.go

@@ -86,7 +86,7 @@ func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {
 		},
 	}
 
-	//增加headers
+	// 增加headers
 	if len(h.option.Headers) != 0 {
 		for key, value := range h.option.Headers {
 			req.Header.Add(key, value)

adapter/outbound/util.go

@@ -3,7 +3,6 @@ package outbound
 import (
 	"bytes"
 	"crypto/tls"
-	xtls "github.com/xtls/go"
 	"net"
 	"strconv"
 	"sync"
@@ -12,6 +11,7 @@ import (
 	"github.com/Dreamacro/clash/component/resolver"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/transport/socks5"
+	xtls "github.com/xtls/go"
 )
 
 var (

adapter/outbound/vless.go

@@ -6,13 +6,13 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/Dreamacro/clash/common/convert"
 	"io"
 	"net"
 	"net/http"
 	"strconv"
 	"sync"
 
+	"github.com/Dreamacro/clash/common/convert"
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/resolver"
 	C "github.com/Dreamacro/clash/constant"

adapter/outbound/vmess.go

@@ -5,12 +5,12 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
-	"github.com/Dreamacro/clash/common/convert"
 	"net"
 	"net/http"
 	"strconv"
 	"strings"
 
+	"github.com/Dreamacro/clash/common/convert"
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/resolver"
 	C "github.com/Dreamacro/clash/constant"

adapter/outboundgroup/fallback.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"time"
+
 	"github.com/Dreamacro/clash/adapter/outbound"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/constant/provider"
-	"time"
 )
 
 type Fallback struct {

adapter/outboundgroup/groupbase.go

@@ -3,16 +3,17 @@ package outboundgroup
 import (
 	"context"
 	"fmt"
+	"sync"
+	"time"
+
 	"github.com/Dreamacro/clash/adapter/outbound"
 	C "github.com/Dreamacro/clash/constant"
-	"github.com/Dreamacro/clash/constant/provider"
 	types "github.com/Dreamacro/clash/constant/provider"
+	"github.com/Dreamacro/clash/constant/provider"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
 	"github.com/dlclark/regexp2"
 	"go.uber.org/atomic"
-	"sync"
-	"time"
 )
 
 type GroupBase struct {

adapter/outboundgroup/loadbalance.go

@@ -5,16 +5,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/Dreamacro/clash/common/cache"
 	"net"
 	"time"
 
 	"github.com/Dreamacro/clash/adapter/outbound"
+	"github.com/Dreamacro/clash/common/cache"
 	"github.com/Dreamacro/clash/common/murmur3"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/constant/provider"
-
 	"golang.org/x/net/publicsuffix"
 )
 

adapter/provider/healthcheck.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/Dreamacro/clash/common/batch"
 	C "github.com/Dreamacro/clash/constant"
-
 	"go.uber.org/atomic"
 )
 

adapter/provider/provider.go

@@ -4,16 +4,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/Dreamacro/clash/common/convert"
-	"github.com/dlclark/regexp2"
 	"math"
 	"runtime"
 	"time"
 
 	"github.com/Dreamacro/clash/adapter"
+	"github.com/Dreamacro/clash/common/convert"
 	C "github.com/Dreamacro/clash/constant"
 	types "github.com/Dreamacro/clash/constant/provider"
-
+	"github.com/dlclark/regexp2"
 	"gopkg.in/yaml.v3"
 )
 

adapter/provider/vehicle.go

@@ -2,12 +2,13 @@ package provider
 
 import (
 	"context"
-	netHttp "github.com/Dreamacro/clash/component/http"
-	types "github.com/Dreamacro/clash/constant/provider"
 	"io"
 	"net/http"
 	"os"
 	"time"
+
+	netHttp "github.com/Dreamacro/clash/component/http"
+	types "github.com/Dreamacro/clash/constant/provider"
 )
 
 type FileVehicle struct {

common/cmd/cmd.go

@@ -14,7 +14,6 @@ func ExecCmd(cmdStr string) (string, error) {
 		cmd = exec.Command(args[0])
 	} else {
 		cmd = exec.Command(args[0], args[1:]...)
-
 	}
 	prepareBackgroundCommand(cmd)
 	out, err := cmd.CombinedOutput()

common/cmd/cmd_other.go

@@ -7,5 +7,4 @@ import (
 )
 
 func prepareBackgroundCommand(cmd *exec.Cmd) {
-
 }

common/convert/converter.go

@@ -116,7 +116,7 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 				headers := make(map[string]any)
 				wsOpts := make(map[string]any)
 
-				//headers["Host"] = RandHost()
+				// headers["Host"] = RandHost()
 				headers["User-Agent"] = RandUserAgent()
 
 				wsOpts["path"] = query.Get("path")
@@ -203,7 +203,7 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 				headers := make(map[string]any)
 				wsOpts := make(map[string]any)
 
-				//headers["Host"] = RandHost()
+				// headers["Host"] = RandHost()
 				headers["User-Agent"] = RandUserAgent()
 				wsOpts["path"] = query.Get("path")
 				wsOpts["headers"] = headers
@@ -267,7 +267,7 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 				headers := make(map[string]any)
 				httpOpts := make(map[string]any)
 
-				//headers["Host"] = RandHost()
+				// headers["Host"] = RandHost()
 				headers["User-Agent"] = RandUserAgent()
 				httpOpts["method"] = values["method"]
 				httpOpts["path"] = values["path"]
@@ -279,7 +279,7 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 				headers := make(map[string]any)
 				h2Opts := make(map[string]any)
 
-				//headers["Host"] = RandHost()
+				// headers["Host"] = RandHost()
 				headers["User-Agent"] = RandUserAgent()
 				h2Opts["path"] = values["path"]
 				h2Opts["headers"] = headers

common/utils/uuid_test.go

@@ -1,9 +1,10 @@
 package utils
 
 import (
-	"github.com/gofrs/uuid"
 	"reflect"
 	"testing"
+
+	"github.com/gofrs/uuid"
 )
 
 func TestUUIDMap(t *testing.T) {

component/dhcp/dhcp.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/Dreamacro/clash/common/nnip"
 	"github.com/Dreamacro/clash/component/iface"
-
 	"github.com/insomniacslk/dhcp/dhcpv4"
 )
 

component/dialer/bind_darwin.go

@@ -6,7 +6,6 @@ import (
 	"syscall"
 
 	"github.com/Dreamacro/clash/component/iface"
-
 	"golang.org/x/sys/unix"
 )
 

component/fakeip/pool_test.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/Dreamacro/clash/component/profile/cachefile"
 	"github.com/Dreamacro/clash/component/trie"
-
 	"github.com/stretchr/testify/assert"
 	"go.etcd.io/bbolt"
 )

component/geodata/geodata.go

@@ -3,10 +3,10 @@ package geodata
 import (
 	"errors"
 	"fmt"
-	C "github.com/Dreamacro/clash/constant"
 	"strings"
 
 	"github.com/Dreamacro/clash/component/geodata/router"
+	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
 )
 

component/geodata/router/condition.go

@@ -329,7 +329,6 @@ func NewGeoIPMatcher(geoip *GeoIP) (*GeoIPMatcher, error) {
 }
 
 func (m *MultiGeoIPMatcher) ApplyIp(ip net.IP) bool {
-
 	for _, matcher := range m.matchers {
 		if matcher.Match(ip) {
 			return true

component/geodata/router/config.pb.go

@@ -7,10 +7,11 @@
 package router
 
 import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
 const (

component/geodata/standard/standard.go

@@ -9,7 +9,6 @@ import (
 	"github.com/Dreamacro/clash/component/geodata"
 	"github.com/Dreamacro/clash/component/geodata/router"
 	C "github.com/Dreamacro/clash/constant"
-
 	"google.golang.org/protobuf/proto"
 )
 

component/geodata/utils.go

@@ -2,6 +2,7 @@ package geodata
 
 import (
 	"fmt"
+
 	"github.com/Dreamacro/clash/component/geodata/router"
 	C "github.com/Dreamacro/clash/constant"
 )

component/http/http.go

@@ -2,14 +2,15 @@ package http
 
 import (
 	"context"
-	"github.com/Dreamacro/clash/listener/inner"
-	"github.com/Dreamacro/clash/log"
 	"io"
 	"net"
 	"net/http"
 	URL "net/url"
 	"strings"
 	"time"
+
+	"github.com/Dreamacro/clash/listener/inner"
+	"github.com/Dreamacro/clash/log"
 )
 
 const (
@@ -60,5 +61,4 @@ func HttpRequest(ctx context.Context, url, method string, header map[string][]st
 
 	client := http.Client{Transport: transport}
 	return client.Do(req)
-
 }

component/mmdb/mmdb.go

@@ -1,11 +1,11 @@
 package mmdb
 
 import (
-	"github.com/oschwald/geoip2-golang"
 	"sync"
 
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
+	"github.com/oschwald/geoip2-golang"
 )
 
 var (

component/process/process.go

@@ -2,10 +2,11 @@ package process
 
 import (
 	"errors"
-	"github.com/Dreamacro/clash/common/nnip"
-	C "github.com/Dreamacro/clash/constant"
 	"net"
 	"net/netip"
+
+	"github.com/Dreamacro/clash/common/nnip"
+	C "github.com/Dreamacro/clash/constant"
 )
 
 var (

component/process/process_darwin.go

@@ -7,7 +7,6 @@ import (
 	"unsafe"
 
 	"github.com/Dreamacro/clash/common/nnip"
-
 	"golang.org/x/sys/unix"
 )
 

component/process/process_windows.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/Dreamacro/clash/common/nnip"
 	"github.com/Dreamacro/clash/log"
-
 	"golang.org/x/sys/windows"
 )
 

component/profile/cachefile/cache.go

@@ -8,7 +8,6 @@ import (
 	"github.com/Dreamacro/clash/component/profile"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
-
 	"go.etcd.io/bbolt"
 )
 

component/sniffer/dispatcher.go

@@ -2,18 +2,17 @@ package sniffer
 
 import (
 	"errors"
-	"github.com/Dreamacro/clash/constant/sniffer"
 	"net"
 	"net/netip"
 	"strconv"
 	"time"
 
-	"github.com/Dreamacro/clash/component/trie"
-
 	CN "github.com/Dreamacro/clash/common/net"
 	"github.com/Dreamacro/clash/common/utils"
 	"github.com/Dreamacro/clash/component/resolver"
+	"github.com/Dreamacro/clash/component/trie"
 	C "github.com/Dreamacro/clash/constant"
+	"github.com/Dreamacro/clash/constant/sniffer"
 	"github.com/Dreamacro/clash/log"
 )
 
@@ -117,13 +116,13 @@ func (sd *SnifferDispatcher) sniffDomain(conn *CN.BufferedConn, metadata *C.Meta
 
 			host, err := sniffer.SniffTCP(bytes)
 			if err != nil {
-				//log.Debugln("[Sniffer] [%s] Sniff data failed %s", sniffer.Protocol(), metadata.DstIP)
+				// log.Debugln("[Sniffer] [%s] Sniff data failed %s", sniffer.Protocol(), metadata.DstIP)
 				continue
 			}
 
 			_, err = netip.ParseAddr(host)
 			if err == nil {
-				//log.Debugln("[Sniffer] [%s] Sniff data failed %s", sniffer.Protocol(), metadata.DstIP)
+				// log.Debugln("[Sniffer] [%s] Sniff data failed %s", sniffer.Protocol(), metadata.DstIP)
 				continue
 			}
 
@@ -143,7 +142,8 @@ func NewCloseSnifferDispatcher() (*SnifferDispatcher, error) {
 }
 
 func NewSnifferDispatcher(needSniffer []sniffer.Type, forceDomain *trie.DomainTrie[bool],
-	skipSNI *trie.DomainTrie[bool], ports *[]utils.Range[uint16]) (*SnifferDispatcher, error) {
+	skipSNI *trie.DomainTrie[bool], ports *[]utils.Range[uint16],
+) (*SnifferDispatcher, error) {
 	dispatcher := SnifferDispatcher{
 		enable:     true,
 		foreDomain: forceDomain,

component/sniffer/http_sniffer.go

@@ -3,9 +3,10 @@ package sniffer
 import (
 	"bytes"
 	"errors"
-	C "github.com/Dreamacro/clash/constant"
 	"net"
 	"strings"
+
+	C "github.com/Dreamacro/clash/constant"
 )
 
 var (

component/sniffer/quic_sniffer.go

@@ -1,3 +1,3 @@
 package sniffer
 
-//TODO
+// TODO

component/sniffer/tls_sniffer.go

@@ -13,8 +13,7 @@ var (
 	errNotClientHello = errors.New("not client hello")
 )
 
-type TLSSniffer struct {
-}
+type TLSSniffer struct{}
 
 func (tls *TLSSniffer) Protocol() string {
 	return "tls"

component/trie/ipcidr_node.go

@@ -2,9 +2,7 @@ package trie
 
 import "errors"
 
-var (
-	ErrorOverMaxValue = errors.New("the value don't over max value")
-)
+var ErrorOverMaxValue = errors.New("the value don't over max value")
 
 type IpCidrNode struct {
 	Mark     bool

component/trie/ipcidr_trie.go

@@ -1,8 +1,9 @@
 package trie
 
 import (
-	"github.com/Dreamacro/clash/log"
 	"net"
+
+	"github.com/Dreamacro/clash/log"
 )
 
 type IPV6 bool

component/trie/trie_test.go

@@ -49,7 +49,6 @@ func TestIpv4Search(t *testing.T) {
 
 	assert.Equal(t, false, trie.IsContain(net.ParseIP("22")))
 	assert.Equal(t, false, trie.IsContain(net.ParseIP("")))
-
 }
 
 func TestIpv6AddSuccess(t *testing.T) {
@@ -96,5 +95,4 @@ func TestIpv6Search(t *testing.T) {
 	assert.Equal(t, true, trie.IsContainForString("2001:67c:4e8:9666::1213"))
 
 	assert.Equal(t, false, trie.IsContain(net.ParseIP("22233:22")))
-
 }

config/config.go

@@ -4,8 +4,6 @@ import (
 	"container/list"
 	"errors"
 	"fmt"
-	"github.com/Dreamacro/clash/constant/sniffer"
-	"github.com/Dreamacro/clash/listener/tun/ipstack/commons"
 	"net"
 	"net/netip"
 	"net/url"
@@ -15,14 +13,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Dreamacro/clash/common/utils"
-	R "github.com/Dreamacro/clash/rules"
-	RP "github.com/Dreamacro/clash/rules/provider"
-
 	"github.com/Dreamacro/clash/adapter"
 	"github.com/Dreamacro/clash/adapter/outbound"
 	"github.com/Dreamacro/clash/adapter/outboundgroup"
 	"github.com/Dreamacro/clash/adapter/provider"
+	"github.com/Dreamacro/clash/common/utils"
 	"github.com/Dreamacro/clash/component/auth"
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/fakeip"
@@ -31,11 +26,14 @@ import (
 	"github.com/Dreamacro/clash/component/trie"
 	C "github.com/Dreamacro/clash/constant"
 	providerTypes "github.com/Dreamacro/clash/constant/provider"
+	"github.com/Dreamacro/clash/constant/sniffer"
 	snifferTypes "github.com/Dreamacro/clash/constant/sniffer"
 	"github.com/Dreamacro/clash/dns"
+	"github.com/Dreamacro/clash/listener/tun/ipstack/commons"
 	"github.com/Dreamacro/clash/log"
+	R "github.com/Dreamacro/clash/rules"
+	RP "github.com/Dreamacro/clash/rules/provider"
 	T "github.com/Dreamacro/clash/tunnel"
-
 	"gopkg.in/yaml.v3"
 )
 
@@ -332,7 +330,7 @@ func UnmarshalRawConfig(buf []byte) (*RawConfig, error) {
 
 func ParseRawConfig(rawCfg *RawConfig) (*Config, error) {
 	config := &Config{}
-	log.Infoln("Start initial configuration in progress") //Segment finished in xxm
+	log.Infoln("Start initial configuration in progress") // Segment finished in xxm
 	startTime := time.Now()
 	config.Experimental = &rawCfg.Experimental
 	config.Profile = &rawCfg.Profile
@@ -386,7 +384,7 @@ func ParseRawConfig(rawCfg *RawConfig) (*Config, error) {
 	}
 
 	elapsedTime := time.Since(startTime) / time.Millisecond                     // duration in ms
-	log.Infoln("Initial configuration complete, total time: %dms", elapsedTime) //Segment finished in xxm
+	log.Infoln("Initial configuration complete, total time: %dms", elapsedTime) // Segment finished in xxm
 	return config, nil
 }
 

config/initial.go

@@ -2,12 +2,12 @@ package config
 
 import (
 	"fmt"
-	"github.com/Dreamacro/clash/component/geodata"
-	"github.com/Dreamacro/clash/component/mmdb"
 	"io"
 	"net/http"
 	"os"
 
+	"github.com/Dreamacro/clash/component/geodata"
+	"github.com/Dreamacro/clash/component/mmdb"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
 )

config/updateGeo.go

@@ -2,13 +2,14 @@ package config
 
 import (
 	"fmt"
+	"io/ioutil"
+	"net/http"
+	"runtime"
+
 	"github.com/Dreamacro/clash/component/geodata"
 	_ "github.com/Dreamacro/clash/component/geodata/standard"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/oschwald/geoip2-golang"
-	"io/ioutil"
-	"net/http"
-	"runtime"
 )
 
 func UpdateGeoDatabases() error {

constant/sniffer/sniffer.go

@@ -13,9 +13,7 @@ const (
 	HTTP
 )
 
-var (
-	List = []Type{TLS, HTTP}
-)
+var List = []Type{TLS, HTTP}
 
 type Type int
 

context/packetconn.go

@@ -4,7 +4,6 @@ import (
 	"net"
 
 	C "github.com/Dreamacro/clash/constant"
-
 	"github.com/gofrs/uuid"
 )
 

dns/client.go

@@ -4,15 +4,14 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	"go.uber.org/atomic"
 	"net"
 	"net/netip"
 	"strings"
 
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/resolver"
-
 	D "github.com/miekg/dns"
+	"go.uber.org/atomic"
 )
 
 type client struct {

dns/dhcp.go

@@ -2,7 +2,6 @@ package dns
 
 import (
 	"context"
-	"go.uber.org/atomic"
 	"net"
 	"net/netip"
 	"sync"
@@ -11,8 +10,8 @@ import (
 	"github.com/Dreamacro/clash/component/dhcp"
 	"github.com/Dreamacro/clash/component/iface"
 	"github.com/Dreamacro/clash/component/resolver"
-
 	D "github.com/miekg/dns"
+	"go.uber.org/atomic"
 )
 
 const (

dns/doh.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/resolver"
-
 	D "github.com/miekg/dns"
 )
 

dns/doq.go

@@ -5,15 +5,15 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	"github.com/Dreamacro/clash/component/dialer"
-	"github.com/Dreamacro/clash/component/resolver"
-	"github.com/lucas-clemente/quic-go"
 	"net"
 	"strconv"
 	"sync"
 	"time"
 
+	"github.com/Dreamacro/clash/component/dialer"
+	"github.com/Dreamacro/clash/component/resolver"
 	"github.com/Dreamacro/clash/log"
+	"github.com/lucas-clemente/quic-go"
 	D "github.com/miekg/dns"
 )
 

dns/filters.go

@@ -2,6 +2,7 @@ package dns
 
 import (
 	"net/netip"
+	"strings"
 
 	"github.com/Dreamacro/clash/component/geodata"
 	"github.com/Dreamacro/clash/component/geodata/router"
@@ -9,7 +10,6 @@ import (
 	"github.com/Dreamacro/clash/component/trie"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
-	"strings"
 )
 
 type fallbackIPFilter interface {

dns/middleware.go

@@ -12,7 +12,6 @@ import (
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/context"
 	"github.com/Dreamacro/clash/log"
-
 	D "github.com/miekg/dns"
 )
 

dns/resolver.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"go.uber.org/atomic"
 	"math/rand"
 	"net/netip"
 	"time"
@@ -16,8 +15,8 @@ import (
 	"github.com/Dreamacro/clash/component/resolver"
 	"github.com/Dreamacro/clash/component/trie"
 	C "github.com/Dreamacro/clash/constant"
-
 	D "github.com/miekg/dns"
+	"go.uber.org/atomic"
 	"golang.org/x/sync/singleflight"
 )
 

dns/server.go

@@ -7,7 +7,6 @@ import (
 	"github.com/Dreamacro/clash/common/sockopt"
 	"github.com/Dreamacro/clash/context"
 	"github.com/Dreamacro/clash/log"
-
 	D "github.com/miekg/dns"
 )
 

dns/util.go

@@ -15,7 +15,6 @@ import (
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
-
 	D "github.com/miekg/dns"
 )
 

hub/executor/executor.go

@@ -2,8 +2,6 @@ package executor
 
 import (
 	"fmt"
-	"github.com/Dreamacro/clash/component/process"
-	"github.com/Dreamacro/clash/listener/inner"
 	"net/netip"
 	"os"
 	"runtime"
@@ -15,6 +13,7 @@ import (
 	"github.com/Dreamacro/clash/component/dialer"
 	G "github.com/Dreamacro/clash/component/geodata"
 	"github.com/Dreamacro/clash/component/iface"
+	"github.com/Dreamacro/clash/component/process"
 	"github.com/Dreamacro/clash/component/profile"
 	"github.com/Dreamacro/clash/component/profile/cachefile"
 	"github.com/Dreamacro/clash/component/resolver"
@@ -26,6 +25,7 @@ import (
 	"github.com/Dreamacro/clash/dns"
 	P "github.com/Dreamacro/clash/listener"
 	authStore "github.com/Dreamacro/clash/listener/auth"
+	"github.com/Dreamacro/clash/listener/inner"
 	"github.com/Dreamacro/clash/listener/tproxy"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
@@ -224,7 +224,6 @@ func loadRuleProvider(ruleProviders map[string]provider.RuleProvider) {
 		go func() {
 			defer func() { <-ch; wg.Done() }()
 			loadProvider(ruleProvider)
-
 		}()
 	}
 

hub/route/cache.go

@@ -4,7 +4,6 @@ import (
 	"net/http"
 
 	"github.com/Dreamacro/clash/component/resolver"
-
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 )

hub/route/configs.go

@@ -1,11 +1,11 @@
 package route
 
 import (
-	"github.com/Dreamacro/clash/component/dialer"
 	"net/http"
 	"path/filepath"
 	"sync"
 
+	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/resolver"
 	"github.com/Dreamacro/clash/config"
 	"github.com/Dreamacro/clash/constant"
@@ -13,7 +13,6 @@ import (
 	P "github.com/Dreamacro/clash/listener"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
-
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 )

hub/route/connections.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/Dreamacro/clash/tunnel/statistic"
-
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 	"github.com/gorilla/websocket"

hub/route/groups.go

@@ -2,14 +2,15 @@ package route
 
 import (
 	"context"
+	"net/http"
+	"strconv"
+	"time"
+
 	"github.com/Dreamacro/clash/adapter"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/tunnel"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
-	"net/http"
-	"strconv"
-	"time"
 )
 
 func GroupRouter() http.Handler {
@@ -68,7 +69,6 @@ func getGroupDelay(w http.ResponseWriter, r *http.Request) {
 	defer cancel()
 
 	dm, err := group.URLTest(ctx, url)
-
 	if err != nil {
 		render.Status(r, http.StatusGatewayTimeout)
 		render.JSON(w, r, newError(err.Error()))

hub/route/provider.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/Dreamacro/clash/constant/provider"
 	"github.com/Dreamacro/clash/tunnel"
-
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 )

hub/route/proxies.go

@@ -12,14 +12,11 @@ import (
 	"github.com/Dreamacro/clash/component/profile/cachefile"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/tunnel"
-
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 )
 
-var (
-	SwitchProxiesCallback func(sGroup string, sProxy string)
-)
+var SwitchProxiesCallback func(sGroup string, sProxy string)
 
 func proxyRouter() http.Handler {
 	r := chi.NewRouter()

hub/route/rules.go

@@ -1,11 +1,10 @@
 package route
 
 import (
-	"github.com/Dreamacro/clash/constant"
 	"net/http"
 
+	"github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/tunnel"
-
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 )

hub/route/server.go

@@ -12,7 +12,6 @@ import (
 	_ "github.com/Dreamacro/clash/constant/mime"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel/statistic"
-
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/cors"
 	"github.com/go-chi/render"

listener/inner/tcp.go

@@ -1,9 +1,10 @@
 package inner
 
 import (
+	"net"
+
 	"github.com/Dreamacro/clash/adapter/inbound"
 	C "github.com/Dreamacro/clash/constant"
-	"net"
 )
 
 var tcpIn chan<- C.ConnContext

listener/listener.go

@@ -2,8 +2,6 @@ package proxy
 
 import (
 	"fmt"
-	"github.com/Dreamacro/clash/listener/inner"
-	"github.com/Dreamacro/clash/listener/tun/ipstack/commons"
 	"net"
 	"sort"
 	"strconv"
@@ -13,12 +11,14 @@ import (
 	"github.com/Dreamacro/clash/config"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/listener/http"
+	"github.com/Dreamacro/clash/listener/inner"
 	"github.com/Dreamacro/clash/listener/mixed"
 	"github.com/Dreamacro/clash/listener/redir"
 	"github.com/Dreamacro/clash/listener/socks"
 	"github.com/Dreamacro/clash/listener/tproxy"
 	"github.com/Dreamacro/clash/listener/tun"
 	"github.com/Dreamacro/clash/listener/tun/ipstack"
+	"github.com/Dreamacro/clash/listener/tun/ipstack/commons"
 	"github.com/Dreamacro/clash/log"
 )
 

listener/tun/device/device_no_gvisor.go

@@ -5,7 +5,6 @@ package device
 // Device is the interface that implemented by network layer devices (e.g. tun),
 // and easy to use as stack.LinkEndpoint.
 type Device interface {
-
 	// Name returns the current name of the device.
 	Name() string
 

listener/tun/device/fdbased/fd_unix.go

@@ -7,7 +7,6 @@ import (
 	"strconv"
 
 	"github.com/Dreamacro/clash/listener/tun/device"
-
 	"golang.org/x/sys/unix"
 )
 

listener/tun/device/fdbased/fd_unix_gvisor.go

@@ -3,8 +3,9 @@
 package fdbased
 
 import (
-	"gvisor.dev/gvisor/pkg/tcpip/stack"
 	"os"
+
+	"gvisor.dev/gvisor/pkg/tcpip/stack"
 )
 
 type FD struct {

listener/tun/device/fdbased/open_linux.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/Dreamacro/clash/listener/tun/device"
-
 	"gvisor.dev/gvisor/pkg/tcpip/link/fdbased"
 	"gvisor.dev/gvisor/pkg/tcpip/link/rawfile"
 )

listener/tun/device/tun/driver/dll_windows.go

@@ -14,7 +14,6 @@ import (
 	"unsafe"
 
 	"github.com/Dreamacro/clash/log"
-
 	"golang.org/x/sys/windows"
 	"golang.zx2c4.com/wireguard/windows/driver/memmod"
 )

listener/tun/device/tun/tun_netstack.go

@@ -7,7 +7,6 @@ import (
 	"unsafe"
 
 	"github.com/Dreamacro/clash/listener/tun/device"
-
 	"golang.org/x/sys/unix"
 	"gvisor.dev/gvisor/pkg/tcpip/link/fdbased"
 	"gvisor.dev/gvisor/pkg/tcpip/link/rawfile"

listener/tun/device/tun/tun_wireguard.go

@@ -8,7 +8,6 @@ import (
 	"runtime"
 
 	"github.com/Dreamacro/clash/listener/tun/device"
-
 	"golang.zx2c4.com/wireguard/tun"
 )
 

listener/tun/device/tun/tun_wireguard_gvisor.go

@@ -4,6 +4,7 @@ package tun
 
 import (
 	"fmt"
+
 	"github.com/Dreamacro/clash/listener/tun/device/iobased"
 	"golang.zx2c4.com/wireguard/tun"
 )

listener/tun/device/tun/tun_wireguard_no_gvisor.go

@@ -16,7 +16,6 @@ type TUN struct {
 }
 
 func closeIO(t *TUN) {
-
 }
 
 func newEq(t *TUN) error {

listener/tun/device/tun/tun_wireguard_windows.go

@@ -2,7 +2,6 @@ package tun
 
 import (
 	"github.com/Dreamacro/clash/listener/tun/device/tun/driver"
-
 	"golang.org/x/sys/windows"
 	"golang.zx2c4.com/wireguard/tun"
 )

listener/tun/ipstack/commons/auto_linux.go

@@ -1,12 +1,13 @@
 package commons
 
 import (
+	"time"
+
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/iface"
 	"github.com/Dreamacro/clash/log"
 	"github.com/vishvananda/netlink"
 	"go.uber.org/atomic"
-	"time"
 )
 
 var (

listener/tun/ipstack/commons/auto_others.go

@@ -3,11 +3,12 @@
 package commons
 
 import (
+	"time"
+
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/iface"
 	"github.com/Dreamacro/clash/log"
 	"go.uber.org/atomic"
-	"time"
 )
 
 var (

listener/tun/ipstack/commons/router.go

@@ -2,14 +2,13 @@ package commons
 
 import (
 	"fmt"
-	"github.com/Dreamacro/clash/log"
 	"net"
 	"time"
+
+	"github.com/Dreamacro/clash/log"
 )
 
-var (
-	defaultRoutes = []string{"1.0.0.0/8", "2.0.0.0/7", "4.0.0.0/6", "8.0.0.0/5", "16.0.0.0/4", "32.0.0.0/3", "64.0.0.0/2", "128.0.0.0/1"}
-)
+var defaultRoutes = []string{"1.0.0.0/8", "2.0.0.0/7", "4.0.0.0/6", "8.0.0.0/5", "16.0.0.0/4", "32.0.0.0/3", "64.0.0.0/2", "128.0.0.0/1"}
 
 func ipv4MaskString(bits int) string {
 	m := net.CIDRMask(bits, 32)

listener/tun/ipstack/commons/router_android.go

@@ -2,11 +2,12 @@ package commons
 
 import (
 	"fmt"
+	"net"
+	"net/netip"
+
 	"github.com/Dreamacro/clash/listener/tun/device"
 	"github.com/Dreamacro/clash/log"
 	"github.com/vishvananda/netlink"
-	"net"
-	"net/netip"
 )
 
 func GetAutoDetectInterface() (ifn string, err error) {
@@ -60,7 +61,7 @@ func ConfigInterfaceAddress(dev device.Device, addr netip.Prefix, forceMTU int,
 
 func configInterfaceRouting(index int, interfaceName string, ip netip.Addr) error {
 	const tableId = 1981801
-	var pref = 9000
+	pref := 9000
 
 	for _, route := range defaultRoutes {
 		_, ipn, err := net.ParseCIDR(route)

listener/tun/ipstack/commons/router_linux.go

@@ -4,10 +4,11 @@ package commons
 
 import (
 	"fmt"
-	"github.com/Dreamacro/clash/listener/tun/device"
-	"github.com/vishvananda/netlink"
 	"net"
 	"net/netip"
+
+	"github.com/Dreamacro/clash/listener/tun/device"
+	"github.com/vishvananda/netlink"
 )
 
 func GetAutoDetectInterface() (string, error) {

listener/tun/ipstack/commons/router_windows.go

@@ -10,7 +10,6 @@ import (
 	"github.com/Dreamacro/clash/listener/tun/device"
 	"github.com/Dreamacro/clash/listener/tun/device/tun"
 	"github.com/Dreamacro/clash/log"
-
 	"golang.org/x/sys/windows"
 	"golang.zx2c4.com/wireguard/windows/services"
 	"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"

listener/tun/ipstack/gvisor/nic.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 
 	"github.com/Dreamacro/clash/listener/tun/ipstack/gvisor/option"
-
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/stack"
 )

listener/tun/ipstack/gvisor/route.go

@@ -4,7 +4,6 @@ package gvisor
 
 import (
 	"github.com/Dreamacro/clash/listener/tun/ipstack/gvisor/option"
-
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/header"
 	"gvisor.dev/gvisor/pkg/tcpip/stack"

listener/tun/ipstack/gvisor/stack.go

@@ -11,7 +11,6 @@ import (
 	"github.com/Dreamacro/clash/listener/tun/device"
 	"github.com/Dreamacro/clash/listener/tun/ipstack"
 	"github.com/Dreamacro/clash/listener/tun/ipstack/gvisor/option"
-
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/network/ipv4"
 	"gvisor.dev/gvisor/pkg/tcpip/network/ipv6"

listener/tun/ipstack/gvisor/stack_no_gvisor.go

@@ -4,12 +4,13 @@ package gvisor
 
 import (
 	"fmt"
+	"net/netip"
+
 	"github.com/Dreamacro/clash/adapter/inbound"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/listener/tun/device"
 	"github.com/Dreamacro/clash/listener/tun/ipstack"
 	"github.com/Dreamacro/clash/log"
-	"net/netip"
 )
 
 // New allocates a new *gvStack with given options.

listener/tun/ipstack/gvisor/tcp.go

@@ -8,7 +8,6 @@ import (
 	"github.com/Dreamacro/clash/listener/tun/ipstack/gvisor/adapter"
 	"github.com/Dreamacro/clash/listener/tun/ipstack/gvisor/option"
 	"github.com/Dreamacro/clash/log"
-
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"
 	"gvisor.dev/gvisor/pkg/tcpip/header"

listener/tun/ipstack/gvisor/udp.go

@@ -9,7 +9,6 @@ import (
 	"github.com/Dreamacro/clash/listener/tun/ipstack/gvisor/adapter"
 	"github.com/Dreamacro/clash/listener/tun/ipstack/gvisor/option"
 	"github.com/Dreamacro/clash/log"
-
 	"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"
 	"gvisor.dev/gvisor/pkg/tcpip/stack"
 	"gvisor.dev/gvisor/pkg/tcpip/transport/udp"

listener/tun/ipstack/system/mars/nat/nat.go

@@ -1,13 +1,13 @@
 package nat
 
 import (
-	log "github.com/sirupsen/logrus"
 	"io"
 	"net"
 	"net/netip"
 
 	"github.com/Dreamacro/clash/common/pool"
 	"github.com/Dreamacro/clash/listener/tun/ipstack/system/mars/tcpip"
+	log "github.com/sirupsen/logrus"
 )
 
 func Start(device io.ReadWriter, gateway, portal, broadcast netip.Addr) (*TCP, *UDP, error) {

listener/tun/tun_adapter.go

@@ -2,6 +2,11 @@ package tun
 
 import (
 	"fmt"
+	"net/netip"
+	"net/url"
+	"runtime"
+	"strings"
+
 	"github.com/Dreamacro/clash/adapter/inbound"
 	"github.com/Dreamacro/clash/common/cmd"
 	"github.com/Dreamacro/clash/component/process"
@@ -15,15 +20,10 @@ import (
 	"github.com/Dreamacro/clash/listener/tun/ipstack/gvisor"
 	"github.com/Dreamacro/clash/listener/tun/ipstack/system"
 	"github.com/Dreamacro/clash/log"
-	"net/netip"
-	"net/url"
-	"runtime"
-	"strings"
 )
 
 // New TunAdapter
 func New(tunConf *config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) (ipstack.Stack, error) {
-
 	var (
 		tunAddress = tunConf.TunAddressPrefix
 		devName    = tunConf.Device

log/log.go

@@ -5,7 +5,6 @@ import (
 	"os"
 
 	"github.com/Dreamacro/clash/common/observable"
-
 	log "github.com/sirupsen/logrus"
 )
 

main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/Dreamacro/clash/constant/features"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -13,10 +12,10 @@ import (
 
 	"github.com/Dreamacro/clash/config"
 	C "github.com/Dreamacro/clash/constant"
+	"github.com/Dreamacro/clash/constant/features"
 	"github.com/Dreamacro/clash/hub"
 	"github.com/Dreamacro/clash/hub/executor"
 	"github.com/Dreamacro/clash/log"
-
 	"go.uber.org/automaxprocs/maxprocs"
 )
 

rules/common/geoip.go

@@ -2,10 +2,10 @@ package common
 
 import (
 	"fmt"
-	"github.com/Dreamacro/clash/component/geodata"
-	"github.com/Dreamacro/clash/component/geodata/router"
 	"strings"
 
+	"github.com/Dreamacro/clash/component/geodata"
+	"github.com/Dreamacro/clash/component/geodata/router"
 	"github.com/Dreamacro/clash/component/mmdb"
 	"github.com/Dreamacro/clash/component/resolver"
 	C "github.com/Dreamacro/clash/constant"

rules/common/geosite.go

@@ -2,13 +2,14 @@ package common
 
 import (
 	"fmt"
+	_ "unsafe"
+
 	"github.com/Dreamacro/clash/component/geodata"
 	_ "github.com/Dreamacro/clash/component/geodata/memconservative"
 	"github.com/Dreamacro/clash/component/geodata/router"
 	_ "github.com/Dreamacro/clash/component/geodata/standard"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
-	_ "unsafe"
 )
 
 //go:linkname initGeoSite github.com/Dreamacro/clash/config.initGeoSite

rules/common/in_type.go

@@ -2,8 +2,9 @@ package common
 
 import (
 	"fmt"
-	C "github.com/Dreamacro/clash/constant"
 	"strings"
+
+	C "github.com/Dreamacro/clash/constant"
 )
 
 type InType struct {

rules/common/ipsuffix.go

@@ -1,8 +1,9 @@
 package common
 
 import (
-	C "github.com/Dreamacro/clash/constant"
 	"net/netip"
+
+	C "github.com/Dreamacro/clash/constant"
 )
 
 type IPSuffix struct {

rules/common/network_type.go

@@ -2,8 +2,9 @@ package common
 
 import (
 	"fmt"
-	C "github.com/Dreamacro/clash/constant"
 	"strings"
+
+	C "github.com/Dreamacro/clash/constant"
 )
 
 type NetworkType struct {

rules/common/uid.go

@@ -2,13 +2,14 @@ package common
 
 import (
 	"fmt"
+	"runtime"
+	"strconv"
+	"strings"
+
 	"github.com/Dreamacro/clash/common/utils"
 	"github.com/Dreamacro/clash/component/process"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
-	"runtime"
-	"strconv"
-	"strings"
 )
 
 type Uid struct {

rules/logic/and.go

@@ -2,9 +2,10 @@ package logic
 
 import (
 	"fmt"
+	"strings"
+
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/rules/common"
-	"strings"
 )
 
 type AND struct {

rules/logic/common.go

@@ -2,11 +2,12 @@ package logic
 
 import (
 	"fmt"
-	"github.com/Dreamacro/clash/common/collections"
-	C "github.com/Dreamacro/clash/constant"
 	"regexp"
 	"strings"
 	_ "unsafe"
+
+	"github.com/Dreamacro/clash/common/collections"
+	C "github.com/Dreamacro/clash/constant"
 )
 
 //go:linkname parseRule github.com/Dreamacro/clash/rules.ParseRule

rules/logic/logic_test.go

@@ -1,9 +1,10 @@
 package logic
 
 import (
+	"testing"
+
 	"github.com/Dreamacro/clash/constant"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestAND(t *testing.T) {

rules/logic/not.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"fmt"
+
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/rules/common"
 )

rules/logic/or.go

@@ -2,9 +2,10 @@ package logic
 
 import (
 	"fmt"
+	"strings"
+
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/rules/common"
-	"strings"
 )
 
 type OR struct {

rules/provider/domain_strategy.go

@@ -1,10 +1,11 @@
 package provider
 
 import (
+	"strings"
+
 	"github.com/Dreamacro/clash/component/trie"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
-	"strings"
 )
 
 type domainStrategy struct {